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 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/inuse/inuse.cfg
 

@@ -45,11 +45,11 @@
 verify_runnable "global"
 
 function cleanup
 {
         if [[ -n $PREVDUMPDEV ]]; then
-                log_must $DUMPADM -u -d $PREVDUMPDEV
+                log_must dumpadm -u -d $PREVDUMPDEV
         fi
 
         poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
         #

@@ -61,11 +61,11 @@
 function verify_assertion #slices
 {
         typeset targets=$1
 
         for t in $targets; do
-                log_mustnot $DUMPADM -d $t
+                log_mustnot dumpadm -d $t
         done
 
         return 0
 }
 

@@ -75,11 +75,11 @@
 
 set -A vdevs "" "mirror" "raidz" "raidz1" "raidz2"
 
 typeset -i i=0
 
-PREVDUMPDEV=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
+PREVDUMPDEV=`dumpadm | grep "Dump device" | awk '{print $3}'`
 
 unset NOINUSE_CHECK
 while (( i < ${#vdevs[*]} )); do
 
         for num in 0 1 2 3 ; do