| Message ID | 20221205131618.1524337-2-daan.j.demeyer@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d68ae4982cb773f3d738b5dc25f77f5c7550548a |
| Delegated to: | BPF |
| Headers | show |
| Series | BPF selftests fixes | expand |
On Mon, Dec 5, 2022 at 5:25 AM Daan De Meyer <daan.j.demeyer@gmail.com> wrote: > > When installing the selftests using > "make -C tools/testing/selftests install", we need to make sure > all the required files to run the selftests are installed. Let's > make sure this is the case. > > Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com> > --- > tools/testing/selftests/bpf/Makefile | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index 6a0f043dc410..f6b8ffdde16f 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -532,8 +532,10 @@ TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ > $(OUTPUT)/liburandom_read.so \ > $(OUTPUT)/xdp_synproxy \ > $(OUTPUT)/sign-file \ > - ima_setup.sh verify_sig_setup.sh \ > - $(wildcard progs/btf_dump_test_case_*.c) > + $(realpath ima_setup.sh) \ > + $(realpath verify_sig_setup.sh) \ why do we need realpath for these scripts, but it's ok to not do that for *.bpf.o and btf_dump_test_case_*.c below? > + $(wildcard progs/btf_dump_test_case_*.c) \ > + $(wildcard progs/*.bpf.o) > TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE > TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS > $(eval $(call DEFINE_TEST_RUNNER,test_progs)) > -- > 2.38.1 >
On Tue, Dec 6, 2022 at 4:29 PM Andrii Nakryiko <andrii.nakryiko@gmail.com> wrote: > > On Mon, Dec 5, 2022 at 5:25 AM Daan De Meyer <daan.j.demeyer@gmail.com> wrote: > > > > When installing the selftests using > > "make -C tools/testing/selftests install", we need to make sure > > all the required files to run the selftests are installed. Let's > > make sure this is the case. > > > > Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com> > > --- > > tools/testing/selftests/bpf/Makefile | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > > index 6a0f043dc410..f6b8ffdde16f 100644 > > --- a/tools/testing/selftests/bpf/Makefile > > +++ b/tools/testing/selftests/bpf/Makefile > > @@ -532,8 +532,10 @@ TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ > > $(OUTPUT)/liburandom_read.so \ > > $(OUTPUT)/xdp_synproxy \ > > $(OUTPUT)/sign-file \ > > - ima_setup.sh verify_sig_setup.sh \ > > - $(wildcard progs/btf_dump_test_case_*.c) > > + $(realpath ima_setup.sh) \ > > + $(realpath verify_sig_setup.sh) \ > > why do we need realpath for these scripts, but it's ok to not do that > for *.bpf.o and btf_dump_test_case_*.c below? > I dropped the $(realpath) change for now and applied the series. Please let me know if I'm missing something. > > > + $(wildcard progs/btf_dump_test_case_*.c) \ > > + $(wildcard progs/*.bpf.o) > > TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE > > TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS > > $(eval $(call DEFINE_TEST_RUNNER,test_progs)) > > -- > > 2.38.1 > >
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 6a0f043dc410..f6b8ffdde16f 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -532,8 +532,10 @@ TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ $(OUTPUT)/liburandom_read.so \ $(OUTPUT)/xdp_synproxy \ $(OUTPUT)/sign-file \ - ima_setup.sh verify_sig_setup.sh \ - $(wildcard progs/btf_dump_test_case_*.c) + $(realpath ima_setup.sh) \ + $(realpath verify_sig_setup.sh) \ + $(wildcard progs/btf_dump_test_case_*.c) \ + $(wildcard progs/*.bpf.o) TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS $(eval $(call DEFINE_TEST_RUNNER,test_progs))
When installing the selftests using "make -C tools/testing/selftests install", we need to make sure all the required files to run the selftests are installed. Let's make sure this is the case. Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com> --- tools/testing/selftests/bpf/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)