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,12 +43,12 @@
 
 verify_runnable "both"
 
 function cleanup
 {
-        log_must $ZFS set refquota=none $TESTPOOL/$TESTFS
-        log_must $ZFS set refreserv=none $TESTPOOL/$TESTFS
+        log_must zfs set refquota=none $TESTPOOL/$TESTFS
+        log_must zfs set refreserv=none $TESTPOOL/$TESTFS
 }
 
 log_assert "'zfs set refquota' can handle incorrect arguments correctly."
 log_onexit cleanup
 

@@ -59,12 +59,12 @@
         "123%d"         "%x123"         "12%p3"         "^def456"       \
         "\0"            "x0"
 
 typeset -i i=0
 while ((i < ${#badopt[@]})); do
-        log_mustnot $ZFS set refquota=${badopt[$i]} $TESTPOOL/$TESTFS
-        log_mustnot $ZFS set refreserv=${badopt[$i]} $TESTPOOL/$TESTFS
+        log_mustnot zfs set refquota=${badopt[$i]} $TESTPOOL/$TESTFS
+        log_mustnot zfs set refreserv=${badopt[$i]} $TESTPOOL/$TESTFS
 
         ((i += 1))
 done
 
 log_pass "'zfs set refquota' can handle incorrect arguments correctly."