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_002_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_002_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/cachefile/cachefile.cfg
  34   34  . $STF_SUITE/tests/functional/cachefile/cachefile.kshlib
  35   35  
  36   36  #
  37   37  # DESCRIPTION:
  38   38  #
  39   39  # Importing 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 the pool doesn't have an entry in zpool.cache
  44   44  # 3. Export the pool
  45   45  # 4. Import the pool
  46   46  # 5. Verify the pool does have an entry in zpool.cache
  47   47  # 6. Export the pool
  48   48  # 7. Import the pool -o cachefile=<cachefile>
  49   49  # 8. Verify the pool doesn't have an entry in zpool.cache
  50   50  #
  51   51  
  52   52  function cleanup
  53   53  {

  54   54          if poolexists $TESTPOOL ; then
  55   55                  destroy_pool $TESTPOOL
  56   56          fi
  57   57  }
  58   58  
  59   59  verify_runnable "global"
  60   60  
  61   61  log_assert "Importing a pool with \"cachefile\" set doesn't update zpool.cache"
  62   62  log_onexit cleanup
  63   63  
  64      -log_must $ZPOOL create -o cachefile=none $TESTPOOL $DISKS
       64 +log_must zpool create -o cachefile=none $TESTPOOL $DISKS
  65   65  typeset DEVICEDIR=$(get_device_dir $DISKS)
  66   66  log_mustnot pool_in_cache $TESTPOOL
  67   67  
  68      -log_must $ZPOOL export $TESTPOOL
  69      -log_must $ZPOOL import -d $DEVICEDIR $TESTPOOL
       68 +log_must zpool export $TESTPOOL
       69 +log_must zpool import -d $DEVICEDIR $TESTPOOL
  70   70  log_must pool_in_cache $TESTPOOL
  71   71  
  72      -log_must $ZPOOL export $TESTPOOL
  73      -log_must $ZPOOL import -o cachefile=none -d $DEVICEDIR $TESTPOOL
       72 +log_must zpool export $TESTPOOL
       73 +log_must zpool import -o cachefile=none -d $DEVICEDIR $TESTPOOL
  74   74  log_mustnot pool_in_cache $TESTPOOL
  75   75  
  76      -log_must $ZPOOL export $TESTPOOL
  77      -log_must $ZPOOL import -o cachefile=$CPATH -d $DEVICEDIR $TESTPOOL
       76 +log_must zpool export $TESTPOOL
       77 +log_must zpool import -o cachefile=$CPATH -d $DEVICEDIR $TESTPOOL
  78   78  log_must pool_in_cache $TESTPOOL
  79   79  
  80      -log_must $ZPOOL destroy $TESTPOOL
       80 +log_must zpool destroy $TESTPOOL
  81   81  
  82   82  log_pass "Importing a pool with \"cachefile\" set doesn't update zpool.cache"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX