smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: hush: Fix variable expansion tests for modern hush

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

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:37 +01:00
committed by Tom Rini
parent 6d3914f9c1
commit 410e78df06
1 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test/hush/dollar.c
View File

@@ -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_simple_dollar(struct unit_test_state *uts)
{
@@ -51,13 +54,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));
/* Two next lines contain error message */
ut_assert_skipline();
ut_assert_skipline();
ut_assert_console_end();
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));
@@ -71,17 +90,35 @@ static int hush_test_simple_dollar(struct unit_test_state *uts)
*/
console_record_reset_enable();
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) {
/*
* 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("dollar_foo=\"bar 'quux\"", 0));
ut_assertok(run_command("echo $dollar_foo", 0));
ut_assert_nextline("bar 'quux");
ut_assert_console_end();
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
ut_asserteq(1, run_command("dollar_foo=\"bar 'quux\"", 0));
/* Next line contains error message */
ut_assert_skipline();
ut_assert_console_end();
}
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();
puts("Beware: this test set local variable dollar_foo and it cannot be unset!");
if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
/* Reset local variable. */
ut_assertok(run_command("dollar_foo=", 0));
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
puts("Beware: this test set local variable dollar_foo and it cannot be unset!");
}
return 0;
}
@@ -109,7 +146,12 @@ static int hush_test_env_dollar(struct unit_test_state *uts)
/* Clean up setting the variable */
env_set("env_foo", NULL);
puts("Beware: this test set local variable env_foo and it cannot be unset!");
if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
/* Reset local variable. */
ut_assertok(run_command("env_foo=", 0));
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
puts("Beware: this test set local variable env_foo and it cannot be unset!");
}
return 0;
}
@@ -144,7 +186,18 @@ static int hush_test_command_dollar(struct unit_test_state *uts)
ut_assertok(run_command("dollar_bar='echo bar\\n'", 0));
ut_assertok(run_command("$dollar_bar", 0));
ut_assert_nextline("barn");
if (gd->flags & GD_FLG_HUSH_MODERN_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("bar\\n");
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
ut_assert_nextline("barn");
}
ut_assert_console_end();
ut_assertok(run_command("dollar_bar='echo $bar'", 0));
@@ -160,7 +213,13 @@ static int hush_test_command_dollar(struct unit_test_state *uts)
ut_assert_nextline("quux");
ut_assert_console_end();
puts("Beware: this test sets local variable dollar_bar and dollar_quux and they cannot be unset!");
if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
/* Reset local variables. */
ut_assertok(run_command("dollar_bar=", 0));
ut_assertok(run_command("dollar_quux=", 0));
} else if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
puts("Beware: this test sets local variable dollar_bar and dollar_quux and they cannot be unset!");
}
return 0;
}