[PATCH mptcp-net 0/2] Fixes for "selftests: mptcp: connect: cover alt modes"

[PATCH mptcp-net 0/2] Fixes for "selftests: mptcp: connect: cover alt modes"

[Matthieu Baerts (NGI0)]

Without that, all mptcp_connect*.sh subtests have the same name, e.g.

  mptcp_connect: ping tests  ## from mptcp_connect.sh
  mptcp_connect: ping tests  ## from mptcp_connect_checksum.sh
  mptcp_connect: ping tests  ## from mptcp_connect_mmap.sh
  mptcp_connect: ping tests  ## from mptcp_connect_sendfile.sh

In such case, the CI will only see one subtest, not 4 different ones.

To fix that, MPTCP_LIB_KSFT_TEST env var can simply be set.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (2):
      Squash to "selftests: mptcp: connect: also cover alt modes"
      Squash to "selftests: mptcp: connect: also cover checksum"

 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh | 3 ++-
 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh     | 3 ++-
 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
base-commit: 422cf93634436650f6ea5dacb37f1edfed7ab3c9
change-id: 20250715-selftests-mptcp-connect-modes-fixes-61383574b42a

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

[PATCH mptcp-net 1/2] Squash to "selftests: mptcp: connect: also cover alt modes"

[Matthieu Baerts (NGI0)]

Without that, all mptcp_connect*.sh subtests have the same name, e.g.

  mptcp_connect: ping tests  ## from mptcp_connect.sh
  mptcp_connect: ping tests  ## from mptcp_connect_checksum.sh
  mptcp_connect: ping tests  ## from mptcp_connect_mmap.sh
  mptcp_connect: ping tests  ## from mptcp_connect_sendfile.sh

In such case, the CI will only see one subtest, not 4 different ones.

To fix that, MPTCP_LIB_KSFT_TEST env var can simply be set.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh     | 3 ++-
 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
index 09bde1303bf79198fe9f7890cbe89901859d78e8..5dd30f9394af6a88b14936a64c50ac9566be2e6e 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
-"$(dirname "${0}")/mptcp_connect.sh" -m mmap "${@}"
+MPTCP_LIB_KSFT_TEST="$(basename "${0}" .sh)" \
+	"$(dirname "${0}")/mptcp_connect.sh" -m mmap "${@}"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh
index c50d08481581f0f8997c6f4f2174d606150bfa6a..1d16fb1cc9bb6d1f88a9fdc11206237ca2b790bb 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
-"$(dirname "${0}")/mptcp_connect.sh" -m sendfile "${@}"
+MPTCP_LIB_KSFT_TEST="$(basename "${0}" .sh)" \
+	"$(dirname "${0}")/mptcp_connect.sh" -m sendfile "${@}"

-- 
2.48.1

[PATCH mptcp-net 2/2] Squash to "selftests: mptcp: connect: also cover checksum"

[Matthieu Baerts (NGI0)]

Without that, all mptcp_connect*.sh subtests have the same name, e.g.

  mptcp_connect: ping tests  ## from mptcp_connect.sh
  mptcp_connect: ping tests  ## from mptcp_connect_checksum.sh
  mptcp_connect: ping tests  ## from mptcp_connect_mmap.sh
  mptcp_connect: ping tests  ## from mptcp_connect_sendfile.sh

In such case, the CI will only see one subtest, not 4 different ones.

To fix that, MPTCP_LIB_KSFT_TEST env var can simply be set.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh b/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
index 569340d4f00ae2e4655b30220bcfce695549a686..ce93ec2f107fba2a699387188932a2680bc9ded7 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
-"$(dirname "${0}")/mptcp_connect.sh" -C "${@}"
+MPTCP_LIB_KSFT_TEST="$(basename "${0}" .sh)" \
+	"$(dirname "${0}")/mptcp_connect.sh" -C "${@}"

-- 
2.48.1

Re: [PATCH mptcp-net 0/2] Fixes for "selftests: mptcp: connect: cover alt modes"

[Geliang Tang]

Hi Matt,

On Tue, 2025-07-15 at 11:49 +0200, Matthieu Baerts (NGI0) wrote:
> Without that, all mptcp_connect*.sh subtests have the same name, e.g.
> 
>   mptcp_connect: ping tests  ## from mptcp_connect.sh
>   mptcp_connect: ping tests  ## from mptcp_connect_checksum.sh
>   mptcp_connect: ping tests  ## from mptcp_connect_mmap.sh
>   mptcp_connect: ping tests  ## from mptcp_connect_sendfile.sh
> 
> In such case, the CI will only see one subtest, not 4 different ones.
> 
> To fix that, MPTCP_LIB_KSFT_TEST env var can simply be set.
> 
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

LGTM!

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

Thanks,
-Geliang

> ---
> Matthieu Baerts (NGI0) (2):
>       Squash to "selftests: mptcp: connect: also cover alt modes"
>       Squash to "selftests: mptcp: connect: also cover checksum"
> 
>  tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh | 3 ++-
>  tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh     | 3 ++-
>  tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh | 3 ++-
>  3 files changed, 6 insertions(+), 3 deletions(-)
> ---
> base-commit: 422cf93634436650f6ea5dacb37f1edfed7ab3c9
> change-id: 20250715-selftests-mptcp-connect-modes-fixes-61383574b42a
> 
> Best regards,

Re: [PATCH mptcp-net 0/2] Fixes for "selftests: mptcp: connect: cover alt modes"

[Matthieu Baerts]

Hi Geliang,

On 15/07/2025 11:52, Geliang Tang wrote:
> Hi Matt,
> 
> On Tue, 2025-07-15 at 11:49 +0200, Matthieu Baerts (NGI0) wrote:
>> Without that, all mptcp_connect*.sh subtests have the same name, e.g.
>>
>>   mptcp_connect: ping tests  ## from mptcp_connect.sh
>>   mptcp_connect: ping tests  ## from mptcp_connect_checksum.sh
>>   mptcp_connect: ping tests  ## from mptcp_connect_mmap.sh
>>   mptcp_connect: ping tests  ## from mptcp_connect_sendfile.sh
>>
>> In such case, the CI will only see one subtest, not 4 different ones.
>>
>> To fix that, MPTCP_LIB_KSFT_TEST env var can simply be set.
>>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> LGTM!
> 
> Reviewed-by: Geliang Tang <geliang@kernel.org>

Thank you for the quick review!

Now in our tree:

New patches for t/upstream-net and t/upstream:
- b3ad2903fba4: "squashed" patch 1/2 in "selftests: mptcp: connect: also
cover alt modes"
- 66d7601242b5: "squashed" patch 2/2 in "selftests: mptcp: connect: also
cover checksum"
- Results: c38c723b6c8e..dc8fe14f5e8b (export-net)
- Results: 422cf9363443..a5f1eec0881b (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/d202fc514d0d69e212781052c8ca20c6990f11f3/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/8a2039d246ee0028762f2304f8878e433afab20d/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.