[PATCH mptcp-next] Squash to "selftests: mptcp: test last time mptcp_info"

Geliang Tang posted 1 patch 1 month ago
Failed in applying to current master (apply log)
tools/testing/selftests/net/mptcp/diag.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
[PATCH mptcp-next] Squash to "selftests: mptcp: test last time mptcp_info"
Posted by Geliang Tang 1 month ago
From: Geliang Tang <tanggeliang@kylinos.cn>

Fix shellcheck errors. Fix a typo, cnt, not cnt1.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/diag.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 3d60e6544e5f..1c72e328ee34 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -214,15 +214,16 @@ chk_msk_info()
 	local port="${1}"
 	local info="${2}"
 	local cnt="${3}"
-	local now=$(msk_info_get_value ${port} "${info}")
-	local delta_ms=250
+	local now delta_ms=250
+
+	now=$(msk_info_get_value ${port} "${info}")
 
 	mptcp_lib_print_title "....chk ${info}"
 	if { [ -z "${cnt}" ] || [ -z "${now}" ]; } &&
 	   ! mptcp_lib_expect_all_features; then
 		mptcp_lib_pr_skip "Feature probably not supported"
 		mptcp_lib_result_skip "${info}"
-	elif [ "$((cnt1 + ${delta_ms}))" -lt "${now}" ]; then
+	elif [ "$((cnt + delta_ms))" -lt "${now}" ]; then
 		mptcp_lib_pr_ok
 		mptcp_lib_result_pass "${info}"
 	else
@@ -236,9 +237,11 @@ chk_msk_info()
 chk_last_time_info()
 {
 	local port="${1}"
-	local cnt1=$(msk_info_get_value ${port} "last_data_sent")
-	local cnt2=$(msk_info_get_value ${port} "last_data_recv")
-	local cnt3=$(msk_info_get_value ${port} "last_ack_recv")
+	local cnt1 cnt2 cnt3
+
+	cnt1=$(msk_info_get_value ${port} "last_data_sent")
+	cnt2=$(msk_info_get_value ${port} "last_data_recv")
+	cnt3=$(msk_info_get_value ${port} "last_ack_recv")
 
 	sleep 0.5
 
-- 
2.40.1