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
 

@@ -51,19 +51,19 @@
         typeset ds
         typeset snap
 
         for ds in $ctr/$TESTVOL1 $ctr/$TESTCLONE; do
                 datasetexists $ds && \
-                        log_must $ZFS destroy -f $ds
+                        log_must zfs destroy -f $ds
         done
 
         for snap in $ctr/$TESTFS1@$TESTSNAP1 \
                 $snappool $snapvol $snapctr $snapctrvol \
                 $snapctrclone $snapctrfs
         do
                 snapexists $snap && \
-                        log_must $ZFS destroy -rf $snap
+                        log_must zfs destroy -rf $snap
         done
 
 }
 
 log_assert "Verify snapshot -r can correctly create a snapshot tree."

@@ -80,19 +80,19 @@
 snapctrvol=$ctrvol@$TESTSNAP
 snapctrclone=$ctrclone@$TESTSNAP
 snapctrfs=$SNAPCTR
 
 #preparation for testing
-log_must $ZFS snapshot $ctrfs@$TESTSNAP1
-log_must $ZFS clone $ctrfs@$TESTSNAP1 $ctrclone
+log_must zfs snapshot $ctrfs@$TESTSNAP1
+log_must zfs clone $ctrfs@$TESTSNAP1 $ctrclone
 if is_global_zone; then
-        log_must $ZFS create -V $VOLSIZE $ctrvol
+        log_must zfs create -V $VOLSIZE $ctrvol
 else
-        log_must $ZFS create $ctrvol
+        log_must zfs create $ctrvol
 fi
 
-log_must $ZFS snapshot -r $snappool
+log_must zfs snapshot -r $snappool
 
 #verify the snapshot -r results
 for snap in $snappool $snapfs $snapvol $snapctr $snapctrvol \
                 $snapctrclone $snapctrfs
 do

@@ -100,11 +100,11 @@
                 log_fail "The snapshot $snap is not created via -r option."
 done
 
 log_note "Verify that destroy -r can destroy the snapshot tree."
 
-log_must $ZFS destroy -r $snappool
+log_must zfs destroy -r $snappool
 for snap in $snappool $snapfs $snapvol $snapctr $snapctrvol \
                 $snapctrclone $snapctrfs
 do
         snapexists $snap && \
                 log_fail "The snapshot $snap is not destroyed correctly."