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 2007 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/tests/functional/slog/slog.kshlib
 
 #

@@ -48,26 +48,26 @@
 
 for type in "" "mirror" "raidz" "raidz2"
 do
         for spare in "" "spare"
         do
-                log_must $ZPOOL create $TESTPOOL $type $VDEV $spare $SDEV \
+                log_must zpool create $TESTPOOL $type $VDEV $spare $SDEV \
                         log mirror $LDEV
 
                 mntpnt=$(get_prop mountpoint $TESTPOOL)
                 #
                 # Create file in pool to trigger writting in slog devices
                 #
-                log_must $DD if=/dev/random of=$mntpnt/testfile.$$ count=100
+                log_must dd if=/dev/random of=$mntpnt/testfile.$$ count=100
 
                 ldev=$(random_get $LDEV)
-                log_must $MKFILE $MINVDEVSIZE $ldev
-                log_must $ZPOOL scrub $TESTPOOL
+                log_must mkfile $MINVDEVSIZE $ldev
+                log_must zpool scrub $TESTPOOL
 
                 log_must display_status $TESTPOOL
                 log_must verify_slog_device $TESTPOOL $ldev 'UNAVAIL' 'mirror'
 
-                log_must $ZPOOL destroy -f $TESTPOOL
+                log_must zpool destroy -f $TESTPOOL
         done
 done
 
 log_pass "Pool can survive when one of mirror log device get corrupted."