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 2007 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/snapshot/snapshot.cfg
 

@@ -48,44 +48,44 @@
 {
         typeset -i i=1
         while [[ $i -lt $COUNT ]]; do
                 snapexists $SNAPFS.$i
                 [[ $? -eq 0 ]] && \
-                        log_must $ZFS destroy $SNAPFS.$i
+                        log_must zfs destroy $SNAPFS.$i
 
                 (( i = i + 1 ))
         done
 
         [[ -e $TESTDIR ]] && \
-                log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+                log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify that destroying snapshots returns space to the pool."
 
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 orig_size=`get_prop available $TESTPOOL`
 
 log_note "Populate the $TESTDIR directory"
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
-        log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
+        log_must file_write -o create -f $TESTDIR/file$i \
            -b $BLOCKSZ -c $NUM_WRITES -d $i
 
-        log_must $ZFS snapshot $SNAPFS.$i
+        log_must zfs snapshot $SNAPFS.$i
         (( i = i + 1 ))
 done
 
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
         log_must rm -rf $TESTDIR/file$i > /dev/null 2>&1
-        log_must $ZFS destroy $SNAPFS.$i
+        log_must zfs destroy $SNAPFS.$i
 
         (( i = i + 1 ))
 done
 
 new_size=`get_prop available $TESTPOOL`