diff options
author | Alexei Starovoitov <ast@kernel.org> | 2019-10-17 12:15:09 -0700 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2019-10-17 12:16:03 -0700 |
commit | 47a92ae074c3d166fa6476d1dfe581bc0356352e (patch) | |
tree | 0954da9a0ec087068d5be24ef6c1e54da8b00de8 /tools/testing/selftests/bpf/test_maps.c | |
parent | selftests/bpf: Restore the netns after flow dissector reattach test (diff) | |
parent | selftest/bpf: Remove test_libbpf.sh and test_libbpf_open (diff) | |
download | linux-dev-47a92ae074c3d166fa6476d1dfe581bc0356352e.tar.xz linux-dev-47a92ae074c3d166fa6476d1dfe581bc0356352e.zip |
Merge branch 'cleanup-selftests-bpf-makefile'
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>
Diffstat (limited to 'tools/testing/selftests/bpf/test_maps.c')
-rw-r--r-- | tools/testing/selftests/bpf/test_maps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index e1f1becda529..806b298397d3 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -1717,9 +1717,9 @@ static void run_all_tests(void) test_map_in_map(); } -#define DECLARE +#define DEFINE_TEST(name) extern void test_##name(void); #include <map_tests/tests.h> -#undef DECLARE +#undef DEFINE_TEST int main(void) { @@ -1731,9 +1731,9 @@ int main(void) map_flags = BPF_F_NO_PREALLOC; run_all_tests(); -#define CALL +#define DEFINE_TEST(name) test_##name(); #include <map_tests/tests.h> -#undef CALL +#undef DEFINE_TEST printf("test_maps: OK, %d SKIPPED\n", skips); return 0; |