Skip to content

Commit 6254031

Browse files
committed
Merge branch 'selftests-mptcp-misc-small-fixes'
Matthieu Baerts says: ==================== selftests: mptcp: misc. small fixes Here are some various fixes for the MPTCP selftests. Patch 1 fixes a recently modified test to continue to work as expected on older kernels. This is a fix for a recent fix that can be backported up to v5.15. Patch 2 and 3 include dependences when exporting or installing the tests. Two fixes for v6.11-rc1. ==================== Link: https://patch.msgid.link/20240910-net-selftests-mptcp-fix-install-v1-0-8f124aa9156d@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
2 parents d1aaaa2 + c66c08e commit 6254031

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

tools/testing/selftests/net/mptcp/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
1111

1212
TEST_FILES := mptcp_lib.sh settings
1313

14+
TEST_INCLUDES := ../lib.sh ../net_helper.sh
15+
1416
EXTRA_CLEAN := *.pcap
1517

1618
include ../../lib.mk

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3064,7 +3064,9 @@ fullmesh_tests()
30643064
pm_nl_set_limits $ns1 1 3
30653065
pm_nl_set_limits $ns2 1 3
30663066
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3067-
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,fullmesh
3067+
if mptcp_lib_kallsyms_has "mptcp_pm_subflow_check_next$"; then
3068+
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,fullmesh
3069+
fi
30683070
fullmesh=1 speed=slow \
30693071
run_tests $ns1 $ns2 10.0.1.1
30703072
chk_join_nr 3 3 3

0 commit comments

Comments
 (0)