selftests: mptcp: set FAILING_LINKS in run_tests

[ Upstream commit be7e9786c9155c2942cd53b813e4723be67e07c4 ]

Set FAILING_LINKS as an env var with a limited scope only when calling
run_tests().

Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230623-send-net-next-20230623-v1-3-a883213c8ba9@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 7cefbe5e1dac ("selftests: mptcp: fix fastclose with csum failure")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 9d8dde3b5c332544f696e5024a737814f9444463..2107579e2939d9a6004efc5589d8fc6f1a87c717 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2167,9 +2167,9 @@ link_failure_tests()
                pm_nl_set_limits $ns1 0 2
                pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
                pm_nl_set_limits $ns2 1 2
-               FAILING_LINKS="1"
                pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
-               run_tests $ns1 $ns2 10.0.1.1 1
+               FAILING_LINKS="1" \
+                       run_tests $ns1 $ns2 10.0.1.1 1
                chk_join_nr 2 2 2
                chk_add_nr 1 1
                chk_link_usage $ns2 ns2eth3 $cinsent 0
@@ -2183,8 +2183,8 @@ link_failure_tests()
                pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
                pm_nl_set_limits $ns2 1 2
                pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
-               FAILING_LINKS="1 2"
-               run_tests $ns1 $ns2 10.0.1.1 1
+               FAILING_LINKS="1 2" \
+                       run_tests $ns1 $ns2 10.0.1.1 1
                chk_join_nr 2 2 2
                chk_add_nr 1 1
                chk_stale_nr $ns2 2 4 2
@@ -2199,8 +2199,8 @@ link_failure_tests()
                pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
                pm_nl_set_limits $ns2 1 3
                pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
-               FAILING_LINKS="1 2"
-               run_tests $ns1 $ns2 10.0.1.1 2
+               FAILING_LINKS="1 2" \
+                       run_tests $ns1 $ns2 10.0.1.1 2
                chk_join_nr 2 2 2
                chk_add_nr 1 1
                chk_stale_nr $ns2 1 -1 2