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
 . $STF_SUITE/tests/functional/reservation/reservation.shlib
 

@@ -54,19 +54,19 @@
 verify_runnable "both"
 
 function cleanup {
 
         for obj in $OBJ_LIST; do
-                datasetexists $obj && log_must $ZFS destroy -f $obj
+                datasetexists $obj && log_must zfs destroy -f $obj
         done
 }
 
 log_assert "Verify space released when a dataset with reservation is destroyed"
 
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS2
+log_must zfs create $TESTPOOL/$TESTFS2
 
 space_avail=`get_prop available $TESTPOOL`
 
 if ! is_global_zone ; then
         OBJ_LIST="$TESTPOOL/$TESTFS2"

@@ -77,14 +77,14 @@
         ((vol_set_size = space_avail / 4))
         vol_set_size=$(floor_volsize $vol_set_size)
         ((sparse_vol_set_size = space_avail * 4))
         sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 
-        log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-        log_must $ZFS set refreservation=none $TESTPOOL/$TESTVOL
-        log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
-        log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+        log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+        log_must zfs set refreservation=none $TESTPOOL/$TESTVOL
+        log_must zfs set reservation=none $TESTPOOL/$TESTVOL
+        log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 # re-calculate space available.
 space_avail=`get_prop available $TESTPOOL`
 

@@ -102,19 +102,19 @@
         # of the volume itself.
         #
         [[ $obj == $TESTPOOL/$TESTVOL ]] && \
             ((resv_size_set = vol_set_size - RESV_DELTA))
 
-        log_must $ZFS set reservation=$resv_size_set $obj
+        log_must zfs set reservation=$resv_size_set $obj
 
         resv_size_get=`get_prop reservation $obj`
         if [[ $resv_size_set != $resv_size_get ]]; then
                 log_fail "Reservation not the expected value " \
                 "($resv_size_set != $resv_size_get)"
         fi
 
-        log_must $ZFS destroy -f $obj
+        log_must zfs destroy -f $obj
 
         new_space_avail=`get_prop available $TESTPOOL`
         new_space_used=`get_prop used $TESTPOOL`
 
         log_must within_limits $space_used $new_space_used $RESV_TOLERANCE