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/fdisk | |
| 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/fdisk')
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 7 |
1 files changed, 4 insertions, 3 deletions
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 |