| Message ID | 9aa7b3c2c2bcfe9e92cff66789e787f63f539c77.1700652422.git.geliang.tang@suse.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | add helpers and vars in mptcp_lib.sh | expand |
| Context | Check | Description |
|---|---|---|
| matttbe/KVM_Validation__normal__except_selftest_mptcp_join_ | success | Success! ✅ |
| matttbe/KVM_Validation__debug__except_selftest_mptcp_join_ | success | Success! ✅ |
| matttbe/KVM_Validation__debug__only_selftest_mptcp_join_ | success | Success! ✅ |
| matttbe/KVM_Validation__normal__only_selftest_mptcp_join_ | success | Success! ✅ |
| matttbe/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 49 lines checked |
| matttbe/build | success | Build and static analysis OK |
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh index b5a17d2b6723..f646fede9872 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 6311deaeab8b..7bde17ffe20b 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 da209af098a8..f49aa59ca326 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -20,8 +20,6 @@ capout="" ksft_skip=4 iptables="iptables" ip6tables="ip6tables" -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 215dfae871e5..0f5dad2ba3b8 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -26,6 +26,9 @@ TEST_COUNT=0 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 839ce692e099..139b3aff4c4f 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)) iptables="iptables" ip6tables="ip6tables" diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh index 67643ffc5c08..a598deaf890b 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=""
Move the variables 'timeout_poll' and 'timeout_test' into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang <geliang.tang@suse.com> --- 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(-)