| Message ID | 4365c81198f62521344c2215909634407184387e.1573821726.git.jbenc@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] selftests: bpf: xdping is not meant to be run standalone | expand |
Jiri Benc <jbenc@redhat.com> writes: > The actual test to run is test_xdping.sh, which is already in TEST_PROGS. > The xdping program alone is not runnable with 'make run_tests', it > immediatelly fails due to missing arguments. > > Move xdping to TEST_GEN_PROGS_EXTENDED in order to be built but not run. > > Fixes: cd5385029f1d ("selftests/bpf: measure RTT from xdp using xdping") > Cc: Alan Maguire <alan.maguire@oracle.com> > Signed-off-by: Jiri Benc <jbenc@redhat.com> Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
On Fri, 15 Nov 2019, Toke Høiland-Jørgensen wrote: > Jiri Benc <jbenc@redhat.com> writes: > > > The actual test to run is test_xdping.sh, which is already in TEST_PROGS. > > The xdping program alone is not runnable with 'make run_tests', it > > immediatelly fails due to missing arguments. > > > > Move xdping to TEST_GEN_PROGS_EXTENDED in order to be built but not run. > > > > Fixes: cd5385029f1d ("selftests/bpf: measure RTT from xdp using xdping") > > Cc: Alan Maguire <alan.maguire@oracle.com> > > Signed-off-by: Jiri Benc <jbenc@redhat.com> > > Acked-by: Toke Høiland-Jørgensen <toke@redhat.com> > > Reviewed-by: Alan Maguire <alan.maguire@oracle.com>
On 11/15/19 1:42 PM, Jiri Benc wrote: > The actual test to run is test_xdping.sh, which is already in TEST_PROGS. > The xdping program alone is not runnable with 'make run_tests', it > immediatelly fails due to missing arguments. > > Move xdping to TEST_GEN_PROGS_EXTENDED in order to be built but not run. > > Fixes: cd5385029f1d ("selftests/bpf: measure RTT from xdp using xdping") > Cc: Alan Maguire <alan.maguire@oracle.com> > Signed-off-by: Jiri Benc <jbenc@redhat.com> Any objections if I take this to bpf-next as otherwise this will create an ugly merge conflict between bpf and bpf-next given selftests have been heavily reworked in there. Thanks, Daniel
On Fri, 15 Nov 2019 23:06:13 +0100, Daniel Borkmann wrote: > Any objections if I take this to bpf-next as otherwise this will create an ugly > merge conflict between bpf and bpf-next given selftests have been heavily reworked > in there. Should I resend against bpf-next? Jiri
On 11/18/19 9:18 AM, Jiri Benc wrote: > On Fri, 15 Nov 2019 23:06:13 +0100, Daniel Borkmann wrote: >> Any objections if I take this to bpf-next as otherwise this will create an ugly >> merge conflict between bpf and bpf-next given selftests have been heavily reworked >> in there. > > Should I resend against bpf-next? I can take care of it today, no need. Thanks, Daniel
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 6889c19a628c..99193a241bc7 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \ test_cgroup_storage test_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ - test_btf_dump test_cgroup_attach xdping + test_btf_dump test_cgroup_attach BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES) @@ -82,7 +82,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \ # Compile but not part of 'make run_tests' TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ - test_lirc_mode2_user + test_lirc_mode2_user xdping include ../lib.mk
The actual test to run is test_xdping.sh, which is already in TEST_PROGS. The xdping program alone is not runnable with 'make run_tests', it immediatelly fails due to missing arguments. Move xdping to TEST_GEN_PROGS_EXTENDED in order to be built but not run. Fixes: cd5385029f1d ("selftests/bpf: measure RTT from xdp using xdping") Cc: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Jiri Benc <jbenc@redhat.com> --- tools/testing/selftests/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)