Skip to contentSkip to conversation

tests: Fix help test to reflect updated help output

PATCH In review Glenn Washburn 2 participants 3 messages Jan 10, 2023 – Jan 11, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests: Fix help test to reflect updated help output

Commit f5759a878 (normal/help: Add paging instructions to normal and help prompts) changed the output of the help command, which broke the help test. This change allows the test to pass.

---
 tests/help_test.in | 3 +++
 1 file changed, 3 insertions(+)
tests/help_test.in +3 -0
index b08cf20138..630e9860ae 100644
@@ -8,6 +8,9 @@ Show a help message.
 
 -h, --help              Display this help and exit.
 -u, --usage             Display the usage of this command and exit.
+
+
+To enable less(1)-like paging, \"set pager=1\".
 Hello World"
 outpu="$(echo 'help help; hello' | @builddir@/grub-shell)"
 
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Glenn Washburn

Commit f5759a878 (normal/help: Add paging instructions to normal and help prompts) changed the output of the help command, which broke the help test. This change allows the test to pass.

... but...

Quoted 9 lines
---
 tests/help_test.in | 3 +++
 1 file changed, 3 insertions(+)
tests/help_test.in +0 -0
index b08cf20138..630e9860ae 100644

tests/help_test.in Show a help message. · line 15

Quoted 8 lines
tests/help_test.in +3 -0
@@ -8,6 +8,9 @@ Show a help message.
 
 -h, --help              Display this help and exit.
 -u, --usage             Display the usage of this command and exit.
+
+
+To enable less(1)-like paging, \"set pager=1\".
 Hello World"
 outpu="$(echo 'help help; hello' | @builddir@/grub-shell)"

We could do s/outpu/output/ on the occasion. I can do it before the push...

Daniel

#2 lore raw
Quoted 21 lines · On Wed, 11 Jan 2023 19:48:06 +0100 Daniel Kiper <[email protected]> wrote:
Quoted 5 lines · Glenn Washburn

Commit f5759a878 (normal/help: Add paging instructions to normal and help prompts) changed the output of the help command, which broke the help test. This change allows the test to pass.

... but...

Quoted 10 lines
---
 tests/help_test.in | 3 +++
 1 file changed, 3 insertions(+)
tests/help_test.in +0 -0
index b08cf20138..630e9860ae 100644
@@ -8,6 +8,9 @@ Show a help message.
 
Quoted 10 lines

tests/help_test.in Show a help message. · line 15

Quoted 7 lines
tests/help_test.in +3 -0
 -h, --help              Display this help and exit.
 -u, --usage             Display the usage of this command and exit.
+
+
+To enable less(1)-like paging, \"set pager=1\".
 Hello World"
 outpu="$(echo 'help help; hello' | @builddir@/grub-shell)"

We could do s/outpu/output/ on the occasion. I can do it before the push...

Sure thing, go ahead.

Glenn