Print this page
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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_004_neg.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_004_neg.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  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) 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  # Invalid pool names are rejected by zpool set bootfs
  38   38  #
  39   39  # STRATEGY:
↓ open down ↓ 2 lines elided ↑ open up ↑
  42   42  #
  43   43  #
  44   44  
  45   45  verify_runnable "global"
  46   46  
  47   47  set -A pools "pool//$$" "pool%d123" "mirror" "c0t0d0s0" "pool*23*" "*po!l" \
  48   48          "%s££%^"
  49   49  
  50   50  function cleanup {
  51   51          if poolexists $POOL; then
  52      -                log_must $ZPOOL destroy $POOL
       52 +                log_must zpool destroy $POOL
  53   53          fi
  54      -        $RM /bootfs_004.$$.dat
       54 +        rm /bootfs_004.$$.dat
  55   55  }
  56   56  
  57   57  
  58      -$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
       58 +zpool set 2>&1 | grep bootfs > /dev/null
  59   59  if [ $? -ne 0 ]
  60   60  then
  61   61          log_unsupported "bootfs pool property not supported on this release."
  62   62  fi
  63   63  
  64   64  log_assert "Invalid pool names are rejected by zpool set bootfs"
  65   65  log_onexit cleanup
  66   66  
  67   67  # here, we build up a large string and add it to the list of pool names
  68   68  # a word to the ksh-wary, ${#array[@]} gives you the
↓ open down ↓ 2 lines elided ↑ open up ↑
  71   71  COUNT=0
  72   72  while [ $COUNT -le 1025 ]
  73   73  do
  74   74          bigname="${bigname}o"
  75   75          COUNT=$(( $COUNT + 1 ))
  76   76  done
  77   77  pools[${#pools[@]}]="$bigname"
  78   78  
  79   79  
  80   80  
  81      -$MKFILE $MINVDEVSIZE /bootfs_004.$$.dat
       81 +mkfile $MINVDEVSIZE /bootfs_004.$$.dat
  82   82  
  83   83  typeset -i i=0;
  84   84  
  85   85  while [ $i -lt "${#pools[@]}" ]
  86   86  do
  87   87          POOL=${pools[$i]}/$TESTFS
  88      -        log_mustnot $ZPOOL create $POOL /bootfs_004.$$.dat
  89      -        log_mustnot $ZFS create $POOL/$TESTFS
  90      -        log_mustnot $ZPOOL set bootfs=$POOL/$TESTFS $POOL
       88 +        log_mustnot zpool create $POOL /bootfs_004.$$.dat
       89 +        log_mustnot zfs create $POOL/$TESTFS
       90 +        log_mustnot zpool set bootfs=$POOL/$TESTFS $POOL
  91   91  
  92   92          i=$(( $i + 1 ))
  93   93  done
  94   94  
  95   95  log_pass "Invalid pool names are rejected by zpool set bootfs"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX