Date: Tue, 27 Mar 2018 11:49:16 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331613 - in head/tests/sys/cddl/zfs: bin include tests/cli_root/zpool_add tests/delegate tests/devices tests/hotspare tests/interop tests/largest_pool tests/slog tests/utils_test tests... Message-ID: <201803271149.w2RBnGIx082165@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Tue Mar 27 11:49:15 2018 New Revision: 331613 URL: https://svnweb.freebsd.org/changeset/base/331613 Log: ZFS test suite: fix uses of illumos /dev/[r]dsk/ and /dev/zvol/[r]dsk/ Modified: head/tests/sys/cddl/zfs/bin/devname2devid.c head/tests/sys/cddl/zfs/bin/zpool_bsd.ksh head/tests/sys/cddl/zfs/bin/zpool_smi.ksh head/tests/sys/cddl/zfs/include/libtest.kshlib head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh head/tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_002_neg.ksh head/tests/sys/cddl/zfs/tests/interop/interop.cfg head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg head/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh head/tests/sys/cddl/zfs/tests/utils_test/utils_test_001_pos.ksh head/tests/sys/cddl/zfs/tests/utils_test/utils_test_002_pos.ksh head/tests/sys/cddl/zfs/tests/utils_test/utils_test_005_pos.ksh head/tests/sys/cddl/zfs/tests/utils_test/utils_test_006_pos.ksh head/tests/sys/cddl/zfs/tests/utils_test/utils_test_008_pos.ksh head/tests/sys/cddl/zfs/tests/utils_test/utils_test_009_pos.ksh head/tests/sys/cddl/zfs/tests/xattr/xattr_004_pos.ksh head/tests/sys/cddl/zfs/tests/zones/zones_001_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_common.kshlib head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_003_neg.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_004_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_005_neg.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_006_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/cleanup.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_001_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_002_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_003_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_004_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_005_pos.ksh head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_006_pos.ksh Modified: head/tests/sys/cddl/zfs/bin/devname2devid.c ============================================================================== --- head/tests/sys/cddl/zfs/bin/devname2devid.c Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/bin/devname2devid.c Tue Mar 27 11:49:15 2018 (r331613) @@ -39,11 +39,11 @@ * Usage: devname2devid <devicepath> * * Examples: - * # ./devname2devid /dev/dsk/c1t4d0s0 + * # ./devname2devid /dev/c1t4d0s0 * devid id1,sd@SSEAGATE_ST318404LSUN18G_3BT2G0Z300002146G4CR/a - * # ./devname2devid /dev/dsk/c1t4d0 + * # ./devname2devid /dev/c1t4d0 * devid id1,sd@SSEAGATE_ST318404LSUN18G_3BT2G0Z300002146G4CR/wd - * # ./devname2devid /dev/dsk/c1t4d0s1 + * # ./devname2devid /dev/c1t4d0s1 * devid id1,sd@SSEAGATE_ST318404LSUN18G_3BT2G0Z300002146G4CR/b * # * @@ -99,7 +99,7 @@ main(int argc, char *argv[]) if (argc == 3) { search_path = argv[2]; } else { - search_path = "/dev/rdsk"; + search_path = "/dev/"; } if (devid_deviceid_to_nmlist(search_path, devid, DEVID_MINOR_NAME_ALL, Modified: head/tests/sys/cddl/zfs/bin/zpool_bsd.ksh ============================================================================== --- head/tests/sys/cddl/zfs/bin/zpool_bsd.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/bin/zpool_bsd.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -16,8 +16,8 @@ typeset option case $cmd in create|add|attach|detach|replace|remove|online|offline|clear) for arg in $@; do - if [[ $arg == "/dev/dsk/"* ]]; then - arg=${arg#/dev/dsk/} + if [[ $arg == "/dev/"* ]]; then + arg=${arg#/dev/} arg="/dev/"$arg fi if [[ $arg == "/dev/"* ]]; then Modified: head/tests/sys/cddl/zfs/bin/zpool_smi.ksh ============================================================================== --- head/tests/sys/cddl/zfs/bin/zpool_smi.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/bin/zpool_smi.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -42,7 +42,7 @@ label yes _EOF - labeltype=$(/usr/sbin/prtvtoc -fh /dev/rdsk/${disk}s2 | \ + labeltype=$(/usr/sbin/prtvtoc -fh /dev/${disk}s2 | \ awk '{print $1}' | awk -F= '{print $2}' ) if [[ -z $labeltype ]]; then print "${disk} not exist." @@ -61,7 +61,7 @@ _EOF print "q" >> $label_file print "q" >> $label_file - fdisk -B /dev/rdsk/${disk}p0 >/dev/null 2>&1 + fdisk -B /dev/${disk}p0 >/dev/null 2>&1 # wait a while for fdisk finishes /usr/sbin/devfsadm > /dev/null 2>&1 elif [[ $arch == "sparc" ]]; then @@ -105,8 +105,8 @@ typeset option case $cmd in create|add|attach|detach|replace|remove|online|offline|clear) for arg in $@; do - if [[ $arg == "/dev/dsk/"* ]]; then - arg=${arg#/dev/dsk/} + if [[ $arg == "/dev/"* ]]; then + arg=${arg#/dev/} fi print $arg | egrep "^c[0-F]+([td][0-F]+)+$" > /dev/null 2>&1 Modified: head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Mar 27 11:49:15 2018 (r331613) @@ -1235,12 +1235,12 @@ function zfs_zones_setup #zone_name zone_root zone_ip # add our zvol to the zone $ECHO "add device" >> $zone_conf - $ECHO "set match=/dev/zvol/dsk/$pool_name/zone_zvol" >> $zone_conf + $ECHO "set match=/dev/zvol/$pool_name/zone_zvol" >> $zone_conf $ECHO "end" >> $zone_conf - # add a corresponding zvol rdsk to the zone + # add a corresponding zvol to the zone $ECHO "add device" >> $zone_conf - $ECHO "set match=/dev/zvol/rdsk/$pool_name/zone_zvol" >> $zone_conf + $ECHO "set match=/dev/zvol/$pool_name/zone_zvol" >> $zone_conf $ECHO "end" >> $zone_conf # once it's supported, we'll add our filesystem to the zone @@ -1349,9 +1349,9 @@ function wait_for # timeout dt <method> [args...] function check_state # pool disk stateexpr { typeset pool=$1 - typeset disk=${2#/dev/dsk/} - disk=${disk#/dev/rdsk/} + typeset disk=${2#/dev/} disk=${disk#/dev/} + disk=${disk#/dev/} typeset stateexpr=$3 $ZPOOL status -v $pool | grep "$disk" \ @@ -1561,9 +1561,9 @@ function check_version # <OS version> function check_hotspare_state # pool disk state{inuse,avail} { typeset pool=$1 - typeset disk=${2#/dev/dsk/} - disk=${disk#/dev/rdsk/} + typeset disk=${2#/dev/} disk=${disk#/dev/} + disk=${disk#/dev/} typeset state=$3 cur_state=$(get_device_state $pool $disk "spares") @@ -1582,9 +1582,9 @@ function check_hotspare_state # pool disk state{inuse, function check_slog_state # pool disk state{online,offline,unavail} { typeset pool=$1 - typeset disk=${2#/dev/dsk/} - disk=${disk#/dev/rdsk/} + typeset disk=${2#/dev/} disk=${disk#/dev/} + disk=${disk#/dev/} typeset state=$3 cur_state=$(get_device_state $pool $disk "logs") @@ -1603,9 +1603,9 @@ function check_slog_state # pool disk state{online,off function check_vdev_state # pool disk state{online,offline,unavail} { typeset pool=$1 - typeset disk=${2#/dev/dsk/} - disk=${disk#/dev/rdsk/} + typeset disk=${2#/dev/} disk=${disk#/dev/} + disk=${disk#/dev/} typeset state=$3 if [[ $WRAPPER == *"smi"* ]]; then @@ -2176,7 +2176,7 @@ function safe_to_destroy_pool { # $1 the pool name $AWK '{print $1}') # this is a list of the zvols that make up the pool - ZVOLPOOL=$($ZPOOL status -v $pool | $GREP "/dev/zvol/dsk/$1$" | \ + ZVOLPOOL=$($ZPOOL status -v $pool | $GREP "/dev/zvol/$1$" | \ $AWK '{print $1}') # also want to determine if it's a file-based pool using an @@ -2728,8 +2728,8 @@ function checksum function get_device_state #pool disk field("", "spares","logs") { typeset pool=$1 - typeset disk=${2#/dev/dsk/} - disk=${disk#/dev/rdsk/} + typeset disk=${2#/dev/} + disk=${disk#/dev/} disk=${disk#/dev/} typeset field=${3:-$pool} Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib Tue Mar 27 11:49:15 2018 (r331613) @@ -54,7 +54,7 @@ function iscontained for vdev in $@; do -# remove /dev/dsk in vdev if there is +# remove /dev/ in vdev if there is vdev=${vdev#/dev/} $ZPOOL status "$pool" | $AWK '$1 == vdevname {exit 1}' \ Modified: head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib Tue Mar 27 11:49:15 2018 (r331613) @@ -1531,7 +1531,7 @@ function verify_vol_rollback log_must $ZFS snapshot $snap oldval=$(datasetcksum $vol) - log_must $DD if=/dev/random of=/dev/zvol/rdsk/$vol \ + log_must $DD if=/dev/random of=/dev/zvol/$vol \ bs=512 count=1 user_run $user $ZFS rollback -R $snap Modified: head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Tue Mar 27 11:49:15 2018 (r331613) @@ -57,7 +57,7 @@ function create_dev_file $AWK '{print $1}') [[ -z $devstr ]] && \ log_fail "Can not get block device file." - devstr=/dev/dsk/${devstr} + devstr=/dev/${devstr} ;; ufs) # @@ -65,7 +65,7 @@ function create_dev_file # And bring out the first one. # devstr=$($DF -lht ufs | \ - $GREP "^/dev/dsk" | \ + $GREP "^/dev/" | \ $AWK '{print $1}') devstr=$($ECHO "$devstr" | \ $AWK '{print $1}') @@ -81,7 +81,7 @@ function create_dev_file # # Get the device file information. i.e: - # /dev/dsk/c0t0d0s0: block special (28/768) + # /dev/c0t0d0s0: block special (28/768) # devstr=$($FILE $devstr) Modified: head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -130,7 +130,7 @@ done # This part of the test can only be run on platforms for which DUMPADM is # defined; ie Solaris if [[ -n $DUMPADM ]]; then - log_must $DUMPADM -u -d /dev/dsk/$dump_dev + log_must $DUMPADM -u -d /dev/$dump_dev log_mustnot $ZPOOL add "$TESTPOOL" spare $dump_dev log_mustnot $ZPOOL add -f "$TESTPOOL" spare $dump_dev fi Modified: head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -131,7 +131,7 @@ if [[ -n $DUMPADM ]]; then # back to something normal so we can use this $disk as a dump device cleanup_devices $dump_dev - log_must $DUMPADM -u -d /dev/dsk/$dump_dev + log_must $DUMPADM -u -d /dev/$dump_dev log_mustnot $ZPOOL create $TESTPOOL1 ${pooldevs[1]} spare "$dump_dev" log_mustnot $ZPOOL create -f $TESTPOOL1 ${pooldevs[1]} spare "$dump_dev" fi Modified: head/tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_002_neg.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_002_neg.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_002_neg.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -86,11 +86,11 @@ typeset dev_nonexist dev_notinlist case $DISK_ARRAY_NUM in 0|1) - dev_nonexist=/dev/dsk/${disk}sbad_slice_num + dev_nonexist=/dev/${disk}sbad_slice_num dev_notinlist=${disk} ;; 2|*) - dev_nonexist=/dev/dsk/${DISK0}sbad_slice_num + dev_nonexist=/dev/${DISK0}sbad_slice_num dev_notinlist="${DISK0} ${DISK1}" ;; esac Modified: head/tests/sys/cddl/zfs/tests/interop/interop.cfg ============================================================================== --- head/tests/sys/cddl/zfs/tests/interop/interop.cfg Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/interop/interop.cfg Tue Mar 27 11:49:15 2018 (r331613) @@ -77,6 +77,6 @@ export META_SIDE0 META_SIDE1 ZFS_SIDE2 SINGLE_DISK export TESTFILE=testfile export FS_SIZE=500m export META_DEVICE_ID=d99 -export META_DEVICE_PATH=/dev/md/dsk/$META_DEVICE_ID +export META_DEVICE_PATH=/dev/md/$META_DEVICE_ID export FILE_COUNT=20 export FILE_SIZE=$(( 1024 * 1024 )) Modified: head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg ============================================================================== --- head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg Tue Mar 27 11:49:15 2018 (r331613) @@ -31,7 +31,7 @@ export TESTVOL=testvol${TESTCASE_ID} export STF_TIMEOUT=1800 -export VOL_PATH=/dev/zvol/dsk/${TESTPOOL2}/$TESTVOL +export VOL_PATH=/dev/zvol/${TESTPOOL2}/$TESTVOL export VOLSIZES=${VOLSIZES-"2pb 5pb 10pb 2eb 5eb 8eb 9eb"} # There're 3 different prompt messages while create Modified: head/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -104,4 +104,4 @@ log_must $ZPOOL add $TESTPOOL $mntpnt/vdev # Add ZFS volume vol=$TESTPOOL/vol log_must $ZPOOL create -V 64M $vol -log_must $ZPOOL add $TESTPOOL /dev/zvol/dsk/$vol +log_must $ZPOOL add $TESTPOOL /dev/zvol/$vol Modified: head/tests/sys/cddl/zfs/tests/utils_test/utils_test_001_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/utils_test/utils_test_001_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/utils_test/utils_test_001_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -69,7 +69,7 @@ log_assert "Ensure that the clri(1M) utility fails on populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUNT $BLOCKSZ $DATA inode=`$LS -i $TESTDIR/$TESTFILE.0 | $AWK '{print $1}'` -log_mustnot $CLRI /dev/rdsk/$DISK $inode -log_mustnot $CLRI -F zfs /dev/rdsk/$DISK $inode +log_mustnot $CLRI /dev/$DISK $inode +log_mustnot $CLRI -F zfs /dev/$DISK $inode log_pass "clri(1M) returned an error as expected." Modified: head/tests/sys/cddl/zfs/tests/utils_test/utils_test_002_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/utils_test/utils_test_002_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/utils_test/utils_test_002_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -76,6 +76,6 @@ populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUN log_must $ZFS unmount $TESTDIR -log_mustnot $LABELIT /dev/rdsk/${DISK}s0 mfiles ${DISK}s0 +log_mustnot $LABELIT /dev/${DISK}s0 mfiles ${DISK}s0 log_pass "labelit(1M) returned an error as expected." Modified: head/tests/sys/cddl/zfs/tests/utils_test/utils_test_005_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/utils_test/utils_test_005_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/utils_test/utils_test_005_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -70,6 +70,6 @@ log_assert "Ensure that the ff(1M) utility fails on a populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUNT $BLOCKSZ $DATA -log_mustnot $FF -F zfs /dev/rdsk/${DISK}s0 +log_mustnot $FF -F zfs /dev/${DISK}s0 log_pass "ff(1M) returned an error as expected." Modified: head/tests/sys/cddl/zfs/tests/utils_test/utils_test_006_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/utils_test/utils_test_006_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/utils_test/utils_test_006_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -74,6 +74,6 @@ populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUN log_must $ZFS unmount $TESTDIR -log_mustnot $FSIRAND /dev/rdsk/${DISK}s0 +log_mustnot $FSIRAND /dev/${DISK}s0 log_pass "fsirand(1M) returned an error as expected." Modified: head/tests/sys/cddl/zfs/tests/utils_test/utils_test_008_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/utils_test/utils_test_008_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/utils_test/utils_test_008_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -76,6 +76,6 @@ populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUN log_must $ZFS unmount $TESTDIR -log_mustnot $NCHECK /dev/rdsk/${DISK}s0 +log_mustnot $NCHECK /dev/${DISK}s0 log_pass "ncheck(1M) returned an error as expected." Modified: head/tests/sys/cddl/zfs/tests/utils_test/utils_test_009_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/utils_test/utils_test_009_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/utils_test/utils_test_009_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -68,6 +68,6 @@ log_assert "Ensure that the tunefs(1M) utility fails o populate_dir $TESTDIR/$TESTFILE $NUM_FILES $WRITE_COUNT $BLOCKSZ $DATA -log_mustnot $TUNEFS -m 80 /dev/dsk/${DISK}s0 +log_mustnot $TUNEFS -m 80 /dev/${DISK}s0 log_pass "tunefs(1M) returned an error as expected." Modified: head/tests/sys/cddl/zfs/tests/xattr/xattr_004_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/xattr/xattr_004_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/xattr/xattr_004_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -78,10 +78,10 @@ test_requires RUNAT # Create a UFS file system that we can work in log_must $ZFS create -V128m $TESTPOOL/$TESTFS/zvol -log_must eval "$ECHO y | $NEWFS /dev/zvol/dsk/$TESTPOOL/$TESTFS/zvol > /dev/null 2>&1" +log_must eval "$ECHO y | $NEWFS /dev/zvol/$TESTPOOL/$TESTFS/zvol > /dev/null 2>&1" log_must $MKDIR $TMPDIR/ufs.${TESTCASE_ID} -log_must $MOUNT /dev/zvol/dsk/$TESTPOOL/$TESTFS/zvol $TMPDIR/ufs.${TESTCASE_ID} +log_must $MOUNT /dev/zvol/$TESTPOOL/$TESTFS/zvol $TMPDIR/ufs.${TESTCASE_ID} # Create files in ufs and tmpfs, and set some xattrs on them. log_must $TOUCH $TMPDIR/ufs.${TESTCASE_ID}/ufs-file.${TESTCASE_ID} Modified: head/tests/sys/cddl/zfs/tests/zones/zones_001_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zones/zones_001_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zones/zones_001_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -64,18 +64,18 @@ log_assert "Local zone contains ZFS datasets as expect # check to see if our zvol exists: -if [ ! -b /dev/zvol/dsk/zonepool/zone_zvol ] +if [ ! -b /dev/zvol/zonepool/zone_zvol ] then - log_fail "block device /dev/zvol/dsk/zonepool/zone_zvol not found!" + log_fail "block device /dev/zvol/zonepool/zone_zvol not found!" fi -if [ ! -c /dev/zvol/rdsk/zonepool/zone_zvol ] +if [ ! -c /dev/zvol/zonepool/zone_zvol ] then - log_fail "char device /dev/zvol/rdsk/zonepool/zone_zvol not found!" + log_fail "char device /dev/zvol/zonepool/zone_zvol not found!" fi # check to see if the device appears sane - create a UFS filesystem on it. -$ECHO y | $NEWFS /dev/zvol/rdsk/zonepool/zone_zvol > /dev/null +$ECHO y | $NEWFS /dev/zvol/zonepool/zone_zvol > /dev/null if [ $? -ne 0 ] then @@ -83,7 +83,7 @@ then fi $MKDIR /ufs.${TESTCASE_ID} -log_must $MOUNT /dev/zvol/dsk/zonepool/zone_zvol /ufs.${TESTCASE_ID} +log_must $MOUNT /dev/zvol/zonepool/zone_zvol /ufs.${TESTCASE_ID} log_must $UMOUNT /ufs.${TESTCASE_ID} $RM -rf /ufs.${TESTCASE_ID} Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_common.kshlib ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_common.kshlib Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_common.kshlib Tue Mar 27 11:49:15 2018 (r331613) @@ -106,7 +106,7 @@ function set_dumpsize log_must $ZFS set volsize=64m $volume - output=$($DUMPADM -d /dev/zvol/dsk/$volume 2>&1 | \ + output=$($DUMPADM -d /dev/zvol/$volume 2>&1 | \ $TAIL -1 | $AWK '{print $3}') if [[ -n $output ]]; then @@ -125,8 +125,8 @@ function safe_dumpadm log_note "No dump device volume specified." return 1 fi - if [[ $device == "/dev/zvol/dsk/"* ]] ; then - typeset volume=${device#/dev/zvol/dsk/} + if [[ $device == "/dev/zvol/"* ]] ; then + typeset volume=${device#/dev/zvol/} set_dumpsize $volume log_must $DUMPADM -d $device else Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -73,7 +73,7 @@ log_onexit cleanup test_requires DUMPADM -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL savedumpdev=$(get_dumpdevice) if ! is_dumpswap_supported $TESTPOOL ; then Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_003_neg.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_003_neg.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_003_neg.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -78,7 +78,7 @@ log_onexit cleanup test_requires DUMPADM -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL savedumpdev=$(get_dumpdevice) safe_dumpadm $voldev Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_004_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_004_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_004_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -104,7 +104,7 @@ log_onexit cleanup test_requires DUMPADM -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL savedumpdev=$(get_dumpdevice) # create snapshot over dump zvol Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_005_neg.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_005_neg.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_005_neg.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -79,7 +79,7 @@ log_onexit cleanup test_requires DUMPADM -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL savedumpdev=$(get_dumpdevice) # If device in swap list, it cannot be dump device Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_006_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_006_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_006_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -75,7 +75,7 @@ log_onexit cleanup test_requires DUMPADM -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL savedumpdev=$(get_dumpdevice) typeset oblksize=$($ZFS get -H -o value volblocksize $TESTPOOL/$TESTVOL) Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/cleanup.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/cleanup.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/cleanup.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -42,7 +42,7 @@ do fi done -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL if is_swap_inuse $voldev ; then log_must $SWAP -d $voldev fi Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_001_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_001_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_001_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -74,7 +74,7 @@ log_onexit cleanup test_requires SWAP -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL log_note "Add zvol volume as swap space" log_must $SWAP -a $voldev Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_002_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_002_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_002_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -78,7 +78,7 @@ fi log_onexit cleanup -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL $SWAP -l | $GREP zvol if (( $? != 0 )) ; then Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_003_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_003_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_003_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -97,7 +97,7 @@ log_onexit cleanup test_requires SWAPADD -voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL +voldev=/dev/zvol/$TESTPOOL/$TESTVOL VFSTAB_FILE=/etc/vfstab NEW_VFSTAB_FILE=$TMPDIR/zvol_vfstab.${TESTCASE_ID} PREV_VFSTAB_FILE=$TMPDIR/zvol_vfstab.PREV.${TESTCASE_ID} Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_004_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_004_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_004_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -94,7 +94,7 @@ while ((i < ${#array[@]})); do log_must $ZFS create -b $volblksize -V ${array[$i]} $vol - swapname="/dev/zvol/dsk/$vol" + swapname="/dev/zvol/$vol" if [[ ${array[((i+1))]} == "fail" ]]; then log_mustnot $SWAP -a $swapname else Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_005_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_005_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_005_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -95,7 +95,7 @@ while ((i < 10)) ; do # The minimum swap size should be 2 pagesize. ((swaplow + swaplen < pageblocks * 2)) && continue - swapname="/dev/zvol/dsk/$vol" + swapname="/dev/zvol/$vol" if is_swap_inuse $swapname ; then log_must $SWAP -d $swapname fi Modified: head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_006_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_006_pos.ksh Tue Mar 27 11:34:34 2018 (r331612) +++ head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_006_pos.ksh Tue Mar 27 11:49:15 2018 (r331613) @@ -95,7 +95,7 @@ set -A swap_opt $((pageblocks)) \ $(((volblocks*2) / 3)) \ $((pageblocks * ((RANDOM % 50) + 1) + (RANDOM % pageblocks) )) -swapname=/dev/zvol/dsk/$vol +swapname=/dev/zvol/$vol typeset -i i=0 count=0 if is_swap_inuse $swapname ; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803271149.w2RBnGIx082165>