On Tue, Oct 15, 2019 at 10:50 PM Andrii Nakryiko <andriin@xxxxxx> wrote: > > test_progs is much more sophisticated superset of tests compared to > test_libbpf.sh and test_libbpf_open. Remove test_libbpf.sh and > test_libbpf_open. > > Signed-off-by: Andrii Nakryiko <andriin@xxxxxx> > --- > tools/testing/selftests/bpf/.gitignore | 2 - > tools/testing/selftests/bpf/Makefile | 3 +- > tools/testing/selftests/bpf/test_libbpf | Bin 0 -> 384568 bytes > tools/testing/selftests/bpf/test_libbpf.sh | 43 ------------------- > tools/testing/selftests/bpf/test_libbpf_open | Bin 0 -> 396096 bytes well this was certainly not intended, sorry about that > 5 files changed, 1 insertion(+), 47 deletions(-) > create mode 100755 tools/testing/selftests/bpf/test_libbpf > delete mode 100755 tools/testing/selftests/bpf/test_libbpf.sh > create mode 100755 tools/testing/selftests/bpf/test_libbpf_open > > diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore > index c51f356f84b5..55d2adf64832 100644 > --- a/tools/testing/selftests/bpf/.gitignore > +++ b/tools/testing/selftests/bpf/.gitignore > @@ -11,7 +11,6 @@ test_dev_cgroup > test_tcpbpf_user > test_verifier_log > feature > -test_libbpf_open > test_sock > test_sock_addr > test_sock_fields > @@ -30,7 +29,6 @@ flow_dissector_load > test_netcnt > test_section_names > test_tcpnotify_user > -test_libbpf > test_tcp_check_syncookie_user > test_sysctl > libbpf.pc > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index db8c842ade73..9d7422a514c5 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -52,7 +52,6 @@ TEST_FILES = > > # Order correspond to 'make run_tests' order > TEST_PROGS := test_kmod.sh \ > - test_libbpf.sh \ > test_xdp_redirect.sh \ > test_xdp_meta.sh \ > test_xdp_veth.sh \ > @@ -79,7 +78,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \ > test_xdp_vlan.sh > > # Compile but not part of 'make run_tests' > -TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \ > +TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \ > flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ > test_lirc_mode2_user > > diff --git a/tools/testing/selftests/bpf/test_libbpf b/tools/testing/selftests/bpf/test_libbpf > new file mode 100755 > index 0000000000000000000000000000000000000000..af5e18b8353486db7156dc81ac25b9eab3720370 > GIT binary patch > literal 384568 > zcmd44e|%KM)jz%gB0<rOiW*z35w(I<8h>CxQ5R)(LDBdlidH3nASgd#ND!>iU`U(m oops