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/cache/cache_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cache/cache_003_pos.ksh

   1    1  #!/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/tests/functional/cache/cache.cfg
  33   33  . $STF_SUITE/tests/functional/cache/cache.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Adding an extra cache device works
  38   38  #
  39   39  # STRATEGY:

  40   40  #       1. Create pool with separated cache devices.
  41   41  #       2. Add an extra cache devices
  42   42  #       3. Display pool status
  43   43  #       4. Destroy and loop to create pool with different configuration.

  44   44  #
  45   45  
  46   46  verify_runnable "global"
  47   47  verify_disk_count "$LDEV2"
  48   48  
  49   49  log_assert "Adding an extra cache device works."
  50   50  log_onexit cleanup
  51   51  
  52   52  for type in "" "mirror" "raidz" "raidz2"
  53   53  do
  54      -        log_must $ZPOOL create $TESTPOOL $type $VDEV \
       54 +        log_must zpool create $TESTPOOL $type $VDEV \
  55   55                  cache $LDEV
  56      -        log_must $ZPOOL add $TESTPOOL \
       56 +        log_must zpool add $TESTPOOL \
  57   57                  cache $LDEV2
  58   58  
  59   59          log_must display_status $TESTPOOL
  60   60          ldev=$(random_get $LDEV2)
  61   61          log_must verify_cache_device $TESTPOOL $ldev 'ONLINE'
  62   62  
  63      -        log_must $ZPOOL remove $TESTPOOL $ldev
       63 +        log_must zpool remove $TESTPOOL $ldev
  64   64          log_must check_vdev_state $TESTPOOL $ldev ""
  65   65  
  66      -        log_must $ZPOOL destroy -f $TESTPOOL
       66 +        log_must zpool destroy -f $TESTPOOL
  67   67  done
  68   68  
  69   69  log_pass "Adding an extra cache device works."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX