Skip to content

Commit

Permalink
selftests: mptcp: diag: skip if MPTCP is not supported
Browse files Browse the repository at this point in the history
stable inclusion
from stable-5.10.183
commit 4f8356ab74dde51d17d75eb18abd75c95968d242
category: bugfix
issue: #I8Y5GC
CVE: NA

Signed-off-by: wanxiaoqing <[email protected]>
---------------------------------------

commit 46565acdd29facbf418a11e4a3791b3c8967308d upstream.

Selftests are supposed to run on any kernels, including the old ones not
supporting MPTCP.

A new check is then added to make sure MPTCP is supported. If not, the
test stops and is marked as "skipped".

Link: multipath-tcp/mptcp_net-next#368
Fixes: df62f2e ("selftests/mptcp: add diag interface tests")
Cc: [email protected]
Acked-by: Paolo Abeni <[email protected]>
Signed-off-by: Matthieu Baerts <[email protected]>
Signed-off-by: Paolo Abeni <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: wanxiaoqing <[email protected]>
  • Loading branch information
matttbe authored and wanxiaoqing committed Jan 23, 2024
1 parent 79a8c17 commit b99e5ef
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tools/testing/selftests/net/mptcp/diag.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0

. "$(dirname "${0}")/mptcp_lib.sh"

rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns="ns1-$rndh"
ksft_skip=4
Expand Down Expand Up @@ -28,6 +30,8 @@ cleanup()
done
}

mptcp_lib_check_mptcp

ip -Version > /dev/null 2>&1
if [ $? -ne 0 ];then
echo "SKIP: Could not run test without ip tool"
Expand Down

0 comments on commit b99e5ef

Please sign in to comment.