Address to Andrii's comments:
- use ASSERT_* instead of CHECK_FAIL
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
.../testing/selftests/bpf/prog_tests/mptcp.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index b74df17b47ba..2f2b110d7f56 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -39,13 +39,12 @@ static int verify_tsk(int map_fd, int client_fd)
static int verify_msk(int map_fd, int client_fd)
{
char *msg = "MPTCP subflow socket";
- int err = 0, cfd = client_fd;
+ int err, cfd = client_fd;
struct mptcp_storage val;
- if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) {
- perror("Failed to read socket storage");
- return -1;
- }
+ err = bpf_map_lookup_elem(map_fd, &cfd, &val);
+ if (!ASSERT_OK(err, "bpf_map_lookup_elem"))
+ return err;
if (val.invoked != 1) {
log_err("%s: unexpected invoked count %d != 1",
@@ -127,25 +126,25 @@ void test_base(void)
int server_fd, cgroup_fd;
cgroup_fd = test__join_cgroup("/mptcp");
- if (CHECK_FAIL(cgroup_fd < 0))
+ if (!ASSERT_GT(cgroup_fd, 0, "test__join_cgroup"))
return;
/* without MPTCP */
server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
- if (CHECK_FAIL(server_fd < 0))
+ if (!ASSERT_GT(server_fd, 0, "start_server"))
goto with_mptcp;
- CHECK_FAIL(run_test(cgroup_fd, server_fd, false));
+ ASSERT_OK(run_test(cgroup_fd, server_fd, false), "run_test tcp");
close(server_fd);
with_mptcp:
/* with MPTCP */
server_fd = start_mptcp_server(AF_INET, NULL, 0, 0);
- if (CHECK_FAIL(server_fd < 0))
+ if (!ASSERT_GT(server_fd, 0, "start_mptcp_server"))
goto close_cgroup_fd;
- CHECK_FAIL(run_test(cgroup_fd, server_fd, true));
+ ASSERT_OK(run_test(cgroup_fd, server_fd, true), "run_test mptcp");
close(server_fd);
--
2.34.1