Merge branch 'cleanup-selftests-bpf-makefile'

Browse source

Andrii Nakryiko says:

====================
This patch set extensively revamps selftests/bpf's Makefile to generalize test
runner concept and apply it uniformly to test_maps and test_progs test
runners, along with test_progs' few build "flavors", exercising various ways
to build BPF programs.

As we do that, we fix dependencies between various phases of test runners, and
simplify some one-off rules and dependencies currently present in Makefile.
test_progs' flavors are now built into root $(OUTPUT) directory and can be run
without any extra steps right from there. E.g., test_progs-alu32 is built and
is supposed to be run from $(OUTPUT). It will cd into alu32/ subdirectory to
load correct set of BPF object files (which are different from the ones built
for test_progs).

Outline:
- patch #1 teaches test_progs about flavor sub-directories;
- patch #2 fixes one of CO-RE tests to not depend strictly on process name;
- patch #3 changes test_maps's usage of map_tests/tests.h to be the same as
  test_progs' one;
- patch #4 adds convenient short `make test_progs`-like targets to build only
  individual tests, if necessary;
- patch #5 is a main patch in the series; it uses a bunch of make magic
  (mainly $(call) and $(eval)) to define test runner "skeleton" and apply it
  to 4 different test runners, lots more details in corresponding commit
  description;
- patch #6 does a bit of post-clean up for test_queue_map and test_stack_map
  BPF programs;
- patch #7 cleans up test_libbpf.sh/test_libbpf_open superseded by test_progs.

v3->v4:
- remove accidentally checked in binaries;

v2->v3:
- drop test_xdp.o mixed compilation mode, remove test_libbpf.sh (Alexei);

v1->v2:
- drop test_progs-native causing compilation failures due to
  __builtin_preserve_field_access, add back test_xdp.o override, which will
  now emit rule re-definition warning.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2019-10-17 12:15:09 -07:00

parent 8d285a3b2e cb79a4e1b8

commit 47a92ae074

11 changed files with 291 additions and 405 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

tools/testing/selftests/bpf/.gitignore vendored

View file

323

tools/testing/selftests/bpf/Makefile

View file

4

tools/testing/selftests/bpf/prog_tests/core_reloc.c

View file

2

tools/testing/selftests/bpf/progs/core_reloc_types.h

View file

3

tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c

View file

0

tools/testing/selftests/bpf/test_queue_stack_map.h → tools/testing/selftests/bpf/progs/test_queue_stack_map.h

View file

43

tools/testing/selftests/bpf/test_libbpf.sh

View file

144

tools/testing/selftests/bpf/test_libbpf_open.c

View file

8

tools/testing/selftests/bpf/test_maps.c

View file

33

tools/testing/selftests/bpf/test_progs.c

View file