* [CRYPTOMOUNT-TEST 3/7] grub-shell: Allow specifying non-default trim line contents.
@ 2020-08-17 0:05 Glenn Washburn
0 siblings, 0 replies; only message in thread
From: Glenn Washburn @ 2020-08-17 0:05 UTC (permalink / raw)
To: grub-devel; +Cc: Glenn Washburn
This will be useful for tests that have unwanted output from setup. This is
not documented because its only intended 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.25.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-17 0:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-17 0:05 [CRYPTOMOUNT-TEST 3/7] grub-shell: Allow specifying non-default trim line contents Glenn Washburn
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.