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 | |
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')
-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 | ||||
-rwxr-xr-x | tests/ts/build-sys/config | 4 | ||||
-rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 7 | ||||
-rwxr-xr-x | tests/ts/hwclock/systohc | 4 | ||||
-rwxr-xr-x | tests/ts/ipcs/limits | 2 | ||||
-rwxr-xr-x | tests/ts/ipcs/limits2 | 3 |
8 files changed, 21 insertions, 22 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 diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config index 308c34b2d..5ae83a3bb 100755 --- a/tests/ts/build-sys/config +++ b/tests/ts/build-sys/config @@ -11,8 +11,8 @@ TS_OPTIONAL="yes" . $TS_TOPDIR/functions.sh ts_init "$*" -[ -x /usr/bin/readelf ] || ts_skip "readelf(1) not found" -[ -x /usr/bin/file ] || ts_skip "file(1) not found" +ts_check_prog "readelf" +ts_check_prog "file" config_gen_dir="$top_srcdir/tools" . $config_gen_dir/config-gen-functions.sh diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index acb6186a6..11a67699b 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -29,6 +29,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_FDISK" ts_skip_nonroot +ts_check_prog "mdadm" # set global variable TS_DEVICE ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 @@ -58,8 +59,8 @@ cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>&1 MD_DEVNAME=md8 MD_DEVICE=/dev/${MD_DEVNAME} -/sbin/mdadm -q -S ${MD_DEVICE} &> /dev/null -/sbin/mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \ +mdadm -q -S ${MD_DEVICE} &> /dev/null +mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \ --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1 udevadm settle @@ -84,7 +85,7 @@ udevadm settle ts_log "Alignment offsets (MD):" cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT 2>&1 -/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/hwclock/systohc b/tests/ts/hwclock/systohc index 8a3eccaf4..a2df4fd9b 100755 --- a/tests/ts/hwclock/systohc +++ b/tests/ts/hwclock/systohc @@ -26,9 +26,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_HWCLOCK" ts_skip_nonroot - -PATH='/usr/sbin:/usr/bin:/sbin:/bin' -type ntpdate >/dev/null 2>&1 || ts_skip "cannot find ntpdate command" +ts_check_prog "ntpdate" set -o pipefail diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits index 71980b533..851d4edfa 100755 --- a/tests/ts/ipcs/limits +++ b/tests/ts/ipcs/limits @@ -26,7 +26,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" ts_skip_nonroot -type bc >/dev/null 2>&1 || ts_skip "cannot find bc command" +ts_check_prog "bc" . $TS_SELF/functions.sh diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2 index ea90174b9..23331985e 100755 --- a/tests/ts/ipcs/limits2 +++ b/tests/ts/ipcs/limits2 @@ -23,8 +23,7 @@ TS_DESC="basic limits" ts_init "$*" ts_check_test_command "$TS_CMD_IPCS" - -type bc >/dev/null 2>&1 || ts_skip "cannot find bc command" +ts_check_prog "bc" . $TS_SELF/functions.sh |