From: Masatake YAMATO <yamato@redhat.com>
Date: Sat, 25 Feb 2023 17:44:49 +0000 (+0900)
Subject: tests: (lsfd) skip if the platform doesn't permit to use ioctl(fd, SIOCGSKNS)
X-Git-Tag: v2.39-rc1~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b0614010f24cd3dbdedd7ced878c32197a32e63;p=thirdparty%2Futil-linux.git

tests: (lsfd) skip if the platform doesn't permit to use ioctl(fd, SIOCGSKNS)

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c
index 091ef7c9e7..94fc1b34bd 100644
--- a/tests/helpers/test_mkfds.c
+++ b/tests/helpers/test_mkfds.c
@@ -1782,7 +1782,8 @@ static void *make_netns(const struct factory *factory _U_, struct fdesc fdescs[]
 
 	int ns = ioctl(sd, SIOCGSKNS);
 	if (ns < 0)
-		err(EXIT_FAILURE, "failed in ioctl(SIOCGSKNS)");
+		err((errno == ENOSYS? EXIT_ENOSYS: EXIT_FAILURE),
+		    "failed in ioctl(SIOCGSKNS)");
 	close(sd);
 
 	if (ns != fdescs[0].fd) {
diff --git a/tests/ts/lsfd/mkfds-netns b/tests/ts/lsfd/mkfds-netns
index 4248fda681..71bf0d012d 100755
--- a/tests/ts/lsfd/mkfds-netns
+++ b/tests/ts/lsfd/mkfds-netns
@@ -20,8 +20,8 @@ TS_DESC="netns associated with a fd"
 . "$TS_TOPDIR"/functions.sh
 ts_init "$*"
 ts_skip_nonroot
-ts_skip_qemu_user
 
+. "$TS_SELF/lsfd-functions.bash"
 ts_check_test_command "$TS_CMD_LSFD"
 ts_check_test_command "$TS_HELPER_MKFDS"
 
@@ -55,5 +55,8 @@ INO_NS=
     fi
     wait "${MKFDS_PID}"
 } > "$TS_OUTPUT" 2>&1
+if [ "$?" == "$ENOSYS" ]; then
+    ts_skip "ioctl(fd, SIOCGSKNS) is not available"
+fi
 
 ts_finalize