[PATCH mptcp-net 4/7] selftests: mptcp: join: mark implicit tests as skipped if not supported

Matthieu Baerts (NGI0) posted 7 patches 2 days, 16 hours ago
[PATCH mptcp-net 4/7] selftests: mptcp: join: mark implicit tests as skipped if not supported
Posted by Matthieu Baerts (NGI0) 2 days, 16 hours ago
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: 36c4127ae8dd ("selftests: mptcp: join: skip implicit tests if not supported")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 59983aed2591..b2a8c51a3969 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3939,7 +3939,7 @@ endpoint_tests()
 	# subflow_rebuild_header is needed to support the implicit flag
 	# userspace pm type prevents add_addr
 	if reset "implicit EP" &&
-	   mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
+	   continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
 		pm_nl_set_limits $ns1 2 2
 		pm_nl_set_limits $ns2 2 2
 		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -3964,7 +3964,7 @@ endpoint_tests()
 	fi
 
 	if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2 REJECT OUTPUT &&
-	   mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
+	   continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
 		start_events
 		pm_nl_set_limits $ns1 0 3
 		pm_nl_set_limits $ns2 0 3

-- 
2.51.0
Re: [PATCH mptcp-net 4/7] selftests: mptcp: join: mark implicit tests as skipped if not supported
Posted by Geliang Tang 20 hours ago
Hi Matt,

On Wed, 2025-10-08 at 15:59 +0200, Matthieu Baerts (NGI0) wrote:
> 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: 36c4127ae8dd ("selftests: mptcp: join: skip implicit tests if
> not supported")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

This patch looks good to me.

Reviewed-by: Geliang Tang <geliang@kernel.org>

Thanks,
-Geliang

> ---
>  tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index 59983aed2591..b2a8c51a3969 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -3939,7 +3939,7 @@ endpoint_tests()
>  	# subflow_rebuild_header is needed to support the implicit
> flag
>  	# userspace pm type prevents add_addr
>  	if reset "implicit EP" &&
> -	   mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
> +	   continue_if mptcp_lib_kallsyms_has
> "subflow_rebuild_header$"; then
>  		pm_nl_set_limits $ns1 2 2
>  		pm_nl_set_limits $ns2 2 2
>  		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> @@ -3964,7 +3964,7 @@ endpoint_tests()
>  	fi
>  
>  	if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2
> REJECT OUTPUT &&
> -	   mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
> +	   continue_if mptcp_lib_kallsyms_has
> "subflow_rebuild_header$"; then
>  		start_events
>  		pm_nl_set_limits $ns1 0 3
>  		pm_nl_set_limits $ns2 0 3
>