Now that test_progs is shaping into more generic test framework, let's convert sockopt tests to it. This requires adding a helper to create and join a cgroup first (test__join_cgroup). Since we already hijack stdout/stderr that shouldn't be a problem (cgroup helpers log to stderr). The rest of the patches just move sockopt tests files under prog_tests/ and do the required small adjustments. v2: * don't create a subtest per sockopt test, too verbose (Alexei Starovoitov) Stanislav Fomichev (6): selftests/bpf: test_progs: add test__join_cgroup helper selftests/bpf: test_progs: convert test_sockopt selftests/bpf: test_progs: convert test_sockopt_sk selftests/bpf: test_progs: convert test_sockopt_multi selftests/bpf: test_progs: convert test_sockopt_inherit selftests/bpf: test_progs: convert test_tcp_rtt tools/testing/selftests/bpf/.gitignore | 5 - tools/testing/selftests/bpf/Makefile | 12 +-- .../{test_sockopt.c => prog_tests/sockopt.c} | 50 ++------- .../sockopt_inherit.c} | 102 ++++++++---------- .../sockopt_multi.c} | 62 ++--------- .../sockopt_sk.c} | 60 +++-------- .../{test_tcp_rtt.c => prog_tests/tcp_rtt.c} | 83 +++++--------- tools/testing/selftests/bpf/test_progs.c | 38 +++++++ tools/testing/selftests/bpf/test_progs.h | 4 +- 9 files changed, 142 insertions(+), 274 deletions(-) rename tools/testing/selftests/bpf/{test_sockopt.c => prog_tests/sockopt.c} (96%) rename tools/testing/selftests/bpf/{test_sockopt_inherit.c => prog_tests/sockopt_inherit.c} (72%) rename tools/testing/selftests/bpf/{test_sockopt_multi.c => prog_tests/sockopt_multi.c} (83%) rename tools/testing/selftests/bpf/{test_sockopt_sk.c => prog_tests/sockopt_sk.c} (79%) rename tools/testing/selftests/bpf/{test_tcp_rtt.c => prog_tests/tcp_rtt.c} (76%) -- 2.23.0.187.g17f5b7556c-goog