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 /tests/ts/blkid | |
| 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>
Diffstat (limited to 'tests/ts/blkid')
| -rwxr-xr-x | tests/ts/blkid/md-raid1-part | 17 |
1 files changed, 9 insertions, 8 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__/' \ |