mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-10 00:40:30 +00:00
6c2f753f4a
The dollar test was merged with bugous console behavior, and
instead of fixing it, this behavior was just workarounded.
It seems like without the fix the ut_assert_skipline(); didn't clear
console and running ut_assert_skipline(); many times would give always
OK. With
lib: membuff: fix readline not returning line in case of overflow
the line is cleared correctly and next assert fails because now there
is nothing to clean which is correct if we look the this a bit above
the failing assert:
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();
}
Which further confirms that tests workaround the old problem and now
that problem is fixed we can remove the whole if blocks and simply
place ut_assert_console_end() right after ut_assert_skipline() without
any conditional and will pass green.
So this part of code goes from:
ut_assert_skipline();
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();
}
to become:
ut_assert_skipline();
ut_assert_console_end();
Same thing should be done with the if block mentioned above that calls
console_record_reset_enable().
Signed-off-by: Ion Agorria <ion@agorria.com>
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20240105072212.6615-8-clamor95@gmail.com
[mkorpershoek: reworded commit title]
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
209 lines
5.6 KiB
C
209 lines
5.6 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)
|
|
{
|
|
console_record_reset_enable();
|
|
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();
|
|
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!");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
HUSH_TEST(hush_test_simple_dollar, 0);
|
|
|
|
static int hush_test_env_dollar(struct unit_test_state *uts)
|
|
{
|
|
env_set("env_foo", "bar");
|
|
console_record_reset_enable();
|
|
|
|
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!");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
HUSH_TEST(hush_test_env_dollar, 0);
|
|
|
|
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", 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!");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
HUSH_TEST(hush_test_command_dollar, 0);
|