Message ID | 710932d51dcc62eaf27963a7cbdc69f27bcfd026.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, 46 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 4279bb59939d..c7a7c0d2792c 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,7 +5,6 @@ mptcp_lib_ns_init ksft_skip=4 -TEST_COUNT=0 timeout_poll=100 timeout_test=$((timeout_poll * 2 + 1)) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh index f4f7112a06bd..a52784a14b76 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -123,7 +123,6 @@ done mptcp_lib_ns_init -TEST_COUNT=0 TEST_GROUP="" cleanup() diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 7b9e3e3ea8c4..eac5485616b1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -40,8 +40,6 @@ declare -A all_tests declare -a only_tests_ids declare -a only_tests_names declare -A failed_tests -TEST_COUNT=0 -TEST_NAME="" nr_blank=6 # These var are used only in some tests, make sure they are not already set diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh index 2d28d0980b85..070c277cad4c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -20,6 +20,9 @@ MPTCP_LIB_LISTENER_CLOSED=16 #MPTCP_EVENT_LISTENER_CLOSED readonly AF_INET=2 readonly AF_INET6=10 +TEST_NAME="" +TEST_COUNT=0 + MPTCP_LIB_SUBTESTS=() # only if supported (or forced) and not disabled, see no-color.org diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh index a9e14698c179..e1f4ddf04bc3 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -8,7 +8,6 @@ capture=false ksft_skip=4 timeout_poll=30 timeout_test=$((timeout_poll * 2 + 1)) -TEST_COUNT=0 bail=0 slack=50 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh index f1fc0a4f3624..9ed8cafde8f3 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -41,8 +41,6 @@ client_addr_id=${RANDOM:0:2} server_addr_id=${RANDOM:0:2} mptcp_lib_ns_init -TEST_NAME="" -TEST_COUNT=0 _printf() { stdbuf -o0 -e0 printf "${@}"
Move the variables 'TEST_NAME' and 'TEST_COUNT' into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang <geliang.tang@suse.com> --- tools/testing/selftests/net/mptcp/diag.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_connect.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++ tools/testing/selftests/net/mptcp/simult_flows.sh | 1 - tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 -- 6 files changed, 3 insertions(+), 7 deletions(-)