Commit 3ece0e85 authored by Yuran Pereira's avatar Yuran Pereira Committed by Andrii Nakryiko
Browse files

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



vmlinux.c 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/GV1PR10MB6563ED1023A2A3AEF30BDA5DE8BBA@GV1PR10MB6563.EURPRD10.PROD.OUTLOOK.COM
parent f125d09b

tools/testing/selftests/bpf/prog_tests/vmlinux.c

+8 −8
Original line number Diff line number Diff line
@@ -16,27 +16,27 @@ static void nsleep() 


void test_vmlinux(void)

{

	int duration = 0, err;

	int err;

	struct test_vmlinux* skel;

	struct test_vmlinux__bss *bss;



	skel = test_vmlinux__open_and_load();

	if (CHECK(!skel, "skel_open", "failed to open skeleton\n"))

	if (!ASSERT_OK_PTR(skel, "test_vmlinux__open_and_load"))

		return;

	bss = skel->bss;



	err = test_vmlinux__attach(skel);

	if (CHECK(err, "skel_attach", "skeleton attach failed: %d\n", err))

	if (!ASSERT_OK(err, "test_vmlinux__attach"))

		goto cleanup;



	/* trigger everything */

	nsleep();



	CHECK(!bss->tp_called, "tp", "not called\n");

	CHECK(!bss->raw_tp_called, "raw_tp", "not called\n");

	CHECK(!bss->tp_btf_called, "tp_btf", "not called\n");

	CHECK(!bss->kprobe_called, "kprobe", "not called\n");

	CHECK(!bss->fentry_called, "fentry", "not called\n");

	ASSERT_TRUE(bss->tp_called, "tp");

	ASSERT_TRUE(bss->raw_tp_called, "raw_tp");

	ASSERT_TRUE(bss->tp_btf_called, "tp_btf");

	ASSERT_TRUE(bss->kprobe_called, "kprobe");

	ASSERT_TRUE(bss->fentry_called, "fentry");



cleanup:

	test_vmlinux__destroy(skel);