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

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: default avatarAntonio Quartulli <antonio@openvpn.net>
Acked-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Acked-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/20251003210127.1021918-1-kuba@kernel.org


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

tools/testing/selftests/drivers/net/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ TEST_GEN_FILES := \ 
# end of TEST_GEN_FILES



TEST_PROGS := \

	hds.py \

	napi_id.py \

	napi_threaded.py \

	netcons_basic.sh \
@@ -21,9 +22,8 @@ TEST_PROGS := \ 
	ping.py \

	psp.py \

	queues.py \

	stats.py \

	shaper.py \

	hds.py \

	stats.py \

	xdp.py \

# end of TEST_PROGS

tools/testing/selftests/drivers/net/bonding/Makefile

+12 −9
Original line number Diff line number Diff line
@@ -4,24 +4,27 @@ 
TEST_PROGS := \

	bond-arp-interval-causes-panic.sh \

	bond-break-lacpdu-tx.sh \

	bond-eth-type-change.sh \

	bond-lladdr-target.sh \

	bond_ipsec_offload.sh \

	bond_lacp_prio.sh \

	bond_macvlan_ipvlan.sh \

	bond_options.sh \

	bond_passive_lacp.sh \

	dev_addr_lists.sh \

	mode-1-recovery-updelay.sh \

	mode-2-recovery-updelay.sh \

	bond_options.sh \

	bond-eth-type-change.sh \

	bond_macvlan_ipvlan.sh \

	bond_passive_lacp.sh \

	bond_lacp_prio.sh

	bond_ipsec_offload.sh

# end of TEST_PROGS



TEST_FILES := \

	lag_lib.sh \

	bond_topo_2d1c.sh \

	bond_topo_3d1c.sh

	bond_topo_3d1c.sh \

	lag_lib.sh \

# end of TEST_FILES



TEST_INCLUDES := \

	../../../net/lib.sh \

	../../../net/forwarding/lib.sh \

	../../../net/lib.sh

# end of TEST_INCLUDES



include ../../../lib.mk

tools/testing/selftests/drivers/net/dsa/Makefile

+8 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+ OR MIT



TEST_PROGS = bridge_locked_port.sh \

TEST_PROGS := \

	bridge_locked_port.sh \

	bridge_mdb.sh \

	bridge_mld.sh \

	bridge_vlan_aware.sh \
@@ -9,11 +10,13 @@ TEST_PROGS = bridge_locked_port.sh \ 
	local_termination.sh \

	no_forwarding.sh \

	tc_actions.sh \

	test_bridge_fdb_stress.sh

	test_bridge_fdb_stress.sh \

# end of TEST_PROGS



TEST_FILES := \

	forwarding.config \

	run_net_forwarding_test.sh \

	forwarding.config

# end of TEST_FILES



TEST_INCLUDES := \

	../../../net/forwarding/bridge_locked_port.sh \
@@ -27,6 +30,7 @@ TEST_INCLUDES := \ 
	../../../net/forwarding/no_forwarding.sh \

	../../../net/forwarding/tc_actions.sh \

	../../../net/forwarding/tc_common.sh \

	../../../net/lib.sh

	../../../net/lib.sh \

# end of TEST_INCLUDES



include ../../../lib.mk

tools/testing/selftests/drivers/net/hw/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ TEST_FILES := \ 
TEST_INCLUDES := \

	$(wildcard lib/py/*.py ../lib/py/*.py) \

	../../../net/lib.sh \

	../../../net/forwarding/lib.sh \

	../../../net/forwarding/ipip_lib.sh \

	../../../net/forwarding/lib.sh \

	../../../net/forwarding/tc_common.sh \

	#
@@ -45,7 +45,11 @@ TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c)) 
include ../../../lib.mk



# YNL build

YNL_GENS := ethtool netdev

YNL_GENS := \

	ethtool \

	netdev \

# end of YNL_GENS



include ../../../net/ynl.mk



include ../../../net/bpf.mk

tools/testing/selftests/drivers/net/netdevsim/Makefile

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+ OR MIT



TEST_PROGS = devlink.sh \

TEST_PROGS := \

	devlink.sh \

	devlink_in_netns.sh \

	devlink_trap.sh \

	ethtool-coalesce.sh \
@@ -17,5 +18,6 @@ TEST_PROGS = devlink.sh \ 
	psample.sh \

	tc-mq-visibility.sh \

	udp_tunnel_nic.sh \

# end of TEST_PROGS



include ../../../lib.mk