summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2023-06-04 22:16:58 +0200
committerFrantisek Sumsal <frantisek@sumsal.cz>2023-06-05 16:50:13 +0200
commit71d7f02cc7dc1bf5b8506c90571cb980ec706def (patch)
treea66f97628dd4b112205a9c21530483310ab16492 /test
parenttest: use check_result_common() (diff)
downloadsystemd-71d7f02cc7dc1bf5b8506c90571cb980ec706def.tar.xz
systemd-71d7f02cc7dc1bf5b8506c90571cb980ec706def.zip
test: make check_result_*() `set -e` friendly
Diffstat (limited to 'test')
-rw-r--r--test/test-functions6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/test-functions b/test/test-functions
index cfae5e9fda..b17a74a450 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:?}"