diff options
| author | Andrii Nakryiko <andriin@fb.com> | 2019-07-27 20:25:27 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-07-27 22:36:19 -0700 |
| commit | 329e38f76cc2a77085264ce6e0dbe902c33fd7a3 (patch) | |
| tree | 5319470540f58659e63ab4695fc7f052641af9a6 /tools/testing/selftests/bpf/prog_tests/reference_tracking.c | |
| parent | e87fd8bae44c3eaa6205c9c81419e773896dc157 (diff) | |
selftest/bpf: centralize libbpf logging management for test_progs
Make test_progs test runner own libbpf logging. Also introduce two
levels of verbosity: -v and -vv. First one will be used in subsequent
patches to enable test log output always. Second one increases verbosity
level of libbpf logging further to include debug output as well.
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/reference_tracking.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/reference_tracking.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/reference_tracking.c b/tools/testing/selftests/bpf/prog_tests/reference_tracking.c index 5633be43828f..4a4f428d1a78 100644 --- a/tools/testing/selftests/bpf/prog_tests/reference_tracking.c +++ b/tools/testing/selftests/bpf/prog_tests/reference_tracking.c @@ -1,15 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> -static int libbpf_debug_print(enum libbpf_print_level level, - const char *format, va_list args) -{ - if (level == LIBBPF_DEBUG) - return 0; - - return vfprintf(stderr, format, args); -} - void test_reference_tracking(void) { const char *file = "./test_sk_lookup_kern.o"; @@ -36,9 +27,11 @@ void test_reference_tracking(void) /* Expect verifier failure if test name has 'fail' */ if (strstr(title, "fail") != NULL) { - libbpf_set_print(NULL); + libbpf_print_fn_t old_print_fn; + + old_print_fn = libbpf_set_print(NULL); err = !bpf_program__load(prog, "GPL", 0); - libbpf_set_print(libbpf_debug_print); + libbpf_set_print(old_print_fn); } else { err = bpf_program__load(prog, "GPL", 0); } |