From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 4 Jun 2023 20:16:58 +0000 (+0200)
Subject: test: make check_result_*() `set -e` friendly
X-Git-Tag: v254-rc1~281^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71d7f02cc7dc1bf5b8506c90571cb980ec706def;p=thirdparty%2Fsystemd.git

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

diff --git a/test/test-functions b/test/test-functions
index cfae5e9fdae..b17a74a4506 100644
--- 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:?}"