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

tests/util/grub-shell: Add $GRUB_QEMU_OPTS to run.sh to easily see unofficial QEMU arguments

Browse Source 
When re-running a failed test, even the non-standard grub-shell QEMU
arguments should be preserved in the run.sh to more precisely replay
the failed test run.

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-21 00:10:46 -06:00 committed by Daniel Kiper
parent 73f2e73815
commit 6d729ced70
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ exec_show_error () {
work_directory=${WORKDIR:-`mktemp -d "${TMPDIR:-/tmp}/grub-shell.XXXXXXXXXX"`} || exit 1 work_directory=${WORKDIR:-`mktemp -d "${TMPDIR:-/tmp}/grub-shell.XXXXXXXXXX"`} || exit 1
. "${builddir}/grub-core/modinfo.sh" . "${builddir}/grub-core/modinfo.sh"
qemuopts="${GRUB_QEMU_OPTS}" qemuopts=
serial_port=com0 serial_port=com0
serial_null= serial_null=
halt_cmd=halt halt_cmd=halt
@ -523,8 +523,9 @@ if [ x$boot = xnet ]; then
[ -z "$files" ] || copy_extra_files "$netdir" $files [ -z "$files" ] || copy_extra_files "$netdir" $files
cat >"$work_directory/run.sh" <<EOF cat >"$work_directory/run.sh" <<EOF
#! @BUILD_SHEBANG@ #! @BUILD_SHEBANG@
GRUB_QEMU_OPTS=\${GRUB_QEMU_OPTS:-"$GRUB_QEMU_OPTS"}
qemuopts="${qemuopts}" qemuopts="${qemuopts}"
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 "\$@" exec "${qemu}" \${qemuopts} \${GRUB_QEMU_OPTS} ${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 EOF
elif [ x$boot = xemu ]; then elif [ x$boot = xemu ]; then
rootdir="$work_directory/rootdir" rootdir="$work_directory/rootdir"
@ -553,9 +554,10 @@ else
cat >"$work_directory/run.sh" <<EOF cat >"$work_directory/run.sh" <<EOF
#! @BUILD_SHEBANG@ #! @BUILD_SHEBANG@
SDIR=\$(realpath -e \${0%/*}) SDIR=\$(realpath -e \${0%/*})
GRUB_QEMU_OPTS=\${GRUB_QEMU_OPTS:-"$GRUB_QEMU_OPTS"}
qemuopts="${qemuopts}" qemuopts="${qemuopts}"
cd "\$SDIR" cd "\$SDIR"
exec "${qemu}" \${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"\${SDIR}/${isofile##*/}" ${bootdev} "\$@" exec "${qemu}" \${qemuopts} \${GRUB_QEMU_OPTS} ${serial_null} -serial file:/dev/stdout -${device}"\${SDIR}/${isofile##*/}" ${bootdev} "\$@"
EOF EOF
fi fi