Skip to contentSkip to conversation

selftests/bpf: fix test_btf_dump with O=

PATCH Applied Ilya Leoshkevich 2 participants 2 messages Aug 19, 2019 – Aug 21, 2019

Subsystems (3)
Kselftest BPF BPF selftests
lore
Share & tools
lore

Ilya Leoshkevich

author
#0 lore raw

PATCH 1/1 selftests/bpf: fix test_btf_dump with O=

test_btf_dump fails when run with O=, because it needs to access source files and assumes they live in ./progs/, which is not the case in this scenario.

Fix by instructing kselftest to copy btf_dump_test_case_*.c files to the test directory. Since kselftest does not preserve directory structure, adjust the test to look in ./progs/ and then in ./.

Signed-off-by Ilya Leoshkevich <[email protected]>
---
 tools/testing/selftests/bpf/Makefile        | 3 +++
 tools/testing/selftests/bpf/test_btf_dump.c | 7 +++++++
 2 files changed, 10 insertions(+)
tools/testing/selftests/bpf/Makefile +3 -0
index c085964e1d05..69b98d8d3b5b 100644
@@ -34,6 +34,9 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test
 BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
 TEST_GEN_FILES = $(BPF_OBJ_FILES)
 
+BTF_C_FILES = $(wildcard progs/btf_dump_test_case_*.c)
+TEST_FILES = $(BTF_C_FILES)
+
 # Also test sub-register code-gen if LLVM has eBPF v3 processor support which
 # contains both ALU32 and JMP32 instructions.
 SUBREG_CODEGEN := $(shell echo "int cal(int a) { return a > 0; }" | \
tools/testing/selftests/bpf/test_btf_dump.c +7 -0
index 8f850823d35f..6e75dd3cb14f 100644
@@ -97,6 +97,13 @@ int test_btf_dump_case(int n, struct btf_dump_test_case *test_case)
 	}
 
 	snprintf(test_file, sizeof(test_file), "progs/%s.c", test_case->name);
+	if (access(test_file, R_OK) == -1)
+		/*
+		 * When the test is run with O=, kselftest copies TEST_FILES
+		 * without preserving the directory structure.
+		 */
+		snprintf(test_file, sizeof(test_file), "%s.c",
+			test_case->name);
 	/*
 	 * Diff test output and expected test output, contained between
 	 * START-EXPECTED-OUTPUT and END-EXPECTED-OUTPUT lines in test case.
Signature · 1 line
2.21.0
maintainer Applied
#1 lore raw
Quoted 9 lines · Ilya Leoshkevich

test_btf_dump fails when run with O=, because it needs to access source files and assumes they live in ./progs/, which is not the case in this scenario.

Fix by instructing kselftest to copy btf_dump_test_case_*.c files to the test directory. Since kselftest does not preserve directory structure, adjust the test to look in ./progs/ and then in ./.

Signed-off-by Ilya Leoshkevich <[email protected]>

Applied, thanks!