Commit 3ec1114a authored by Yuran Pereira's avatar Yuran Pereira Committed by Andrii Nakryiko

selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bind_perm

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: default avatarYuran Pereira <yuran.pereira@hotmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/GV1PR10MB656314F467E075A106CA02BFE8BBA@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM
parent b0e2a039
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#include "cap_helpers.h" #include "cap_helpers.h"
#include "bind_perm.skel.h" #include "bind_perm.skel.h"
static int duration;
static int create_netns(void) static int create_netns(void)
{ {
if (!ASSERT_OK(unshare(CLONE_NEWNET), "create netns")) if (!ASSERT_OK(unshare(CLONE_NEWNET), "create netns"))
...@@ -27,7 +25,7 @@ void try_bind(int family, int port, int expected_errno) ...@@ -27,7 +25,7 @@ void try_bind(int family, int port, int expected_errno)
int fd = -1; int fd = -1;
fd = socket(family, SOCK_STREAM, 0); fd = socket(family, SOCK_STREAM, 0);
if (CHECK(fd < 0, "fd", "errno %d", errno)) if (!ASSERT_GE(fd, 0, "socket"))
goto close_socket; goto close_socket;
if (family == AF_INET) { if (family == AF_INET) {
...@@ -60,7 +58,7 @@ void test_bind_perm(void) ...@@ -60,7 +58,7 @@ void test_bind_perm(void)
return; return;
cgroup_fd = test__join_cgroup("/bind_perm"); 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; return;
skel = bind_perm__open_and_load(); skel = bind_perm__open_and_load();
......
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