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/snapused/snapused.kshlib
 

@@ -46,35 +46,35 @@
 
 verify_runnable "both"
 
 function cleanup
 {
-        log_must $ZFS destroy -rR $USEDTEST
+        log_must zfs destroy -rR $USEDTEST
 }
 
 log_assert "Verify usedbydataset is correct."
 log_onexit cleanup
 
-log_must $ZFS create $USEDTEST
+log_must zfs create $USEDTEST
 check_usedbydataset $USEDTEST
 
 typeset -i i=0
 typeset -i r_size=0
 mntpnt=$(get_prop mountpoint $USEDTEST)
 while ((i < 5)); do
         ((r_size=(i+1)*16))
 
-        log_must $MKFILE 16M $mntpnt/file$i
-        log_must $MKFILE "$r_size"M $mntpnt/file_var$i
-        log_must $ZFS snapshot -r $USEDTEST@snap$i
+        log_must mkfile 16M $mntpnt/file$i
+        log_must mkfile "$r_size"M $mntpnt/file_var$i
+        log_must zfs snapshot -r $USEDTEST@snap$i
 
-        log_must $ZFS clone $USEDTEST@snap$i $USEDTEST/cln$i
-        log_must $ZFS set is:cloned=yes $USEDTEST/cln$i
+        log_must zfs clone $USEDTEST@snap$i $USEDTEST/cln$i
+        log_must zfs set is:cloned=yes $USEDTEST/cln$i
 
         mntpnt_cln=$(get_prop mountpoint $USEDTEST/cln$i)
-        log_must $MKFILE 16M $mntpnt_cln/file_cln$i
-        log_must $MKFILE "$r_size"M $mntpnt_cln/file_cln_var$i
+        log_must mkfile 16M $mntpnt_cln/file_cln$i
+        log_must mkfile "$r_size"M $mntpnt_cln/file_cln_var$i
 
         check_usedbydataset $USEDTEST
 
         ((i = i + 1))
 done