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) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 #

@@ -43,35 +43,35 @@
 
 verify_runnable "both"
 
 function cleanup
 {
-        log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-        log_must $ZFS create $TESTPOOL/$TESTFS
-        log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+        log_must zfs destroy -rf $TESTPOOL/$TESTFS
+        log_must zfs create $TESTPOOL/$TESTFS
+        log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "refquotas are not limited by sub-filesystem snapshots."
 log_onexit cleanup
 
 TESTFILE='testfile'
 fs=$TESTPOOL/$TESTFS
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refquota=15M $fs
-log_must $ZFS create $fs/subfs
+log_must zfs set quota=25M $fs
+log_must zfs set refquota=15M $fs
+log_must zfs create $fs/subfs
 
 mntpnt=$(get_prop mountpoint $fs/subfs)
 typeset -i i=0
 while ((i < 3)); do
-        log_must $MKFILE 7M $mntpnt/$TESTFILE.$i
-        log_must $ZFS snapshot $fs/subfs@snap.$i
-        log_must $RM $mntpnt/$TESTFILE.$i
+        log_must mkfile 7M $mntpnt/$TESTFILE.$i
+        log_must zfs snapshot $fs/subfs@snap.$i
+        log_must rm $mntpnt/$TESTFILE.$i
 
         ((i += 1))
 done
 
 #
 # Verify out of the limitation of 'quota'
 #
-log_mustnot $MKFILE 7M $mntpnt/$TESTFILE
+log_mustnot mkfile 7M $mntpnt/$TESTFILE
 
 log_pass "refquotas are not limited by sub-filesystem snapshots"