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
 
 #

@@ -45,11 +45,11 @@
 
 verify_runnable "both"
 
 function cleanup
 {
-        $RM -f $TESTDIR/*
+        rm -f $TESTDIR/*
 }
 
 log_assert "Changing blocksize doesn't casue system panic with compression settings"
 log_onexit cleanup
 

@@ -62,33 +62,33 @@
 
 for propname in "compression" "compress"
 do
         for value in $(get_compress_opts zfs_compress)
         do
-                log_must $ZFS set $propname=$value $fs
+                log_must zfs set $propname=$value $fs
                 if [[ $value == "gzip-6" ]]; then
                         value="gzip"
                 fi
                 real_val=$(get_prop $propname $fs)
                 [[ $real_val != $value ]] && \
                         log_fail "Set property $propname=$value failed."
 
                 (( blksize = 512 ))
                 while (( blksize <= 131072 )); do
-                        log_must $ZFS set recordsize=$blksize $fs
+                        log_must zfs set recordsize=$blksize $fs
                         (( offset = $RANDOM ))
                         if (( offset > blksize )); then
                                 (( offset = offset % blksize ))
                         fi
                         if (( (offset % 2) == 0 )); then
                                 #keep offset as non-power-of-2
                                 (( offset = offset + 1 ))
                         fi
                         (( fsize = offset ))
-                        log_must $MKFILE $fsize $single_blk_file
+                        log_must mkfile $fsize $single_blk_file
                         (( fsize = blksize + offset ))
-                        log_must $MKFILE $fsize $multi_blk_file
+                        log_must mkfile $fsize $multi_blk_file
 
                         (( blksize = blksize * 2 ))
                 done
         done
 done