Commit a12fd5c3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

selftests: net: run groups from fcnal-test in parallel 



fcnal-test.sh takes almost hour and a half to finish.
The tests are already grouped into ipv4, ipv6 and other.
Run those groups separately.

Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250908201021.270681-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3b4296f5

tools/testing/selftests/net/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -8,11 +8,12 @@ CFLAGS += -I../ 


TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \

	      rtnetlink.sh xfrm_policy.sh

TEST_PROGS += fcnal-ipv4.sh fcnal-ipv6.sh fcnal-other.sh

TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh ip_defrag.sh

TEST_PROGS += udpgso_bench.sh fib_rule_tests.sh msg_zerocopy.sh psock_snd.sh

TEST_PROGS += udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh reuseport_addr_any.sh

TEST_PROGS += test_vxlan_fdb_changelink.sh so_txtime.sh ipv6_flowlabel.sh

TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh l2tp.sh traceroute.sh

TEST_PROGS += tcp_fastopen_backup_key.sh l2tp.sh traceroute.sh

TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh fib_nexthop_nongw.sh

TEST_PROGS += altnames.sh icmp.sh icmp_redirect.sh ip6_gre_headroom.sh

TEST_PROGS += route_localnet.sh
@@ -128,6 +129,7 @@ TEST_GEN_FILES += $(YNL_GEN_FILES) 
TEST_GEN_PROGS += $(YNL_GEN_PROGS)



TEST_FILES := settings

TEST_FILES += fcnal-test.sh

TEST_FILES += in_netns.sh lib.sh setup_loopback.sh setup_veth.sh



TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c))

tools/testing/selftests/net/fcnal-ipv4.sh

0 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/bin/sh

./fcnal-test.sh -t ipv4

tools/testing/selftests/net/fcnal-ipv6.sh

0 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/bin/sh

./fcnal-test.sh -t ipv6

tools/testing/selftests/net/fcnal-other.sh

0 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/bin/sh

./fcnal-test.sh -t other

tools/testing/selftests/net/fcnal-test.sh

+3 −0
Original line number Diff line number Diff line
@@ -4272,6 +4272,7 @@ EOF 
TESTS_IPV4="ipv4_ping ipv4_tcp ipv4_udp ipv4_bind ipv4_runtime ipv4_netfilter"

TESTS_IPV6="ipv6_ping ipv6_tcp ipv6_udp ipv6_bind ipv6_runtime ipv6_netfilter"

TESTS_OTHER="use_cases"

# note: each TEST_ group needs a dedicated runner, e.g. fcnal-ipv4.sh



PAUSE_ON_FAIL=no

PAUSE=no
@@ -4302,6 +4303,8 @@ elif [ "$TESTS" = "ipv4" ]; then 
	TESTS="$TESTS_IPV4"

elif [ "$TESTS" = "ipv6" ]; then

	TESTS="$TESTS_IPV6"

elif [ "$TESTS" = "other" ]; then

	TESTS="$TESTS_OTHER"

fi



check_gen_prog "nettest"