Use ASSERT_EQ and cleanups.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/bpf/prog_tests/mptcp.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 2015a6c93a99..f41336e41f04 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -50,17 +50,15 @@ static __u32 get_msk_token(void)
sync();
fd = open(monitor_log_path, O_RDONLY);
- if (!ASSERT_GE(fd, 0, "Failed to open monitor_log_path"))
+ if (!ASSERT_GE(fd, 0, "failed to open monitor_log_path"))
return token;
len = read(fd, buf, sizeof(buf));
- if (!ASSERT_GT(len, 0, "Failed to read monitor_log_path"))
+ if (!ASSERT_GT(len, 0, "failed to read monitor_log_path"))
goto err;
- if (strncmp(buf, prefix, strlen(prefix))) {
- log_err("Invalid prefix %s", buf);
+ if (!ASSERT_STRNEQ(buf, prefix, strlen(prefix), "invalid prefix"))
goto err;
- }
token = strtol(buf + strlen(prefix), NULL, 16);
@@ -76,7 +74,7 @@ static int verify_msk(int map_fd, int client_fd)
__u32 token;
token = get_msk_token();
- if (!ASSERT_GT(token, 0, "Unexpected token"))
+ if (!ASSERT_GT(token, 0, "invalid token"))
return -1;
err = bpf_map_lookup_elem(map_fd, &cfd, &val);
@@ -89,11 +87,8 @@ static int verify_msk(int map_fd, int client_fd)
if (!ASSERT_EQ(val.is_mptcp, 1, "unexpected is_mptcp"))
err++;
- if (val.token != token) {
- log_err("Unexpected mptcp_sock.token %x != %x",
- val.token, token);
+ if (!ASSERT_EQ(val.token, token, "unexpected token"))
err++;
- }
return err;
}
--
2.34.1