Move the variables 'timeout_poll' and 'timeout_test' into mptcp_lib.sh
as public variables.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 --
tools/testing/selftests/net/mptcp/simult_flows.sh | 2 --
6 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 216123547131..1752cf292588 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,8 +5,6 @@
mptcp_lib_ns_init
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
flush_pids()
{
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index a3f864cb0a02..356cbb2289be 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -9,8 +9,6 @@ optstring="S:R:d:e:l:r:h4cm:f:tC"
final_ret=0
cin_disconnect=""
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
ipv6=true
ethtool_random_on=true
tc_delay="$((RANDOM%50))"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index db254496b43a..824f2a3ed7c2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -18,8 +18,6 @@ cinsent=""
tmpfile=""
capout=""
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
ip_mptcp=0
check_invert=0
validate_checksum=false
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 8c7f181768b3..1f1e8c5e9540 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -26,6 +26,9 @@ TEST_NAME=""
capture=false
checksum=false
+readonly timeout_poll=30
+timeout_test=$((timeout_poll * 2 + 1))
+
MPTCP_LIB_SUBTESTS=()
sin=$(mktemp)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index ec829165d562..3305f1a7249b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -4,8 +4,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
mptcp_lib_ns_init
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 34981e88e129..dd249ba32cc2 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -5,8 +5,6 @@
mptcp_lib_ns_init
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
bail=0
slack=50
large=""
--
2.35.3