On Wed, Dec 18, 2019 at 11:45 PM Andrey Ignatov <rdna@xxxxxx> wrote: > > Convert test_cgroup_attach to prog_tests. > > This change does a lot of things but in many cases it's pretty expensive > to separate them, so they go in one commit. Nevertheless the logic is > ketp as is and changes made are just moving things around, simplifying > them (w/o changing the meaning of the tests) and making prog_tests > compatible: > > * split the 3 tests in the file into 3 separate files in prog_tests/; > > * rename the test functions to test_<file_base_name>; > > * remove unused includes, constants, variables and functions from every > test; > > * replace `if`-s with or `if (CHECK())` where additional context should > be logged and with `if (CHECK_FAIL())` where line number is enough; > > * switch from `log_err()` to logging via `CHECK()`; > > * replace `assert`-s with `CHECK_FAIL()` to avoid crashing the whole > test_progs if one assertion fails; > > * replace cgroup_helpers with test__join_cgroup() in > cgroup_attach_override only, other tests need more fine-grained > control for cgroup creation/deletion so cgroup_helpers are still used > there; > > * simplify cgroup_attach_autodetach by switching to easiest possible > program since this test doesn't really need such a complicated program > as cgroup_attach_multi does; > > * remove test_cgroup_attach.c itself. > > Signed-off-by: Andrey Ignatov <rdna@xxxxxx> > --- Acked-by: Andrii Nakryiko <andriin@xxxxxx> > tools/testing/selftests/bpf/.gitignore | 1 - > tools/testing/selftests/bpf/Makefile | 3 +- > .../bpf/prog_tests/cgroup_attach_autodetach.c | 111 ++++ > .../bpf/prog_tests/cgroup_attach_multi.c | 238 ++++++++ > .../bpf/prog_tests/cgroup_attach_override.c | 148 +++++ > .../selftests/bpf/test_cgroup_attach.c | 571 ------------------ > 6 files changed, 498 insertions(+), 574 deletions(-) > create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_attach_autodetach.c > create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c > create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_attach_override.c > delete mode 100644 tools/testing/selftests/bpf/test_cgroup_attach.c > [...]
