From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>
Subject: Re: [PATCH bpf-next] selftests/bpf: Copy extra resources in the non-flavored build too
Date: Tue, 23 Feb 2021 23:18:35 -0800 [thread overview]
Message-ID: <CAEf4BzZ97LryiKX2K8vZhdbhW_SFUMDwkXpJyz89QVhLrYk+7A@mail.gmail.com> (raw)
In-Reply-To: <20210222232451.84574-1-iii@linux.ibm.com>
On Mon, Feb 22, 2021 at 3:25 PM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> Building selftests in a separate directory like this:
>
> make O=... -C tools/testing/selftests/bpf
>
> and then running:
>
> ./test_progs -t btf
>
> causes all the non-flavored btf_dump_test_case_*.c tests to fail,
> because these files are not copied to where test_progs expects to find
> them.
>
> Fix by removing the flavored build check and using rsync instead of cp:
> cp fails because e.g. urandom_read is being copied into itself, and
> rsync simply skips such cases. rsync is used by kselftests elsewhere
> and therefore is not a new dependency.
So this leaves a bunch of non-ignored files in selftests/bpf directory:
Untracked files:
(use "git add <file>..." to include in what will be committed)
btf_dump_test_case_bitfields.c
btf_dump_test_case_multidim.c
btf_dump_test_case_namespacing.c
btf_dump_test_case_ordering.c
btf_dump_test_case_packing.c
btf_dump_test_case_padding.c
btf_dump_test_case_syntax.c
We can add them to .gitignore, but that feels wrong, to be honest. Any
ideas how to fix this in some better way?
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> tools/testing/selftests/bpf/Makefile | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 044bfdcf5b74..192119f6aeb7 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -382,12 +382,9 @@ $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o: \
> $$(call msg,EXT-OBJ,$(TRUNNER_BINARY),$$@)
> $(Q)$$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@
>
> -# only copy extra resources if in flavored build
> $(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT)
> -ifneq ($2,)
> $$(call msg,EXT-COPY,$(TRUNNER_BINARY),$(TRUNNER_EXTRA_FILES))
> - $(Q)cp -a $$^ $(TRUNNER_OUTPUT)/
> -endif
> + $(Q)rsync -aq $$^ $(TRUNNER_OUTPUT)/
>
> $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS) \
> $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ) \
> --
> 2.29.2
>
prev parent reply other threads:[~2021-02-24 7:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 23:24 [PATCH bpf-next] selftests/bpf: Copy extra resources in the non-flavored build too Ilya Leoshkevich
2021-02-24 7:18 ` Andrii Nakryiko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEf4BzZ97LryiKX2K8vZhdbhW_SFUMDwkXpJyz89QVhLrYk+7A@mail.gmail.com \
--to=andrii.nakryiko@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gor@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=iii@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).