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>

*** 26,36 **** # # Copyright 2015 Nexenta Systems, Inc. # # ! # Copyright (c) 2012, 2015 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib # --- 26,36 ---- # # Copyright 2015 Nexenta Systems, Inc. # # ! # Copyright (c) 2012, 2016 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib #
*** 45,63 **** verify_runnable "global" function cleanup { if poolexists $TESTPOOL ; then ! log_must $ZPOOL destroy $TESTPOOL fi if [[ -f $VDEV ]]; then ! log_must $RM -f $VDEV fi } ! $ZPOOL set 2>&1 | $GREP bootfs > /dev/null if [ $? -ne 0 ] then log_unsupported "bootfs pool property not supported on this release." fi --- 45,63 ---- verify_runnable "global" function cleanup { if poolexists $TESTPOOL ; then ! log_must zpool destroy $TESTPOOL fi if [[ -f $VDEV ]]; then ! log_must rm -f $VDEV fi } ! zpool set 2>&1 | grep bootfs > /dev/null if [ $? -ne 0 ] then log_unsupported "bootfs pool property not supported on this release." fi
*** 64,82 **** log_assert "Valid datasets are accepted as bootfs property values" log_onexit cleanup typeset VDEV=/bootfs_001_pos_a.$$.dat ! log_must $MKFILE $MINVDEVSIZE $VDEV create_pool "$TESTPOOL" "$VDEV" ! log_must $ZFS create $TESTPOOL/$TESTFS ! log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap ! log_must $ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone ! log_must $ZPOOL set bootfs=$TESTPOOL/$TESTFS $TESTPOOL ! log_must $ZPOOL set bootfs=$TESTPOOL/$TESTFS@snap $TESTPOOL ! log_must $ZPOOL set bootfs=$TESTPOOL/clone $TESTPOOL ! log_must $ZFS promote $TESTPOOL/clone ! log_must $ZPOOL set bootfs=$TESTPOOL/clone $TESTPOOL log_pass "Valid datasets are accepted as bootfs property values" --- 64,82 ---- log_assert "Valid datasets are accepted as bootfs property values" log_onexit cleanup typeset VDEV=/bootfs_001_pos_a.$$.dat ! log_must mkfile $MINVDEVSIZE $VDEV create_pool "$TESTPOOL" "$VDEV" ! log_must zfs create $TESTPOOL/$TESTFS ! log_must zfs snapshot $TESTPOOL/$TESTFS@snap ! log_must zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone ! log_must zpool set bootfs=$TESTPOOL/$TESTFS $TESTPOOL ! log_must zpool set bootfs=$TESTPOOL/$TESTFS@snap $TESTPOOL ! log_must zpool set bootfs=$TESTPOOL/clone $TESTPOOL ! log_must zfs promote $TESTPOOL/clone ! log_must zpool set bootfs=$TESTPOOL/clone $TESTPOOL log_pass "Valid datasets are accepted as bootfs property values"