From 71d7f02cc7dc1bf5b8506c90571cb980ec706def Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 4 Jun 2023 22:16:58 +0200 Subject: [PATCH] test: make check_result_*() `set -e` friendly --- test/test-functions | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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:?}" -- 2.47.3