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) 2013 by Delphix. All rights reserved. # . $STF_SUITE/tests/functional/cache/cache.cfg . $STF_SUITE/tests/functional/cache/cache.kshlib --- 24,34 ---- # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013, 2016 by Delphix. All rights reserved. # . $STF_SUITE/tests/functional/cache/cache.cfg . $STF_SUITE/tests/functional/cache/cache.kshlib
*** 46,84 **** function cleanup_testenv { cleanup if [[ -n $lofidev ]]; then ! log_must $LOFIADM -d $lofidev fi } log_assert "Cache device can only be block devices." log_onexit cleanup_testenv TESTVOL=testvol1$$ dsk1=${DISKS%% *} ! log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1} # Add nomal /dev/rdsk device ! log_mustnot $ZPOOL add $TESTPOOL cache /dev/rdsk/${dsk1}s0 #log_must verify_cache_device $TESTPOOL $dsk1 'ONLINE' # Add nomal file ! log_mustnot $ZPOOL add $TESTPOOL cache $VDEV2 # Add /dev/rlofi device lofidev=${VDEV2%% *} ! log_must $LOFIADM -a $lofidev ! lofidev=$($LOFIADM $lofidev) ! log_mustnot $ZPOOL add $TESTPOOL cache "/dev/rlofi/${lofidev#/dev/lofi/}" if [[ -n $lofidev ]]; then ! log_must $LOFIADM -d $lofidev lofidev="" fi # Add /dev/zvol/rdsk device ! log_must $ZPOOL create $TESTPOOL2 $VDEV2 ! log_must $ZFS create -V $SIZE $TESTPOOL2/$TESTVOL ! log_mustnot $ZPOOL add $TESTPOOL cache /dev/zvol/rdsk/$TESTPOOL2/$TESTVOL log_pass "Cache device can only be block devices." --- 46,84 ---- function cleanup_testenv { cleanup if [[ -n $lofidev ]]; then ! log_must lofiadm -d $lofidev fi } log_assert "Cache device can only be block devices." log_onexit cleanup_testenv TESTVOL=testvol1$$ dsk1=${DISKS%% *} ! log_must zpool create $TESTPOOL ${DISKS#$dsk1} # Add nomal /dev/rdsk device ! log_mustnot zpool add $TESTPOOL cache /dev/rdsk/${dsk1}s0 #log_must verify_cache_device $TESTPOOL $dsk1 'ONLINE' # Add nomal file ! log_mustnot zpool add $TESTPOOL cache $VDEV2 # Add /dev/rlofi device lofidev=${VDEV2%% *} ! log_must lofiadm -a $lofidev ! lofidev=$(lofiadm $lofidev) ! log_mustnot zpool add $TESTPOOL cache "/dev/rlofi/${lofidev#/dev/lofi/}" if [[ -n $lofidev ]]; then ! log_must lofiadm -d $lofidev lofidev="" fi # Add /dev/zvol/rdsk device ! log_must zpool create $TESTPOOL2 $VDEV2 ! log_must zfs create -V $SIZE $TESTPOOL2/$TESTVOL ! log_mustnot zpool add $TESTPOOL cache /dev/zvol/rdsk/$TESTPOOL2/$TESTVOL log_pass "Cache device can only be block devices."