:p
atchew
Login
From: Geliang Tang <tanggeliang@kylinos.cn> Skip the test with test__skip() for systems that do not support "ip mptcp", so that CI can also pass. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -XXX,XX +XXX,XX @@ static int endpoint_init(char *flags) SYS(fail, "ip -net %s link set dev veth1 up", NS_TEST); SYS(fail, "ip -net %s addr add %s/24 dev veth2", NS_TEST, ADDR_2); SYS(fail, "ip -net %s link set dev veth2 up", NS_TEST); - /* It would be better to use "ip -net %s mptcp endpoint add %s %s", - * but the BPF CI is using an old version of IPRoute (5.5.0). - */ - SYS(fail, "ip netns exec %s ./mptcp_pm_nl_ctl add %s flags %s", NS_TEST, ADDR_2, flags); + if (SYS_NOFAIL("ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, flags)) { + /* "ip mptcp" not support, skip this test. */ + test__skip(); + goto fail; + } return 0; fail: @@ -XXX,XX +XXX,XX @@ static void test_subflow(void) if (!ASSERT_OK_PTR(nstoken, "create_netns: mptcp_subflow")) goto skel_destroy; - if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) + if (endpoint_init("subflow")) goto close_netns; run_subflow(skel->data->cc); -- 2.43.0
Fix sleep() usage: sleep() takes an integer, not a float/double. tools/testing/selftests/bpf/prog_tests/mptcp.c:373:9: error: implicit conversion from 'double' to 'unsigned int' changes value from 0.1 to 0 [-Werror,-Wliteral-conversion] 373 | sleep(0.1); | ~~~~~ ^~~ Use usleep() instead. Link: https://github.com/kernel-patches/bpf/actions/runs/10794529238/job/29939101033 Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -XXX,XX +XXX,XX @@ #include <linux/const.h> #include <netinet/in.h> #include <test_progs.h> +#include <unistd.h> #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_sock.skel.h" @@ -XXX,XX +XXX,XX @@ static void wait_for_new_subflows(int fd) if (!err && subflows > 0) break; - sleep(0.1); + usleep(100000); /* 0.1s */ } } -- 2.45.2