Skip to content

Commit 53b2fb6

Browse files
committed
Merge branch 'selftests-mptcp-connect-cover-alt-modes'
Matthieu Baerts says: ==================== selftests: mptcp: connect: cover alt modes mptcp_connect.sh can be executed manually with "-m <MODE>" and "-C" to make sure everything works as expected when using "mmap" and "sendfile" modes instead of "poll", and with the MPTCP checksum support. These modes should be validated, but they are not when the selftests are executed via the kselftest helpers. It means that most CIs validating these selftests, like NIPA for the net development trees and LKFT for the stable ones, are not covering these modes. To fix that, new test programs have been added, simply calling mptcp_connect.sh with the right parameters. The first patch can be backported up to v5.6, and the second one up to v5.14. v1: https://lore.kernel.org/[email protected] ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 81e0db8 + fdf0f60 commit 53b2fb6

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-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+
mptcp_connect_checksum.sh 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" -C "${@}"
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)