Now it becomes trivial to re-run a test from the output in its working
directory. This also makes it easy to send a reproducible failing test to
the mailing list. This has allowed a a refactor so that the duplicated
code to call QEMU has be condensed (eg. the use of timeout and file
descriptor redirection).
Signed-off-by: Glenn Washburn <developm...@efficientek.com>
---
tests/util/grub-shell.in | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 96869184c..48c7fde48 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -511,8 +511,10 @@ if [ x$boot = xnet ]; then
cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
cp "${source}" "$netdir/boot/grub/testcase.cfg"
[ -z "$files" ] || copy_extra_files "$netdir" $files
- setup_qemu_logger
- timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial
file:/dev/stdout -boot n -net
"user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"
-net nic > "$work_directory/qemu-pipe" || ret=$?
+ cat >"$work_directory/run.sh" <<EOF
+#! @BUILD_SHEBANG@
+exec "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -boot n
-net
"user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext"
-net nic
+EOF
elif [ x$boot = xemu ]; then
rootdir="$work_directory/rootdir"
grubdir="$rootdir/boot/grub"
@@ -531,11 +533,23 @@ elif [ x$boot = xemu ]; then
[ -z "$files" ] || copy_extra_files "$rootdir" $files
roottar="$work_directory/root.tar"
(cd "$rootdir"; tar cf "$roottar" .)
- setup_qemu_logger
- @builddir@/grub-core/grub-emu -m "$device_map" --memdisk "$roottar" -r
memdisk -d "/boot/grub" > "$work_directory/qemu-pipe" || ret=$?
+ cat >"$work_directory/run.sh" <<EOF
+#! @BUILD_SHEBANG@
+exec @builddir@/grub-core/grub-emu -m "$device_map" --memdisk "$roottar" -r
memdisk -d "/boot/grub"
+EOF
else
+ cat >"$work_directory/run.sh" <<EOF
+#! @BUILD_SHEBANG@
+SDIR=\$(realpath -e \${0%/*})
+cd "\$SDIR"
+exec "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout
-${device}"\${SDIR}/${isofile##*/}" ${bootdev}
+EOF
+fi
+
+if [ -f "$work_directory/run.sh" ]; then
setup_qemu_logger
- timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial
file:/dev/stdout -${device}"${isofile}" ${bootdev} >
"$work_directory/qemu-pipe" || ret=$?
+ chmod +x "$work_directory/run.sh"
+ timeout -s KILL $timeout "$work_directory/run.sh" >
"$work_directory/qemu-pipe" || ret=$?
fi
wait
@@ -555,6 +569,7 @@ fi
test -n "$debug" || rm -f "${isofile}"
test -n "$debug" || rm -rf "${rom_directory}"
test -n "$debug" || rm -f "${tmpfile}" "${cfgfile}" "${goutfile}"
+test -n "$debug" || rm -f "$work_directory/run.sh"
exit $ret
--
2.27.0
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
