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
 

@@ -49,54 +49,54 @@
 {
         typeset -i i=1
         while [ $i -lt $COUNT ]; do
                 snapexists $SNAPFS.$i
                 if [[ $? -eq 0 ]]; then
-                        log_must $ZFS destroy $SNAPFS.$i
+                        log_must zfs destroy $SNAPFS.$i
                 fi
 
                 if [[ -e $SNAPDIR.$i ]]; then
-                        log_must $RM -rf $SNAPDIR.$i > /dev/null 2>&1
+                        log_must rm -rf $SNAPDIR.$i > /dev/null 2>&1
                 fi
 
                 (( i = i + 1 ))
         done
 
         if [[ -e $TESTDIR ]]; then
-                log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+                log_must rm -rf $TESTDIR/* > /dev/null 2>&1
         fi
 }
 
 log_assert "Verify many snapshots of a file system can be taken."
 
 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
 
 log_note "Create some files in 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
 
 log_note "Remove all of the original files"
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/file* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/file* > /dev/null 2>&1
 
 i=1
 while [[ $i -lt $COUNT ]]; do
-        FILECOUNT=`$LS $SNAPDIR.$i/file* | wc -l`
+        FILECOUNT=`ls $SNAPDIR.$i/file* | wc -l`
         typeset j=1
         while [ $j -lt $FILECOUNT ]; do
-                log_must $FILE_CHECK $SNAPDIR.$i/file$j $j
+                log_must file_check $SNAPDIR.$i/file$j $j
                 (( j = j + 1 ))
         done
         (( i = i + 1 ))
 done