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/cachefile/cachefile_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_003_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 2008 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/cachefile/cachefile.cfg
  34   34  . $STF_SUITE/tests/functional/cachefile/cachefile.kshlib
  35   35  
  36   36  #
  37   37  # DESCRIPTION:
  38   38  #
  39   39  # Setting altroot=<path> and cachefile=$CPATH for zpool create is succeed

  40   40  #
  41   41  # STRATEGY:
  42   42  # 1. Attempt to create a pool with -o altroot=<path> -o cachefile=<value>
  43   43  # 2. Verify the command succeed
  44   44  #
  45   45  #
  46   46  
  47   47  TESTDIR=/altdir.$$
  48   48  

  49   49  function cleanup
  50   50  {
  51   51          typeset file
  52   52  
  53   53          if poolexists $TESTPOOL ; then
  54   54                  destroy_pool $TESTPOOL
  55   55          fi
  56   56  
  57   57          for file in $CPATH1 $CPATH2 ; do
  58   58                  if [[ -f $file ]] ; then
  59      -                        log_must $RM $file
       59 +                        log_must rm $file
  60   60                  fi
  61   61          done
  62   62  
  63   63          if [ -d $TESTDIR ]
  64   64          then
  65      -                $RMDIR $TESTDIR
       65 +                rmdir $TESTDIR
  66   66          fi
  67   67  }
  68   68  
  69   69  verify_runnable "global"
  70   70  
  71   71  log_assert "Setting altroot=path and cachefile=$CPATH for zpool create succeed."
  72   72  log_onexit cleanup
  73   73  
  74   74  typeset -i i=0
  75   75  
  76   76  set -A opts "none" "none" \
  77   77          "$CPATH" "-" \
  78   78          "$CPATH1" "$CPATH1" \
  79   79          "$CPATH2" "$CPATH2"
  80   80  
  81   81  
  82   82  while (( i < ${#opts[*]} )); do
  83      -        log_must $ZPOOL create -o altroot=$TESTDIR -o cachefile=${opts[i]} \
       83 +        log_must zpool create -o altroot=$TESTDIR -o cachefile=${opts[i]} \
  84   84                  $TESTPOOL $DISKS
  85   85          if [[ ${opts[i]} != none ]]; then
  86   86                  log_must pool_in_cache $TESTPOOL ${opts[i]}
  87   87          else
  88   88                  log_mustnot pool_in_cache $TESTPOOL
  89   89          fi
  90   90  
  91   91          PROP=$(get_pool_prop cachefile $TESTPOOL)
  92   92          if [[ $PROP != ${opts[((i+1))]} ]]; then
  93   93                  log_fail "cachefile property not set as expected. " \
  94   94                          "Expect: ${opts[((i+1))]}, Current: $PROP"
  95   95          fi
  96      -        log_must $ZPOOL destroy $TESTPOOL
       96 +        log_must zpool destroy $TESTPOOL
  97   97          (( i = i + 2 ))
  98   98  done
  99   99  
 100  100  log_pass "Setting altroot=path and cachefile=$CPATH for zpool create succeed."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX