Commit a9649dfb authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

selftests: mptcp: join: mark laminar tests as skipped if not supported 



The call to 'continue_if' was missing: it properly marks a subtest as
'skipped' if the attached condition is not valid.

Without that, the test is wrongly marked as passed on older kernels.

Fixes: c912f935 ("selftests: mptcp: join: validate new laminar endp")
Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251020-net-mptcp-c-flag-late-add-addr-v1-5-8207030cb0e8@kernel.org


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

tools/testing/selftests/net/mptcp/mptcp_join.sh

+5 −5
Original line number Diff line number Diff line
@@ -2324,7 +2324,7 @@ laminar_endp_tests() 
{

	# no laminar endpoints: routing rules are used

	if reset_with_tcp_filter "without a laminar endpoint" ns1 10.0.2.2 REJECT &&

	   mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

	   continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 2 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2336,7 +2336,7 @@ laminar_endp_tests() 


	# laminar endpoints: this endpoint is used

	if reset_with_tcp_filter "with a laminar endpoint" ns1 10.0.2.2 REJECT &&

	   mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

	   continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 2 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2348,7 +2348,7 @@ laminar_endp_tests() 


	# laminar endpoints: these endpoints are used

	if reset_with_tcp_filter "with multiple laminar endpoints" ns1 10.0.2.2 REJECT &&

	   mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

	   continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 2 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2363,7 +2363,7 @@ laminar_endp_tests() 


	# laminar endpoints: only one endpoint is used

	if reset_with_tcp_filter "single laminar endpoint" ns1 10.0.2.2 REJECT &&

	   mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

	   continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 2 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2376,7 +2376,7 @@ laminar_endp_tests() 


	# laminar endpoints: subflow and laminar flags

	if reset_with_tcp_filter "sublow + laminar endpoints" ns1 10.0.2.2 REJECT &&

	   mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

	   continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then

		pm_nl_set_limits $ns1 0 4

		pm_nl_set_limits $ns2 2 4

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal