From cb16b72e9cd9fa88cfd5623edb197ad49f875320 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 11 Aug 2023 16:39:30 +0200
Subject: [PATCH] test: correctly propagate return code from check_result hooks

---
 test/test-functions | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test-functions b/test/test-functions
index 7092276b8e2..4b4587aca76 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1768,7 +1768,7 @@ check_result_common() {
 
 check_result_nspawn() {
     local workspace="${1:?}"
-    local ret
+    local ret=0
 
     # Run a test-specific checks if defined by check_result_nspawn_hook()
     if declare -F check_result_nspawn_hook >/dev/null; then
@@ -1778,7 +1778,7 @@ check_result_nspawn() {
         fi
     fi
 
-    check_result_common "${workspace}" && ret=0 || ret=$?
+    check_result_common "${workspace}" || ret=$?
 
     _umount_dir "${initdir:?}"
 
@@ -1787,7 +1787,7 @@ check_result_nspawn() {
 
 # can be overridden in specific test
 check_result_qemu() {
-    local ret
+    local ret=0
     mount_initdir
 
     # Run a test-specific checks if defined by check_result_qemu_hook()
@@ -1798,7 +1798,7 @@ check_result_qemu() {
         fi
     fi
 
-    check_result_common "${initdir:?}" && ret=0 || ret=$?
+    check_result_common "${initdir:?}" || ret=$?
 
     _umount_dir "${initdir:?}"
 
-- 
2.47.3