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/slog/slog_013_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/slog/slog_013_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, 2015 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/slog/slog.kshlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #       Verify slog device can be disk, file, lofi device or any device that
  37   37  #       presents a block interface.
  38   38  #
  39   39  # STRATEGY:

  40   40  #       1. Create a pool

  41   41  #       2. Loop to add different object as slog
  42   42  #       3. Verify it passes
  43   43  #
  44   44  
  45   45  verify_runnable "global"
  46   46  
  47   47  function cleanup_testenv
  48   48  {
  49   49          cleanup
  50   50          if datasetexists $TESTPOOL2 ; then
  51      -                log_must $ZPOOL destroy -f $TESTPOOL2
       51 +                log_must zpool destroy -f $TESTPOOL2
  52   52          fi
  53   53          if [[ -n $lofidev ]]; then
  54      -                $LOFIADM -d $lofidev
       54 +                lofiadm -d $lofidev
  55   55          fi
  56   56  }
  57   57  
  58   58  log_assert "Verify slog device can be disk, file, lofi device or any device " \
  59   59          "that presents a block interface."
  60   60  verify_disk_count "$DISKS" 2
  61   61  log_onexit cleanup_testenv
  62   62  
  63   63  dsk1=${DISKS%% *}
  64      -log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1}
       64 +log_must zpool create $TESTPOOL ${DISKS#$dsk1}
  65   65  
  66   66  # Add nomal disk
  67      -log_must $ZPOOL add $TESTPOOL log $dsk1
       67 +log_must zpool add $TESTPOOL log $dsk1
  68   68  log_must verify_slog_device $TESTPOOL $dsk1 'ONLINE'
  69   69  # Add nomal file
  70      -log_must $ZPOOL add $TESTPOOL log $LDEV
       70 +log_must zpool add $TESTPOOL log $LDEV
  71   71  ldev=$(random_get $LDEV)
  72   72  log_must verify_slog_device $TESTPOOL $ldev 'ONLINE'
  73   73  
  74   74  # Add lofi device
  75   75  lofidev=${LDEV2%% *}
  76      -log_must $LOFIADM -a $lofidev
  77      -lofidev=$($LOFIADM $lofidev)
  78      -log_must $ZPOOL add $TESTPOOL log $lofidev
       76 +log_must lofiadm -a $lofidev
       77 +lofidev=$(lofiadm $lofidev)
       78 +log_must zpool add $TESTPOOL log $lofidev
  79   79  log_must verify_slog_device $TESTPOOL $lofidev 'ONLINE'
  80   80  
  81   81  log_pass "Verify slog device can be disk, file, lofi device or any device " \
  82   82          "that presents a block interface."
  83   83  
  84   84  # Add file which reside in the itself
  85   85  mntpnt=$(get_prop mountpoint $TESTPOOL)
  86      -log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev
  87      -log_must $ZPOOL add $TESTPOOL $mntpnt/vdev
       86 +log_must mkfile $MINVDEVSIZE $mntpnt/vdev
       87 +log_must zpool add $TESTPOOL $mntpnt/vdev
  88   88  
  89   89  # Add ZFS volume
  90   90  vol=$TESTPOOL/vol
  91      -log_must $ZPOOL create -V $MINVDEVSIZE $vol
  92      -log_must $ZPOOL add $TESTPOOL /dev/zvol/dsk/$vol
       91 +log_must zpool create -V $MINVDEVSIZE $vol
       92 +log_must zpool add $TESTPOOL /dev/zvol/dsk/$vol
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX