mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-17 02:15:02 +00:00

A few messages lack a newline so the test output shows the next test-name on the same line. For example: Beware: this test sets local variable dollar_bar and dollar_quux and they cannot be unset!Test: hush_test_env_dollar: dollar.c This is confusing, so fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
215 lines
5.8 KiB
C
215 lines
5.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* (C) Copyright 2021
|
|
* Francis Laniel, Amarula Solutions, francis.laniel@amarulasolutions.com
|
|
*/
|
|
|
|
#include <command.h>
|
|
#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)
|
|
{
|
|
ut_assertok(run_command("echo $dollar_foo", 0));
|
|
ut_assert_nextline_empty();
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("echo ${dollar_foo}", 0));
|
|
ut_assert_nextline_empty();
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_foo=bar", 0));
|
|
|
|
ut_assertok(run_command("echo $dollar_foo", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("echo ${dollar_foo}", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_foo=\\$bar", 0));
|
|
|
|
ut_assertok(run_command("echo $dollar_foo", 0));
|
|
ut_assert_nextline("$bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_foo='$bar'", 0));
|
|
|
|
ut_assertok(run_command("echo $dollar_foo", 0));
|
|
ut_assert_nextline("$bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_asserteq(1, run_command("dollar_foo=bar quux", 0));
|
|
/* Next line contains error message */
|
|
ut_assert_skipline();
|
|
ut_assert_console_end();
|
|
|
|
ut_asserteq(1, run_command("dollar_foo='bar quux", 0));
|
|
/* Next line contains error message */
|
|
ut_assert_skipline();
|
|
ut_assert_console_end();
|
|
|
|
ut_asserteq(1, run_command("dollar_foo=bar quux\"", 0));
|
|
/* Next line contains error message */
|
|
ut_assert_skipline();
|
|
/*
|
|
* Old parser prints the error message on two lines:
|
|
* Unknown command 'quux
|
|
* ' - try 'help'
|
|
* While the new only prints it on one:
|
|
* syntax error: unterminated \"
|
|
*/
|
|
if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
|
|
ut_assert_skipline();
|
|
}
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_foo='bar \"quux'", 0));
|
|
|
|
ut_assertok(run_command("echo $dollar_foo", 0));
|
|
/*
|
|
* This one is buggy.
|
|
* ut_assert_nextline("bar \"quux");
|
|
* ut_assert_console_end();
|
|
*
|
|
* So, let's reset output:
|
|
*/
|
|
console_record_reset_enable();
|
|
|
|
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();
|
|
|
|
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!\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
HUSH_TEST(hush_test_simple_dollar, UTF_CONSOLE);
|
|
|
|
static int hush_test_env_dollar(struct unit_test_state *uts)
|
|
{
|
|
env_set("env_foo", "bar");
|
|
|
|
ut_assertok(run_command("echo $env_foo", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("echo ${env_foo}", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
/* Environment variables have priority over local variable */
|
|
ut_assertok(run_command("env_foo=quux", 0));
|
|
ut_assertok(run_command("echo ${env_foo}", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
/* Clean up setting the variable */
|
|
env_set("env_foo", NULL);
|
|
|
|
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!\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
HUSH_TEST(hush_test_env_dollar, UTF_CONSOLE);
|
|
|
|
static int hush_test_command_dollar(struct unit_test_state *uts)
|
|
{
|
|
ut_assertok(run_command("dollar_bar=\"echo bar\"", 0));
|
|
|
|
ut_assertok(run_command("$dollar_bar", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("${dollar_bar}", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_bar=\"echo\nbar\"", 0));
|
|
|
|
ut_assertok(run_command("$dollar_bar", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_bar='echo bar\n'", 0));
|
|
|
|
ut_assertok(run_command("$dollar_bar", 0));
|
|
ut_assert_nextline("bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_bar='echo bar\\n'", 0));
|
|
|
|
ut_assertok(run_command("$dollar_bar", 0));
|
|
|
|
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));
|
|
|
|
ut_assertok(run_command("$dollar_bar", 0));
|
|
ut_assert_nextline("$bar");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("dollar_quux=quux", 0));
|
|
ut_assertok(run_command("dollar_bar=\"echo $dollar_quux\"", 0));
|
|
|
|
ut_assertok(run_command("$dollar_bar", 0));
|
|
ut_assert_nextline("quux");
|
|
ut_assert_console_end();
|
|
|
|
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!\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
HUSH_TEST(hush_test_command_dollar, UTF_CONSOLE);
|