7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 24,34 ****
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/quota/quota.kshlib
  
--- 24,34 ----
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/quota/quota.kshlib
  
*** 56,66 ****
  # run independently or out of order
  #
  function cleanup
  {
          [[ -e $TESTDIR1/$TESTFILE1 ]] && \
!             log_must $RM $TESTDIR1/$TESTFILE1
  
          #
          # Need to allow time for space to be released back to
          # pool, otherwise next test will fail trying to set a
          # quota which is less than the space used.
--- 56,66 ----
  # run independently or out of order
  #
  function cleanup
  {
          [[ -e $TESTDIR1/$TESTFILE1 ]] && \
!             log_must rm $TESTDIR1/$TESTFILE1
  
          #
          # Need to allow time for space to be released back to
          # pool, otherwise next test will fail trying to set a
          # quota which is less than the space used.