From: Bobby Eshleman <[email protected]>

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).

Signed-off-by: Bobby Eshleman <[email protected]>
---
 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 99db2e415253..0957d6a41d08 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 ))
+
+       if [[ ${rc} -eq $KSFT_PASS ]]; then
+               cnt_pass=$(( cnt_pass + 1 ))
+               echo "ok ${num} ${arg}"
+       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 $?
@@ -521,17 +541,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}
 done
 
 terminate_pidfiles "${pidfile}"

-- 
2.47.3


Reply via email to