[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/15] tests: Allow turning on shell tracing from environment
From: |
Glenn Washburn |
Subject: |
[PATCH v3 11/15] tests: Allow turning on shell tracing from environment variables |
Date: |
Thu, 10 Feb 2022 15:51:28 -0600 |
This allows turning on shell tracing when its not practical or not possible
to use commandline arguments. Turn on tracing when the envvar is an integer
greater than 1, since these can log a lot of messages.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-fs-tester.in | 2 ++
tests/util/grub-shell.in | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index 2dcd09f5e..6b8028f9b 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -2,6 +2,8 @@
set -e
+[ "${GRUB_TEST_DEFAULT_DEBUG:-0}" -gt 1 ] && set -x
+
fs="$1"
GRUBFSTEST="@builddir@/grub-fstest"
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index fdabc6171..a1c7b9265 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -215,6 +215,7 @@ esac
timeout=${GRUB_SHELL_DEFAULT_TIMEOUT:-60}
mkimage_extra_arg=
+debug=${GRUB_SHELL_DEFAULT_DEBUG:-$GRUB_TEST_DEFAULT_DEBUG}
# Check the arguments.
for option in "$@"; do
@@ -234,7 +235,7 @@ for option in "$@"; do
--no-trim)
trim=0 ;;
--debug)
- debug=1 ;;
+ debug=$((debug+1)) ;;
--modules=*)
ms=`echo "$option" | sed -e 's/--modules=//' -e 's/,/ /g'`
modules="$modules $ms" ;;
@@ -319,6 +320,8 @@ for option in "$@"; do
esac
done
+[ "${debug:-0}" -gt 1 ] && set -x
+
if [ "x${source}" = x ] ; then
tmpfile="$work_directory/testcase.cfg"
while read REPLY; do
--
2.27.0
- [PATCH v3 01/15] grub-shell: Allow specifying non-default trim line contents, (continued)
- [PATCH v3 01/15] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2022/02/10
- [PATCH v3 02/15] grub-shell: Trim line should always be matched from the beginning of the line, Glenn Washburn, 2022/02/10
- [PATCH v3 03/15] grub-shell: Only show grub-mkrescue output if it returns an error, Glenn Washburn, 2022/02/10
- [PATCH v3 04/15] grub-shell: Allow setting default timeout via GRUB_SHELL_DEFAULT_TIMEOUT envvar, Glenn Washburn, 2022/02/10
- [PATCH v3 05/15] grub-shell: Put all generated files into working dir and use better file names, Glenn Washburn, 2022/02/10
- [PATCH v3 06/15] grub-shell: Add grub output logfile with grub-shell --debug, Glenn Washburn, 2022/02/10
- [PATCH v3 07/15] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2022/02/10
- [PATCH v3 08/15] grub-shell: Only cleanup working directory file if QEMU does not fail or timeout, Glenn Washburn, 2022/02/10
- [PATCH v3 09/15] grub-shell: Create run.sh in working directory for easily running test again, Glenn Washburn, 2022/02/10
- [PATCH v3 10/15] grub-shell: Add $GRUB_QEMU_OPTS to run.sh to easily see unofficial QEMU arguments, Glenn Washburn, 2022/02/10
- [PATCH v3 11/15] tests: Allow turning on shell tracing from environment variables,
Glenn Washburn <=
- [PATCH v3 12/15] grub-shell: Add --verbose to mkrescue when $debug is greater than 2, Glenn Washburn, 2022/02/10
- [PATCH v3 14/15] grub-shell: Use malta qemu-mips machine type instead off non-existant indy, Glenn Washburn, 2022/02/10
- [PATCH v3 13/15] grub-shell: Only turn on qemu head when large debug value is specified, Glenn Washburn, 2022/02/10
- [PATCH v3 15/15] grub-shell: Add flexibility in QEMU firmware handling, Glenn Washburn, 2022/02/10