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_005_neg.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_005_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 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  . $STF_SUITE/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #
  38   38  # Boot properties cannot be set on pools with older versions
  39   39  #
↓ open down ↓ 5 lines elided ↑ open up ↑
  45   45  
  46   46  verify_runnable "global"
  47   47  
  48   48  function cleanup {
  49   49  
  50   50          #
  51   51          # we need destroy pools that created on top of $TESTPOOL first
  52   52          #
  53   53          typeset pool_name
  54   54          for config in $CONFIGS; do
  55      -                pool_name=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME)
       55 +                pool_name=$(eval echo \$ZPOOL_VERSION_${config}_NAME)
  56   56                  if poolexists $pool_name; then
  57      -                        log_must $ZPOOL destroy $pool_name
       57 +                        log_must zpool destroy $pool_name
  58   58                  fi
  59   59          done
  60   60  
  61   61          if poolexists $TESTPOOL ; then
  62      -                log_must $ZPOOL destroy $TESTPOOL
       62 +                log_must zpool destroy $TESTPOOL
  63   63          fi
  64   64  }
  65   65  
  66   66  log_assert "Boot properties cannot be set on pools with older versions"
  67   67  
  68   68  # These are configs from zpool_upgrade.cfg - see that file for more info.
  69   69  CONFIGS="1 2 3"
  70   70  
  71   71  log_onexit cleanup
  72      -log_must $ZPOOL create -f $TESTPOOL $DISKS
       72 +log_must zpool create -f $TESTPOOL $DISKS
  73   73  
  74   74  for config in $CONFIGS
  75   75  do
  76   76          create_old_pool $config
  77      -        POOL_NAME=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME)
  78      -        log_must $ZFS create $POOL_NAME/$TESTFS
  79      -        log_mustnot $ZPOOL set bootfs=$POOL_NAME/$TESTFS $POOL_NAME
       77 +        POOL_NAME=$(eval echo \$ZPOOL_VERSION_${config}_NAME)
       78 +        log_must zfs create $POOL_NAME/$TESTFS
       79 +        log_mustnot zpool set bootfs=$POOL_NAME/$TESTFS $POOL_NAME
  80   80          log_must destroy_upgraded_pool $config
  81   81  done
  82   82  
  83   83  log_pass "Boot properties cannot be set on pools with older versions"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX