[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[CI 05/17] grub-shell: Allow specifying non-default trim line contents
From: |
Glenn Washburn |
Subject: |
[CI 05/17] grub-shell: Allow specifying non-default trim line contents |
Date: |
Thu, 18 Feb 2021 20:59:24 -0600 |
This will be useful for tests that have unwanted output from setup. This is
not documented because its only intended to be internal at the moment. Also,
--no-trim is allowed to explicitly turn off trim.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 93e9f5148..b409962f1 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -32,6 +32,7 @@ PATH="${builddir}:$PATH"
export PATH
trim=0
+trim_head=664cbea8-132f-4770-8aa4-1696d59ac35c
# Usage: usage
# Print the usage.
@@ -212,8 +213,13 @@ for option in "$@"; do
echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
exit 0 ;;
--trim)
- trim=1
+ trim=1 ;;
+ --trim=*)
+ trim=2
+ trim_head=`echo "$option" | sed -e 's/--trim=//' -e 's/,/ /g'`
;;
+ --no-trim)
+ trim=0 ;;
--debug)
debug=1 ;;
--modules=*)
@@ -336,8 +342,6 @@ terminal_input ${term}
terminal_output ${term}
EOF
-trim_head=664cbea8-132f-4770-8aa4-1696d59ac35c
-
if [ $trim = 1 ]; then
echo "echo $trim_head" >>${cfgfile}
fi
@@ -452,8 +456,8 @@ fi
do_trim ()
{
- if [ $trim = 1 ]; then
- awk '{ if (have_head == 1) print $0; }
/664cbea8-132f-4770-8aa4-1696d59ac35c/ { have_head=1; }'
+ if [ $trim = 1 ] || [ $trim = 2 ]; then
+ awk '{ if (have_head == 1) print $0; } /'"$trim_head"'/ { have_head=1;
}'
else
cat
fi
--
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 <=
- [CI 07/17] grub-shell: Only show grub-mkrescue output if it returns an error, Glenn Washburn, 2021/02/18
- [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