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_010_neg.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cache/cache_010_neg.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 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/tests/functional/cache/cache.cfg
  33   33  . $STF_SUITE/tests/functional/cache/cache.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Verify cache device must be a block device.
  38   38  #
  39   39  # STRATEGY:

  40   40  #       1. Create a pool

  41   41  #       2. Add different object as cache
  42   42  #       3. Verify character devices and files fail
  43   43  #
  44   44  
  45   45  verify_runnable "global"
  46   46  
  47   47  function cleanup_testenv
  48   48  {
  49   49          cleanup
  50   50          if [[ -n $lofidev ]]; then
  51      -                log_must $LOFIADM -d $lofidev
       51 +                log_must lofiadm -d $lofidev
  52   52          fi
  53   53  }
  54   54  
  55   55  log_assert "Cache device can only be block devices."
  56   56  log_onexit cleanup_testenv
  57   57  
  58   58  TESTVOL=testvol1$$
  59   59  dsk1=${DISKS%% *}
  60      -log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1}
       60 +log_must zpool create $TESTPOOL ${DISKS#$dsk1}
  61   61  
  62   62  # Add nomal /dev/rdsk device
  63      -log_mustnot $ZPOOL add $TESTPOOL cache /dev/rdsk/${dsk1}s0
       63 +log_mustnot zpool add $TESTPOOL cache /dev/rdsk/${dsk1}s0
  64   64  #log_must verify_cache_device $TESTPOOL $dsk1 'ONLINE'
  65   65  
  66   66  # Add nomal file
  67      -log_mustnot $ZPOOL add $TESTPOOL cache $VDEV2
       67 +log_mustnot zpool add $TESTPOOL cache $VDEV2
  68   68  
  69   69  # Add /dev/rlofi device
  70   70  lofidev=${VDEV2%% *}
  71      -log_must $LOFIADM -a $lofidev
  72      -lofidev=$($LOFIADM $lofidev)
  73      -log_mustnot $ZPOOL add $TESTPOOL cache "/dev/rlofi/${lofidev#/dev/lofi/}"
       71 +log_must lofiadm -a $lofidev
       72 +lofidev=$(lofiadm $lofidev)
       73 +log_mustnot zpool add $TESTPOOL cache "/dev/rlofi/${lofidev#/dev/lofi/}"
  74   74  if [[ -n $lofidev ]]; then
  75      -        log_must $LOFIADM -d $lofidev
       75 +        log_must lofiadm -d $lofidev
  76   76          lofidev=""
  77   77  fi
  78   78  
  79   79  # Add /dev/zvol/rdsk device
  80      -log_must $ZPOOL create $TESTPOOL2 $VDEV2
  81      -log_must $ZFS create -V $SIZE $TESTPOOL2/$TESTVOL
  82      -log_mustnot $ZPOOL add $TESTPOOL cache /dev/zvol/rdsk/$TESTPOOL2/$TESTVOL
       80 +log_must zpool create $TESTPOOL2 $VDEV2
       81 +log_must zfs create -V $SIZE $TESTPOOL2/$TESTVOL
       82 +log_mustnot zpool add $TESTPOOL cache /dev/zvol/rdsk/$TESTPOOL2/$TESTVOL
  83   83  
  84   84  log_pass "Cache device can only be block devices."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX