[RFC PATCH v2 16/21] test: hush: Fix variable expansion tests for hush 2021

[Francis Laniel]

Modifies the expected result for hush 2021.
Indeed, there were bugs in actual U-Boot hush which were fixed in upstream
Busybox.
As hush 2021 is based on upstream Busybox, these bugs no longer exist.

Signed-off-by: Francis Laniel <francis.laniel at amarulasolutions.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
 test/hush/dollar.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/test/hush/dollar.c b/test/hush/dollar.c
index 2614517cd2..3701521f69 100644
--- a/test/hush/dollar.c
+++ b/test/hush/dollar.c
@@ -57,13 +57,27 @@ 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();
+#if CONFIG_IS_ENABLED(HUSH_2021_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 /* HUSH_OLD_PARSER */
 	ut_assert_console_end();
+#endif /* HUSH_OLD_PARSER */
 
 	ut_asserteq(1, run_command(R"(dollar_foo=bar quux")", 0));
 	/* Two next lines contain error message */
 	ut_assert_skipline();
 	ut_assert_skipline();
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+	/* See above comments. */
+	console_record_reset_enable();
+#else /* HUSH_OLD_PARSER */
 	ut_assert_console_end();
+#endif /* HUSH_OLD_PARSER */
 
 	ut_assertok(run_command(R"(dollar_foo='bar "quux')", 0));
 
@@ -77,17 +91,35 @@ static int hush_test_simple_dollar(struct unit_test_state *uts)
 	 */
 	console_record_reset_enable();
 
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+	/*
+	 * Old parser returns an error because it waits for closing '\'', but
+	 * this behavior is wrong as the '\'' is surrounded by '"', so no need
+	 * to wait for a closing one.
+	 */
+	ut_assertok(run_command(R"(dollar_foo="bar 'quux")", 0));
+
+	ut_assertok(run_command("echo $dollar_foo", 0));
+	ut_assert_nextline("bar 'quux");
+	ut_assert_console_end();
+#else /* HUSH_OLD_PARSER */
 	ut_asserteq(1, run_command(R"(dollar_foo="bar 'quux")", 0));
 	/* Next line contains error message */
 	ut_assert_skipline();
 	ut_assert_console_end();
+#endif /* HUSH_OLD_PARSER */
 
 	ut_assertok(run_command("dollar_foo='bar quux'", 0));
 	ut_assertok(run_command("echo $dollar_foo", 0));
 	ut_assert_nextline("bar quux");
 	ut_assert_console_end();
 
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+	/* Reset local variable. */
+	ut_assertok(run_command("dollar_foo=", 0));
+#else /* HUSH_OLD_PARSER */
 	puts("Beware: this test set local variable dollar_foo and it cannot be unset!");
+#endif /* HUSH_OLD_PARSER */
 
 	return 0;
 }
@@ -115,7 +147,12 @@ static int hush_test_env_dollar(struct unit_test_state *uts)
 	/* Clean up setting the variable */
 	env_set("env_foo", NULL);
 
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+	/* Reset local variable. */
+	ut_assertok(run_command("env_foo=", 0));
+#else /* HUSH_OLD_PARSER */
 	puts("Beware: this test set local variable env_foo and it cannot be unset!");
+#endif /* HUSH_OLD_PARSER */
 
 	return 0;
 }
@@ -152,7 +189,15 @@ static int hush_test_command_dollar(struct unit_test_state *uts)
 	ut_assertok(run_command(R"(dollar_bar='echo bar\n')", 0));
 
 	ut_assertok(run_command("$dollar_bar", 0));
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+	/*
+	 * This difference seems to come from a bug solved in Busybox hush.
+	 * Behavior of hush 2021 is coherent with bash and other shells.
+	 */
+	ut_assert_nextline(R"(bar\n)");
+#else /* HUSH_OLD_PARSER */
 	ut_assert_nextline("barn");
+#endif /* HUSH_OLD_PARSER */
 	ut_assert_console_end();
 
 	ut_assertok(run_command("dollar_bar='echo $bar'", 0));
@@ -168,7 +213,13 @@ static int hush_test_command_dollar(struct unit_test_state *uts)
 	ut_assert_nextline("quux");
 	ut_assert_console_end();
 
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+	/* Reset local variables. */
+	ut_assertok(run_command("dollar_bar=", 0));
+	ut_assertok(run_command("dollar_quux=", 0));
+#else /* HUSH_OLD_PARSER */
 	puts("Beware: this test sets local variable dollar_bar and dollar_quux and they cannot be unset!");
+#endif /* HUSH_OLD_PARSER */
 
 	return 0;
 }
-- 
2.25.1