On Tue, Nov 04, 2025 at 02:38:57PM -0800, Bobby Eshleman wrote:
From: Bobby Eshleman bobbyeshleman@meta.com
Add check_result() function to reuse logic for incrementing the pass/fail counters. This function will get used by different callers as we add different types of tests in future patches (namely, namespace and non-namespace tests will be called at different places, and re-use this function).
Reviewed-by: Simon Horman horms@kernel.org Signed-off-by: Bobby Eshleman bobbyeshleman@meta.com
tools/testing/selftests/vsock/vmtest.sh | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index 940e1260de28..4ce93cef32e9 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -78,6 +78,26 @@ die() { exit "${KSFT_FAIL}" }
+check_result() {
- local rc num
- rc=$1
- num=$(( cnt_total + 1 ))
Can we just increment `cnt_total` here and avoid `num` at all?
- if [[ ${rc} -eq $KSFT_PASS ]]; then
cnt_pass=$(( cnt_pass + 1 ))echo "ok ${num} ${arg}"
Where `${arg}` is assigned?
- elif [[ ${rc} -eq $KSFT_SKIP ]]; then
cnt_skip=$(( cnt_skip + 1 ))echo "ok ${num} ${arg} # SKIP"- elif [[ ${rc} -eq $KSFT_FAIL ]]; then
cnt_fail=$(( cnt_fail + 1 ))echo "not ok ${num} ${arg} # exit=$rc"- fi
- cnt_total=$(( cnt_total + 1 ))
+}
vm_ssh() { ssh -q -o UserKnownHostsFile=/dev/null -p ${SSH_HOST_PORT} localhost "$@" return $? @@ -510,17 +530,7 @@ cnt_total=0 for arg in "${ARGS[@]}"; do run_test "${arg}" rc=$?
- if [[ ${rc} -eq $KSFT_PASS ]]; then
cnt_pass=$(( cnt_pass + 1 ))echo "ok ${cnt_total} ${arg}"- elif [[ ${rc} -eq $KSFT_SKIP ]]; then
cnt_skip=$(( cnt_skip + 1 ))echo "ok ${cnt_total} ${arg} # SKIP"- elif [[ ${rc} -eq $KSFT_FAIL ]]; then
cnt_fail=$(( cnt_fail + 1 ))echo "not ok ${cnt_total} ${arg} # exit=$rc"- fi
- cnt_total=$(( cnt_total + 1 ))
- check_result ${rc}
Oh, so the arg is in this scope. mmm, can we pass it as parameter?
Stefano
done
terminate_pidfiles "${pidfile}"
-- 2.47.3