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_001_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_001_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  # Creating a pool with "cachefile" set doesn't update zpool.cache

  40   40  #
  41   41  # STRATEGY:
  42   42  # 1. Create a pool with the cachefile property set
  43   43  # 2. Verify that the pool doesn't have an entry in zpool.cache
  44   44  # 3. Verify the cachefile property is set
  45   45  # 4. Create a pool without the cachefile property
  46   46  # 5. Verify the cachefile property isn't set
  47   47  # 6. Verify that zpool.cache contains an entry for the pool
  48   48  #

  49   49  
  50   50  function cleanup
  51   51  {
  52   52          typeset file
  53   53  
  54   54          if poolexists $TESTPOOL ; then
  55   55                  destroy_pool $TESTPOOL
  56   56          fi
  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  
  64   64  verify_runnable "global"
  65   65  
  66   66  log_assert "Creating a pool with \"cachefile\" set doesn't update zpool.cache"
  67   67  log_onexit cleanup
  68   68  
  69   69  set -A opts "none" "false" "none" \
  70   70          "$CPATH" "true" "-" \
  71   71          "$CPATH1" "true" "$CPATH1" \
  72   72          "$CPATH2" "true" "$CPATH2"
  73   73  
  74   74  typeset -i i=0
  75   75  
  76   76  while (( i < ${#opts[*]} )); do
  77      -        log_must $ZPOOL create -o cachefile=${opts[i]} $TESTPOOL $DISKS
       77 +        log_must zpool create -o cachefile=${opts[i]} $TESTPOOL $DISKS
  78   78          case ${opts[((i+1))]} in
  79   79                  false) log_mustnot pool_in_cache $TESTPOOL
  80   80                          ;;
  81   81                  true) log_must pool_in_cache $TESTPOOL ${opts[i]}
  82   82                          ;;
  83   83          esac
  84   84  
  85   85          PROP=$(get_pool_prop cachefile $TESTPOOL)
  86   86          if [[ $PROP != ${opts[((i+2))]} ]]; then
  87   87                  log_fail "cachefile property not set as expected. " \
  88   88                          "Expect: ${opts[((i+2))]}, Current: $PROP"
  89   89          fi
  90      -        log_must $ZPOOL destroy $TESTPOOL
       90 +        log_must zpool destroy $TESTPOOL
  91   91          (( i = i + 3 ))
  92   92  done
  93   93  
  94   94  log_pass "Creating a pool with \"cachefile\" set doesn't update zpool.cache"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX