From: Karel Zak <kzak@redhat.com>
Date: Tue, 17 Mar 2015 10:34:22 +0000 (+0100)
Subject: tests: add --skip-loopdevs
X-Git-Tag: v2.26.2~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0373fa6462e2fe60e058ba413bacbe47d4bfccc1;p=thirdparty%2Futil-linux.git

tests: add --skip-loopdevs

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/functions.sh b/tests/functions.sh
index bfc3fa28d1..38ed03d554 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 f61b6e4f77..20afb77e16 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]."