tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

selftests: net: unify the Makefile formats

We get a significant number of conflicts between net and net-next
because of selftests Makefile changes. People tend to append new
test cases at the end of the Makefile when there's no clear sort
order. Sort all networking selftests Makefiles, use the following
format:

VAR_NAME := \
entry1 \
entry2 \
entry3 \
# end of VAR_NAME

Some Makefiles are already pretty close to this.

Acked-by: Antonio Quartulli <antonio@openvpn.net>
Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Acked-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/20251003210127.1021918-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Jakub Kicinski f07f91a3 2aa74c62

+382 -241
+2 -2
tools/testing/selftests/drivers/net/Makefile
··· 10 10 # end of TEST_GEN_FILES 11 11 12 12 TEST_PROGS := \ 13 + hds.py \ 13 14 napi_id.py \ 14 15 napi_threaded.py \ 15 16 netcons_basic.sh \ ··· 22 21 ping.py \ 23 22 psp.py \ 24 23 queues.py \ 25 - stats.py \ 26 24 shaper.py \ 27 - hds.py \ 25 + stats.py \ 28 26 xdp.py \ 29 27 # end of TEST_PROGS 30 28
+12 -9
tools/testing/selftests/drivers/net/bonding/Makefile
··· 4 4 TEST_PROGS := \ 5 5 bond-arp-interval-causes-panic.sh \ 6 6 bond-break-lacpdu-tx.sh \ 7 + bond-eth-type-change.sh \ 7 8 bond-lladdr-target.sh \ 9 + bond_ipsec_offload.sh \ 10 + bond_lacp_prio.sh \ 11 + bond_macvlan_ipvlan.sh \ 12 + bond_options.sh \ 13 + bond_passive_lacp.sh \ 8 14 dev_addr_lists.sh \ 9 15 mode-1-recovery-updelay.sh \ 10 16 mode-2-recovery-updelay.sh \ 11 - bond_options.sh \ 12 - bond-eth-type-change.sh \ 13 - bond_macvlan_ipvlan.sh \ 14 - bond_passive_lacp.sh \ 15 - bond_lacp_prio.sh 16 - bond_ipsec_offload.sh 17 + # end of TEST_PROGS 17 18 18 19 TEST_FILES := \ 19 - lag_lib.sh \ 20 20 bond_topo_2d1c.sh \ 21 - bond_topo_3d1c.sh 21 + bond_topo_3d1c.sh \ 22 + lag_lib.sh \ 23 + # end of TEST_FILES 22 24 23 25 TEST_INCLUDES := \ 26 + ../../../net/lib.sh \ 24 27 ../../../net/forwarding/lib.sh \ 25 - ../../../net/lib.sh 28 + # end of TEST_INCLUDES 26 29 27 30 include ../../../lib.mk
+8 -4
tools/testing/selftests/drivers/net/dsa/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0+ OR MIT 2 2 3 - TEST_PROGS = bridge_locked_port.sh \ 3 + TEST_PROGS := \ 4 + bridge_locked_port.sh \ 4 5 bridge_mdb.sh \ 5 6 bridge_mld.sh \ 6 7 bridge_vlan_aware.sh \ ··· 10 9 local_termination.sh \ 11 10 no_forwarding.sh \ 12 11 tc_actions.sh \ 13 - test_bridge_fdb_stress.sh 12 + test_bridge_fdb_stress.sh \ 13 + # end of TEST_PROGS 14 14 15 15 TEST_FILES := \ 16 + forwarding.config \ 16 17 run_net_forwarding_test.sh \ 17 - forwarding.config 18 + # end of TEST_FILES 18 19 19 20 TEST_INCLUDES := \ 20 21 ../../../net/forwarding/bridge_locked_port.sh \ ··· 30 27 ../../../net/forwarding/no_forwarding.sh \ 31 28 ../../../net/forwarding/tc_actions.sh \ 32 29 ../../../net/forwarding/tc_common.sh \ 33 - ../../../net/lib.sh 30 + ../../../net/lib.sh \ 31 + # end of TEST_INCLUDES 34 32 35 33 include ../../../lib.mk
+6 -2
tools/testing/selftests/drivers/net/hw/Makefile
··· 32 32 TEST_INCLUDES := \ 33 33 $(wildcard lib/py/*.py ../lib/py/*.py) \ 34 34 ../../../net/lib.sh \ 35 - ../../../net/forwarding/lib.sh \ 36 35 ../../../net/forwarding/ipip_lib.sh \ 36 + ../../../net/forwarding/lib.sh \ 37 37 ../../../net/forwarding/tc_common.sh \ 38 38 # 39 39 ··· 45 45 include ../../../lib.mk 46 46 47 47 # YNL build 48 - YNL_GENS := ethtool netdev 48 + YNL_GENS := \ 49 + ethtool \ 50 + netdev \ 51 + # end of YNL_GENS 52 + 49 53 include ../../../net/ynl.mk 50 54 51 55 include ../../../net/bpf.mk
+3 -1
tools/testing/selftests/drivers/net/netdevsim/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0+ OR MIT 2 2 3 - TEST_PROGS = devlink.sh \ 3 + TEST_PROGS := \ 4 + devlink.sh \ 4 5 devlink_in_netns.sh \ 5 6 devlink_trap.sh \ 6 7 ethtool-coalesce.sh \ ··· 18 17 psample.sh \ 19 18 tc-mq-visibility.sh \ 20 19 udp_tunnel_nic.sh \ 20 + # end of TEST_PROGS 21 21 22 22 include ../../../lib.mk
+8 -3
tools/testing/selftests/drivers/net/team/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 # Makefile for net selftests 3 3 4 - TEST_PROGS := dev_addr_lists.sh propagation.sh options.sh 4 + TEST_PROGS := \ 5 + dev_addr_lists.sh \ 6 + options.sh \ 7 + propagation.sh \ 8 + # end of TEST_PROGS 5 9 6 10 TEST_INCLUDES := \ 7 11 ../bonding/lag_lib.sh \ 8 12 ../../../net/forwarding/lib.sh \ 9 - ../../../net/lib.sh \ 10 13 ../../../net/in_netns.sh \ 11 - ../../../net/lib/sh/defer.sh 14 + ../../../net/lib.sh \ 15 + ../../../net/lib/sh/defer.sh \ 16 + # end of TEST_INCLUDES 12 17 13 18 include ../../../lib.mk
+5 -8
tools/testing/selftests/drivers/net/virtio_net/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0+ OR MIT 2 2 3 - TEST_PROGS = basic_features.sh \ 4 - # 3 + TEST_PROGS = basic_features.sh 5 4 6 - TEST_FILES = \ 7 - virtio_net_common.sh \ 8 - # 5 + TEST_FILES = virtio_net_common.sh 9 6 10 7 TEST_INCLUDES = \ 11 - ../../../net/forwarding/lib.sh \ 12 - ../../../net/lib.sh \ 13 - # 8 + ../../../net/forwarding/lib.sh \ 9 + ../../../net/lib.sh \ 10 + # end of TEST_INCLUDES 14 11 15 12 include ../../../lib.mk
+191 -122
tools/testing/selftests/net/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 # Makefile for net selftests 3 3 4 - CFLAGS += -Wall -Wl,--no-as-needed -O2 -g 4 + CFLAGS += -Wall -Wl,--no-as-needed -O2 -g 5 5 CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) 6 6 # Additional include paths needed by kselftest.h 7 7 CFLAGS += -I../ 8 8 9 - TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \ 10 - rtnetlink.sh xfrm_policy.sh 11 - TEST_PROGS += fcnal-ipv4.sh fcnal-ipv6.sh fcnal-other.sh 12 - TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh ip_defrag.sh 13 - TEST_PROGS += udpgso_bench.sh fib_rule_tests.sh msg_zerocopy.sh psock_snd.sh 14 - TEST_PROGS += udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh reuseport_addr_any.sh 15 - TEST_PROGS += test_vxlan_fdb_changelink.sh so_txtime.sh ipv6_flowlabel.sh 16 - TEST_PROGS += tcp_fastopen_backup_key.sh l2tp.sh traceroute.sh 17 - TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh fib_nexthop_nongw.sh 18 - TEST_PROGS += altnames.sh icmp.sh icmp_redirect.sh ip6_gre_headroom.sh 19 - TEST_PROGS += route_localnet.sh 20 - TEST_PROGS += reuseaddr_ports_exhausted.sh 21 - TEST_PROGS += txtimestamp.sh 22 - TEST_PROGS += vrf-xfrm-tests.sh 23 - TEST_PROGS += rxtimestamp.sh 24 - TEST_PROGS += drop_monitor_tests.sh 25 - TEST_PROGS += vrf_route_leaking.sh 26 - TEST_PROGS += bareudp.sh 27 - TEST_PROGS += amt.sh 28 - TEST_PROGS += unicast_extensions.sh 29 - TEST_PROGS += udpgro_fwd.sh 30 - TEST_PROGS += udpgro_frglist.sh 31 - TEST_PROGS += nat6to4.sh 32 - TEST_PROGS += veth.sh 33 - TEST_PROGS += ioam6.sh 34 - TEST_PROGS += gro.sh 35 - TEST_PROGS += gre_gso.sh 36 - TEST_PROGS += gre_ipv6_lladdr.sh 37 - TEST_PROGS += cmsg_so_mark.sh 38 - TEST_PROGS += cmsg_so_priority.sh 39 - TEST_PROGS += test_so_rcv.sh 40 - TEST_PROGS += cmsg_time.sh cmsg_ip.sh 41 - TEST_PROGS += netns-name.sh 42 - TEST_PROGS += link_netns.py 43 - TEST_PROGS += nl_netdev.py 44 - TEST_PROGS += rtnetlink.py 45 - TEST_PROGS += rtnetlink_notification.sh 46 - TEST_PROGS += srv6_end_dt46_l3vpn_test.sh 47 - TEST_PROGS += srv6_end_dt4_l3vpn_test.sh 48 - TEST_PROGS += srv6_end_dt6_l3vpn_test.sh 49 - TEST_PROGS += srv6_hencap_red_l3vpn_test.sh 50 - TEST_PROGS += srv6_hl2encap_red_l2vpn_test.sh 51 - TEST_PROGS += srv6_end_next_csid_l3vpn_test.sh 52 - TEST_PROGS += srv6_end_x_next_csid_l3vpn_test.sh 53 - TEST_PROGS += srv6_end_flavors_test.sh 54 - TEST_PROGS += srv6_end_dx4_netfilter_test.sh 55 - TEST_PROGS += srv6_end_dx6_netfilter_test.sh 56 - TEST_PROGS += vrf_strict_mode_test.sh 57 - TEST_PROGS += arp_ndisc_evict_nocarrier.sh 58 - TEST_PROGS += ndisc_unsolicited_na_test.sh 59 - TEST_PROGS += arp_ndisc_untracked_subnets.sh 60 - TEST_PROGS += stress_reuseport_listen.sh 61 - TEST_PROGS += l2_tos_ttl_inherit.sh 62 - TEST_PROGS += bind_bhash.sh 63 - TEST_PROGS += ip_local_port_range.sh 64 - TEST_PROGS += rps_default_mask.sh 65 - TEST_PROGS += big_tcp.sh 66 - TEST_PROGS += netns-sysctl.sh 67 - TEST_PROGS += netdev-l2addr.sh 68 - TEST_PROGS_EXTENDED := toeplitz_client.sh toeplitz.sh xfrm_policy_add_speed.sh 69 - TEST_GEN_FILES = socket nettest 70 - TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any 71 - TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite 72 - TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx ip_defrag 73 - TEST_GEN_FILES += so_txtime ipv6_flowlabel ipv6_flowlabel_mgr so_netns_cookie 74 - TEST_GEN_FILES += tcp_fastopen_backup_key 75 - TEST_GEN_FILES += fin_ack_lat 76 - TEST_GEN_FILES += reuseaddr_ports_exhausted 77 - TEST_GEN_FILES += hwtstamp_config rxtimestamp timestamping txtimestamp 78 - TEST_GEN_FILES += ipsec 79 - TEST_GEN_FILES += ioam6_parser 80 - TEST_GEN_FILES += gro 81 - TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa 82 - TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls tun tap epoll_busy_poll 83 - TEST_GEN_FILES += toeplitz 84 - TEST_GEN_FILES += cmsg_sender 85 - TEST_GEN_FILES += stress_reuseport_listen 86 - TEST_GEN_FILES += so_rcv_listener 87 - TEST_PROGS += test_vxlan_vnifiltering.sh 88 - TEST_GEN_FILES += io_uring_zerocopy_tx 89 - TEST_PROGS += io_uring_zerocopy_tx.sh 90 - TEST_GEN_FILES += bind_bhash 91 - TEST_GEN_PROGS += sk_bind_sendto_listen 92 - TEST_GEN_PROGS += sk_connect_zero_addr 93 - TEST_GEN_PROGS += sk_so_peek_off 94 - TEST_PROGS += test_ingress_egress_chaining.sh 95 - TEST_GEN_PROGS += so_incoming_cpu 96 - TEST_PROGS += sctp_vrf.sh 97 - TEST_GEN_FILES += sctp_hello 98 - TEST_GEN_FILES += ip_local_port_range 99 - TEST_GEN_PROGS += bind_wildcard 100 - TEST_GEN_PROGS += bind_timewait 101 - TEST_PROGS += test_vxlan_mdb.sh 102 - TEST_PROGS += test_bridge_neigh_suppress.sh 103 - TEST_PROGS += test_vxlan_nh.sh 104 - TEST_PROGS += test_vxlan_nolocalbypass.sh 105 - TEST_PROGS += test_bridge_backup_port.sh 106 - TEST_PROGS += test_neigh.sh 107 - TEST_PROGS += fdb_flush.sh fdb_notify.sh 108 - TEST_PROGS += fq_band_pktlimit.sh 109 - TEST_PROGS += vlan_hw_filter.sh 110 - TEST_PROGS += vlan_bridge_binding.sh 111 - TEST_PROGS += bpf_offload.py 112 - TEST_PROGS += ipv6_route_update_soft_lockup.sh 113 - TEST_PROGS += busy_poll_test.sh 114 - TEST_GEN_PROGS += proc_net_pktgen 115 - TEST_PROGS += lwt_dst_cache_ref_loop.sh 116 - TEST_PROGS += skf_net_off.sh 117 - TEST_GEN_FILES += skf_net_off 118 - TEST_GEN_FILES += tfo 119 - TEST_PROGS += tfo_passive.sh 120 - TEST_PROGS += broadcast_ether_dst.sh 121 - TEST_PROGS += broadcast_pmtu.sh 122 - TEST_PROGS += ipv6_force_forwarding.sh 123 - TEST_GEN_PROGS += ipv6_fragmentation 124 - TEST_PROGS += route_hint.sh 125 - TEST_GEN_PROGS += tcp_port_share 9 + TEST_PROGS := \ 10 + altnames.sh \ 11 + amt.sh \ 12 + arp_ndisc_evict_nocarrier.sh \ 13 + arp_ndisc_untracked_subnets.sh \ 14 + bareudp.sh \ 15 + big_tcp.sh \ 16 + bind_bhash.sh \ 17 + bpf_offload.py \ 18 + broadcast_ether_dst.sh \ 19 + broadcast_pmtu.sh \ 20 + busy_poll_test.sh \ 21 + cmsg_ip.sh \ 22 + cmsg_so_mark.sh \ 23 + cmsg_so_priority.sh \ 24 + cmsg_time.sh \ 25 + drop_monitor_tests.sh \ 26 + fcnal-ipv4.sh \ 27 + fcnal-ipv6.sh \ 28 + fcnal-other.sh \ 29 + fdb_flush.sh \ 30 + fdb_notify.sh \ 31 + fib-onlink-tests.sh \ 32 + fib_nexthop_multiprefix.sh \ 33 + fib_nexthop_nongw.sh \ 34 + fib_nexthops.sh \ 35 + fib_rule_tests.sh \ 36 + fib_tests.sh \ 37 + fin_ack_lat.sh \ 38 + fq_band_pktlimit.sh \ 39 + gre_gso.sh \ 40 + gre_ipv6_lladdr.sh \ 41 + gro.sh \ 42 + icmp.sh \ 43 + icmp_redirect.sh \ 44 + io_uring_zerocopy_tx.sh \ 45 + ioam6.sh \ 46 + ip6_gre_headroom.sh \ 47 + ip_defrag.sh \ 48 + ip_local_port_range.sh \ 49 + ipv6_flowlabel.sh \ 50 + ipv6_force_forwarding.sh \ 51 + ipv6_route_update_soft_lockup.sh \ 52 + l2_tos_ttl_inherit.sh \ 53 + l2tp.sh \ 54 + link_netns.py \ 55 + lwt_dst_cache_ref_loop.sh \ 56 + msg_zerocopy.sh \ 57 + nat6to4.sh \ 58 + ndisc_unsolicited_na_test.sh \ 59 + netdev-l2addr.sh \ 60 + netdevice.sh \ 61 + netns-name.sh \ 62 + netns-sysctl.sh \ 63 + nl_netdev.py \ 64 + pmtu.sh \ 65 + psock_snd.sh \ 66 + reuseaddr_ports_exhausted.sh \ 67 + reuseport_addr_any.sh \ 68 + route_hint.sh \ 69 + route_localnet.sh \ 70 + rps_default_mask.sh \ 71 + rtnetlink.py \ 72 + rtnetlink.sh \ 73 + rtnetlink_notification.sh \ 74 + run_afpackettests \ 75 + run_netsocktests \ 76 + rxtimestamp.sh \ 77 + sctp_vrf.sh \ 78 + skf_net_off.sh \ 79 + so_txtime.sh \ 80 + srv6_end_dt46_l3vpn_test.sh \ 81 + srv6_end_dt4_l3vpn_test.sh \ 82 + srv6_end_dt6_l3vpn_test.sh \ 83 + srv6_end_dx4_netfilter_test.sh \ 84 + srv6_end_dx6_netfilter_test.sh \ 85 + srv6_end_flavors_test.sh \ 86 + srv6_end_next_csid_l3vpn_test.sh \ 87 + srv6_end_x_next_csid_l3vpn_test.sh \ 88 + srv6_hencap_red_l3vpn_test.sh \ 89 + srv6_hl2encap_red_l2vpn_test.sh \ 90 + stress_reuseport_listen.sh \ 91 + tcp_fastopen_backup_key.sh \ 92 + test_bpf.sh \ 93 + test_bridge_backup_port.sh \ 94 + test_bridge_neigh_suppress.sh \ 95 + test_ingress_egress_chaining.sh \ 96 + test_neigh.sh \ 97 + test_so_rcv.sh \ 98 + test_vxlan_fdb_changelink.sh \ 99 + test_vxlan_mdb.sh \ 100 + test_vxlan_nh.sh \ 101 + test_vxlan_nolocalbypass.sh \ 102 + test_vxlan_under_vrf.sh \ 103 + test_vxlan_vnifiltering.sh \ 104 + tfo_passive.sh \ 105 + traceroute.sh \ 106 + txtimestamp.sh \ 107 + udpgro.sh \ 108 + udpgro_bench.sh \ 109 + udpgro_frglist.sh \ 110 + udpgro_fwd.sh \ 111 + udpgso.sh \ 112 + udpgso_bench.sh \ 113 + unicast_extensions.sh \ 114 + veth.sh \ 115 + vlan_bridge_binding.sh \ 116 + vlan_hw_filter.sh \ 117 + vrf-xfrm-tests.sh \ 118 + vrf_route_leaking.sh \ 119 + vrf_strict_mode_test.sh \ 120 + xfrm_policy.sh \ 121 + # end of TEST_PROGS 122 + 123 + TEST_PROGS_EXTENDED := \ 124 + toeplitz.sh \ 125 + toeplitz_client.sh \ 126 + xfrm_policy_add_speed.sh \ 127 + # end of TEST_PROGS_EXTENDED 128 + 129 + TEST_GEN_FILES := \ 130 + bind_bhash \ 131 + cmsg_sender \ 132 + fin_ack_lat \ 133 + gro \ 134 + hwtstamp_config \ 135 + io_uring_zerocopy_tx \ 136 + ioam6_parser \ 137 + ip_defrag \ 138 + ip_local_port_range \ 139 + ipsec \ 140 + ipv6_flowlabel \ 141 + ipv6_flowlabel_mgr \ 142 + msg_zerocopy \ 143 + nettest \ 144 + psock_fanout \ 145 + psock_snd \ 146 + psock_tpacket \ 147 + reuseaddr_ports_exhausted \ 148 + reuseport_addr_any \ 149 + rxtimestamp \ 150 + sctp_hello \ 151 + skf_net_off \ 152 + so_netns_cookie \ 153 + so_rcv_listener \ 154 + so_txtime \ 155 + socket \ 156 + stress_reuseport_listen \ 157 + tcp_fastopen_backup_key \ 158 + tcp_inq \ 159 + tcp_mmap \ 160 + tfo \ 161 + timestamping \ 162 + toeplitz \ 163 + txring_overwrite \ 164 + txtimestamp \ 165 + udpgso \ 166 + udpgso_bench_rx \ 167 + udpgso_bench_tx \ 168 + # end of TEST_GEN_FILES 169 + 170 + TEST_GEN_PROGS := \ 171 + bind_timewait \ 172 + bind_wildcard \ 173 + epoll_busy_poll \ 174 + ipv6_fragmentation \ 175 + proc_net_pktgen \ 176 + reuseaddr_conflict \ 177 + reuseport_bpf \ 178 + reuseport_bpf_cpu \ 179 + reuseport_bpf_numa \ 180 + reuseport_dualstack \ 181 + sk_bind_sendto_listen \ 182 + sk_connect_zero_addr \ 183 + sk_so_peek_off \ 184 + so_incoming_cpu \ 185 + tap \ 186 + tcp_port_share \ 187 + tls \ 188 + tun \ 189 + # end of TEST_GEN_PROGS 190 + 191 + TEST_FILES := \ 192 + fcnal-test.sh \ 193 + in_netns.sh \ 194 + lib.sh \ 195 + settings \ 196 + setup_loopback.sh \ 197 + setup_veth.sh \ 198 + # end of TEST_FILES 126 199 127 200 # YNL files, must be before "include ..lib.mk" 128 201 YNL_GEN_FILES := busy_poller 129 202 YNL_GEN_PROGS := netlink-dumps 130 203 TEST_GEN_FILES += $(YNL_GEN_FILES) 131 204 TEST_GEN_PROGS += $(YNL_GEN_PROGS) 132 - 133 - TEST_FILES := settings 134 - TEST_FILES += fcnal-test.sh 135 - TEST_FILES += in_netns.sh lib.sh setup_loopback.sh setup_veth.sh 136 205 137 206 TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c)) 138 207
+9 -1
tools/testing/selftests/net/af_unix/Makefile
··· 1 1 CFLAGS += $(KHDR_INCLUDES) -Wall -Wflex-array-member-not-at-end 2 - TEST_GEN_PROGS := diag_uid msg_oob scm_inq scm_pidfd scm_rights unix_connect 2 + 3 + TEST_GEN_PROGS := \ 4 + diag_uid \ 5 + msg_oob \ 6 + scm_inq \ 7 + scm_pidfd \ 8 + scm_rights \ 9 + unix_connect \ 10 + # end of TEST_GEN_PROGS 3 11 4 12 include ../../lib.mk
+31 -27
tools/testing/selftests/net/forwarding/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0+ OR MIT 2 2 3 - TEST_PROGS = \ 3 + TEST_PROGS := \ 4 4 bridge_activity_notify.sh \ 5 5 bridge_fdb_learning_limit.sh \ 6 + bridge_fdb_local_vlan_0.sh \ 6 7 bridge_igmp.sh \ 7 8 bridge_locked_port.sh \ 8 - bridge_fdb_local_vlan_0.sh \ 9 9 bridge_mdb.sh \ 10 10 bridge_mdb_host.sh \ 11 11 bridge_mdb_max.sh \ ··· 21 21 gre_custom_multipath_hash.sh \ 22 22 gre_inner_v4_multipath.sh \ 23 23 gre_inner_v6_multipath.sh \ 24 - gre_multipath_nh_res.sh \ 25 - gre_multipath_nh.sh \ 26 24 gre_multipath.sh \ 25 + gre_multipath_nh.sh \ 26 + gre_multipath_nh_res.sh \ 27 27 ip6_forward_instats_vrf.sh \ 28 28 ip6gre_custom_multipath_hash.sh \ 29 + ip6gre_flat.sh \ 29 30 ip6gre_flat_key.sh \ 30 31 ip6gre_flat_keys.sh \ 31 - ip6gre_flat.sh \ 32 + ip6gre_hier.sh \ 32 33 ip6gre_hier_key.sh \ 33 34 ip6gre_hier_keys.sh \ 34 - ip6gre_hier.sh \ 35 35 ip6gre_inner_v4_multipath.sh \ 36 36 ip6gre_inner_v6_multipath.sh \ 37 + ipip_flat_gre.sh \ 37 38 ipip_flat_gre_key.sh \ 38 39 ipip_flat_gre_keys.sh \ 39 - ipip_flat_gre.sh \ 40 + ipip_hier_gre.sh \ 40 41 ipip_hier_gre_key.sh \ 41 42 ipip_hier_gre_keys.sh \ 42 - ipip_hier_gre.sh \ 43 43 lib_sh_test.sh \ 44 44 local_termination.sh \ 45 45 min_max_mtu.sh \ 46 + mirror_gre.sh \ 46 47 mirror_gre_bound.sh \ 47 48 mirror_gre_bridge_1d.sh \ 48 49 mirror_gre_bridge_1d_vlan.sh \ 49 - mirror_gre_bridge_1q_lag.sh \ 50 50 mirror_gre_bridge_1q.sh \ 51 + mirror_gre_bridge_1q_lag.sh \ 51 52 mirror_gre_changes.sh \ 52 53 mirror_gre_flower.sh \ 53 54 mirror_gre_lag_lacp.sh \ 54 55 mirror_gre_neigh.sh \ 55 56 mirror_gre_nh.sh \ 56 - mirror_gre.sh \ 57 - mirror_gre_vlan_bridge_1q.sh \ 58 57 mirror_gre_vlan.sh \ 58 + mirror_gre_vlan_bridge_1q.sh \ 59 59 mirror_vlan.sh \ 60 60 no_forwarding.sh \ 61 61 pedit_dsfield.sh \ 62 62 pedit_ip.sh \ 63 63 pedit_l4port.sh \ 64 - q_in_vni_ipv6.sh \ 65 64 q_in_vni.sh \ 65 + q_in_vni_ipv6.sh \ 66 + router.sh \ 66 67 router_bridge.sh \ 67 68 router_bridge_1d.sh \ 68 69 router_bridge_1d_lag.sh \ 69 70 router_bridge_lag.sh \ 71 + router_bridge_pvid_vlan_upper.sh \ 70 72 router_bridge_vlan.sh \ 71 73 router_bridge_vlan_upper.sh \ 72 - router_bridge_pvid_vlan_upper.sh \ 73 74 router_bridge_vlan_upper_pvid.sh \ 74 75 router_broadcast.sh \ 75 - router_mpath_nh_res.sh \ 76 76 router_mpath_nh.sh \ 77 + router_mpath_nh_res.sh \ 77 78 router_mpath_seed.sh \ 78 79 router_multicast.sh \ 79 80 router_multipath.sh \ 80 81 router_nh.sh \ 81 - router.sh \ 82 82 router_vid_1.sh \ 83 83 sch_ets.sh \ 84 84 sch_red.sh \ ··· 88 88 skbedit_priority.sh \ 89 89 tc_actions.sh \ 90 90 tc_chains.sh \ 91 - tc_flower_router.sh \ 92 91 tc_flower.sh \ 93 - tc_flower_l2_miss.sh \ 94 92 tc_flower_cfm.sh \ 93 + tc_flower_l2_miss.sh \ 95 94 tc_flower_port_range.sh \ 95 + tc_flower_router.sh \ 96 96 tc_mpls_l2vpn.sh \ 97 97 tc_police.sh \ 98 98 tc_shblocks.sh \ 99 99 tc_tunnel_key.sh \ 100 100 tc_vlan_modify.sh \ 101 - vxlan_asymmetric_ipv6.sh \ 102 101 vxlan_asymmetric.sh \ 103 - vxlan_bridge_1d_ipv6.sh \ 104 - vxlan_bridge_1d_port_8472_ipv6.sh \ 105 - vxlan_bridge_1d_port_8472.sh \ 102 + vxlan_asymmetric_ipv6.sh \ 106 103 vxlan_bridge_1d.sh \ 104 + vxlan_bridge_1d_ipv6.sh \ 105 + vxlan_bridge_1d_port_8472.sh \ 106 + vxlan_bridge_1d_port_8472_ipv6.sh \ 107 + vxlan_bridge_1q.sh \ 107 108 vxlan_bridge_1q_ipv6.sh \ 108 109 vxlan_bridge_1q_mc_ul.sh \ 109 - vxlan_bridge_1q_port_8472_ipv6.sh \ 110 110 vxlan_bridge_1q_port_8472.sh \ 111 - vxlan_bridge_1q.sh \ 111 + vxlan_bridge_1q_port_8472_ipv6.sh \ 112 112 vxlan_reserved.sh \ 113 + vxlan_symmetric.sh \ 113 114 vxlan_symmetric_ipv6.sh \ 114 - vxlan_symmetric.sh 115 + # end of TEST_PROGS 115 116 116 - TEST_FILES := devlink_lib.sh \ 117 + TEST_FILES := \ 118 + devlink_lib.sh \ 117 119 fib_offload_lib.sh \ 118 120 forwarding.config.sample \ 119 121 ip6gre_lib.sh \ ··· 130 128 sch_ets_tests.sh \ 131 129 sch_tbf_core.sh \ 132 130 sch_tbf_etsprio.sh \ 133 - tc_common.sh 131 + tc_common.sh \ 132 + # end of TEST_FILES 134 133 135 134 TEST_INCLUDES := \ 135 + $(wildcard ../lib/sh/*.sh) \ 136 136 ../lib.sh \ 137 - $(wildcard ../lib/sh/*.sh) 137 + # end of TEST_INCLUDES 138 138 139 139 include ../../lib.mk
+5 -1
tools/testing/selftests/net/hsr/Makefile
··· 2 2 3 3 top_srcdir = ../../../../.. 4 4 5 - TEST_PROGS := hsr_ping.sh hsr_redbox.sh 5 + TEST_PROGS := \ 6 + hsr_ping.sh \ 7 + hsr_redbox.sh \ 8 + # end of TEST_PROGS 9 + 6 10 TEST_FILES += hsr_common.sh 7 11 8 12 include ../../lib.mk
+9 -5
tools/testing/selftests/net/lib/Makefile
··· 5 5 # Additional include paths needed by kselftest.h 6 6 CFLAGS += -I../../ 7 7 8 - TEST_FILES := ../../../../../Documentation/netlink/specs 9 - TEST_FILES += ../../../../net/ynl 8 + TEST_FILES := \ 9 + ../../../../net/ynl \ 10 + ../../../../../Documentation/netlink/specs \ 11 + # end of TEST_FILES 10 12 11 - TEST_GEN_FILES += csum 12 - TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c)) 13 - TEST_GEN_FILES += xdp_helper 13 + TEST_GEN_FILES := \ 14 + $(patsubst %.c,%.o,$(wildcard *.bpf.c)) \ 15 + csum \ 16 + xdp_helper \ 17 + # end of TEST_GEN_FILES 14 18 15 19 TEST_INCLUDES := $(wildcard py/*.py sh/*.sh) 16 20
+23 -5
tools/testing/selftests/net/mptcp/Makefile
··· 4 4 5 5 CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES) 6 6 7 - TEST_PROGS := mptcp_connect.sh mptcp_connect_mmap.sh mptcp_connect_sendfile.sh \ 8 - mptcp_connect_checksum.sh pm_netlink.sh mptcp_join.sh diag.sh \ 9 - simult_flows.sh mptcp_sockopt.sh userspace_pm.sh 7 + TEST_PROGS := \ 8 + diag.sh \ 9 + mptcp_connect.sh \ 10 + mptcp_connect_checksum.sh \ 11 + mptcp_connect_mmap.sh \ 12 + mptcp_connect_sendfile.sh \ 13 + mptcp_join.sh \ 14 + mptcp_sockopt.sh \ 15 + pm_netlink.sh \ 16 + simult_flows.sh \ 17 + userspace_pm.sh \ 18 + # end of TEST_PROGS 10 19 11 - TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq mptcp_diag 20 + TEST_GEN_FILES := \ 21 + mptcp_connect \ 22 + mptcp_diag \ 23 + mptcp_inq \ 24 + mptcp_sockopt \ 25 + pm_nl_ctl \ 26 + # end of TEST_GEN_FILES 12 27 13 - TEST_FILES := mptcp_lib.sh settings 28 + TEST_FILES := \ 29 + mptcp_lib.sh \ 30 + settings \ 31 + # end of TEST_FILES 14 32 15 33 TEST_INCLUDES := ../lib.sh $(wildcard ../lib/sh/*.sh) 16 34
+49 -40
tools/testing/selftests/net/netfilter/Makefile
··· 6 6 MNL_CFLAGS := $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null) 7 7 MNL_LDLIBS := $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) 8 8 9 - TEST_PROGS := br_netfilter.sh bridge_brouter.sh 10 - TEST_PROGS += br_netfilter_queue.sh 11 - TEST_PROGS += conntrack_dump_flush.sh 12 - TEST_PROGS += conntrack_icmp_related.sh 13 - TEST_PROGS += conntrack_ipip_mtu.sh 14 - TEST_PROGS += conntrack_tcp_unreplied.sh 15 - TEST_PROGS += conntrack_resize.sh 16 - TEST_PROGS += conntrack_sctp_collision.sh 17 - TEST_PROGS += conntrack_vrf.sh 18 - TEST_PROGS += conntrack_clash.sh 19 - TEST_PROGS += conntrack_reverse_clash.sh 20 - TEST_PROGS += ipvs.sh 21 - TEST_PROGS += nf_conntrack_packetdrill.sh 22 - TEST_PROGS += nf_nat_edemux.sh 23 - TEST_PROGS += nft_audit.sh 24 - TEST_PROGS += nft_concat_range.sh 25 - TEST_PROGS += nft_conntrack_helper.sh 26 - TEST_PROGS += nft_fib.sh 27 - TEST_PROGS += nft_flowtable.sh 28 - TEST_PROGS += nft_interface_stress.sh 29 - TEST_PROGS += nft_meta.sh 30 - TEST_PROGS += nft_nat.sh 31 - TEST_PROGS += nft_nat_zones.sh 32 - TEST_PROGS += nft_queue.sh 33 - TEST_PROGS += nft_synproxy.sh 34 - TEST_PROGS += nft_tproxy_tcp.sh 35 - TEST_PROGS += nft_tproxy_udp.sh 36 - TEST_PROGS += nft_zones_many.sh 37 - TEST_PROGS += rpath.sh 38 - TEST_PROGS += vxlan_mtu_frag.sh 39 - TEST_PROGS += xt_string.sh 9 + TEST_PROGS := \ 10 + br_netfilter.sh \ 11 + br_netfilter_queue.sh \ 12 + bridge_brouter.sh \ 13 + conntrack_clash.sh \ 14 + conntrack_dump_flush.sh \ 15 + conntrack_icmp_related.sh \ 16 + conntrack_ipip_mtu.sh \ 17 + conntrack_resize.sh \ 18 + conntrack_reverse_clash.sh \ 19 + conntrack_sctp_collision.sh \ 20 + conntrack_tcp_unreplied.sh \ 21 + conntrack_vrf.sh \ 22 + ipvs.sh \ 23 + nf_conntrack_packetdrill.sh \ 24 + nf_nat_edemux.sh \ 25 + nft_audit.sh \ 26 + nft_concat_range.sh \ 27 + nft_conntrack_helper.sh \ 28 + nft_fib.sh \ 29 + nft_flowtable.sh \ 30 + nft_interface_stress.sh \ 31 + nft_meta.sh \ 32 + nft_nat.sh \ 33 + nft_nat_zones.sh \ 34 + nft_queue.sh \ 35 + nft_synproxy.sh \ 36 + nft_tproxy_tcp.sh \ 37 + nft_tproxy_udp.sh \ 38 + nft_zones_many.sh \ 39 + rpath.sh \ 40 + vxlan_mtu_frag.sh \ 41 + xt_string.sh \ 42 + # end of TEST_PROGS 40 43 41 44 TEST_PROGS_EXTENDED = nft_concat_range_perf.sh 42 45 43 - TEST_GEN_FILES = audit_logread 44 - TEST_GEN_FILES += connect_close nf_queue 45 - TEST_GEN_FILES += conntrack_dump_flush 46 - TEST_GEN_FILES += conntrack_reverse_clash 47 - TEST_GEN_FILES += sctp_collision 48 - TEST_GEN_FILES += udpclash 46 + TEST_GEN_FILES = \ 47 + audit_logread \ 48 + connect_close \ 49 + conntrack_dump_flush \ 50 + conntrack_reverse_clash \ 51 + nf_queue \ 52 + sctp_collision \ 53 + udpclash \ 54 + # end of TEST_GEN_FILES 49 55 50 56 include ../../lib.mk 51 57 ··· 62 56 $(OUTPUT)/conntrack_dump_flush: LDLIBS += $(MNL_LDLIBS) 63 57 $(OUTPUT)/udpclash: LDLIBS += -lpthread 64 58 65 - TEST_FILES := lib.sh 66 - TEST_FILES += packetdrill 59 + TEST_FILES := \ 60 + lib.sh \ 61 + packetdrill \ 62 + # end of TEST_FILES 67 63 68 64 TEST_INCLUDES := \ 65 + $(wildcard ../lib/sh/*.sh) \ 69 66 ../lib.sh \ 70 - $(wildcard ../lib/sh/*.sh) 67 + # end of TEST_INCLUDES
+7 -5
tools/testing/selftests/net/ovpn/Makefile
··· 19 19 20 20 TEST_FILES = common.sh 21 21 22 - TEST_PROGS = test.sh \ 23 - test-large-mtu.sh \ 22 + TEST_PROGS := \ 24 23 test-chachapoly.sh \ 25 - test-tcp.sh \ 26 - test-float.sh \ 24 + test-close-socket-tcp.sh \ 27 25 test-close-socket.sh \ 28 - test-close-socket-tcp.sh 26 + test-float.sh \ 27 + test-large-mtu.sh \ 28 + test-tcp.sh \ 29 + test.sh \ 30 + # end of TEST_PROGS 29 31 30 32 TEST_GEN_FILES := ovpn-cli 31 33
+6 -4
tools/testing/selftests/net/packetdrill/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 - TEST_INCLUDES := ksft_runner.sh \ 4 - defaults.sh \ 5 - set_sysctls.py \ 6 - ../../kselftest/ktap_helpers.sh 3 + TEST_INCLUDES := \ 4 + defaults.sh \ 5 + ksft_runner.sh \ 6 + set_sysctls.py \ 7 + ../../kselftest/ktap_helpers.sh \ 8 + # end of TEST_INCLUDES 7 9 8 10 TEST_PROGS := $(wildcard *.pkt) 9 11
+8 -2
tools/testing/selftests/net/rds/Makefile
··· 5 5 6 6 TEST_PROGS := run.sh 7 7 8 - TEST_FILES := include.sh test.py 8 + TEST_FILES := \ 9 + include.sh \ 10 + test.py \ 11 + # end of TEST_FILES 9 12 10 - EXTRA_CLEAN := /tmp/rds_logs include.sh 13 + EXTRA_CLEAN := \ 14 + include.sh \ 15 + /tmp/rds_logs \ 16 + # end of EXTRA_CLEAN 11 17 12 18 include ../../lib.mk