Jakub Kicinski kuba@kernel.org writes:
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:
If we see weird errors in CI, it might be because tests now run in a different order and previously masked missed cleanups are now exposed.
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 Signed-off-by: Jakub Kicinski kuba@kernel.org
Reviewed-by: Petr Machata petrm@nvidia.com
But there's a missed nit below.
diff --git a/tools/testing/selftests/drivers/net/dsa/Makefile b/tools/testing/selftests/drivers/net/dsa/Makefile index cd6817fe5be6..699e3565d735 100644 --- a/tools/testing/selftests/drivers/net/dsa/Makefile +++ b/tools/testing/selftests/drivers/net/dsa/Makefile @@ -9,11 +9,13 @@ TEST_PROGS = bridge_locked_port.sh \
This should have the header converted as well:
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 \