* [PATCH] selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set
@ 2019-05-11 2:52 Shuah Khan
2019-05-11 4:37 ` Alexei Starovoitov
0 siblings, 1 reply; 4+ messages in thread
From: Shuah Khan @ 2019-05-11 2:52 UTC (permalink / raw)
To: shuah, alexei.starovoitov
Cc: Shuah Khan, daniel, davem, torvalds, linux-kselftest,
linux-kernel, netdev, bpf
commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
broke bpf build/test workflow. When KBUILD_OUTPUT is set, bpf objects end
up in KBUILD_OUTPUT build directory instead of in ../selftests/bpf.
The following bpf workflow breaks when it can't find the test_verifier:
cd tools/testing/selftests/bpf; make; ./test_verifier;
Fix it to set OUTPUT only when it is undefined in lib.mk. It didn't need
to be set in the first place.
Fixes: commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
tools/testing/selftests/lib.mk | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 098dd0065fb1..077337195783 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -3,15 +3,9 @@
CC := $(CROSS_COMPILE)gcc
ifeq (0,$(MAKELEVEL))
- ifneq ($(O),)
- OUTPUT := $(O)
- else
- ifneq ($(KBUILD_OUTPUT),)
- OUTPUT := $(KBUILD_OUTPUT)
- else
- OUTPUT := $(shell pwd)
- DEFAULT_INSTALL_HDR_PATH := 1
- endif
+ ifeq ($(OUTPUT),)
+ OUTPUT := $(shell pwd)
+ DEFAULT_INSTALL_HDR_PATH := 1
endif
endif
selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set
2019-05-11 2:52 [PATCH] selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set Shuah Khan
@ 2019-05-11 4:37 ` Alexei Starovoitov
2019-05-16 18:36 ` Alexei Starovoitov
0 siblings, 1 reply; 4+ messages in thread
From: Alexei Starovoitov @ 2019-05-11 4:37 UTC (permalink / raw)
To: Shuah Khan
Cc: shuah, daniel, davem, torvalds, linux-kselftest, linux-kernel,
netdev, bpf
On Fri, May 10, 2019 at 08:52:49PM -0600, Shuah Khan wrote:
> commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
> broke bpf build/test workflow. When KBUILD_OUTPUT is set, bpf objects end
> up in KBUILD_OUTPUT build directory instead of in ../selftests/bpf.
>
> The following bpf workflow breaks when it can't find the test_verifier:
>
> cd tools/testing/selftests/bpf; make; ./test_verifier;
>
> Fix it to set OUTPUT only when it is undefined in lib.mk. It didn't need
> to be set in the first place.
>
> Fixes: commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
>
> Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
'git am' couldn't apply this patch because "sha1 information is lacking",
but the patch itself looks good.
Acked-by: Alexei Starovoitov <ast@kernel.org>
Thanks for the quick fix.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set
2019-05-11 4:37 ` Alexei Starovoitov
@ 2019-05-16 18:36 ` Alexei Starovoitov
2019-05-16 19:18 ` Shuah Khan
0 siblings, 1 reply; 4+ messages in thread
From: Alexei Starovoitov @ 2019-05-16 18:36 UTC (permalink / raw)
To: Shuah Khan
Cc: Shuah Khan, Daniel Borkmann, David S. Miller, Linus Torvalds,
open list:KERNEL SELFTEST FRAMEWORK, LKML, Network Development,
bpf
On Fri, May 10, 2019 at 9:37 PM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Fri, May 10, 2019 at 08:52:49PM -0600, Shuah Khan wrote:
> > commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
> > broke bpf build/test workflow. When KBUILD_OUTPUT is set, bpf objects end
> > up in KBUILD_OUTPUT build directory instead of in ../selftests/bpf.
> >
> > The following bpf workflow breaks when it can't find the test_verifier:
> >
> > cd tools/testing/selftests/bpf; make; ./test_verifier;
> >
> > Fix it to set OUTPUT only when it is undefined in lib.mk. It didn't need
> > to be set in the first place.
> >
> > Fixes: commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
> >
> > Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> > Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
>
> 'git am' couldn't apply this patch because "sha1 information is lacking",
> but the patch itself looks good.
> Acked-by: Alexei Starovoitov <ast@kernel.org>
> Thanks for the quick fix.
Ping! What is the status of the fix?
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set
2019-05-16 18:36 ` Alexei Starovoitov
@ 2019-05-16 19:18 ` Shuah Khan
0 siblings, 0 replies; 4+ messages in thread
From: Shuah Khan @ 2019-05-16 19:18 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: Shuah Khan, Daniel Borkmann, David S. Miller, Linus Torvalds,
open list:KERNEL SELFTEST FRAMEWORK, LKML, Network Development,
bpf, skhan
On 5/16/19 12:36 PM, Alexei Starovoitov wrote:
> On Fri, May 10, 2019 at 9:37 PM Alexei Starovoitov
> <alexei.starovoitov@gmail.com> wrote:
>>
>> On Fri, May 10, 2019 at 08:52:49PM -0600, Shuah Khan wrote:
>>> commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
>>> broke bpf build/test workflow. When KBUILD_OUTPUT is set, bpf objects end
>>> up in KBUILD_OUTPUT build directory instead of in ../selftests/bpf.
>>>
>>> The following bpf workflow breaks when it can't find the test_verifier:
>>>
>>> cd tools/testing/selftests/bpf; make; ./test_verifier;
>>>
>>> Fix it to set OUTPUT only when it is undefined in lib.mk. It didn't need
>>> to be set in the first place.
>>>
>>> Fixes: commit 8ce72dc32578 ("selftests: fix headers_install circular dependency")
>>>
>>> Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
>>> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
>>
>> 'git am' couldn't apply this patch because "sha1 information is lacking",
>> but the patch itself looks good.
>> Acked-by: Alexei Starovoitov <ast@kernel.org>
>> Thanks for the quick fix.
>
> Ping! What is the status of the fix?
>
Sending pull request this afternoon.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-16 19:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-11 2:52 [PATCH] selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set Shuah Khan
2019-05-11 4:37 ` Alexei Starovoitov
2019-05-16 18:36 ` Alexei Starovoitov
2019-05-16 19:18 ` Shuah Khan
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).