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
  
*** 55,68 ****
  # run independently or out of order
  #
  function cleanup
  {
          [[ -e $TESTDIR/$TESTFILE1 ]] && \
!             log_must $RM $TESTDIR/$TESTFILE1
  
          [[ -e $TESTDIR/$TESTFILE2 ]] && \
!             log_must $RM $TESTDIR/$TESTFILE2
  }
  
  log_onexit cleanup
  
  #
--- 55,68 ----
  # run independently or out of order
  #
  function cleanup
  {
          [[ -e $TESTDIR/$TESTFILE1 ]] && \
!             log_must rm $TESTDIR/$TESTFILE1
  
          [[ -e $TESTDIR/$TESTFILE2 ]] && \
!             log_must rm $TESTDIR/$TESTFILE2
  }
  
  log_onexit cleanup
  
  #