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

test: hush: Use UTF_CONSOLE in tests

Browse source 
Set this flag rather than doing things manually in the test.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Simon Glass 2024-08-22 07:58:00 -06:00 • committed by Tom Rini
parent 675fde825a
commit d77519652a
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/hush/dollar.c
View file

@ -14,7 +14,6 @@ DECLARE_GLOBAL_DATA_PTR;
static int hush_test_simple_dollar(struct unit_test_state *uts) static int hush_test_simple_dollar(struct unit_test_state *uts)
{ {
console_record_reset_enable();
ut_assertok(run_command("echo $dollar_foo", 0)); ut_assertok(run_command("echo $dollar_foo", 0));
ut_assert_nextline_empty(); ut_assert_nextline_empty();
ut_assert_console_end(); ut_assert_console_end();
@ -121,12 +120,11 @@ static int hush_test_simple_dollar(struct unit_test_state *uts)
return 0; return 0;
} }
HUSH_TEST(hush_test_simple_dollar, 0); HUSH_TEST(hush_test_simple_dollar, UTF_CONSOLE);
static int hush_test_env_dollar(struct unit_test_state *uts) static int hush_test_env_dollar(struct unit_test_state *uts)
{ {
env_set("env_foo", "bar"); env_set("env_foo", "bar");
console_record_reset_enable();
ut_assertok(run_command("echo $env_foo", 0)); ut_assertok(run_command("echo $env_foo", 0));
ut_assert_nextline("bar"); ut_assert_nextline("bar");
@ -154,12 +152,10 @@ static int hush_test_env_dollar(struct unit_test_state *uts)
return 0; return 0;
} }
HUSH_TEST(hush_test_env_dollar, 0); HUSH_TEST(hush_test_env_dollar, UTF_CONSOLE);
static int hush_test_command_dollar(struct unit_test_state *uts) static int hush_test_command_dollar(struct unit_test_state *uts)
{ {
console_record_reset_enable();
ut_assertok(run_command("dollar_bar=\"echo bar\"", 0)); ut_assertok(run_command("dollar_bar=\"echo bar\"", 0));
ut_assertok(run_command("$dollar_bar", 0)); ut_assertok(run_command("$dollar_bar", 0));
@ -222,4 +218,4 @@ static int hush_test_command_dollar(struct unit_test_state *uts)
return 0; return 0;
} }
HUSH_TEST(hush_test_command_dollar, 0); HUSH_TEST(hush_test_command_dollar, UTF_CONSOLE);

11
test/hush/loop.c
View file

@ -14,8 +14,6 @@ DECLARE_GLOBAL_DATA_PTR;
static int hush_test_for(struct unit_test_state *uts) static int hush_test_for(struct unit_test_state *uts)
{ {
console_record_reset_enable();
ut_assertok(run_command("for loop_i in foo bar quux quux; do echo $loop_i; done", 0)); ut_assertok(run_command("for loop_i in foo bar quux quux; do echo $loop_i; done", 0));
ut_assert_nextline("foo"); ut_assert_nextline("foo");
ut_assert_nextline("bar"); ut_assert_nextline("bar");
@ -32,12 +30,10 @@ static int hush_test_for(struct unit_test_state *uts)
return 0; return 0;
} }
HUSH_TEST(hush_test_for, 0); HUSH_TEST(hush_test_for, UTF_CONSOLE);
static int hush_test_while(struct unit_test_state *uts) static int hush_test_while(struct unit_test_state *uts)
{ {
console_record_reset_enable();
if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) { if (gd->flags & GD_FLG_HUSH_MODERN_PARSER) {
/* /*
* Hush 2021 always returns 0 from while loop... * Hush 2021 always returns 0 from while loop...
@ -65,11 +61,10 @@ static int hush_test_while(struct unit_test_state *uts)
return 0; return 0;
} }
HUSH_TEST(hush_test_while, 0); HUSH_TEST(hush_test_while, UTF_CONSOLE);
static int hush_test_until(struct unit_test_state *uts) static int hush_test_until(struct unit_test_state *uts)
{ {
console_record_reset_enable();
env_set("loop_bar", "bar"); env_set("loop_bar", "bar");
/* /*
@ -87,4 +82,4 @@ static int hush_test_until(struct unit_test_state *uts)
env_set("loop_bar", NULL); env_set("loop_bar", NULL);
return 0; return 0;
} }
HUSH_TEST(hush_test_until, 0); HUSH_TEST(hush_test_until, UTF_CONSOLE);