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>

          --- old/usr/src/test/zfs-tests/tests/functional/migration/setup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/migration/setup.ksh

   1    1  #!/usr/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]

  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29      -# Copyright (c) 2013 by Delphix. All rights reserved.
       29 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  30   30  #
  31   31  
  32   32  . $STF_SUITE/include/libtest.shlib
  33   33  . $STF_SUITE/tests/functional/migration/migration.cfg
  34   34  
  35   35  verify_runnable "global"
  36   36  
  37   37  case $DISK_COUNT in
  38   38  0)
  39   39          log_untested "Need at least 1 disk device for test"

  40   40          ;;
  41   41  1)
  42   42          log_note "Partitioning a single disk ($SINGLE_DISK)"
  43   43          ;;

  44   44  *)
  45   45          log_note "Partitioning disks ($ZFS_DISK $NONZFS_DISK)"
  46   46          ;;
  47   47  esac
  48   48  
  49   49  set_partition ${ZFSSIDE_DISK##*s} "" $FS_SIZE $ZFS_DISK
  50   50  set_partition ${NONZFSSIDE_DISK##*s} "" $FS_SIZE $NONZFS_DISK
  51   51  
  52   52  create_pool $TESTPOOL "$ZFSSIDE_DISK"
  53   53  
  54      -$RM -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
  55      -$MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
       54 +rm -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
       55 +mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
  56   56  
  57      -log_must $ZFS create $TESTPOOL/$TESTFS
  58      -log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
       57 +log_must zfs create $TESTPOOL/$TESTFS
       58 +log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
  59   59  
  60      -$RM -rf $NONZFS_TESTDIR  || log_unresolved Could not remove $NONZFS_TESTDIR
  61      -$MKDIR -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR
       60 +rm -rf $NONZFS_TESTDIR  || log_unresolved Could not remove $NONZFS_TESTDIR
       61 +mkdir -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR
  62   62  
  63      -$ECHO "y" | $NEWFS -v /dev/rdsk/$NONZFSSIDE_DISK
       63 +echo "y" | newfs -v /dev/rdsk/$NONZFSSIDE_DISK
  64   64  (( $? != 0 )) &&
  65   65          log_untested "Unable to setup a UFS file system"
  66   66  
  67      -log_must $MOUNT /dev/dsk/$NONZFSSIDE_DISK $NONZFS_TESTDIR
       67 +log_must mount /dev/dsk/$NONZFSSIDE_DISK $NONZFS_TESTDIR
  68   68  
  69   69  log_pass
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX