test: hush: Fix loop tests for modern hush

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>

diff --git a/test/hush/loop.c b/test/hush/loop.c
index ca777e38fe66092091168e1f1ced24cf3af9f231..80a9071a800f3301b5d5f98d93f1be5edbcb34fa 100644 (file)
--- a/test/hush/loop.c
+++ b/test/hush/loop.c
@@ -9,6 +9,9 @@
 #include <env_attr.h>
 #include <test/hush.h>
 #include <test/ut.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 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_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;
 }
@@ -31,12 +39,30 @@ static int hush_test_while(struct unit_test_state *uts)
 {
        console_record_reset_enable();
 
-       /* 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));
+       if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
+               /*
+                * 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_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;
 }