mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: correctly propagate return code from check_result hooks

Browse Source
This commit is contained in:
Frantisek Sumsal 2023-08-11 16:39:30 +02:00
parent 701e0c2660
commit cb16b72e9c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/test-functions
View File

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