From: Glenn Washburn <development@efficientek.com>
To: grub-devel@gnu.org, Daniel Kiper <daniel.kiper@oracle.com>
Cc: Glenn Washburn <development@efficientek.com>
Subject: [PATCH 06/12] grub-shell: Add grub output logfile with grub-shell --debug
Date: Wed, 31 Mar 2021 20:57:45 -0500 [thread overview]
Message-ID: <8acbe1a63ed91437456b98207814ace4c10d65d1.1617240986.git.development@efficientek.com> (raw)
In-Reply-To: <cover.1617240986.git.development@efficientek.com>
This allows seeing full qemu output of grub-shell, which can be invaluable
when debugging failing tests.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 8c6ed76d7..c6d7860e9 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -379,6 +379,9 @@ echo "${halt_cmd}" >>${cfgfile}
test -z "$debug" || echo "GRUB script: ${cfgfile}" >&2
test -z "$debug" || echo "GRUB testcase script: ${tmpfile}" >&2
+
+goutfile="$work_directory/grub-qemu.log"
+test -z "$debug" || echo "GRUB output log: ${goutfile}" >&2
test -z "$debug" || echo "Boot device: ${boot}" >&2
isofile="$work_directory/grub.iso"
@@ -502,7 +505,7 @@ 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
- 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 | cat | tr -d "\r" | do_trim
+ 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 | cat | tr -d "\r" | tee "${goutfile}" | do_trim
elif [ x$boot = xemu ]; then
rootdir="$work_directory/rootdir"
grubdir="$rootdir/boot/grub"
@@ -521,11 +524,11 @@ elif [ x$boot = xemu ]; then
[ -z "$files" ] || copy_extra_files "$rootdir" $files
roottar="$work_directory/root.tar"
(cd "$rootdir"; tar cf "$roottar" .)
- @builddir@/grub-core/grub-emu -m "$device_map" --memdisk "$roottar" -r memdisk -d "/boot/grub" | tr -d "\r" | do_trim
+ @builddir@/grub-core/grub-emu -m "$device_map" --memdisk "$roottar" -r memdisk -d "/boot/grub" | tr -d "\r" | tee "${goutfile}" | do_trim
test -n "$debug" || rm -rf "$rootdir"
test -n "$debug" || rm -f "$roottar"
else
- timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim
+ timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | tee "${goutfile}" | do_trim
fi
if [ x$boot = xcoreboot ]; then
test -n "$debug" || rm -f "${imgfile}"
--
2.27.0
next prev parent reply other threads:[~2021-04-01 1:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 1:57 [PATCH 00/12] Grub-shell improvements Glenn Washburn
2021-04-01 1:57 ` [PATCH 01/12] grub-shell: Allow specifying non-default trim line contents Glenn Washburn
2021-04-01 1:57 ` [PATCH 02/12] grub-shell: Trim line should always be matched from the beginning of the line Glenn Washburn
2021-04-01 1:57 ` [PATCH 03/12] grub-shell: Only show grub-mkrescue output if it returns an error Glenn Washburn
2021-04-01 1:57 ` [PATCH 04/12] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar Glenn Washburn
2021-04-01 1:57 ` [PATCH 05/12] grub-shell: Put all generated files into working dir and use better file names Glenn Washburn
2021-04-01 1:57 ` Glenn Washburn [this message]
2021-04-01 1:57 ` [PATCH 07/12] grub-shell: Set exit status to qemu exit status Glenn Washburn
2021-04-01 1:57 ` [PATCH 08/12] tests: Allow turning on shell tracing from environment variables Glenn Washburn
2021-04-01 1:57 ` [PATCH 09/12] grub-shell: Add --verbose to mkrescue when $debug is greater than 2 Glenn Washburn
2021-04-01 1:57 ` [PATCH 10/12] grub-shell: Only turn on qemu head when large debug value is specified Glenn Washburn
2021-04-01 1:57 ` [PATCH 11/12] grub-shell: Use malta qemu-mips machine type instead off non-existant indy Glenn Washburn
2021-04-01 1:57 ` [PATCH 12/12] grub-shell: Update qemu UEFI firmware names to be more generic Glenn Washburn
2021-08-25 23:06 ` [PATCH 00/12] Grub-shell improvements Glenn Washburn
2021-08-26 18:00 ` Daniel Kiper
2021-08-26 22:08 ` Glenn Washburn
2021-08-30 15:23 ` Daniel Kiper
2021-08-30 16:33 ` Denis 'GNUtoo' Carikli
2021-08-30 17:50 ` Patrick Steinhardt
2021-09-14 11:04 ` IS: Glenn's patches status WAS: " Daniel Kiper
2021-09-14 17:27 ` Glenn Washburn
2021-09-15 16:15 ` Daniel Kiper
2021-09-15 16:18 ` Daniel Kiper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8acbe1a63ed91437456b98207814ace4c10d65d1.1617240986.git.development@efficientek.com \
--to=development@efficientek.com \
--cc=daniel.kiper@oracle.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.