selftests/bpf: don't check for btf fd in test_btf
Subsystems (5)
PATCH 1/1 selftests/bpf: don't check for btf fd in test_btf
After commit 0d13bfce023a ("libbpf: Don't require root for bpf_object__open()") we no longer load BTF during bpf_object__open(), so let's remove the expectation from test_btf that the fd is not -1. The test currently fails.
Before:
BTF libbpf test[1] (test_btf_haskv.o): do_test_file:4152:FAIL bpf_object__btf_fd: -1 BTF libbpf test[2] (test_btf_newkv.o): do_test_file:4152:FAIL bpf_object__btf_fd: -1 BTF libbpf test[3] (test_btf_nokv.o): do_test_file:4152:FAIL bpf_object__btf_fd: -1
After:
BTF libbpf test[1] (test_btf_haskv.o): OK
BTF libbpf test[2] (test_btf_newkv.o): OK
BTF libbpf test[3] (test_btf_nokv.o): OK
--- tools/testing/selftests/bpf/test_btf.c | 4 ---- 1 file changed, 4 deletions(-)
tools/testing/selftests/bpf/test_btf.c +0 -4
@@ -4148,10 +4148,6 @@ static int do_test_file(unsigned int test_num)if (CHECK (IS_ERR (obj),"obj: %ld" ,PTR_ERR (obj)))return PTR_ERR (obj); - err =bpf_object__btf_fd (obj); -if (CHECK (err ==-1 ,"bpf_object__btf_fd: -1" )) - goto done; - prog =bpf_program__next (NULL , obj);if (CHECK (!prog,"Cannot find bpf_prog" )) { err =-1 ;
Signature · 1 line
2.25.0.341.g760bfbb309-goog
Quoted 10 lines · Stanislav Fomichev
After commit
0d13bfce023a("libbpf: Don't require root forbpf_object__open()") we no longer load BTF duringbpf_object__open(), so let's remove the expectation fromtest_btfthat the fd is not -1. The test currently fails.Before:
BTF libbpf test[1] (test_btf_haskv.o): do_test_file:4152:FAILbpf_object__btf_fd: -1 BTF libbpf test[2] (test_btf_newkv.o): do_test_file:4152:FAILbpf_object__btf_fd: -1 BTF libbpf test[3] (test_btf_nokv.o): do_test_file:4152:FAILbpf_object__btf_fd: -1
Quoted 8 lines
After:
BTF libbpf test[1] (test_btf_haskv.o): OK
BTF libbpf test[2] (test_btf_newkv.o): OK
BTF libbpf test[3] (test_btf_nokv.o): OKFixes 0d13bfce023a ("libbpf: Don't require root forbpf_object__open()")Signed-off-by Stanislav Fomichev <[email protected]>---
Quoted 10 lines · Stanislav Fomichev
After commit
0d13bfce023a("libbpf: Don't require root forbpf_object__open()") we no longer load BTF duringbpf_object__open(), so let's remove the expectation fromtest_btfthat the fd is not -1. The test currently fails.Before:
BTF libbpf test[1] (test_btf_haskv.o): do_test_file:4152:FAILbpf_object__btf_fd: -1 BTF libbpf test[2] (test_btf_newkv.o): do_test_file:4152:FAILbpf_object__btf_fd: -1 BTF libbpf test[3] (test_btf_nokv.o): do_test_file:4152:FAILbpf_object__btf_fd: -1
Quoted 7 lines
After:
BTF libbpf test[1] (test_btf_haskv.o): OK
BTF libbpf test[2] (test_btf_newkv.o): OK
BTF libbpf test[3] (test_btf_nokv.o): OKFixes 0d13bfce023a ("libbpf: Don't require root forbpf_object__open()")Signed-off-by Stanislav Fomichev <[email protected]>
Applied, thanks!