testing: Add IGNORE_UNPRIV_USERNS_TESTS to skip tests that use userns

Signed-off-by: Alexey Gladkov <[email protected]>
osboot · Jul 10, 2024 · beeded7 · beeded7
1 parent 124a819
commit beeded7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/features/overlayfs/tests/ts0001-guess-overlayfs/run b/features/overlayfs/tests/ts0001-guess-overlayfs/run
@@ -1,5 +1,8 @@
 #!/bin/bash -eu
 
+[ -z "${IGNORE_UNPRIV_USERNS_TESTS-}" ] ||
+	exit 127
+
 cwd="${0%/*}"
 
 export GUESS_SUFFIX=add:guess-root

diff --git a/features/rootfs/tests/ts0001-guess-rootfs/run b/features/rootfs/tests/ts0001-guess-rootfs/run
@@ -1,5 +1,8 @@
 #!/bin/bash -eu
 
+[ -z "${IGNORE_UNPRIV_USERNS_TESTS-}" ] ||
+	exit 127
+
 cwd="${0%/*}"
 
 export GUESS_SUFFIX=add:guess-root

diff --git a/testing/tests/run b/testing/tests/run
@@ -29,7 +29,7 @@ for testsuite in "$@"; do
 			num="$(printf '%4s' "$i")"
 			i=$(( $i + 1 ))
 
-			echo "[$num/$max] ${ts##*/}"
+			echo -n "[$num/$max] ${ts##*/} "
 		fi
 
 		{
@@ -38,6 +38,15 @@ for testsuite in "$@"; do
 			echo "rc=$rc";
 		} > "$ts"/output 2>&1
 
+		if [ "$rc" = 127 ]; then
+			[ -z "${VERBOSE:-${V:-}}" ] ||
+				echo "[skipped]"
+			rm -f -- "$ts"/output
+			continue
+		fi
+		[ -z "${VERBOSE:-${V:-}}" ] ||
+			echo
+
 		[ ! -f "$ts"/expect.in ] ||
 			sed \
 			-e "s#@ts@#${ts##*/}#g" \