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,34 ****
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/migration/migration.kshlib
  
--- 24,34 ----
  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/migration/migration.kshlib
  
*** 46,57 ****
  
  verify_runnable "both"
  
  function cleanup
  {
!         $RM -rf $NONZFS_TESTDIR/cpio$$.cpio
!         $RM -rf $TESTDIR/$BNAME
  }
  
  log_assert "Migrating test file from UFS fs to ZFS fs using cpio"
  
  log_onexit cleanup
--- 46,57 ----
  
  verify_runnable "both"
  
  function cleanup
  {
!         rm -rf $NONZFS_TESTDIR/cpio$$.cpio
!         rm -rf $TESTDIR/$BNAME
  }
  
  log_assert "Migrating test file from UFS fs to ZFS fs using cpio"
  
  log_onexit cleanup
*** 58,68 ****
  
  cwd=$PWD
  cd $DNAME
  (( $? != 0 )) && log_untested "Could not change directory to $DNAME"
  
! $LS $BNAME | $CPIO -oc > $NONZFS_TESTDIR/cpio$$.cpio
  (( $? != 0 )) && log_failED "Unable to create cpio archive"
  
  cd $cwd
  (( $? != 0 )) && log_untested "Could not change directory to $cwd"
  
--- 58,68 ----
  
  cwd=$PWD
  cd $DNAME
  (( $? != 0 )) && log_untested "Could not change directory to $DNAME"
  
! ls $BNAME | cpio -oc > $NONZFS_TESTDIR/cpio$$.cpio
  (( $? != 0 )) && log_failED "Unable to create cpio archive"
  
  cd $cwd
  (( $? != 0 )) && log_untested "Could not change directory to $cwd"