From: Björn Töpel <bj...@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 <bj...@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
