selftests/bpf: Include build flavors for install target
Subsystems (5)
PATCH v2 1/1 selftests/bpf: Include build flavors for install target
From: Björn Töpel <[email protected]>
When using the "install" or targets depending on install, e.g. "gen_tar", the BPF machine flavors weren't included.
A command like:
| make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- O=/workspace/kbuild \ | HOSTCC=gcc FORMAT= SKIP_TARGETS="arm64 ia64 powerpc sparc64 x86 sgx" \ | -C tools/testing/selftests gen_tar
would not include bpf/no_alu32, bpf/cpuv4, or bpf/bpf-gcc.
Include the BPF machine flavors for "install" make target.
---
v1->v2: Rename the subdir variable, and define/populate it at more clear locations. (Daniel)
--- tools/testing/selftests/bpf/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/testing/selftests/bpf/Makefile +12 -0
@@ -50,14 +50,17 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_cgroup_storage \ test_tcpnotify_user test_sysctl \ test_progs-no_alu32 +TEST_INST_SUBDIRS := no_alu32 # Also test bpf-gcc, if present ifneq ($(BPF_GCC),) TEST_GEN_PROGS += test_progs-bpf_gcc +TEST_INST_SUBDIRS += bpf_gcc endif ifneq ($(CLANG_CPUV4),) TEST_GEN_PROGS += test_progs-cpuv4 +TEST_INST_SUBDIRS += cpuv4 endif TEST_GEN_FILES = test_lwt_ip_encap.bpf.o test_tc_edt.bpf.o
@@ -714,3 +717,12 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ # Delete partially updated (corrupted) files on error .DELETE_ON_ERROR: + +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;\ + done +endef
base-commit: d11ae1b16b0a57fac524cad8e277a20ec62600d1
Signature · 1 line
2.39.2
This patch was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:
Quoted 5 lines · On Thu, 31 Aug 2023 18:29:54 +0200 you wrote:
From: Björn Töpel <[email protected]>
When using the "install" or targets depending on install, e.g. "
gen_tar", the BPF machine flavors weren't included.
Quoted 7 lines
A command like:
| make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- O=/workspace/kbuild \ | HOSTCC=gcc FORMAT= SKIP_TARGETS="arm64 ia64 powerpc sparc64 x86 sgx" \ | -C tools/testing/selftests gen_tarwould not include bpf/no_alu32, bpf/cpuv4, or bpf/bpf-gcc.
[...]
Here is the summary with links:
- [bpf,v2] selftests/bpf: Include build flavors for install target
https://git.kernel.org/bpf/bpf/c/be8e754cbfac
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Daniel Borkmann
maintainerQuoted 6 lines · Björn Töpel
From: Björn Töpel <[email protected]>
When using the "install" or targets depending on install, e.g. "
gen_tar", the BPF machine flavors weren't included.A command like:
Quoted 8 lines
| make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- O=/workspace/kbuild \ | HOSTCC=gcc FORMAT= SKIP_TARGETS="arm64 ia64 powerpc sparc64 x86 sgx" \ | -C tools/testing/selftests gen_tarwould not include bpf/no_alu32, bpf/cpuv4, or bpf/bpf-gcc.
Include the BPF machine flavors for "install" make target.
Signed-off-by Björn Töpel <[email protected]>
Lgtm, applied, thanks!