]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tests: (lsfd) skip mkfds-netns if SIOCGSKNS is not defined
authorMasatake YAMATO <yamato@redhat.com>
Fri, 19 Jan 2024 21:21:28 +0000 (06:21 +0900)
committerMasatake YAMATO <yamato@redhat.com>
Mon, 22 Jan 2024 12:39:13 +0000 (21:39 +0900)
Fixed #2691 partially.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
tests/helpers/test_mkfds.c
tests/ts/lsfd/mkfds-netns

index 0335224e29b59f362198f0d03e16ccf7fc5e6009..2e4ad02b98132b8f8d4e4f5e656781ccd66bbefb 100644 (file)
@@ -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",
index df11c95f309eb03b05d36b5505df95e8a1b75b7e..0fbaec88f3bcaa318b508f432556cfca7c54b9bf 100755 (executable)
@@ -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"