diff options
author | Ruediger Meier | 2014-05-11 08:50:28 +0200 |
---|---|---|
committer | Ruediger Meier | 2014-05-13 17:38:12 +0200 |
commit | f45df374ffc311220bd395da985b121eccfb4045 (patch) | |
tree | 6f9daba1ecfcd2523a6d70085d0e2997270a61e2 | |
parent | tests: cleanup ts_scsi_debug_init (diff) | |
download | kernel-qcow2-util-linux-f45df374ffc311220bd395da985b121eccfb4045.tar.gz kernel-qcow2-util-linux-f45df374ffc311220bd395da985b121eccfb4045.tar.xz kernel-qcow2-util-linux-f45df374ffc311220bd395da985b121eccfb4045.zip |
tests: ts_scsi_debug_init must not run in a subshell
ts_skip and ts_die won't work from subshell. Now we simply use
TS_DEVICE which is globally set in that function.
I've made sure that we never change TS_DEVICE variable after
we've got it. So we could use it again for cleanup on exit in
ts_{finalize,die,skip} functions.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
-rwxr-xr-x | tests/ts/blkid/md-raid1-part | 17 | ||||
-rwxr-xr-x | tests/ts/eject/umount | 39 | ||||
-rwxr-xr-x | tests/ts/fdisk/align-512-4K | 9 | ||||
-rwxr-xr-x | tests/ts/fdisk/align-512-4K-63 | 9 | ||||
-rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 11 | ||||
-rwxr-xr-x | tests/ts/fdisk/align-512-512-topology | 10 | ||||
-rwxr-xr-x | tests/ts/libmount/context | 9 | ||||
-rwxr-xr-x | tests/ts/libmount/context-py | 9 | ||||
-rwxr-xr-x | tests/ts/libmount/context-utab | 9 | ||||
-rwxr-xr-x | tests/ts/libmount/context-utab-py | 9 | ||||
-rwxr-xr-x | tests/ts/libmount/tabfiles-tags | 15 | ||||
-rwxr-xr-x | tests/ts/libmount/tabfiles-tags-py | 15 | ||||
-rwxr-xr-x | tests/ts/losetup/losetup | 5 | ||||
-rwxr-xr-x | tests/ts/mount/umount-alltargets | 29 | ||||
-rwxr-xr-x | tests/ts/mount/umount-recursive | 21 | ||||
-rwxr-xr-x | tests/ts/partx/partx | 47 | ||||
-rwxr-xr-x | tests/ts/wipefs/wipefs | 13 |
17 files changed, 146 insertions, 130 deletions
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index 0257e15a8..6a59037e4 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -27,10 +27,11 @@ ts_check_test_command "$TS_CMD_BLKID" ts_skip_nonroot -DEVICE=$(ts_scsi_debug_init dev_size_mb=51 sector_size=512) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=51 sector_size=512 ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF +$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF n p 1 @@ -47,7 +48,7 @@ q EOF # replace generated ID with something stable -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF x i 0x1 @@ -63,24 +64,24 @@ MD_DEVICE=/dev/${MD_DEVNAME} ts_log "Create RAID1 device" /sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null /sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ - --raid-devices=2 ${DEVICE}1 ${DEVICE}2 >> $TS_OUTPUT 2>&1 + --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1 udevadm settle ts_log "Probe whole-disk" -$TS_CMD_BLKID -p -o udev ${DEVICE} 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev ${TS_DEVICE} 2>&1 | sort >> $TS_OUTPUT ts_log "Probe first RAID member" -$TS_CMD_BLKID -p -o udev ${DEVICE}1 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev ${TS_DEVICE}1 2>&1 | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev ${DEVICE}2 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>&1 | sort >> $TS_OUTPUT /sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 udevadm settle rmmod scsi_debug -ts_fdisk_clean $DEVICE +ts_fdisk_clean $TS_DEVICE # substitue UUIDs and major/minor number before comparison sed -i \ -e 's/^\(ID_FS_UUID\)=.*/\1=__ts_uuid__/' \ diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount index e781a7ba6..2a684669a 100755 --- a/tests/ts/eject/umount +++ b/tests/ts/eject/umount @@ -16,6 +16,7 @@ ts_skip_nonroot # not removable device. # +# set global variable TS_DEVICE function init_device { ts_scsi_debug_init dev_size_mb=100 } @@ -51,50 +52,50 @@ function deinit_device { ts_init_subtest "by-disk" -DEVICE=$(init_device) -$TS_CMD_EJECT --force $DEVICE && ts_log "Success" +init_device +$TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success" deinit_device ts_finalize_subtest ts_init_subtest "by-disk-mounted" -DEVICE=$(init_device) -mkfs.ext2 -q -F $DEVICE +init_device +mkfs.ext2 -q -F $TS_DEVICE udevadm settle mkdir -p $TS_MOUNTPOINT -mount $DEVICE $TS_MOUNTPOINT -$TS_CMD_EJECT --force $DEVICE && ts_log "Success" +mount $TS_DEVICE $TS_MOUNTPOINT +$TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success" deinit_device ts_finalize_subtest ts_init_subtest "by-disk-mounted-partition" -DEVICE=$(init_device) -init_partitions $DEVICE +init_device +init_partitions $TS_DEVICE mkdir -p ${TS_MOUNTPOINT}1 mkdir -p ${TS_MOUNTPOINT}2 -mount ${DEVICE}1 ${TS_MOUNTPOINT}1 -mount ${DEVICE}2 ${TS_MOUNTPOINT}2 -$TS_CMD_EJECT --force $DEVICE && ts_log "Success" +mount ${TS_DEVICE}1 ${TS_MOUNTPOINT}1 +mount ${TS_DEVICE}2 ${TS_MOUNTPOINT}2 +$TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success" deinit_device ts_finalize_subtest ts_init_subtest "by-partition" -DEVICE=$(init_device) -init_partitions $DEVICE -$TS_CMD_EJECT --force ${DEVICE}1 && ts_log "Success" +init_device +init_partitions $TS_DEVICE +$TS_CMD_EJECT --force ${TS_DEVICE}1 && ts_log "Success" deinit_device ts_finalize_subtest ts_init_subtest "by-partition-mounted" -DEVICE=$(init_device) -init_partitions $DEVICE +init_device +init_partitions $TS_DEVICE mkdir -p ${TS_MOUNTPOINT}1 mkdir -p ${TS_MOUNTPOINT}2 -mount ${DEVICE}1 ${TS_MOUNTPOINT}1 -mount ${DEVICE}2 ${TS_MOUNTPOINT}2 -$TS_CMD_EJECT --force ${DEVICE}1 && ts_log "Success" +mount ${TS_DEVICE}1 ${TS_MOUNTPOINT}1 +mount ${TS_DEVICE}2 ${TS_MOUNTPOINT}2 +$TS_CMD_EJECT --force ${TS_DEVICE}1 && ts_log "Success" deinit_device ts_finalize_subtest diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index 5d70fe1fa..bdfb5ceca 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -30,11 +30,12 @@ ts_check_test_command "$TS_CMD_FDISK" ts_skip_nonroot -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF +$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF n p 1 @@ -74,6 +75,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP rmmod scsi_debug -ts_fdisk_clean $DEVICE +ts_fdisk_clean $TS_DEVICE ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index 65f2a7556..e259b5a0a 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -30,11 +30,12 @@ ts_check_test_command "$TS_CMD_FDISK" ts_skip_nonroot -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF +$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF n p 1 @@ -74,6 +75,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP rmmod scsi_debug -ts_fdisk_clean $DEVICE +ts_fdisk_clean $TS_DEVICE ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index 9a2cb88f7..acb6186a6 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -30,11 +30,12 @@ ts_check_test_command "$TS_CMD_FDISK" ts_skip_nonroot -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF +$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF n p 1 @@ -59,7 +60,7 @@ MD_DEVICE=/dev/${MD_DEVNAME} /sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null /sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \ - --level=0 --raid-devices=2 ${DEVICE}1 ${DEVICE}2 >> $TS_OUTPUT 2>&1 + --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1 udevadm settle ts_log "Create partitions (MD)" @@ -88,7 +89,7 @@ cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT udevadm settle rmmod scsi_debug -ts_fdisk_clean $DEVICE +ts_fdisk_clean $TS_DEVICE ts_fdisk_clean $MD_DEVICE ts_finalize diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology index f988b4e42..d291e2f97 100755 --- a/tests/ts/fdisk/align-512-512-topology +++ b/tests/ts/fdisk/align-512-512-topology @@ -30,12 +30,12 @@ ts_check_test_command "$TS_CMD_FDISK" ts_skip_nonroot - -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 sector_size=512 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF +$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF n p 1 @@ -75,6 +75,6 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTP rmmod scsi_debug -ts_fdisk_clean $DEVICE +ts_fdisk_clean $TS_DEVICE ts_finalize diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 35e1a014e..8267b135d 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -26,11 +26,12 @@ TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" ts_log "Init device" umount $MOUNTPOINT &> /dev/null -DEVICE=$(ts_scsi_debug_init dev_size_mb=100) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=100 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -40,7 +41,7 @@ w q EOF -DEVICE="${DEVICE}1" +DEVICE="${TS_DEVICE}1" sleep 1 udevadm settle diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py index 840634413..78994008a 100755 --- a/tests/ts/libmount/context-py +++ b/tests/ts/libmount/context-py @@ -28,11 +28,12 @@ TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" ts_log "Init device" umount $MOUNTPOINT &> /dev/null -DEVICE=$(ts_scsi_debug_init dev_size_mb=100) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=100 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -42,7 +43,7 @@ w q EOF -DEVICE="${DEVICE}1" +DEVICE="${TS_DEVICE}1" sleep 1 udevadm settle diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index 4d3e3d7ca..2c4e30ccf 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -20,11 +20,12 @@ MOUNTPOINT="$TS_MOUNTPOINT" [ -x $TESTPROG ] || ts_skip "test not compiled" -DEVICE=$(ts_scsi_debug_init dev_size_mb=100) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=100 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -34,7 +35,7 @@ w q EOF -DEVICE="${DEVICE}1" +DEVICE="${TS_DEVICE}1" sleep 1 udevadm settle diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py index b454ceb54..d2168a75c 100755 --- a/tests/ts/libmount/context-utab-py +++ b/tests/ts/libmount/context-utab-py @@ -20,11 +20,12 @@ LABEL=libmount-test UUID=$(uuidgen) MOUNTPOINT="$TS_MOUNTPOINT" -DEVICE=$(ts_scsi_debug_init dev_size_mb=100) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=100 +DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -34,7 +35,7 @@ w q EOF -DEVICE="${DEVICE}1" +DEVICE="${TS_DEVICE}1" sleep 1 udevadm settle diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags index 318ccf05c..dbc9a57f5 100755 --- a/tests/ts/libmount/tabfiles-tags +++ b/tests/ts/libmount/tabfiles-tags @@ -11,17 +11,18 @@ TESTPROG="$TS_HELPER_LIBMOUNT_TAB" [ -x $TESTPROG ] || ts_skip "test not compiled" -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 sector_size=512 LABEL="testLibmount" UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9" # # Create filesystem # -mkfs.ext3 -F -L $LABEL $DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE +mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE" $TS_DEVICE udevadm settle -ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE +ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE" $TS_DEVICE FSTAB="$TS_OUTDIR/fstab" @@ -36,7 +37,7 @@ sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "fstab-label2dev" -ts_valgrind $TESTPROG --find-forward $FSTAB source $DEVICE &> $TS_OUTPUT +ts_valgrind $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest @@ -60,18 +61,18 @@ ts_finalize_subtest ts_init_subtest "fstab-dev2label" # has to return /mnt/mountpoint -ts_valgrind $TESTPROG --find-forward $FSTAB source $DEVICE &> $TS_OUTPUT +ts_valgrind $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest # # Add devname # -echo "$DEVICE /mnt/mountpoint3 auto defaults" >> $FSTAB +echo "$TS_DEVICE /mnt/mountpoint3 auto defaults" >> $FSTAB ts_init_subtest "fstab-dev" # has to return /mnt/mountpoint3 -ts_valgrind $TESTPROG --find-forward $FSTAB source $DEVICE &> $TS_OUTPUT +ts_valgrind $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT sed -i -e 's/source: .*//g' $TS_OUTPUT # devname is generated, remove it ts_finalize_subtest diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py index 237a6d827..278d70665 100755 --- a/tests/ts/libmount/tabfiles-tags-py +++ b/tests/ts/libmount/tabfiles-tags-py @@ -12,17 +12,18 @@ TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB" PYDBG="$PYTHON -m pdb" -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 sector_size=512) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 sector_size=512 LABEL="testLibmount" UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9" # # Create filesystem # -mkfs.ext3 -F -L $LABEL $DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE +mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE" $TS_DEVICE udevadm settle -ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE +ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE" $TS_DEVICE FSTAB="$TS_OUTDIR/fstab" @@ -37,7 +38,7 @@ sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "fstab-label2dev" -$PYTHON $TESTPROG --find-forward $FSTAB source $DEVICE &> $TS_OUTPUT +$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest @@ -61,18 +62,18 @@ ts_finalize_subtest ts_init_subtest "fstab-dev2label" # has to return /mnt/mountpoint -$PYTHON $TESTPROG --find-forward $FSTAB source $DEVICE &> $TS_OUTPUT +$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest # # Add devname # -echo "$DEVICE /mnt/mountpoint3 auto defaults" >> $FSTAB +echo "$TS_DEVICE /mnt/mountpoint3 auto defaults" >> $FSTAB ts_init_subtest "fstab-dev" # has to return /mnt/mountpoint3 -$PYTHON $TESTPROG --find-forward $FSTAB source $DEVICE &> $TS_OUTPUT +$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT sed -i -e 's/source: .*//g' $TS_OUTPUT # devname is generated, remove it ts_finalize_subtest diff --git a/tests/ts/losetup/losetup b/tests/ts/losetup/losetup index f27501bc4..804518998 100755 --- a/tests/ts/losetup/losetup +++ b/tests/ts/losetup/losetup @@ -35,7 +35,8 @@ ts_skip_nonroot ts_check_losetup -DEVICE=$(ts_scsi_debug_init dev_size_mb=11) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=11 REFILE=$(ts_image_init 10) function lo_print { @@ -93,7 +94,7 @@ rm -rf $BACKFILE # # Backing file is a block device # -BACKFILE="$DEVICE" +BACKFILE="$TS_DEVICE" ts_init_subtest "blkdev" LODEV=$( $TS_CMD_LOSETUP --find --show $BACKFILE ) diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets index e3b5aec9a..9060524e6 100755 --- a/tests/ts/mount/umount-alltargets +++ b/tests/ts/mount/umount-alltargets @@ -17,10 +17,11 @@ ts_skip_nonroot $TS_CMD_UMOUNT --help | grep -q all-targets [ $? -eq 1 ] && ts_skip "all-targets unsupported" -DEVICE=$(ts_scsi_debug_init dev_size_mb=50) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -47,13 +48,13 @@ EOF udevadm settle ts_log "Create filesystem A" -mkfs.ext2 ${DEVICE}1 &> /dev/null +mkfs.ext2 ${TS_DEVICE}1 &> /dev/null ts_log "Create filesystem B" -mkfs.ext2 ${DEVICE}2 &> /dev/null +mkfs.ext2 ${TS_DEVICE}2 &> /dev/null ts_log "Create filesystem C" -mkfs.ext2 ${DEVICE}3 &> /dev/null +mkfs.ext2 ${TS_DEVICE}3 &> /dev/null ts_log "Create filesystem D" -mkfs.ext2 ${DEVICE}4 &> /dev/null +mkfs.ext2 ${TS_DEVICE}4 &> /dev/null udevadm settle @@ -81,7 +82,7 @@ MOUNTPOINT=$TS_MOUNTPOINT # The same device mounted on more places, umount all by mountpoint name # ts_init_subtest "all-targets-mnt" -multi_mount ${DEVICE}1 $MOUNTPOINT +multi_mount ${TS_DEVICE}1 $MOUNTPOINT $TS_CMD_UMOUNT --all-targets ${MOUNTPOINT}1 >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest @@ -90,8 +91,8 @@ ts_finalize_subtest # The same device mounted on more places, umount all by device name # ts_init_subtest "all-targets-dev" -multi_mount ${DEVICE}1 $MOUNTPOINT -$TS_CMD_UMOUNT --all-targets ${DEVICE}1 >> $TS_OUTPUT 2>&1 +multi_mount ${TS_DEVICE}1 $MOUNTPOINT +$TS_CMD_UMOUNT --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest @@ -100,14 +101,14 @@ ts_finalize_subtest # sub-mounts. Umount all by one umount all by top-level device name. # ts_init_subtest "all-targets-recursive" -multi_mount ${DEVICE}1 $MOUNTPOINT +multi_mount ${TS_DEVICE}1 $MOUNTPOINT [ -d "${MOUNTPOINT}1/subA" ] || mkdir -p ${MOUNTPOINT}1/subA -$TS_CMD_MOUNT ${DEVICE}2 ${MOUNTPOINT}1/subA +$TS_CMD_MOUNT ${TS_DEVICE}2 ${MOUNTPOINT}1/subA [ -d "${MOUNTPOINT}1/subA/subAB" ] || mkdir -p ${MOUNTPOINT}1/subA/subAB -$TS_CMD_MOUNT ${DEVICE}3 ${MOUNTPOINT}1/subA/subAB +$TS_CMD_MOUNT ${TS_DEVICE}3 ${MOUNTPOINT}1/subA/subAB [ -d "${MOUNTPOINT}1/subB" ] || mkdir -p ${MOUNTPOINT}1/subB -$TS_CMD_MOUNT ${DEVICE}4 ${MOUNTPOINT}1/subB -$TS_CMD_UMOUNT --recursive --all-targets ${DEVICE}1 >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}4 ${MOUNTPOINT}1/subB +$TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive index d55f61285..f393aed12 100755 --- a/tests/ts/mount/umount-recursive +++ b/tests/ts/mount/umount-recursive @@ -18,10 +18,11 @@ $TS_CMD_UMOUNT --help | grep -q recursive [ $? -eq 1 ] && ts_skip "recursive unsupported" ts_log "Init device" -DEVICE=$(ts_scsi_debug_init dev_size_mb=50) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} &> /dev/null <<EOF +$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n p 1 @@ -48,13 +49,13 @@ EOF udevadm settle ts_log "Create filesystem A" -mkfs.ext2 ${DEVICE}1 &> /dev/null +mkfs.ext2 ${TS_DEVICE}1 &> /dev/null ts_log "Create filesystem B" -mkfs.ext2 ${DEVICE}2 &> /dev/null +mkfs.ext2 ${TS_DEVICE}2 &> /dev/null ts_log "Create filesystem C" -mkfs.ext2 ${DEVICE}3 &> /dev/null +mkfs.ext2 ${TS_DEVICE}3 &> /dev/null ts_log "Create filesystem D" -mkfs.ext2 ${DEVICE}4 &> /dev/null +mkfs.ext2 ${TS_DEVICE}4 &> /dev/null udevadm settle @@ -63,12 +64,12 @@ ts_log "Do tests..." [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT ts_log "A) Mount root" -$TS_CMD_MOUNT ${DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 $TS_CMD_MOUNT --make-shared $TS_MOUNTPOINT ts_log "B) Mount child" mkdir -p $TS_MOUNTPOINT/mntB -$TS_CMD_MOUNT ${DEVICE}2 $TS_MOUNTPOINT/mntB >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}2 $TS_MOUNTPOINT/mntB >> $TS_OUTPUT 2>&1 ts_log "B2) Mount child-bind" mkdir -p $TS_MOUNTPOINT/bindB @@ -76,10 +77,10 @@ $TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB $TS_MOUNTPOINT/bindB >> $TS_OUTPUT 2>&1 ts_log "C) Mount child/child" mkdir -p $TS_MOUNTPOINT/mntB/mnt{C,D} -$TS_CMD_MOUNT ${DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> $TS_OUTPUT 2>&1 ts_log "D) Mount child/child" -$TS_CMD_MOUNT ${DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>&1 ts_log "E) Mount child-bind" mkdir -p $TS_MOUNTPOINT/bindC diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx index bc612b0a4..ed6d0e184 100755 --- a/tests/ts/partx/partx +++ b/tests/ts/partx/partx @@ -44,94 +44,95 @@ for img in $(ls $TS_IMGDIR/*.img.bz2 | sort); do ts_finalize_subtest done - -DEVICE=$(ts_scsi_debug_init dev_size_mb=50) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 ts_init_subtest "addpart" -$TS_CMD_ADDPART ${DEVICE} 1 0 1 +$TS_CMD_ADDPART ${TS_DEVICE} 1 0 1 [ "$?" == 0 ] && echo OK &>$TS_OUTPUT || ts_die "Unable to add partition"a &>$TS_OUTPUT ts_finalize_subtest udevadm settle ts_init_subtest "delpart" -$TS_CMD_DELPART ${DEVICE} 1 +$TS_CMD_DELPART ${TS_DEVICE} 1 [ "$?" == 0 ] && echo OK >> $TS_OUTPUT 2>&1 || ts_die "Unable to remove partition" >> $TS_OUTPUT 2>&1 ts_finalize_subtest udevadm settle rmmod scsi_debug &> /dev/null -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 num_parts=$PARTS) -DEVNAME=$(basename $DEVICE) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 num_parts=$PARTS +DEVNAME=$(basename $TS_DEVICE) ts_init_subtest "detect-parts" -$TS_CMD_PARTX --show $DEVICE &> $TS_OUTPUT +$TS_CMD_PARTX --show $TS_DEVICE &> $TS_OUTPUT ts_finalize_subtest udevadm settle ts_init_subtest "delete-all" #delete partinfo -$TS_CMD_PARTX --delete $DEVICE &> $TS_OUTPUT +$TS_CMD_PARTX --delete $TS_DEVICE &> $TS_OUTPUT [ $? -eq 0 ] && echo "partitions deleted" &> $TS_OUTPUT || - echo "Unable to delete partitions on $DEVICE" &> $TS_OUTPUT + echo "Unable to delete partitions on $TS_DEVICE" &> $TS_OUTPUT ls -d "/sys/block/${DEVNAME}/${DEVNAME}*" 2>/dev/null && ts_die ts_finalize_subtest udevadm settle ts_init_subtest "add-all" -#read DEVICE and restore the partinfo -$TS_CMD_PARTX --add $DEVICE &> $TS_OUTPUT +#read TS_DEVICE and restore the partinfo +$TS_CMD_PARTX --add $TS_DEVICE &> $TS_OUTPUT [ $(ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null | wc -l) -eq $PARTS ] && echo "partitions added" >> $TS_OUTPUT 2>&1 || - echo "Unable to add partitions for $DEVICE" >> $TS_OUTPUT 2>&1 + echo "Unable to add partitions for $TS_DEVICE" >> $TS_OUTPUT 2>&1 ts_finalize_subtest udevadm settle ts_init_subtest "update-one" -#read DEVICE and update second partition -$TS_CMD_PARTX --update ${DEVICE}2 &> $TS_OUTPUT +#read TS_DEVICE and update second partition +$TS_CMD_PARTX --update ${TS_DEVICE}2 &> $TS_OUTPUT [ $(ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null | wc -l) -eq $PARTS ] && echo "partitions updated" >> $TS_OUTPUT 2>&1 || - echo "Unable to update 2nd partition for $DEVICE" >> $TS_OUTPUT 2>&1 + echo "Unable to update 2nd partition for $TS_DEVICE" >> $TS_OUTPUT 2>&1 ts_finalize_subtest udevadm settle ts_init_subtest "delete-one" #remove last partition only -$TS_CMD_PARTX -d --nr -1 $DEVICE >> $TS_OUTPUT 2>&1 +$TS_CMD_PARTX -d --nr -1 $TS_DEVICE >> $TS_OUTPUT 2>&1 [ $(ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null | wc -l) -eq $((PARTS-1)) ] && echo "last partition removed" >> $TS_OUTPUT 2>&1 || - echo "Unable to remove a partition on $DEVICE" >> $TS_OUTPUT 2>&1 + echo "Unable to remove a partition on $TS_DEVICE" >> $TS_OUTPUT 2>&1 ts_finalize_subtest udevadm settle ts_init_subtest "delete-non-existent" #attempt to remove it again -$TS_CMD_PARTX -d $PARTS $DEVICE && echo "partx failed: removed non-existing partition" &>$TS_OUTPUT || echo "partx: OK" &>$TS_OUTPUT +$TS_CMD_PARTX -d $PARTS $TS_DEVICE && echo "partx failed: removed non-existing partition" &>$TS_OUTPUT || echo "partx: OK" &>$TS_OUTPUT ts_finalize_subtest udevadm settle ts_init_subtest "add-existing" #try adding an existing partition -$TS_CMD_PARTX -a --nr 1 $DEVICE &>/dev/null && echo "partx failed: re-added an existing partition" &> $TS_OUTPUT || echo "partx: OK" &> $TS_OUTPUT +$TS_CMD_PARTX -a --nr 1 $TS_DEVICE &>/dev/null && echo "partx failed: re-added an existing partition" &> $TS_OUTPUT || echo "partx: OK" &> $TS_OUTPUT ts_finalize_subtest udevadm settle ts_init_subtest "change-by-range" # {-a|-d} --nr 0 should handle all partitions -$TS_CMD_PARTX -d --nr 0 $DEVICE -ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null && echo "Unable to delete partitions on $DEVICE" >> $TS_OUTPUT 2>&1 || echo "partitions deleted" >> $TS_OUTPUT 2>&1 -$TS_CMD_PARTX -a --nr 0 $DEVICE -[ $(ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null | wc -l) -eq $PARTS ] && echo "partitions added" >> $TS_OUTPUT 2>&1 || echo "Failed to add $DEVICE partitions" >> $TS_OUTPUT 2>&1 +$TS_CMD_PARTX -d --nr 0 $TS_DEVICE +ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null && echo "Unable to delete partitions on $TS_DEVICE" >> $TS_OUTPUT 2>&1 || echo "partitions deleted" >> $TS_OUTPUT 2>&1 +$TS_CMD_PARTX -a --nr 0 $TS_DEVICE +[ $(ls -d /sys/block/${DEVNAME}/${DEVNAME}* 2>/dev/null | wc -l) -eq $PARTS ] && echo "partitions added" >> $TS_OUTPUT 2>&1 || echo "Failed to add $TS_DEVICE partitions" >> $TS_OUTPUT 2>&1 ts_finalize_subtest udevadm settle diff --git a/tests/ts/wipefs/wipefs b/tests/ts/wipefs/wipefs index 4bd174800..f921625c5 100755 --- a/tests/ts/wipefs/wipefs +++ b/tests/ts/wipefs/wipefs @@ -9,21 +9,22 @@ ts_init "$*" ts_check_test_command "$TS_CMD_WIPEFS" -DEVICE=$(ts_scsi_debug_init dev_size_mb=50 num_parts=2) +# set global variable TS_DEVICE +ts_scsi_debug_init dev_size_mb=50 num_parts=2 # remove old backups -rm -rf $HOME/wipefs-$(basename ${DEVICE})-*.bak +rm -rf $HOME/wipefs-$(basename ${TS_DEVICE})-*.bak #remove the magic byte, back it up -$TS_CMD_WIPEFS --all --backup ${DEVICE} &>/dev/null || ts_die "wipefs failed" +$TS_CMD_WIPEFS --all --backup ${TS_DEVICE} &>/dev/null || ts_die "wipefs failed" #there should be just one magic string/backup file in this case -INFILE=$(ls $HOME/wipefs-$(basename ${DEVICE})-*.bak) +INFILE=$(ls $HOME/wipefs-$(basename ${TS_DEVICE})-*.bak) OFFT=$(echo $INFILE | sed -E 's/^.*-(.*).bak$/\1/') -dd if=$INFILE of=$DEVICE bs=1 conv=notrunc seek=$(($OFFT)) &>/dev/null +dd if=$INFILE of=$TS_DEVICE bs=1 conv=notrunc seek=$(($OFFT)) &>/dev/null #the bytes should be copied back, check if wipefs can recognize it -$TS_CMD_WIPEFS -a ${DEVICE} > $TS_OUTDIR/out 2>/dev/null +$TS_CMD_WIPEFS -a ${TS_DEVICE} > $TS_OUTDIR/out 2>/dev/null # check for output [ -s $TS_OUTDIR/out ] && echo "OK" &> $TS_OUTPUT || exit 1 |