OpenZFS 7290 - ZFS test suite needs to control what utilities it can run

[mirror_zfs.git] / tests / zfs-tests / tests / functional / cachefile / cachefile_003_pos.ksh

diff --git a/tests/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh b/tests/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh
index d79a1a74ea9b69ea9209fbc05442537c953317aa..a5f427cb4135d226ef7c0549bf4b377a1a8e7083 100755 (executable)
--- a/tests/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,13 +56,13 @@ function cleanup
 
         for file in $CPATH1 $CPATH2 ; do
                 if [[ -f $file ]] ; then
-                        log_must $RM $file
+                        log_must rm $file
                 fi
         done
 
        if [ -d $TESTDIR ]
        then
-               $RMDIR $TESTDIR
+               rmdir $TESTDIR
        fi
 }
 
@@ -80,7 +80,7 @@ set -A opts "none" "none" \
 
 
 while (( i < ${#opts[*]} )); do
-       log_must $ZPOOL create -o altroot=$TESTDIR -o cachefile=${opts[i]} \
+       log_must zpool create -o altroot=$TESTDIR -o cachefile=${opts[i]} \
                $TESTPOOL $DISKS
        if [[ ${opts[i]} != none ]]; then
                log_must pool_in_cache $TESTPOOL ${opts[i]}
@@ -93,7 +93,7 @@ while (( i < ${#opts[*]} )); do
                log_fail "cachefile property not set as expected. " \
                        "Expect: ${opts[((i+1))]}, Current: $PROP"
        fi
-       log_must $ZPOOL destroy $TESTPOOL
+       log_must zpool destroy $TESTPOOL
        (( i = i + 2 ))
 done