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,11 +44,11 @@
 #
 
 function cleanup
 {
         if datasetexists $snap_fs; then
-                log_must $ZFS destroy $snap_fs
+                log_must zfs destroy $snap_fs
         fi
 
         log_must cleanup_quota
 }
 

@@ -61,18 +61,18 @@
     "-s name" "-s used" "-s quota" "-S type" "-S name" "-S used" "-S quota" \
     "-t posixuser" "-t posixgroup" "-t all" "-i" "-tsmbuser" "-t smbgroup"
 
 typeset snap_fs=$QFS@snap
 
-log_must $ZFS set userquota@$QUSER1=100m $QFS
+log_must zfs set userquota@$QUSER1=100m $QFS
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE 50m $QFILE
-$SYNC
+log_must user_run $QUSER1 mkfile 50m $QFILE
+sync
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 for param in "${params[@]}"; do
-        log_must eval "$ZFS userspace $param $QFS >/dev/null 2>&1"
-        log_must eval "$ZFS userspace $param $snap_fs >/dev/null 2>&1"
+        log_must eval "zfs userspace $param $QFS >/dev/null 2>&1"
+        log_must eval "zfs userspace $param $snap_fs >/dev/null 2>&1"
 done
 
 log_pass "zfs userspace with all possible parameters pass as expect"