| Message ID | 20210112135959.649075-6-jean-philippe@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/bpf: Some build fixes | expand |
On Tue, Jan 12, 2021 at 6:01 AM Jean-Philippe Brucker <jean-philippe@linaro.org> wrote: > > The btf_dump test cannot access the original source files for comparison > when running the selftests out of tree, causing several failures: > > awk: btf_dump_test_case_syntax.c: No such file or directory > ... > > Add those files to $(TEST_FILES) to have "make install" pick them up. > > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > tools/testing/selftests/bpf/Makefile | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index bffb4ad59a3d..fb8cddc410c0 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -46,7 +46,14 @@ endif > > TEST_GEN_FILES = test_lwt_ip_encap.o \ > test_tc_edt.o > -TEST_FILES = xsk_prereqs.sh > +TEST_FILES = xsk_prereqs.sh \ > + progs/btf_dump_test_case_syntax.c \ > + progs/btf_dump_test_case_ordering.c \ > + progs/btf_dump_test_case_padding.c \ > + progs/btf_dump_test_case_packing.c \ > + progs/btf_dump_test_case_bitfields.c \ > + progs/btf_dump_test_case_multidim.c \ > + progs/btf_dump_test_case_namespacing.c maybe wildcard(progs/btf_dump_test_case_*) instead? one less thing to remember to update, if we ever add another test case > > # Order correspond to 'make run_tests' order > TEST_PROGS := test_kmod.sh \ > -- > 2.30.0 >
On Tue, Jan 12, 2021 at 12:55:02PM -0800, Andrii Nakryiko wrote: > > -TEST_FILES = xsk_prereqs.sh > > +TEST_FILES = xsk_prereqs.sh \ > > + progs/btf_dump_test_case_syntax.c \ > > + progs/btf_dump_test_case_ordering.c \ > > + progs/btf_dump_test_case_padding.c \ > > + progs/btf_dump_test_case_packing.c \ > > + progs/btf_dump_test_case_bitfields.c \ > > + progs/btf_dump_test_case_multidim.c \ > > + progs/btf_dump_test_case_namespacing.c > > > maybe wildcard(progs/btf_dump_test_case_*) instead? one less thing to > remember to update, if we ever add another test case Sure, I'll send a v2 Thanks, Jean
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index bffb4ad59a3d..fb8cddc410c0 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -46,7 +46,14 @@ endif TEST_GEN_FILES = test_lwt_ip_encap.o \ test_tc_edt.o -TEST_FILES = xsk_prereqs.sh +TEST_FILES = xsk_prereqs.sh \ + progs/btf_dump_test_case_syntax.c \ + progs/btf_dump_test_case_ordering.c \ + progs/btf_dump_test_case_padding.c \ + progs/btf_dump_test_case_packing.c \ + progs/btf_dump_test_case_bitfields.c \ + progs/btf_dump_test_case_multidim.c \ + progs/btf_dump_test_case_namespacing.c # Order correspond to 'make run_tests' order TEST_PROGS := test_kmod.sh \
The btf_dump test cannot access the original source files for comparison when running the selftests out of tree, causing several failures: awk: btf_dump_test_case_syntax.c: No such file or directory ... Add those files to $(TEST_FILES) to have "make install" pick them up. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- tools/testing/selftests/bpf/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.30.0