Commit 4d84dcc7 authored Sep 18, 2023 by Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov Sep 19, 2023

selftests/bpf: Print log buffer for exceptions test only on failure

Alexei reported seeing log messages for some test cases even though we
just wanted to match the error string from the verifier. Move the
printing of the log buffer to a guarded condition so that we only print
it when we fail to match on the expected string in the log buffer,
preventing unneeded output when running the test.

Reported-by: Alexei Starovoitov <ast@kernel.org>
Fixes: d2a93715 ("selftests/bpf: Add tests for BPF exceptions")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20230918155233.297024-2-memxor@gmail.com

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent a5ea2653

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -103,10 +103,11 @@ static void test_exceptions_success(void)
		goto done; \
		} \
		if (load_ret != 0) { \
		if (!ASSERT_OK_PTR(strstr(log_buf, msg), "strstr")) { \
		printf("%s\n", log_buf); \
		if (!ASSERT_OK_PTR(strstr(log_buf, msg), "strstr")) \
		goto done; \
		} \
		} \
		if (!load_ret && attach_err) { \
		if (!ASSERT_ERR_PTR(link = bpf_program__attach(prog), "attach err")) \
		goto done; \