From 7b0614010f24cd3dbdedd7ced878c32197a32e63 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 26 Feb 2023 02:44:49 +0900 Subject: [PATCH] tests: (lsfd) skip if the platform doesn't permit to use ioctl(fd, SIOCGSKNS) Signed-off-by: Masatake YAMATO --- tests/helpers/test_mkfds.c | 3 ++- tests/ts/lsfd/mkfds-netns | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 -- 2.47.3