diff options
author | Karel Zak | 2015-03-17 11:34:22 +0100 |
---|---|---|
committer | Karel Zak | 2015-03-17 11:34:22 +0100 |
commit | d995c2f082a710e01e7abeb10c6ca533494d0304 (patch) | |
tree | 83931977391c343c5689c397e495277ab85c4ccd | |
parent | Merge branch 'drone-ci' of https://github.com/rudimeier/util-linux (diff) | |
download | kernel-qcow2-util-linux-d995c2f082a710e01e7abeb10c6ca533494d0304.tar.gz kernel-qcow2-util-linux-d995c2f082a710e01e7abeb10c6ca533494d0304.tar.xz kernel-qcow2-util-linux-d995c2f082a710e01e7abeb10c6ca533494d0304.zip |
tests: add --skip-loopdevs
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | tests/functions.sh | 3 | ||||
-rwxr-xr-x | tests/run.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index bfc3fa28d..38ed03d55 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -68,7 +68,7 @@ function ts_check_losetup { local tmp ts_check_test_command "$TS_CMD_LOSETUP" - if [ "$TS_OPT_FEAT_SKIP_LOOP" = "yes" ]; then + if [ "$TS_SKIP_LOOPDEVS" = "yes" ]; then ts_skip "loop-device tests disabled" fi @@ -241,6 +241,7 @@ function ts_init_env { TS_VERBOSE=$(ts_has_option "verbose" "$*") TS_PARALLEL=$(ts_has_option "parallel" "$*") TS_KNOWN_FAIL=$(ts_has_option "known-fail" "$*") + TS_SKIP_LOOPDEVS=$(ts_has_option "skip-loopdevs" "$*") tmp=$( ts_has_option "memcheck" "$*") if [ "$tmp" == "yes" -a -f /usr/bin/valgrind ]; then diff --git a/tests/run.sh b/tests/run.sh index f61b6e4f7..20afb77e1 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -47,6 +47,9 @@ while [ -n "$1" ]; do --verbose) OPTS="$OPTS --verbose" ;; + --skip-loopdevs) + OPTS="$OPTS --skip-loopdevs" + ;; --nonroot) if [ $(id -ru) -eq 0 ]; then echo "Ignore util-linux test suite [non-root UID expected]." |