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/reservation/reservation.shlib
 

@@ -54,14 +54,14 @@
     " be written to top level filesystem"
 
 function cleanup
 {
         datasetexists $TESTPOOL/$TESTVOL && \
-            log_must $ZFS destroy $TESTPOOL/$TESTVOL
+            log_must zfs destroy $TESTPOOL/$TESTVOL
 
-        [[ -e $TESTDIR/$TESTFILE1 ]] && log_must $RM -rf $TESTDIR/$TESTFILE1
-        [[ -e $TESTDIR/$TESTFILE2 ]] && log_must $RM -rf $TESTDIR/$TESTFILE2
+        [[ -e $TESTDIR/$TESTFILE1 ]] && log_must rm -rf $TESTDIR/$TESTFILE1
+        [[ -e $TESTDIR/$TESTFILE2 ]] && log_must rm -rf $TESTDIR/$TESTFILE2
 }
 log_onexit cleanup
 
 space_avail=$(largest_volsize_from_pool $TESTPOOL)
 

@@ -73,26 +73,26 @@
 ((vol_set_size = space_avail - RESV_FREE_SPACE))
 vol_set_size=$(floor_volsize $vol_set_size)
 
 # Creating a regular volume implicitly sets its reservation
 # property to the same value.
-log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
+log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
 
 space_avail_still=$(get_prop available $TESTPOOL)
 fill_size=$((space_avail_still + $RESV_TOLERANCE))
 write_count=$((fill_size / BLOCK_SIZE))
 
 # Now fill up the filesystem (which doesn't have a reservation set
 # and thus will use up whatever free space is left in the pool).
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
+file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
 ret=$?
 if (($ret != $ENOSPC)); then
         log_fail "Did not get ENOSPC as expected (got $ret)."
 fi
 
-log_must $ZFS destroy -f $TESTPOOL/$TESTVOL
+log_must zfs destroy -f $TESTPOOL/$TESTVOL
 
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $PAGESIZE \
+log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b pagesize \
     -c 1000 -d 0
 
 log_pass "Destroying volume with reservation allows more data to be written " \
     "to top level filesystem"