From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 31 May 2023 15:27:38 +0000 (+0200)
Subject: tests: add ts_skip_docker
X-Git-Tag: v2.39.3~13
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2e5f5c8d85338811595d321a77647a40e12321c9;p=thirdparty%2Futil-linux.git

tests: add ts_skip_docker

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit 023e77d26a12aa632266e2a967e944bcbf9c8a12)
---

diff --git a/tests/functions.sh b/tests/functions.sh
index c5e42b1a68..5a562a39aa 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -1163,3 +1163,7 @@ function ts_check_enosys_syscalls {
 	"$TS_HELPER_ENOSYS" ${@/#/-s } true 2> /dev/null
 	[ $? -ne 0 ] && ts_skip "test_enosys does not work: $*"
 }
+
+function ts_skip_docker {
+	test -e /.dockerenv && ts_skip "unsupported in docker environment"
+}
diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch
index 5398b3391e..e7b6ff34c1 100755
--- a/tests/ts/misc/setarch
+++ b/tests/ts/misc/setarch
@@ -19,11 +19,11 @@ TS_DESC="setarch"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_SETARCH"
+ts_skip_docker
 
 ARCH=$(uname -m)
 
 ts_init_subtest options
-test -e /.dockerenv && ts_skip "unsupported in docker environment"
 ts_log_both "###### unknown arch"
 $TS_CMD_SETARCH qubit -v echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit: $?" >>$TS_OUTPUT