Skip to content

Commit a9649df

Browse files
matttbekuba-moo
authored andcommitted
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: c912f93 ("selftests: mptcp: join: validate new laminar endp") Reviewed-by: Geliang Tang <geliang@kernel.org> Signed-off-by: Matthieu 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: Jakub Kicinski <kuba@kernel.org>
1 parent c3496c0 commit a9649df

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ laminar_endp_tests()
23242324
{
23252325
# no laminar endpoints: routing rules are used
23262326
if reset_with_tcp_filter "without a laminar endpoint" ns1 10.0.2.2 REJECT &&
2327-
mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
2327+
continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
23282328
pm_nl_set_limits $ns1 0 2
23292329
pm_nl_set_limits $ns2 2 2
23302330
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2336,7 +2336,7 @@ laminar_endp_tests()
23362336

23372337
# laminar endpoints: this endpoint is used
23382338
if reset_with_tcp_filter "with a laminar endpoint" ns1 10.0.2.2 REJECT &&
2339-
mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
2339+
continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
23402340
pm_nl_set_limits $ns1 0 2
23412341
pm_nl_set_limits $ns2 2 2
23422342
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2348,7 +2348,7 @@ laminar_endp_tests()
23482348

23492349
# laminar endpoints: these endpoints are used
23502350
if reset_with_tcp_filter "with multiple laminar endpoints" ns1 10.0.2.2 REJECT &&
2351-
mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
2351+
continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
23522352
pm_nl_set_limits $ns1 0 2
23532353
pm_nl_set_limits $ns2 2 2
23542354
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2363,7 +2363,7 @@ laminar_endp_tests()
23632363

23642364
# laminar endpoints: only one endpoint is used
23652365
if reset_with_tcp_filter "single laminar endpoint" ns1 10.0.2.2 REJECT &&
2366-
mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
2366+
continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
23672367
pm_nl_set_limits $ns1 0 2
23682368
pm_nl_set_limits $ns2 2 2
23692369
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2376,7 +2376,7 @@ laminar_endp_tests()
23762376

23772377
# laminar endpoints: subflow and laminar flags
23782378
if reset_with_tcp_filter "sublow + laminar endpoints" ns1 10.0.2.2 REJECT &&
2379-
mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
2379+
continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
23802380
pm_nl_set_limits $ns1 0 4
23812381
pm_nl_set_limits $ns2 2 4
23822382
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

0 commit comments

Comments
 (0)