[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[CI 07/17] grub-shell: Only show grub-mkrescue output if it returns an e
From: |
Glenn Washburn |
Subject: |
[CI 07/17] grub-shell: Only show grub-mkrescue output if it returns an error |
Date: |
Thu, 18 Feb 2021 20:59:26 -0600 |
The previous behavior ignored an error and the output from grub-mkrescue.
This made it a pain to discover that grub-mkrescue was the reason that tests
which rely on grub-shell were failing. Even after discovering grub-mkrescue
was the culprit, there was no output to indicate why it was failing. It
turns out that grub-mkrescue is a thin wrapper around xorriso. So if you do
not have xorriso installed it will fail with an error message about not
being able to find xorriso.
This change will allow grub-mkrescue output to be written to stderr, only if
grub-mkrescue fails. If grub-mkrescue succeeds, there will be no output
from grub-mkrescue so as not to interfere with the functioning of tests.
This change should have no effect on the running of tests or other uses of
grub-shell as it only modifies the error path.
Also, if grub-mkrescue fails, the script exits early. Since grub-shell
needs the iso image created by grub-mkresue to boot the qemu instance, a
failure here should be considered fatal.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 602b16f3e..9d8c417da 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -60,6 +60,17 @@ Report bugs to <bug-grub@gnu.org>.
EOF
}
+# Exec given argv and only show its output on STDERR if it returns an
+# error status.
+exec_show_error () {
+ v=`$@ 2>&1`
+ ret=$?
+ if [ "$ret" != 0 ]; then
+ echo "$v" >&2
+ exit $ret
+ fi
+}
+
. "${builddir}/grub-core/modinfo.sh"
qemuopts="${GRUB_QEMU_OPTS}"
serial_port=com0
@@ -383,13 +394,15 @@ if test -z "$debug"; then
fi
if [ x$boot != xnet ] && [ x$boot != xemu ]; then
- pkgdatadir="@builddir@" "@builddir@/grub-mkrescue" "--output=${isofile}"
"--override-directory=${builddir}/grub-core" \
+ pkgdatadir="@builddir@" \
+ exec_show_error "@builddir@/grub-mkrescue" "--output=${isofile}" \
+ "--override-directory=${builddir}/grub-core" \
--rom-directory="${rom_directory}" \
--locale-directory="@srcdir@/po" \
--themes-directory="@srcdir@/themes" \
$mkimage_extra_arg ${mkrescue_args} \
"/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
- ${files} >/dev/null 2>&1
+ ${files} || exit $?
fi
if [ x$boot = xhd ]; then
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ]
|| [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm-efi ]; then
--
2.27.0
- [CI 00/17] Gitlab CI and test framework improvements, Glenn Washburn, 2021/02/18
- [CI 01/17] tests: Make sure LANG is set properly for iso9660_test, Glenn Washburn, 2021/02/18
- [CI 02/17] tests: Fix partmap_test for arm*-efi, disk numbering has changed, Glenn Washburn, 2021/02/18
- [CI 03/17] tests: When checking squashfs fstime, use superblock last modified time, Glenn Washburn, 2021/02/18
- [CI 04/17] tests: Fail immediately when grub-shell fails and do not occlude the error code, Glenn Washburn, 2021/02/18
- [CI 05/17] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2021/02/18
- [CI 07/17] grub-shell: Only show grub-mkrescue output if it returns an error,
Glenn Washburn <=
- [CI 08/17] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar, Glenn Washburn, 2021/02/18
- [CI 06/17] grub-shell: Trim line should always be matched from the beginning of the line, Glenn Washburn, 2021/02/18
- [CI 10/17] grub-shell: Add grub output logfile with grub-shell --debug, Glenn Washburn, 2021/02/18
- [CI 11/17] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2021/02/18
- [CI 12/17] tests: Allow turning on shell tracing from environment variables, Glenn Washburn, 2021/02/18
- [CI 13/17] grub-shell: Add --verbose to mkrescue when $debug is greater than 2, Glenn Washburn, 2021/02/18
- [CI 09/17] grub-shell: Put all generated files into working dir and use better file names, Glenn Washburn, 2021/02/18
- [CI 15/17] grub-shell: Update qemu UEFI firmware names to be more generic, Glenn Washburn, 2021/02/18
- [CI 14/17] grub-shell: Use malta qemu-mips machine type instead off non-existant indy, Glenn Washburn, 2021/02/18
- [CI 17/17] keep: remove a lot of cruft that we probably want to reuse at some point, Glenn Washburn, 2021/02/18