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/include/libtest.shlib
 . $STF_SUITE/tests/functional/migration/migration.kshlib
 

@@ -46,12 +46,12 @@
 
 verify_runnable "both"
 
 function cleanup
 {
-        $RM -rf $TESTDIR/cpio$$.cpio
-        $RM -rf $TESTDIR/$BNAME
+        rm -rf $TESTDIR/cpio$$.cpio
+        rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to ZFS fs using cpio"
 
 log_onexit cleanup

@@ -58,11 +58,11 @@
 
 cwd=$PWD
 cd $DNAME
 (( $? != 0 )) && log_untested "Could not change directory to $DNAME"
 
-$LS $BNAME | $CPIO -oc > $TESTDIR/cpio$$.cpio
+ls $BNAME | cpio -oc > $TESTDIR/cpio$$.cpio
 (( $? != 0 )) && log_failED "Unable to create cpio archive"
 
 cd $cwd
 (( $? != 0 )) && log_untested "Could not change directory to $cwd"