Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 06:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: hush: Fix loop tests for modern hush

Browse source 
Modifies return code got from while loop as modern hush always returns 0 from
while loop.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
This commit is contained in:
Francis Laniel 2023-12-22 22:02:41 +01:00 • committed by Tom Rini
parent e252f50f27
commit 2223c49c75
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
test/hush/loop.c
View file

@ -9,6 +9,9 @@
#include <env_attr.h> #include <env_attr.h>
#include <test/hush.h> #include <test/hush.h>
#include <test/ut.h> #include <test/ut.h>
#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
static int hush_test_for(struct unit_test_state *uts) static int hush_test_for(struct unit_test_state *uts)
{ {
@ -21,7 +24,12 @@ static int hush_test_for(struct unit_test_state *uts)
ut_assert_nextline("quux"); ut_assert_nextline("quux");
ut_assert_console_end(); ut_assert_console_end();
puts("Beware: this test set local variable loop_i and it cannot be unset!"); if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
/* Reset local variable. */
ut_assertok(run_command("loop_i=", 0));
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
puts("Beware: this test set local variable loop_i and it cannot be unset!");
}
return 0; return 0;
} }
@ -31,12 +39,30 @@ static int hush_test_while(struct unit_test_state *uts)
{ {
console_record_reset_enable(); console_record_reset_enable();
/* Exit status is that of test, so 1 since test is false to quit the loop. */ if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
ut_asserteq(1, run_command("while test -z \"$loop_foo\"; do echo bar; loop_foo=quux; done", 0)); /*
* Hush 2021 always returns 0 from while loop...
* You can see code snippet near this line to have a better
* understanding:
* debug_printf_exec(": while expr is false: breaking (exitcode:EXIT_SUCCESS)\n");
*/
ut_assertok(run_command("while test -z \"$loop_foo\"; do echo bar; loop_foo=quux; done", 0));
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
/*
* Exit status is that of test, so 1 since test is false to quit
* the loop.
*/
ut_asserteq(1, run_command("while test -z \"$loop_foo\"; do echo bar; loop_foo=quux; done", 0));
}
ut_assert_nextline("bar"); ut_assert_nextline("bar");
ut_assert_console_end(); ut_assert_console_end();
puts("Beware: this test set local variable loop_foo and it cannot be unset!"); if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
/* Reset local variable. */
ut_assertok(run_command("loop_foo=", 0));
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
puts("Beware: this test set local variable loop_foo and it cannot be unset!");
}
return 0; return 0;
} }