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 From: Geliang Tang <tanggeliang@kylinos.cn> Should use dedicated ASSERT_OK_FD() to check the fds. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 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 void run_subflow(void) socklen_t len; server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) + if (!ASSERT_OK_FD(server_fd, "start_mptcp_server")) return; client_fd = connect_to_fd(server_fd, 0); - if (!ASSERT_GE(client_fd, 0, "connect to fd")) + if (!ASSERT_OK_FD(client_fd, "connect_to_fd")) goto close_server; send_byte(client_fd); @@ -XXX,XX +XXX,XX @@ static void test_subflow(void) struct bpf_link *link; cgroup_fd = test__join_cgroup("/mptcp_subflow"); - if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow")) + if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: mptcp_subflow")) return; skel = mptcp_subflow__open_and_load(); -- 2.43.0