@@ -502,41 +502,7 @@ MPTCP_SCHED_TEST(first, 1, 0);
MPTCP_SCHED_TEST(bkup, 1, 0);
MPTCP_SCHED_TEST(rr, 1, 1);
MPTCP_SCHED_TEST(red, 1, 1);
-
-static void test_burst(void)
-{
- struct mptcp_bpf_burst *burst_skel;
- int server_fd, client_fd;
- struct nstoken *nstoken;
- struct bpf_link *link;
-
- burst_skel = mptcp_bpf_burst__open_and_load();
- if (!ASSERT_OK_PTR(burst_skel, "bpf_burst__open_and_load"))
- return;
-
- link = bpf_map__attach_struct_ops(burst_skel->maps.burst);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- mptcp_bpf_burst__destroy(burst_skel);
- return;
- }
-
- nstoken = sched_init("subflow", "bpf_burst");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_burst"))
- goto fail;
- server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
- client_fd = connect_to_fd(server_fd, 0);
-
- send_data(server_fd, client_fd, "bpf_burst");
- ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1");
- ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2");
-
- close(client_fd);
- close(server_fd);
-fail:
- cleanup_netns(nstoken);
- bpf_link__destroy(link);
- mptcp_bpf_burst__destroy(burst_skel);
-}
+MPTCP_SCHED_TEST(burst, 1, 1);
#define RUN_MPTCP_TEST(suffix) \
do { \
@@ -553,6 +519,5 @@ void test_mptcp(void)
RUN_MPTCP_TEST(bkup);
RUN_MPTCP_TEST(rr);
RUN_MPTCP_TEST(red);
- if (test__start_subtest("burst"))
- test_burst();
+ RUN_MPTCP_TEST(burst);
}