selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bind_perm
authorYuran Pereira <yuran.pereira@hotmail.com>
Tue, 21 Nov 2023 00:07:43 +0000 (05:37 +0530)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 21 Nov 2023 18:43:03 +0000 (10:43 -0800)
bind_perm uses the `CHECK` calls even though the use of
ASSERT_ series of macros is preferred in the bpf selftests.

This patch replaces all `CHECK` calls for equivalent `ASSERT_`
macro calls.

Signed-off-by: Yuran Pereira <yuran.pereira@hotmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/GV1PR10MB656314F467E075A106CA02BFE8BBA@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM
tools/testing/selftests/bpf/prog_tests/bind_perm.c

index a1766a298bb77923bc5627b9a51f68fb736a45c5..f7cd129cb82bd125a4bd316532f85bba11566e68 100644 (file)
@@ -9,8 +9,6 @@
 #include "cap_helpers.h"
 #include "bind_perm.skel.h"
 
-static int duration;
-
 static int create_netns(void)
 {
        if (!ASSERT_OK(unshare(CLONE_NEWNET), "create netns"))
@@ -27,7 +25,7 @@ void try_bind(int family, int port, int expected_errno)
        int fd = -1;
 
        fd = socket(family, SOCK_STREAM, 0);
-       if (CHECK(fd < 0, "fd", "errno %d", errno))
+       if (!ASSERT_GE(fd, 0, "socket"))
                goto close_socket;
 
        if (family == AF_INET) {
@@ -60,7 +58,7 @@ void test_bind_perm(void)
                return;
 
        cgroup_fd = test__join_cgroup("/bind_perm");
-       if (CHECK(cgroup_fd < 0, "cg-join", "errno %d", errno))
+       if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
                return;
 
        skel = bind_perm__open_and_load();