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 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
 

@@ -44,15 +44,15 @@
 verify_runnable "global"
 
 function cleanup
 {
         if poolexists $TESTPOOL1; then
-                log_must $ZPOOL destroy $TESTPOOL1
+                log_must zpool destroy $TESTPOOL1
         fi
 
         if [[ -f $pool_vdev ]]; then
-                $RM -f $pool_vdev
+                rm -f $pool_vdev
         fi
 }
 
 log_onexit cleanup
 

@@ -59,29 +59,29 @@
 log_assert \
         "the userquota and groupquota can be set during zpool,zfs creation"
 
 typeset pool_vdev=/var/tmp/pool_dev.$$
 
-log_must $MKFILE 500m $pool_vdev
+log_must mkfile 500m $pool_vdev
 
 if poolexists $TESTPOOL1; then
-        $ZPOOL destroy $TESTPOOL1
+        zpool destroy $TESTPOOL1
 fi
 
-log_must $ZPOOL create -O userquota@$QUSER1=$UQUOTA_SIZE \
+log_must zpool create -O userquota@$QUSER1=$UQUOTA_SIZE \
         -O groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1 $pool_vdev
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
         $TESTPOOL1 > /dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL1 "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL1 "$GQUOTA_SIZE"
 
-log_must $ZFS create -o userquota@$QUSER1=$UQUOTA_SIZE \
+log_must zfs create -o userquota@$QUSER1=$UQUOTA_SIZE \
         -o groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1/fs
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
         $TESTPOOL1 > /dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL1/fs "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL1/fs "$GQUOTA_SIZE"