From: "Björn Töpel" <bjorn@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Mykola Lysenko <mykolal@fb.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: "Björn Töpel" <bjorn@rivosinc.com>,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH bpf-next v2] selftests/bpf: Include runner extras for install target
Date: Thu, 25 Jan 2024 17:05:02 +0100 [thread overview]
Message-ID: <20240125160502.1512422-1-bjorn@kernel.org> (raw)
From: Björn Töpel <bjorn@rivosinc.com>
When using the "install" or targets depending on install, e.g.
"gen_tar", the "runner extras" weren't included for the BPF machine
flavors.
Make sure the necessary helper scripts/tools are added to
corresponding BPF machine flavor.
Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
---
v2: Added btf_dump_test_case files
---
tools/testing/selftests/bpf/Makefile | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index fd15017ed3b1..d5cff32997b3 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -744,8 +744,20 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \
DEFAULT_INSTALL_RULE := $(INSTALL_RULE)
override define INSTALL_RULE
$(DEFAULT_INSTALL_RULE)
- @for DIR in $(TEST_INST_SUBDIRS); do \
- mkdir -p $(INSTALL_PATH)/$$DIR; \
- rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\
+ @for DIR in $(TEST_INST_SUBDIRS); do \
+ mkdir -p $(INSTALL_PATH)/$$DIR; \
+ rsync -a --copy-unsafe-links \
+ $(OUTPUT)/$$DIR/bpf_testmod.ko \
+ $(OUTPUT)/$$DIR/bpftool \
+ $(OUTPUT)/$$DIR/ima_setup.sh \
+ $(OUTPUT)/$$DIR/liburandom_read.so \
+ $(OUTPUT)/$$DIR/sign-file \
+ $(OUTPUT)/$$DIR/uprobe_multi \
+ $(OUTPUT)/$$DIR/urandom_read \
+ $(OUTPUT)/$$DIR/verify_sig_setup.sh \
+ $(OUTPUT)/$$DIR/xdp_synproxy \
+ $(OUTPUT)/$$DIR/btf_dump_test_case_*.c \
+ $(OUTPUT)/$$DIR/*.bpf.o \
+ $(INSTALL_PATH)/$$DIR; \
done
endef
base-commit: c8632acf193beac64bbdaebef013368c480bf74f
--
2.40.1
next reply other threads:[~2024-01-25 16:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-25 16:05 Björn Töpel [this message]
2024-01-26 23:10 ` [PATCH bpf-next v2] selftests/bpf: Include runner extras for install target Andrii Nakryiko
2024-01-27 9:03 ` Björn Töpel
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=20240125160502.1512422-1-bjorn@kernel.org \
--to=bjorn@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bjorn@rivosinc.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
/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