From: Tom Rini <trini@konsulko.com>
Date: Thu, 18 Jan 2024 16:38:25 +0000 (-0500)
Subject: Revert "test: hush: dollar: fix bugous behavior"
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=f7cca7ccc5117eaafcc2bde91ad1bed6fee7cfc3;p=u-boot.git

Revert "test: hush: dollar: fix bugous behavior"

What we were doing here amounts to simplifying the code for the new hush
parser, and the workarounds are required when using the old one. As we
have returned to having the old parser be default for now, we must undo
this so that the test passes again.

This reverts commit 6c2f753f4ad3dcee60190949d1286736a6d51d17.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/test/hush/dollar.c b/test/hush/dollar.c
index 68d0874d90..4caa07c192 100644
--- a/test/hush/dollar.c
+++ b/test/hush/dollar.c
@@ -53,12 +53,29 @@ static int hush_test_simple_dollar(struct unit_test_state *uts)
 	ut_asserteq(1, run_command("dollar_foo='bar quux", 0));
 	/* Next line contains error message */
 	ut_assert_skipline();
-	ut_assert_console_end();
+
+	if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
+		/*
+		 * For some strange reasons, the console is not empty after
+		 * running above command.
+		 * So, we reset it to not have side effects for other tests.
+		 */
+		console_record_reset_enable();
+	} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+		ut_assert_console_end();
+	}
 
 	ut_asserteq(1, run_command("dollar_foo=bar quux\"", 0));
-	/* Next line contains error message */
+	/* Two next lines contain error message */
 	ut_assert_skipline();
-	ut_assert_console_end();
+	ut_assert_skipline();
+
+	if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
+		/* See above comments. */
+		console_record_reset_enable();
+	} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+		ut_assert_console_end();
+	}
 
 	ut_assertok(run_command("dollar_foo='bar \"quux'", 0));