summaryrefslogtreecommitdiffstats
path: root/tests/ts/minix
diff options
context:
space:
mode:
authorSami Kerola2014-02-16 16:22:56 +0100
committerKarel Zak2014-03-07 11:52:57 +0100
commit2f791546395cb43f3f93de6c095c812c7cd5237f (patch)
tree0fe025270e9c5acbb15ef7d433c553a72fdfdf1e /tests/ts/minix
parenttools: make config-gen to require build target argument (diff)
downloadkernel-qcow2-util-linux-2f791546395cb43f3f93de6c095c812c7cd5237f.tar.gz
kernel-qcow2-util-linux-2f791546395cb43f3f93de6c095c812c7cd5237f.tar.xz
kernel-qcow2-util-linux-2f791546395cb43f3f93de6c095c812c7cd5237f.zip
tests: check commands needed for running a test exist
Signed-off-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/minix')
-rwxr-xr-xtests/ts/minix/fsck5
-rwxr-xr-xtests/ts/minix/mkfs5
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck
index 2b290b0f8..70ad2faa7 100755
--- a/tests/ts/minix/fsck
+++ b/tests/ts/minix/fsck
@@ -19,12 +19,13 @@ TS_DESC="mkfs checksums"
. $TS_TOPDIR/functions.sh
ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKMINIX"
+
ts_skip_nonroot
set -o pipefail
-[ -x $TS_CMD_FSCKMINIX ] || ts_skip "fsck.minix not compiled"
-
IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
DEVICE=$(ts_device_init)
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index 00d5a863d..0159c7b97 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -19,12 +19,13 @@ TS_DESC="mkfs"
. $TS_TOPDIR/functions.sh
ts_init "$*"
+
+ts_check_test_command "$TS_CMD_MKMINIX"
+
ts_skip_nonroot
set -o pipefail
-[ -x $TS_CMD_MKMINIX ] || ts_skip "mkfs.minix not compiled"
-
IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
DEVICE=$(ts_device_init)