mirror of
https://github.com/systemd/systemd.git
synced 2024-11-23 18:23:32 +08:00
test: pass the initdir to check_result_{qemu,nspawn} hooks
This commit is contained in:
parent
72f0e89c0d
commit
4b9a0c3aeb
@ -1507,7 +1507,7 @@ check_result_nspawn() {
|
||||
|
||||
# Run additional test-specific checks if defined by check_result_nspawn_hook()
|
||||
if declare -F check_result_nspawn_hook >/dev/null; then
|
||||
if ! check_result_nspawn_hook; then
|
||||
if ! check_result_nspawn_hook "${workspace}"; then
|
||||
derror "check_result_nspawn_hook() returned with EC > 0"
|
||||
ret=4
|
||||
fi
|
||||
@ -1526,16 +1526,16 @@ check_result_qemu() {
|
||||
check_result_common "${initdir:?}"
|
||||
ret=$?
|
||||
|
||||
_umount_dir "${initdir:?}"
|
||||
|
||||
# Run additional test-specific checks if defined by check_result_qemu_hook()
|
||||
if declare -F check_result_qemu_hook >/dev/null; then
|
||||
if ! check_result_qemu_hook; then
|
||||
if ! check_result_qemu_hook "${initdir:?}"; then
|
||||
derror "check_result_qemu_hook() returned with EC > 0"
|
||||
ret=4
|
||||
fi
|
||||
fi
|
||||
|
||||
_umount_dir "${initdir:?}"
|
||||
|
||||
return $ret
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user