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>

@@ -26,11 +26,10 @@
 
 #
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
-. $STF_SUITE/include/commands.cfg
 . $STF_SUITE/include/libtest.shlib
 
 # Define run length constants
 export RT_LONG="3"
 export RT_MEDIUM="2"

@@ -38,29 +37,10 @@
 
 # Define macro for zone test
 export ZONE_POOL="zonepool"
 export ZONE_CTR="zonectr"
 
-# Test Suite Specific Commands
-export CHG_USR_EXEC="/opt/zfs-tests/bin/chg_usr_exec"
-export DEVNAME2DEVID="/opt/zfs-tests/bin/devname2devid"
-export DIR_RD_UPDATE="/opt/zfs-tests/bin/dir_rd_update"
-export FILE_CHECK="/opt/zfs-tests/bin/file_check"
-export FILE_TRUNC="/opt/zfs-tests/bin/file_trunc"
-export FILE_WRITE="/opt/zfs-tests/bin/file_write"
-export GETHOLES="/opt/zfs-tests/bin/getholes"
-export LARGEST_FILE="/opt/zfs-tests/bin/largest_file"
-export MKBUSY="/opt/zfs-tests/bin/mkbusy"
-export MKFILES="/opt/zfs-tests/bin/mkfiles"
-export MKHOLES="/opt/zfs-tests/bin/mkholes"
-export MKTREE="/opt/zfs-tests/bin/mktree"
-export MMAPWRITE="/opt/zfs-tests/bin/mmapwrite"
-export RANDFREE_FILE="/opt/zfs-tests/bin/randfree_file"
-export READMMAP="/opt/zfs-tests/bin/readmmap"
-export RENAME_DIR="/opt/zfs-tests/bin/rename_dir"
-export RM_LNKCNT_ZERO_FILE="/opt/zfs-tests/bin/rm_lnkcnt_zero_file"
-
 # ensure we're running in the C locale, since
 # localised messages may result in test failures
 export LC_ALL="C"
 export LANG="C"
 

@@ -137,11 +117,11 @@
 export MINVDEVSIZE=$((256 * 1024 * 1024))
 
 # Minimum vdev size possible as defined in the OS
 export SPA_MINDEVSIZE=$((64 * 1024 * 1024))
 
-export AUTO_SNAP=$($SVCS -a | $GREP auto-snapshot | $GREP online | $AWK \
+export AUTO_SNAP=$(svcs -a | grep auto-snapshot | grep online | awk \
     '{print $3}')
 
 # finally, if we're running in a local zone
 # we take some additional actions
 if ! is_global_zone; then