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>

*** 24,34 **** # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2012, 2015 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib --- 24,34 ---- # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2012, 2016 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
*** 50,83 **** # # we need destroy pools that created on top of $TESTPOOL first # typeset pool_name for config in $CONFIGS; do ! pool_name=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME) if poolexists $pool_name; then ! log_must $ZPOOL destroy $pool_name fi done if poolexists $TESTPOOL ; then ! log_must $ZPOOL destroy $TESTPOOL fi } log_assert "Boot properties cannot be set on pools with older versions" # These are configs from zpool_upgrade.cfg - see that file for more info. CONFIGS="1 2 3" log_onexit cleanup ! log_must $ZPOOL create -f $TESTPOOL $DISKS for config in $CONFIGS do create_old_pool $config ! POOL_NAME=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME) ! log_must $ZFS create $POOL_NAME/$TESTFS ! log_mustnot $ZPOOL set bootfs=$POOL_NAME/$TESTFS $POOL_NAME log_must destroy_upgraded_pool $config done log_pass "Boot properties cannot be set on pools with older versions" --- 50,83 ---- # # we need destroy pools that created on top of $TESTPOOL first # typeset pool_name for config in $CONFIGS; do ! pool_name=$(eval echo \$ZPOOL_VERSION_${config}_NAME) if poolexists $pool_name; then ! log_must zpool destroy $pool_name fi done if poolexists $TESTPOOL ; then ! log_must zpool destroy $TESTPOOL fi } log_assert "Boot properties cannot be set on pools with older versions" # These are configs from zpool_upgrade.cfg - see that file for more info. CONFIGS="1 2 3" log_onexit cleanup ! log_must zpool create -f $TESTPOOL $DISKS for config in $CONFIGS do create_old_pool $config ! POOL_NAME=$(eval echo \$ZPOOL_VERSION_${config}_NAME) ! log_must zfs create $POOL_NAME/$TESTFS ! log_mustnot zpool set bootfs=$POOL_NAME/$TESTFS $POOL_NAME log_must destroy_upgraded_pool $config done log_pass "Boot properties cannot be set on pools with older versions"