[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] grub-shell: Trim line should always be matched from the begi
From: |
Glenn Washburn |
Subject: |
[PATCH 4/6] grub-shell: Trim line should always be matched from the beginning of the line |
Date: |
Tue, 10 Jan 2023 16:08:58 -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 585f0d066e..f41e1a0b68 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -360,7 +360,7 @@ terminal_output ${term}
EOF
if [ $trim = 1 ]; then
- echo "echo $trim_head" >>${cfgfile}
+ echo "echo; echo $trim_head" >>${cfgfile}
fi
rom_directory="$work_directory/rom_directory"
@@ -484,7 +484,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.34.1
- [PATCH 0/6] Cryptomount testing, Glenn Washburn, 2023/01/10
- [PATCH 1/6] grub-shell: Set exit status to qemu exit status, Glenn Washburn, 2023/01/10
- [PATCH 2/6] grub-shell: Only cleanup working directory file if QEMU does not fail or timeout, Glenn Washburn, 2023/01/10
- [PATCH 3/6] grub-shell: Allow specifying non-default trim line contents, Glenn Washburn, 2023/01/10
- [PATCH 4/6] grub-shell: Trim line should always be matched from the beginning of the line,
Glenn Washburn <=
- [PATCH 5/6] grub-shell: Add halt_cmd variable to testcase namespace, Glenn Washburn, 2023/01/10
- [PATCH 6/6] tests: Add cryptomount functional test, Glenn Washburn, 2023/01/10
- Re: [PATCH 0/6] Cryptomount testing, Daniel Kiper, 2023/01/12