diff options
| author | Ruediger Meier | 2014-05-15 11:24:59 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2014-05-15 12:48:35 +0200 |
| commit | 12826d4c20358a2e096b0df8e34dfb0fa88c5b21 (patch) | |
| tree | a58ebc33e776045a827e205c5b2b5e7edfab3fa8 /tests/ts/blkid | |
| parent | tests: add function ts_check_prog (diff) | |
| download | kernel-qcow2-util-linux-12826d4c20358a2e096b0df8e34dfb0fa88c5b21.tar.gz kernel-qcow2-util-linux-12826d4c20358a2e096b0df8e34dfb0fa88c5b21.tar.xz kernel-qcow2-util-linux-12826d4c20358a2e096b0df8e34dfb0fa88c5b21.zip | |
tests: consolidate some checks for commands
Use ts_check_prog for mdadm, readelf, file, ntpdate, bc (mdadm was
not always checked so far).
There are some positive side-effects. We are using always $PATH now
instead of randomly hardcoded /usr/bin, /sbin, etc. If we ever want
to change this again, we should do this generically in ts_init.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/blkid')
| -rwxr-xr-x | tests/ts/blkid/md-raid0-whole | 8 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-part | 7 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-whole | 8 |
3 files changed, 12 insertions, 11 deletions
diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 5cf2eea08..e2359619b 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_BLKID" ts_skip_nonroot ts_check_losetup -[ -x /sbin/mdadm ] || ts_skip "missing mdadm" +ts_check_prog "mdadm" set -o pipefail @@ -43,10 +43,10 @@ DEVICE2=$(ts_device_init 50 ${IMGNAME}2.img) MD_DEVNAME=md8 MD_DEVICE=/dev/${MD_DEVNAME} -/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null +mdadm -q -S ${MD_DEVICE} &> /dev/null ts_log "Create RAID device" -/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \ +mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \ --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1 ts_log "Create partitions on RAID device" @@ -75,7 +75,7 @@ ts_log "Probe second RAID member" $TS_CMD_BLKID -p -o udev $DEVICE1 2>&1 | sort >> $TS_OUTPUT ts_log "Stop RAID device" -/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 udevadm settle diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index 6a59037e4..ce3a687c7 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_BLKID" ts_skip_nonroot +ts_check_prog "mdadm" # set global variable TS_DEVICE ts_scsi_debug_init dev_size_mb=51 sector_size=512 @@ -62,8 +63,8 @@ MD_DEVNAME=md8 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 \ +mdadm -q -S ${MD_DEVICE} &> /dev/null +mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1 udevadm settle @@ -76,7 +77,7 @@ $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 ${TS_DEVICE}2 2>&1 | sort >> $TS_OUTPUT -/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 udevadm settle rmmod scsi_debug diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 0ec6c1582..611ead3b7 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_BLKID" ts_skip_nonroot ts_check_losetup -[ -x /sbin/mdadm ] || ts_skip "missing mdadm" +ts_check_prog "mdadm" set -o pipefail @@ -43,10 +43,10 @@ DEVICE2=$(ts_device_init 50 ${IMGNAME}2.img) MD_DEVNAME=md8 MD_DEVICE=/dev/${MD_DEVNAME} -/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null +mdadm -q -S ${MD_DEVICE} &> /dev/null ts_log "Create RAID device" -/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ +mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1 ts_log "Create partitions on RAID device" @@ -75,7 +75,7 @@ ts_log "Probe second RAID member" $TS_CMD_BLKID -p -o udev $DEVICE1 2>&1 | sort >> $TS_OUTPUT ts_log "Stop RAID device" -/sbin/mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 udevadm settle |