selftests/bpf: Convert sockopt test to ASSERT_* macros

Convert the selftest to use the preferred ASSERT_* macros instead of the
deprecated CHECK().

Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1664169131-32405-4-git-send-email-wangyufen@huawei.com

diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt.c b/tools/testing/selftests/bpf/prog_tests/sockopt.c
index cd09f4c7dd922cee08dc34f6f0f5bf89272dee0a..aa4debf62fc6d6a10e7cfe7d0a88bbfd1132c9db 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/sockopt.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt.c
@@ -972,12 +972,12 @@ void test_sockopt(void)
        int cgroup_fd, i;
 
        cgroup_fd = test__join_cgroup("/sockopt");
-       if (CHECK_FAIL(cgroup_fd < 0))
+       if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup"))
                return;
 
        for (i = 0; i < ARRAY_SIZE(tests); i++) {
                test__start_subtest(tests[i].descr);
-               CHECK_FAIL(run_test(cgroup_fd, &tests[i]));
+               ASSERT_OK(run_test(cgroup_fd, &tests[i]), tests[i].descr);
        }
 
        close(cgroup_fd);