* [PATCH bpf-next] selftests/bpf: restore $(OUTPUT)/test_stub.o rule
@ 2019-10-24 18:42 Ilya Leoshkevich
2019-10-25 21:01 ` Andrii Nakryiko
0 siblings, 1 reply; 3+ messages in thread
From: Ilya Leoshkevich @ 2019-10-24 18:42 UTC (permalink / raw)
To: Daniel Borkmann, Alexei Starovoitov
Cc: bpf, Heiko Carstens, Vasily Gorbik, Ilya Leoshkevich
`make O=/linux-build kselftest TARGETS=bpf` fails with
make[3]: *** No rule to make target '/linux-build/bpf/test_stub.o', needed by '/linux-build/bpf/test_verifier'
The same command without the O= part works, presumably thanks to the
implicit rule.
Fix by restoring the explicit $(OUTPUT)/test_stub.o rule.
Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
tools/testing/selftests/bpf/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 59b93a5667c8..9d63a12f932b 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -89,6 +89,9 @@ $(notdir $(TEST_GEN_PROGS) \
$(OUTPUT)/urandom_read: urandom_read.c
$(CC) -o $@ $< -Wl,--build-id
+$(OUTPUT)/test_stub.o: test_stub.c
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+
BPFOBJ := $(OUTPUT)/libbpf.a
$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/test_stub.o $(BPFOBJ)
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: restore $(OUTPUT)/test_stub.o rule
2019-10-24 18:42 [PATCH bpf-next] selftests/bpf: restore $(OUTPUT)/test_stub.o rule Ilya Leoshkevich
@ 2019-10-25 21:01 ` Andrii Nakryiko
2019-10-25 21:39 ` Daniel Borkmann
0 siblings, 1 reply; 3+ messages in thread
From: Andrii Nakryiko @ 2019-10-25 21:01 UTC (permalink / raw)
To: Ilya Leoshkevich
Cc: Daniel Borkmann, Alexei Starovoitov, bpf, Heiko Carstens, Vasily Gorbik
On Fri, Oct 25, 2019 at 11:54 AM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> `make O=/linux-build kselftest TARGETS=bpf` fails with
>
> make[3]: *** No rule to make target '/linux-build/bpf/test_stub.o', needed by '/linux-build/bpf/test_verifier'
>
> The same command without the O= part works, presumably thanks to the
> implicit rule.
>
> Fix by restoring the explicit $(OUTPUT)/test_stub.o rule.
>
> Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> tools/testing/selftests/bpf/Makefile | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 59b93a5667c8..9d63a12f932b 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -89,6 +89,9 @@ $(notdir $(TEST_GEN_PROGS) \
> $(OUTPUT)/urandom_read: urandom_read.c
> $(CC) -o $@ $< -Wl,--build-id
>
> +$(OUTPUT)/test_stub.o: test_stub.c
> + $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
Looks good to me, even though we never pass $(CPPFLAGS) to any other
objects, so for consistency we might want to drop them.
But either way:
Acked-by: Andrii Nakryiko <andriin@fb.com>
> +
> BPFOBJ := $(OUTPUT)/libbpf.a
>
> $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/test_stub.o $(BPFOBJ)
> --
> 2.23.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: restore $(OUTPUT)/test_stub.o rule
2019-10-25 21:01 ` Andrii Nakryiko
@ 2019-10-25 21:39 ` Daniel Borkmann
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2019-10-25 21:39 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Ilya Leoshkevich, Alexei Starovoitov, bpf, Heiko Carstens, Vasily Gorbik
On Fri, Oct 25, 2019 at 02:01:40PM -0700, Andrii Nakryiko wrote:
> On Fri, Oct 25, 2019 at 11:54 AM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
> >
> > `make O=/linux-build kselftest TARGETS=bpf` fails with
> >
> > make[3]: *** No rule to make target '/linux-build/bpf/test_stub.o', needed by '/linux-build/bpf/test_verifier'
> >
> > The same command without the O= part works, presumably thanks to the
> > implicit rule.
> >
> > Fix by restoring the explicit $(OUTPUT)/test_stub.o rule.
> >
> > Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")
> > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> > ---
> > tools/testing/selftests/bpf/Makefile | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> > index 59b93a5667c8..9d63a12f932b 100644
> > --- a/tools/testing/selftests/bpf/Makefile
> > +++ b/tools/testing/selftests/bpf/Makefile
> > @@ -89,6 +89,9 @@ $(notdir $(TEST_GEN_PROGS) \
> > $(OUTPUT)/urandom_read: urandom_read.c
> > $(CC) -o $@ $< -Wl,--build-id
> >
> > +$(OUTPUT)/test_stub.o: test_stub.c
> > + $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
>
> Looks good to me, even though we never pass $(CPPFLAGS) to any other
> objects, so for consistency we might want to drop them.
>
> But either way:
>
> Acked-by: Andrii Nakryiko <andriin@fb.com>
+1, Ilya could you respin with CPPFLAGS removed. Feel free to retain
Andrii's ACK then.
Thanks,
Daniel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-25 21:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-24 18:42 [PATCH bpf-next] selftests/bpf: restore $(OUTPUT)/test_stub.o rule Ilya Leoshkevich
2019-10-25 21:01 ` Andrii Nakryiko
2019-10-25 21:39 ` Daniel Borkmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).