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,50 ****
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
  . $STF_SUITE/include/libtest.shlib
  
  if poolexists $TESTPOOL.virt
  then
!         log_must $ZPOOL destroy $TESTPOOL.virt
  fi
  
  if poolexists v1-pool
  then
!         log_must $ZPOOL destroy v1-pool
  fi
  
  if [[ -f /tmp/zfstest_datastream.dat ]]
  then
!         log_must $RM -f /tmp/zfstest_datastream.dat
  fi
  
  default_cleanup
--- 24,50 ----
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
  . $STF_SUITE/include/libtest.shlib
  
  if poolexists $TESTPOOL.virt
  then
!         log_must zpool destroy $TESTPOOL.virt
  fi
  
  if poolexists v1-pool
  then
!         log_must zpool destroy v1-pool
  fi
  
  if [[ -f /tmp/zfstest_datastream.dat ]]
  then
!         log_must rm -f /tmp/zfstest_datastream.dat
  fi
  
  default_cleanup