Skip to content

Commit 37848a4

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: connect: also cover alt modes
The "mmap" and "sendfile" alternate modes for mptcp_connect.sh/.c are available from the beginning, but only tested when mptcp_connect.sh is manually launched with "-m mmap" or "-m sendfile", not via the kselftests helpers. The MPTCP CI was manually running "mptcp_connect.sh -m mmap", but not "-m sendfile". Plus other CIs, especially the ones validating the stable releases, were not validating these alternate modes. To make sure these modes are validated by these CIs, add two new test programs executing mptcp_connect.sh with the alternate modes. Fixes: 048d19d ("mptcp: add basic kselftest for mptcp") Cc: [email protected] Reviewed-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 81e0db8 commit 37848a4

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

tools/testing/selftests/net/mptcp/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ top_srcdir = ../../../../..
44

55
CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
66

7-
TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
7+
TEST_PROGS := mptcp_connect.sh mptcp_connect_mmap.sh mptcp_connect_sendfile.sh \
8+
pm_netlink.sh mptcp_join.sh diag.sh \
89
simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
910

1011
TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq mptcp_diag
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# SPDX-License-Identifier: GPL-2.0
3+
4+
MPTCP_LIB_KSFT_TEST="$(basename "${0}" .sh)" \
5+
"$(dirname "${0}")/mptcp_connect.sh" -m mmap "${@}"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
# SPDX-License-Identifier: GPL-2.0
3+
4+
MPTCP_LIB_KSFT_TEST="$(basename "${0}" .sh)" \
5+
"$(dirname "${0}")/mptcp_connect.sh" -m sendfile "${@}"

0 commit comments

Comments
 (0)