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_004_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/slog/slog_004_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 2007 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/slog/slog.kshlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #       Attaching a log device passes.
  37   37  #
  38   38  # STRATEGY:
  39   39  #       1. Create pool with separated log devices.

  40   40  #       2. Attaching a log device for existing log device
  41   41  #       3. Display pool status
  42   42  #       4. Destroy and loop to create pool with different configuration.
  43   43  #
  44   44  
  45   45  verify_runnable "global"

  46   46  
  47   47  log_assert "Attaching a log device passes."
  48   48  log_onexit cleanup
  49   49  
  50   50  for type in "" "mirror" "raidz" "raidz2"
  51   51  do
  52   52          for spare in "" "spare"
  53   53          do
  54   54                  for logtype in "" "mirror"
  55   55                  do
  56      -                        log_must $ZPOOL create $TESTPOOL $type $VDEV \
       56 +                        log_must zpool create $TESTPOOL $type $VDEV \
  57   57                                  $spare $SDEV log $logtype $LDEV
  58   58  
  59   59                          ldev=$(random_get $LDEV)
  60   60                          typeset ldev2=$(random_get $LDEV2)
  61      -                        log_must $ZPOOL attach $TESTPOOL $ldev $ldev2
       61 +                        log_must zpool attach $TESTPOOL $ldev $ldev2
  62   62                          log_must display_status $TESTPOOL
  63   63                          log_must verify_slog_device \
  64   64                                  $TESTPOOL $ldev 'ONLINE' 'mirror'
  65   65                          log_must verify_slog_device \
  66   66                                  $TESTPOOL $ldev2 'ONLINE' 'mirror'
  67   67  
  68      -                        log_must $ZPOOL destroy -f $TESTPOOL
       68 +                        log_must zpool destroy -f $TESTPOOL
  69   69                  done
  70   70          done
  71   71  done
  72   72  
  73   73  log_pass "Attaching a log device passes."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX