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 2009 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.cfg
  
--- 24,34 ----
  # Copyright 2009 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.cfg
  
*** 49,69 ****
  set_partition ${ZFSSIDE_DISK##*s} "" $FS_SIZE $ZFS_DISK
  set_partition ${NONZFSSIDE_DISK##*s} "" $FS_SIZE $NONZFS_DISK
  
  create_pool $TESTPOOL "$ZFSSIDE_DISK"
  
! $RM -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
! $MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
  
! log_must $ZFS create $TESTPOOL/$TESTFS
! log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
  
! $RM -rf $NONZFS_TESTDIR  || log_unresolved Could not remove $NONZFS_TESTDIR
! $MKDIR -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR
  
! $ECHO "y" | $NEWFS -v /dev/rdsk/$NONZFSSIDE_DISK
  (( $? != 0 )) &&
          log_untested "Unable to setup a UFS file system"
  
! log_must $MOUNT /dev/dsk/$NONZFSSIDE_DISK $NONZFS_TESTDIR
  
  log_pass
--- 49,69 ----
  set_partition ${ZFSSIDE_DISK##*s} "" $FS_SIZE $ZFS_DISK
  set_partition ${NONZFSSIDE_DISK##*s} "" $FS_SIZE $NONZFS_DISK
  
  create_pool $TESTPOOL "$ZFSSIDE_DISK"
  
! rm -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
! mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
  
! log_must zfs create $TESTPOOL/$TESTFS
! log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
  
! rm -rf $NONZFS_TESTDIR  || log_unresolved Could not remove $NONZFS_TESTDIR
! mkdir -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR
  
! echo "y" | newfs -v /dev/rdsk/$NONZFSSIDE_DISK
  (( $? != 0 )) &&
          log_untested "Unable to setup a UFS file system"
  
! log_must mount /dev/dsk/$NONZFSSIDE_DISK $NONZFS_TESTDIR
  
  log_pass