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

@@ -51,22 +51,22 @@
 do
         for spare in "" "spare"
         do
                 for logtype in "" "mirror"
                 do
-                        log_must $ZPOOL create $TESTPOOL $type $VDEV \
+                        log_must zpool create $TESTPOOL $type $VDEV \
                                 $spare $SDEV log $logtype $LDEV
                         sdev=$(random_get $LDEV)
                         tdev=$(random_get $LDEV2)
-                        log_must $ZPOOL replace $TESTPOOL $sdev $tdev
+                        log_must zpool replace $TESTPOOL $sdev $tdev
                         log_must display_status $TESTPOOL
                         # sleep 15 to make sure replacement completely.
-                        log_must $SLEEP 15
+                        log_must sleep 15
                         log_must verify_slog_device \
                                 $TESTPOOL $tdev 'ONLINE' $logtype
 
-                        log_must $ZPOOL destroy -f $TESTPOOL
+                        log_must zpool destroy -f $TESTPOOL
                 done
         done
 done
 
 log_pass "Replacing a log device passes."