From: Masatake YAMATO <yamato@redhat.com>
Date: Fri, 19 Jan 2024 21:21:28 +0000 (+0900)
Subject: tests: (lsfd) skip mkfds-netns if SIOCGSKNS is not defined
X-Git-Tag: v2.40-rc1~31^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce674525d482dbaa13cfbdf3f41d7bc9aa63d0e7;p=thirdparty%2Futil-linux.git

tests: (lsfd) skip mkfds-netns if SIOCGSKNS is not defined

Fixed #2691 partially.

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

diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c
index 0335224e29..2e4ad02b98 100644
--- a/tests/helpers/test_mkfds.c
+++ b/tests/helpers/test_mkfds.c
@@ -2226,6 +2226,7 @@ static void *make_ping6(const struct factory *factory, struct fdesc fdescs[],
 				(struct sockaddr *)&in6);
 }
 
+#ifdef SIOCGSKNS
 static void *make_netns(const struct factory *factory _U_, struct fdesc fdescs[],
 			int argc _U_, char ** argv _U_)
 {
@@ -2256,6 +2257,7 @@ static void *make_netns(const struct factory *factory _U_, struct fdesc fdescs[]
 
 	return NULL;
 }
+#endif	/* SIOCGSKNS */
 
 static void *make_netlink(const struct factory *factory, struct fdesc fdescs[],
 			  int argc, char ** argv)
@@ -3757,6 +3759,7 @@ static const struct factory factories[] = {
 			PARAM_END
 		}
 	},
+#ifdef SIOCGSKNS
 	{
 		.name = "netns",
 		.desc = "open a file specifying a netns",
@@ -3768,6 +3771,7 @@ static const struct factory factories[] = {
 			PARAM_END
 		}
 	},
+#endif
 	{
 		.name = "netlink",
 		.desc = "AF_NETLINK sockets",
diff --git a/tests/ts/lsfd/mkfds-netns b/tests/ts/lsfd/mkfds-netns
index df11c95f30..0fbaec88f3 100755
--- a/tests/ts/lsfd/mkfds-netns
+++ b/tests/ts/lsfd/mkfds-netns
@@ -25,6 +25,7 @@ ts_skip_docker
 . "$TS_SELF/lsfd-functions.bash"
 ts_check_test_command "$TS_CMD_LSFD"
 ts_check_test_command "$TS_HELPER_MKFDS"
+lsfd_check_mkfds_factory netns
 
 ts_cd "$TS_OUTDIR"