test: make check_result_*() `set -e` friendly

diff --git a/test/test-functions b/test/test-functions
index cfae5e9fdae0ae98d9402acd8dcdb85211ad542e..b17a74a45061e9c5340be684021c5cc02aebc23f 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -1711,8 +1711,7 @@ check_result_nspawn() {
         fi
     fi
 
-    check_result_common "${workspace}"
-    ret=$?
+    check_result_common "${workspace}" && ret=0 || ret=$?
 
     _umount_dir "${initdir:?}"
 
@@ -1732,8 +1731,7 @@ check_result_qemu() {
         fi
     fi
 
-    check_result_common "${initdir:?}"
-    ret=$?
+    check_result_common "${initdir:?}" && ret=0 || ret=$?
 
     _umount_dir "${initdir:?}"