[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[CI 06/17] grub-shell: Trim line should always be matched from the begin
From: |
Glenn Washburn |
Subject: |
[CI 06/17] grub-shell: Trim line should always be matched from the beginning of the line |
Date: |
Thu, 18 Feb 2021 20:59:25 -0600 |
When turning on shell tracing the trim line will be output before we
actually want to start the trim. However, in this case the trim line never
starts from the beginning of the line. So start trimming from the correct
line by matching from the beginning of the line.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
tests/util/grub-shell.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index b409962f1..602b16f3e 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -343,7 +343,7 @@ terminal_output ${term}
EOF
if [ $trim = 1 ]; then
- echo "echo $trim_head" >>${cfgfile}
+ echo "echo; echo $trim_head" >>${cfgfile}
fi
rom_directory=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
@@ -457,7 +457,7 @@ fi
do_trim ()
{
if [ $trim = 1 ] || [ $trim = 2 ]; then
- awk '{ if (have_head == 1) print $0; } /'"$trim_head"'/ { have_head=1;
}'
+ 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, 2021/02/18
- [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 <=
- [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
- [CI 16/17] ci: Add .gitlab-ci.yml for continuous integration with Gitlab CI, Glenn Washburn, 2021/02/18