]> err.no Git - util-linux/commitdiff
tests: skip non-compiled libmount tests
authorKarel Zak <kzak@redhat.com>
Tue, 25 Jan 2011 15:36:28 +0000 (16:36 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 25 Jan 2011 15:36:28 +0000 (16:36 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
tests/ts/libmount/context
tests/ts/libmount/context-utab
tests/ts/libmount/lock
tests/ts/libmount/optstr
tests/ts/libmount/tabfiles
tests/ts/libmount/tabfiles-tags
tests/ts/libmount/update
tests/ts/libmount/utils

index 536ab1b507730d908d3035bea408991ff50bb9ec..4248f3132754427564779e809f66f77b3446dc3c 100755 (executable)
@@ -14,6 +14,8 @@ LABEL=libmount-test
 UUID=$(uuidgen)
 MOUNTPOINT="$TS_MOUNTPOINT"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 modprobe --dry-run --quiet scsi_debug
 [ "$?" == 0 ] || ts_skip "missing scsi_debug module"
 
index db039d1f15133287c33db9fa5b51e26f68269764..5f36d28aa2427233b29e0cd65a27691f1370b38e 100755 (executable)
@@ -14,6 +14,8 @@ LABEL=libmount-test
 UUID=$(uuidgen)
 MOUNTPOINT="$TS_MOUNTPOINT"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 modprobe --dry-run --quiet scsi_debug
 [ "$?" == 0 ] || ts_skip "missing scsi_debug module"
 
index 1230e5cc520fe19ba4a60a911b834c282ebde186..a6a0a60d5865f8713cee6a2617f57e1f5602ab1a 100755 (executable)
@@ -10,6 +10,8 @@ ts_init "$*"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_LOCK"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 #
 # Be careful with number of processes. Don't forget that there is time limit
 # when the mount waits on the mtab lock. If you define too much processes some
index a58eaaa70988351967f6f154b2f63ecc53944a07..447c7e0ad67f0d23e8ada6e93ca5ac6650e6ea0f 100755 (executable)
@@ -10,6 +10,8 @@ ts_init "$*"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_OPTSTR"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 ts_init_subtest "append"
 $TESTPROG --append "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> $TS_OUTPUT
 ts_finalize_subtest
index 2de86807cbd174f41ae3485fccc36d51cf6b3a7a..cf3fb5cdb740117fda56e4507f5b4495363b2b2c 100755 (executable)
@@ -10,6 +10,8 @@ ts_init "$*"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 ts_init_subtest "parse-fstab"
 $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT
 sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
index da76724bb68f16017ba62088e6e12f51f63e1536..893c65bc8aa9142a9637eb271ad3202b5679c4db 100755 (executable)
@@ -9,6 +9,8 @@ ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 #
 # Init device
 #
index 65e0ea5277c68fa201f633c432167e90fb7cc6d0..bbe19ffd35d9534d83d04a0f4270f973c1b3ed4d 100755 (executable)
@@ -10,6 +10,8 @@ ts_init "$*"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_UPDATE"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 # IMPORTANT notes:
 #
 #  - the $TS_OUTPUT variable is between ts_init_subtest and ts_finalize_subtest
index e06c9b9cd3c854364a8be5c89f08290fdabd3e89..fbd63593b8dac0e9ee5b56221c3968e3c4bca6f8 100755 (executable)
@@ -10,6 +10,8 @@ ts_init "$*"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_UTILS"
 
+[ -x $TESTPROG ] || ts_skip "test not compiled"
+
 ts_init_subtest "match-fstype"
 $TESTPROG --match-fstype ext3 "ext2,ext3,cifs" &> $TS_OUTPUT
 ts_finalize_subtest