* [PATCH bpf-next] selftests/bpf: Build testing_helpers.o out of tree
@ 2021-11-29 11:15 Jean-Philippe Brucker
2021-11-29 23:23 ` Andrii Nakryiko
0 siblings, 1 reply; 3+ messages in thread
From: Jean-Philippe Brucker @ 2021-11-29 11:15 UTC (permalink / raw)
To: shuah, ast, daniel, andrii
Cc: kafai, songliubraving, yhs, john.fastabend, kpsingh, quentin,
linux-kselftest, bpf, Jean-Philippe Brucker
Add $(OUTPUT) prefix to testing_helpers.o, so it can be built out of
tree when necessary. At the moment, in addition to being built in-tree
even when out-of-tree is required, testing_helpers.o is not built with
the right recipe when cross-building.
Fixes: f87c1930ac29 ("selftests/bpf: Merge test_stub.c into testing_helpers.c")
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
tools/testing/selftests/bpf/Makefile | 32 ++++++++++++++--------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 35684d61aaeb..082f6aeec1d9 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -192,22 +192,22 @@ TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL)
$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ)
-$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_sock: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_sock_addr: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_sockmap: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c testing_helpers.o
-$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_sock_fields: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_sysctl: cgroup_helpers.c testing_helpers.o
-$(OUTPUT)/test_tag: testing_helpers.o
-$(OUTPUT)/test_lirc_mode2_user: testing_helpers.o
-$(OUTPUT)/xdping: testing_helpers.o
-$(OUTPUT)/flow_dissector_load: testing_helpers.o
-$(OUTPUT)/test_maps: testing_helpers.o
-$(OUTPUT)/test_verifier: testing_helpers.o
+$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_sock: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_sock_addr: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_sockmap: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_sock_fields: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_sysctl: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_tag: $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_lirc_mode2_user: $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/xdping: $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/flow_dissector_load: $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_maps: $(OUTPUT)/testing_helpers.o
+$(OUTPUT)/test_verifier: $(OUTPUT)/testing_helpers.o
BPFTOOL ?= $(DEFAULT_BPFTOOL)
$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
--
2.34.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: Build testing_helpers.o out of tree
2021-11-29 11:15 [PATCH bpf-next] selftests/bpf: Build testing_helpers.o out of tree Jean-Philippe Brucker
@ 2021-11-29 23:23 ` Andrii Nakryiko
2021-12-01 14:13 ` Jean-Philippe Brucker
0 siblings, 1 reply; 3+ messages in thread
From: Andrii Nakryiko @ 2021-11-29 23:23 UTC (permalink / raw)
To: Jean-Philippe Brucker
Cc: Shuah Khan, Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin Lau, Song Liu, Yonghong Song, john fastabend, KP Singh,
Quentin Monnet, open list:KERNEL SELFTEST FRAMEWORK, bpf
On Mon, Nov 29, 2021 at 3:17 AM Jean-Philippe Brucker
<jean-philippe@linaro.org> wrote:
>
> Add $(OUTPUT) prefix to testing_helpers.o, so it can be built out of
> tree when necessary. At the moment, in addition to being built in-tree
> even when out-of-tree is required, testing_helpers.o is not built with
> the right recipe when cross-building.
>
> Fixes: f87c1930ac29 ("selftests/bpf: Merge test_stub.c into testing_helpers.c")
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
> tools/testing/selftests/bpf/Makefile | 32 ++++++++++++++--------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 35684d61aaeb..082f6aeec1d9 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -192,22 +192,22 @@ TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL)
>
> $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ)
>
> -$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c testing_helpers.o
one of cgroup_helper.c (C source code) or testing_helper.o (object
file) is wrong, let's ensure that the dependencies are correct while
at it?
> -$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_sock: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_sock_addr: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_sockmap: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c testing_helpers.o
> -$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_sock_fields: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_sysctl: cgroup_helpers.c testing_helpers.o
> -$(OUTPUT)/test_tag: testing_helpers.o
> -$(OUTPUT)/test_lirc_mode2_user: testing_helpers.o
> -$(OUTPUT)/xdping: testing_helpers.o
> -$(OUTPUT)/flow_dissector_load: testing_helpers.o
> -$(OUTPUT)/test_maps: testing_helpers.o
> -$(OUTPUT)/test_verifier: testing_helpers.o
> +$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_sock: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_sock_addr: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_sockmap: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_sock_fields: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_sysctl: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_tag: $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_lirc_mode2_user: $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/xdping: $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/flow_dissector_load: $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_maps: $(OUTPUT)/testing_helpers.o
> +$(OUTPUT)/test_verifier: $(OUTPUT)/testing_helpers.o
>
> BPFTOOL ?= $(DEFAULT_BPFTOOL)
> $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
> --
> 2.34.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: Build testing_helpers.o out of tree
2021-11-29 23:23 ` Andrii Nakryiko
@ 2021-12-01 14:13 ` Jean-Philippe Brucker
0 siblings, 0 replies; 3+ messages in thread
From: Jean-Philippe Brucker @ 2021-12-01 14:13 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Shuah Khan, Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin Lau, Song Liu, Yonghong Song, john fastabend, KP Singh,
Quentin Monnet, open list:KERNEL SELFTEST FRAMEWORK, bpf
On Mon, Nov 29, 2021 at 03:23:02PM -0800, Andrii Nakryiko wrote:
> On Mon, Nov 29, 2021 at 3:17 AM Jean-Philippe Brucker
> <jean-philippe@linaro.org> wrote:
> >
> > Add $(OUTPUT) prefix to testing_helpers.o, so it can be built out of
> > tree when necessary. At the moment, in addition to being built in-tree
> > even when out-of-tree is required, testing_helpers.o is not built with
> > the right recipe when cross-building.
> >
> > Fixes: f87c1930ac29 ("selftests/bpf: Merge test_stub.c into testing_helpers.c")
> > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> > ---
> > tools/testing/selftests/bpf/Makefile | 32 ++++++++++++++--------------
> > 1 file changed, 16 insertions(+), 16 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> > index 35684d61aaeb..082f6aeec1d9 100644
> > --- a/tools/testing/selftests/bpf/Makefile
> > +++ b/tools/testing/selftests/bpf/Makefile
> > @@ -192,22 +192,22 @@ TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL)
> >
> > $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ)
> >
> > -$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c testing_helpers.o
>
> one of cgroup_helper.c (C source code) or testing_helper.o (object
> file) is wrong, let's ensure that the dependencies are correct while
> at it?
Sure, I'll change this to object files
Thanks,
Jean
>
>
> > -$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_sock: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_sock_addr: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_sockmap: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c testing_helpers.o
> > -$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_sock_fields: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_sysctl: cgroup_helpers.c testing_helpers.o
> > -$(OUTPUT)/test_tag: testing_helpers.o
> > -$(OUTPUT)/test_lirc_mode2_user: testing_helpers.o
> > -$(OUTPUT)/xdping: testing_helpers.o
> > -$(OUTPUT)/flow_dissector_load: testing_helpers.o
> > -$(OUTPUT)/test_maps: testing_helpers.o
> > -$(OUTPUT)/test_verifier: testing_helpers.o
> > +$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_sock: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_sock_addr: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_sockmap: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_sock_fields: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_sysctl: cgroup_helpers.c $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_tag: $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_lirc_mode2_user: $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/xdping: $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/flow_dissector_load: $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_maps: $(OUTPUT)/testing_helpers.o
> > +$(OUTPUT)/test_verifier: $(OUTPUT)/testing_helpers.o
> >
> > BPFTOOL ?= $(DEFAULT_BPFTOOL)
> > $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
> > --
> > 2.34.0
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-01 14:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-29 11:15 [PATCH bpf-next] selftests/bpf: Build testing_helpers.o out of tree Jean-Philippe Brucker
2021-11-29 23:23 ` Andrii Nakryiko
2021-12-01 14:13 ` Jean-Philippe Brucker
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.