Print this page
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
 

@@ -50,18 +50,18 @@
 
 for type in "" "mirror" "raidz" "raidz2"
 do
         for cachetype in "mirror" "raidz" "raidz1" "raidz2"
         do
-                log_must $ZPOOL create $TESTPOOL $type $VDEV \
+                log_must zpool create $TESTPOOL $type $VDEV \
                         cache $LDEV
 
-                log_mustnot $ZPOOL add $TESTPOOL cache $cachetype $LDEV2
+                log_mustnot zpool add $TESTPOOL cache $cachetype $LDEV2
                 ldev=$(random_get $LDEV2)
                 log_mustnot verify_cache_device \
                         $TESTPOOL $ldev 'ONLINE' $cachetype
 
-                log_must $ZPOOL destroy $TESTPOOL
+                log_must zpool destroy $TESTPOOL
         done
 done
 
 log_pass "A mirror/raidz/raidz2 cache can not be added to existed pool."