Use ASSERT_STRNEQ and cleanups.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/bpf/prog_tests/mptcp.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index d90ac3620635..3050655d71d6 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -78,11 +78,11 @@ void get_msk_ca_name(char ca_name[])
int fd;
fd = open("/proc/sys/net/ipv4/tcp_congestion_control", O_RDONLY);
- if (!ASSERT_GE(fd, 0, "Failed to open tcp_congestion_control"))
+ if (!ASSERT_GE(fd, 0, "failed to open tcp_congestion_control"))
return;
len = read(fd, ca_name, TCP_CA_NAME_MAX);
- if (!ASSERT_GT(len, 0, "Failed to read ca_name"))
+ if (!ASSERT_GT(len, 0, "failed to read ca_name"))
goto err;
if (len > 0 && ca_name[len - 1] == '\n')
@@ -118,11 +118,8 @@ static int verify_msk(int map_fd, int client_fd)
if (!ASSERT_EQ(val.token, token, "unexpected token"))
err++;
- if (strncmp(val.ca_name, ca_name, TCP_CA_NAME_MAX)) {
- log_err("Unexpected mptcp_sock.ca_name %s != %s",
- val.ca_name, ca_name);
+ if (!ASSERT_STRNEQ(val.ca_name, ca_name, TCP_CA_NAME_MAX, "unexpected ca_name"))
err++;
- }
return err;
}
--
2.34.1