| Message ID | 20200513021722.7787-1-yauheni.kaliuta@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | selftests/bpf: install generated test progs | expand |
On Tue, May 12, 2020 at 7:18 PM Yauheni Kaliuta <yauheni.kaliuta@redhat.com> wrote: > > Before commit 74b5a5968fe8 ("selftests/bpf: Replace test_progs and > test_maps w/ general rule") selftests/bpf used generic install > target from selftests/lib.mk to install generated bpf test progs by > mentioning them in TEST_GEN_FILES variable. > > Take that functionality back. > > Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and > test_maps w/ general rule") > > Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> > --- Thanks for fixing! Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/testing/selftests/bpf/Makefile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index 7729892e0b04..c9a07cc7dede 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -263,6 +263,7 @@ TRUNNER_BPF_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o, $$(TRUNNER_BPF_SRCS) > TRUNNER_BPF_SKELS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.skel.h, \ > $$(filter-out $(SKEL_BLACKLIST), \ > $$(TRUNNER_BPF_SRCS))) > +TEST_GEN_FILES += $$(TRUNNER_BPF_OBJS) > > # Evaluate rules now with extra TRUNNER_XXX variables above already defined > $$(eval $$(call DEFINE_TEST_RUNNER_RULES,$1,$2)) > -- > 2.26.2 >
On 5/13/20 4:17 AM, Yauheni Kaliuta wrote: > Before commit 74b5a5968fe8 ("selftests/bpf: Replace test_progs and > test_maps w/ general rule") selftests/bpf used generic install > target from selftests/lib.mk to install generated bpf test progs by > mentioning them in TEST_GEN_FILES variable. > > Take that functionality back. > > Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and > test_maps w/ general rule") > > Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> Applied, thanks!
Hi, Daniel! >>>>> On Wed, 13 May 2020 16:55:22 +0200, Daniel Borkmann wrote: > On 5/13/20 4:17 AM, Yauheni Kaliuta wrote: >> Before commit 74b5a5968fe8 ("selftests/bpf: Replace test_progs and >> test_maps w/ general rule") selftests/bpf used generic install >> target from selftests/lib.mk to install generated bpf test progs by >> mentioning them in TEST_GEN_FILES variable. >> >> Take that functionality back. >> >> Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and >> test_maps w/ general rule") >> >> Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> > Applied, thanks! Thanks! Should I do anything about https://lore.kernel.org/bpf/20200507145652.190823-3-yauheni.kaliuta@redhat.com/T/#mbeddec628675f06f176528b67d570aee0539ebbf yet?
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 7729892e0b04..c9a07cc7dede 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -263,6 +263,7 @@ TRUNNER_BPF_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o, $$(TRUNNER_BPF_SRCS) TRUNNER_BPF_SKELS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.skel.h, \ $$(filter-out $(SKEL_BLACKLIST), \ $$(TRUNNER_BPF_SRCS))) +TEST_GEN_FILES += $$(TRUNNER_BPF_OBJS) # Evaluate rules now with extra TRUNNER_XXX variables above already defined $$(eval $$(call DEFINE_TEST_RUNNER_RULES,$1,$2))
Before commit 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule") selftests/bpf used generic install target from selftests/lib.mk to install generated bpf test progs by mentioning them in TEST_GEN_FILES variable. Take that functionality back. Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule") Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> --- tools/testing/selftests/bpf/Makefile | 1 + 1 file changed, 1 insertion(+)