tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/util/grub-shell: Only cleanup working directory file if QEMU does not fail or timeout

Browse Source 
This keeps the generated files to aid in diagnosing the source of the failure.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn 2023-01-10 16:08:56 -06:00 committed by Daniel Kiper
parent d247823ecb
commit de605d5683
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/util/grub-shell.in
View File

@ -534,8 +534,6 @@ elif [ x$boot = xemu ]; then
(cd "$rootdir"; tar cf "$roottar" .) (cd "$rootdir"; tar cf "$roottar" .)
setup_qemu_logger setup_qemu_logger
"${builddir}/grub-core/grub-emu" -m "$device_map" --memdisk "$roottar" -r memdisk -d "/boot/grub" > "$work_directory/qemu-pipe" || ret=$? "${builddir}/grub-core/grub-emu" -m "$device_map" --memdisk "$roottar" -r memdisk -d "/boot/grub" > "$work_directory/qemu-pipe" || ret=$?
test -n "$debug" || rm -rf "$rootdir"
test -n "$debug" || rm -f "$roottar"
else else
setup_qemu_logger setup_qemu_logger
timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} > "$work_directory/qemu-pipe" || ret=$? timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} > "$work_directory/qemu-pipe" || ret=$?
@ -544,8 +542,16 @@ fi
wait wait
rm -f "$work_directory/qemu-pipe" rm -f "$work_directory/qemu-pipe"
if [ "$ret" -ne 0 ]; then
# If QEMU failure, keep generated files to reproduce
exit $ret
fi
if [ x$boot = xcoreboot ]; then if [ x$boot = xcoreboot ]; then
test -n "$debug" || rm -f "${imgfile}" test -n "$debug" || rm -f "${imgfile}"
elif [ x$boot = xemu ]; then
test -n "$debug" || rm -rf "$rootdir"
test -n "$debug" || rm -f "$roottar"
fi fi
test -n "$debug" || rm -f "${isofile}" test -n "$debug" || rm -f "${isofile}"
test -n "$debug" || rm -rf "${rom_directory}" test -n "$debug" || rm -rf "${rom_directory}"