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,11 +24,11 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 #

@@ -46,41 +46,41 @@
 
 set -A pools "pool.$$" "pool123" "mypool"
 
 function cleanup {
         if poolexists $POOL ; then
-                log_must $ZPOOL destroy $POOL
+                log_must zpool destroy $POOL
         fi
-        $RM /bootfs_003.$$.dat
+        rm /bootfs_003.$$.dat
 }
 
 
-$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
+zpool set 2>&1 | grep bootfs > /dev/null
 if [ $? -ne 0 ]
 then
         log_unsupported "bootfs pool property not supported on this release."
 fi
 
 log_onexit cleanup
 
 log_assert "Valid pool names are accepted by zpool set bootfs"
-$MKFILE $MINVDEVSIZE /bootfs_003.$$.dat
+mkfile $MINVDEVSIZE /bootfs_003.$$.dat
 
 typeset -i i=0;
 
 while [ $i -lt "${#pools[@]}" ]
 do
         POOL=${pools[$i]}
-        log_must $ZPOOL create $POOL /bootfs_003.$$.dat
-        log_must $ZFS create $POOL/$TESTFS
+        log_must zpool create $POOL /bootfs_003.$$.dat
+        log_must zfs create $POOL/$TESTFS
 
-        log_must $ZPOOL set bootfs=$POOL/$TESTFS $POOL
-        RES=$($ZPOOL get bootfs $POOL | $TAIL -1 | $AWK '{print $3}' )
+        log_must zpool set bootfs=$POOL/$TESTFS $POOL
+        RES=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
         if [ $RES != "$POOL/$TESTFS" ]
         then
                 log_fail "Expected $RES == $POOL/$TESTFS"
         fi
-        log_must $ZPOOL destroy $POOL
+        log_must zpool destroy $POOL
         i=$(( $i + 1 ))
 done
 
 log_pass "Valid pool names are accepted by zpool set bootfs"