Commit 8dda32ac authored by Wang Yufen's avatar Wang Yufen Committed by Andrii Nakryiko

selftests/bpf: Convert tcp_rtt test to ASSERT_* macros

Convert the selftest to use the preferred ASSERT_* macros instead of the
deprecated CHECK().
Signed-off-by: default avatarWang Yufen <wangyufen@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1664169131-32405-10-git-send-email-wangyufen@huawei.com
parent 3082f8cd
...@@ -16,8 +16,7 @@ static void send_byte(int fd) ...@@ -16,8 +16,7 @@ static void send_byte(int fd)
{ {
char b = 0x55; char b = 0x55;
if (CHECK_FAIL(write(fd, &b, sizeof(b)) != 1)) ASSERT_EQ(write(fd, &b, sizeof(b)), 1, "send single byte");
perror("Failed to send single byte");
} }
static int wait_for_ack(int fd, int retries) static int wait_for_ack(int fd, int retries)
...@@ -51,10 +50,8 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 invoked, ...@@ -51,10 +50,8 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 invoked,
int err = 0; int err = 0;
struct tcp_rtt_storage val; struct tcp_rtt_storage val;
if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &client_fd, &val) < 0)) { if (!ASSERT_GE(bpf_map_lookup_elem(map_fd, &client_fd, &val), 0, "read socket storage"))
perror("Failed to read socket storage");
return -1; return -1;
}
if (val.invoked != invoked) { if (val.invoked != invoked) {
log_err("%s: unexpected bpf_tcp_sock.invoked %d != %d", log_err("%s: unexpected bpf_tcp_sock.invoked %d != %d",
...@@ -151,14 +148,14 @@ void test_tcp_rtt(void) ...@@ -151,14 +148,14 @@ void test_tcp_rtt(void)
int server_fd, cgroup_fd; int server_fd, cgroup_fd;
cgroup_fd = test__join_cgroup("/tcp_rtt"); cgroup_fd = test__join_cgroup("/tcp_rtt");
if (CHECK_FAIL(cgroup_fd < 0)) if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup /tcp_rtt"))
return; return;
server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
if (CHECK_FAIL(server_fd < 0)) if (!ASSERT_GE(server_fd, 0, "start_server"))
goto close_cgroup_fd; goto close_cgroup_fd;
CHECK_FAIL(run_test(cgroup_fd, server_fd)); ASSERT_OK(run_test(cgroup_fd, server_fd), "run_test");
close(server_fd); close(server_fd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment