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/bootfs/bootfs_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_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 2008 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29      -# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
       29 +# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  30   30  #
  31   31  
  32   32  . $STF_SUITE/include/libtest.shlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #
  37   37  # Valid pool names are accepted
  38   38  #
  39   39  # STRATEGY:

  40   40  # 1. Using a list of valid pool names

  41   41  # 2. Create a filesystem in that pool
  42   42  # 2. Verify we can set the bootfs to that filesystem
  43   43  #
  44   44  
  45   45  verify_runnable "global"
  46   46  
  47   47  set -A pools "pool.$$" "pool123" "mypool"
  48   48  
  49   49  function cleanup {
  50   50          if poolexists $POOL ; then
  51      -                log_must $ZPOOL destroy $POOL
       51 +                log_must zpool destroy $POOL
  52   52          fi
  53      -        $RM /bootfs_003.$$.dat
       53 +        rm /bootfs_003.$$.dat
  54   54  }
  55   55  
  56   56  
  57      -$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
       57 +zpool set 2>&1 | grep bootfs > /dev/null
  58   58  if [ $? -ne 0 ]
  59   59  then
  60   60          log_unsupported "bootfs pool property not supported on this release."
  61   61  fi
  62   62  
  63   63  log_onexit cleanup
  64   64  
  65   65  log_assert "Valid pool names are accepted by zpool set bootfs"
  66      -$MKFILE $MINVDEVSIZE /bootfs_003.$$.dat
       66 +mkfile $MINVDEVSIZE /bootfs_003.$$.dat
  67   67  
  68   68  typeset -i i=0;
  69   69  
  70   70  while [ $i -lt "${#pools[@]}" ]
  71   71  do
  72   72          POOL=${pools[$i]}
  73      -        log_must $ZPOOL create $POOL /bootfs_003.$$.dat
  74      -        log_must $ZFS create $POOL/$TESTFS
       73 +        log_must zpool create $POOL /bootfs_003.$$.dat
       74 +        log_must zfs create $POOL/$TESTFS
  75   75  
  76      -        log_must $ZPOOL set bootfs=$POOL/$TESTFS $POOL
  77      -        RES=$($ZPOOL get bootfs $POOL | $TAIL -1 | $AWK '{print $3}' )
       76 +        log_must zpool set bootfs=$POOL/$TESTFS $POOL
       77 +        RES=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
  78   78          if [ $RES != "$POOL/$TESTFS" ]
  79   79          then
  80   80                  log_fail "Expected $RES == $POOL/$TESTFS"
  81   81          fi
  82      -        log_must $ZPOOL destroy $POOL
       82 +        log_must zpool destroy $POOL
  83   83          i=$(( $i + 1 ))
  84   84  done
  85   85  
  86   86  log_pass "Valid pool names are accepted by zpool set bootfs"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX