Re: [PATCH bpf-next] selftests/bpf: Include build flavors for install target

From: Björn Töpel
Date: Thu Aug 31 2023 - 12:18:37 EST


Daniel Borkmann <daniel@xxxxxxxxxxxxx> writes:

> On 8/28/23 8:33 PM, Björn Töpel wrote:
>> From: Björn Töpel <bjorn@xxxxxxxxxxxx>
>>
>> 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.
>>
>> Signed-off-by: Björn Töpel <bjorn@xxxxxxxxxxxx>
>
> Looks good and BPF CI also seems to be fine with it, wrt INSTDIRS could we use
> a more appropriate location where we define it? Was thinking sth like:
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 7c77a21c3371..8b724efb8b7f 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -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
>
> [...]

Ok! I'll spin a v2!