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/inuse/inuse_008_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/inuse/inuse_008_pos.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/inuse/inuse.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  # Newfs will interfere with devices and spare devices that are in use
  38   38  # by exported pool.
  39   39  #
  40   40  # STRATEGY:
  41   41  # 1. Create a regular|mirror|raidz|raidz2 pool with the given disk
  42   42  # 2. Export the pool
  43   43  # 3. Try to newfs against the disk, verify it succeeds as expect.
  44   44  #
  45   45  
  46   46  verify_runnable "global"
  47   47  
  48   48  function cleanup
  49   49  {
  50      -        poolexists $TESTPOOL1 || $ZPOOL import $TESTPOOL1 >/dev/null 2>&1
       50 +        poolexists $TESTPOOL1 || zpool import $TESTPOOL1 >/dev/null 2>&1
  51   51  
  52   52          poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
  53   53  
  54   54          #
  55   55          # Tidy up the disks we used.
  56   56          #
  57   57          cleanup_devices $vdisks $sdisks
  58   58  }
  59   59  
  60   60  function verify_assertion #slices
  61   61  {
  62   62          typeset targets=$1
  63   63  
  64   64          for t in $targets; do
  65      -                $ECHO "y" | $NEWFS -v $t > /dev/null 2>&1
       65 +                echo "y" | newfs -v $t > /dev/null 2>&1
  66   66                  (( $? !=0 )) && \
  67   67                          log_fail "newfs over exported pool " \
  68   68                                  "failes unexpected."
  69   69          done
  70   70  
  71   71          return 0
  72   72  }
  73   73  
  74   74  log_assert "Verify newfs over exported pool succeed."
  75   75  

  76   76  log_onexit cleanup
  77   77  
  78   78  set -A vdevs "" "mirror" "raidz" "raidz1" "raidz2"
  79   79  
  80   80  typeset -i i=0
  81   81  
  82   82  for num in 0 1 2 3 ; do
  83   83          eval typeset slice=\${FS_SIDE$num}
  84   84          disk=${slice%s*}
  85   85          slice=${slice##*s}

  86   86          log_must set_partition $slice "" $FS_SIZE $disk
  87   87  done
  88   88  
  89   89  while (( i < ${#vdevs[*]} )); do
  90   90          if [[ -n $SINGLE_DISK && -n ${vdevs[i]} ]]; then
  91   91                  (( i = i + 1 ))
  92   92                  continue
  93   93          fi
  94   94  
  95   95          create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
  96      -        log_must $ZPOOL export $TESTPOOL1
       96 +        log_must zpool export $TESTPOOL1
  97   97          verify_assertion "$rawtargets"
  98   98          cleanup_devices $vslices $sslices
  99   99  
 100  100          (( i = i + 1 ))
 101  101  done
 102  102  
 103  103  log_pass "Newfs over exported pool succeed."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX