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 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
 . $STF_SUITE/tests/functional/cache/cache.kshlib
 

@@ -51,35 +51,35 @@
 log_assert "Exporting and importing pool with cache devices passes."
 log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-        log_must $ZPOOL create $TESTPOOL $type $VDEV \
+        log_must zpool create $TESTPOOL $type $VDEV \
                 cache $LDEV $LDEV2
         ldev=$(random_get $LDEV $LDEV2)
         log_must verify_cache_device \
                 $TESTPOOL $ldev 'ONLINE'
 
         #
         # Nomal export/import operating
         #
-        log_must $ZPOOL export $TESTPOOL
-        log_must $ZPOOL import -d $VDIR $TESTPOOL
+        log_must zpool export $TESTPOOL
+        log_must zpool import -d $VDIR $TESTPOOL
         log_must display_status $TESTPOOL
         ldev=$(random_get $LDEV $LDEV2)
         log_must verify_cache_device \
                 $TESTPOOL $ldev 'ONLINE'
 
         #
         # Destroy the pool and import again
         #
-        log_must $ZPOOL destroy $TESTPOOL
-        log_must $ZPOOL import -Df -d $VDIR $TESTPOOL
+        log_must zpool destroy $TESTPOOL
+        log_must zpool import -Df -d $VDIR $TESTPOOL
         log_must display_status $TESTPOOL
         ldev=$(random_get $LDEV $LDEV2)
         log_must verify_cache_device \
                 $TESTPOOL $ldev 'ONLINE'
 
-        log_must $ZPOOL destroy -f $TESTPOOL
+        log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Exporting and importing pool with cache devices passes."