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
 
 #

@@ -43,11 +43,11 @@
 #
 
 verify_runnable "global"
 
 function cleanup {
-        log_must $ZFS set compression=$orig_compress $rootfs
+        log_must zfs set compression=$orig_compress $rootfs
 }
 
 log_onexit cleanup
 log_assert $assert_msg
 

@@ -61,10 +61,10 @@
 set -A gtype "gzip" "gzip-1" "gzip-2" "gzip-3" "gzip-4" "gzip-5" \
              "gzip-6" "gzip-7" "gzip-8" "gzip-9"
 
 typeset -i i=0
 while (( i < ${#gtype[@]} )); do
-        log_mustnot $ZFS set compression=${gtype[i]} $rootfs
+        log_mustnot zfs set compression=${gtype[i]} $rootfs
         (( i += 1 ))
 done
 
 log_pass $assert_msg