On Thu, Nov 06, 2025 at 04:49:51PM -0800, Bobby Eshleman wrote:
> 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).
>
> Reviewed-by: Simon Horman <[email protected]>
> Signed-off-by: Bobby Eshleman <[email protected]>
> ---
> Changes in v3:
> - increment cnt_total directly (no intermediary var) (Stefano)
> - pass arg to check_result() from caller, dont incidentally rely on
> global (Stefano)
> - use new create_pidfile() introduce in v3 of earlier patch
> - continue with more disciplined variable quoting style
> ---
> tools/testing/selftests/vsock/vmtest.sh | 95
> +++++++++++++++++++++++++--------
> 1 file changed, 72 insertions(+), 23 deletions(-)
>
> diff --git a/tools/testing/selftests/vsock/vmtest.sh
> b/tools/testing/selftests/vsock/vmtest.sh
> index 557f9a99a306..05cf370a3db4 100755
> --- a/tools/testing/selftests/vsock/vmtest.sh
> +++ b/tools/testing/selftests/vsock/vmtest.sh
> @@ -46,6 +46,8 @@ readonly TEST_DESCS=(
> "Run vsock_test using the loopback transport in the VM."
> )
>
> +readonly USE_SHARED_VM=(vm_server_host_client vm_client_host_server
> vm_loopback)
> +
> VERBOSE=0
>
> usage() {
> @@ -79,6 +81,28 @@ die() {
> exit "${KSFT_FAIL}"
> }
>
> +check_result() {
> + local rc arg
> +
> + rc=$1
> + arg=$2
> +
> + cnt_total=$(( 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"
Hi Bobby,
Should num be cnt_total above?
> + fi
> +
> + cnt_total=$(( cnt_total + 1 ))
It seems that cnt_total is being incremented twice.
Once seems like it ought to be enough.
> +}
> +
> vm_ssh() {
> ssh -q -o UserKnownHostsFile=/dev/null -p ${SSH_HOST_PORT} localhost
> "$@"
> return $?
I'll confess that I didn't notice these myself, but
Claude Code with https://github.com/masoncl/review-prompts/ did.
