diff options
| author | Ruediger Meier | 2015-12-10 16:56:11 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2015-12-10 19:05:25 +0100 |
| commit | ee6c0ca65b36f4925f58d787276786252532be6f (patch) | |
| tree | 6c0eab369c26ac473c1004d9f54b64d3f4935de7 /tests/ts/libmount | |
| parent | tests: skip automake's empty "Testsuite summary" (diff) | |
| download | kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.tar.gz kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.tar.xz kernel-qcow2-util-linux-ee6c0ca65b36f4925f58d787276786252532be6f.zip | |
tests: skip nonroot before checking for progs in PATH
The least annoying and most useful order is this one:
1. check for compiled UL commands
2. check for root
3. check for loop support
4. check for external progs
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/libmount')
| -rwxr-xr-x | tests/ts/libmount/context | 3 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-py | 3 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-utab | 3 | ||||
| -rwxr-xr-x | tests/ts/libmount/context-utab-py | 4 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles-tags | 1 | ||||
| -rwxr-xr-x | tests/ts/libmount/tabfiles-tags-py | 4 |
6 files changed, 12 insertions, 6 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 9424fef90..357cab45a 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -13,10 +13,11 @@ ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_check_test_command "$TS_CMD_UUIDGEN" + +ts_skip_nonroot ts_check_prog "mkfs.ext3" ts_check_prog "mkfs.ext4" -ts_skip_nonroot TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT" LABEL=libmount-test UUID=$($TS_CMD_UUIDGEN) diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py index 0f8398f6e..377982fe7 100755 --- a/tests/ts/libmount/context-py +++ b/tests/ts/libmount/context-py @@ -13,11 +13,12 @@ ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_MOUNT" ts_check_test_command "$TS_CMD_UMOUNT" ts_check_test_command "$TS_CMD_UUIDGEN" + +ts_skip_nonroot ts_check_prog "mkfs.ext3" ts_check_prog "mkfs.ext4" ts_init_py libmount -ts_skip_nonroot TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT" [ -x $TESTPROG ] || ts_die "test script missing" diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index d6e7494e7..f6c3024af 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -12,8 +12,9 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_WIPEFS" ts_check_test_command "$TS_CMD_UUIDGEN" -ts_check_prog "mkfs.ext4" + ts_skip_nonroot +ts_check_prog "mkfs.ext4" TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT" LABEL=libmount-test diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py index 00af69554..7603aa7e4 100755 --- a/tests/ts/libmount/context-utab-py +++ b/tests/ts/libmount/context-utab-py @@ -11,11 +11,11 @@ ts_check_test_command "$TS_CMD_FDISK" ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_WIPEFS" ts_check_test_command "$TS_CMD_UUIDGEN" -ts_check_prog "mkfs.ext4" -ts_init_py libmount ts_skip_nonroot +ts_check_prog "mkfs.ext4" +ts_init_py libmount TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT" [ -x $TESTPROG ] || ts_die "test script missing" diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags index 662d38b6c..598b11cf6 100755 --- a/tests/ts/libmount/tabfiles-tags +++ b/tests/ts/libmount/tabfiles-tags @@ -5,6 +5,7 @@ TS_DESC="tags" . $TS_TOPDIR/functions.sh ts_init "$*" + ts_skip_nonroot if [ -f "$ASAN_SYMBOLIZER_PATH" ]; then diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py index 47efa70e1..4fd2a2695 100755 --- a/tests/ts/libmount/tabfiles-tags-py +++ b/tests/ts/libmount/tabfiles-tags-py @@ -5,9 +5,11 @@ TS_DESC="tags-py" . $TS_TOPDIR/functions.sh ts_init "$*" -ts_init_py libmount + ts_skip_nonroot +ts_init_py libmount + if [ -f "$ASAN_SYMBOLIZER_PATH" ]; then TS_KNOWN_FAIL="yes" fi |