test: hush: Test hush variable expansion

Verifies shell variables are replaced by their values.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>

diff --git a/test/hush/Makefile b/test/hush/Makefile
index a3c9ae510610bfccf737d1fd64014170becf1560..feb4f71956182fe0109fe1471631d79bcc4f2274 100644 (file)
--- a/test/hush/Makefile
+++ b/test/hush/Makefile
@@ -5,3 +5,4 @@
 
 obj-y += cmd_ut_hush.o
 obj-y += if.o
+obj-y += dollar.o

diff --git a/test/hush/dollar.c b/test/hush/dollar.c
new file mode 100644 (file)
index 0000000..defb2c3
--- /dev/null
+++ b/test/hush/dollar.c
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * (C) Copyright 2021
+ * Francis Laniel, Amarula Solutions, francis.laniel@amarulasolutions.com
+ */
+
+#include <common.h>
+#include <command.h>
+#include <env_attr.h>
+#include <test/hush.h>
+#include <test/ut.h>
+
+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));
+       /* Two next lines contain error message */
+       ut_assert_skipline();
+       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();
+
+       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!");
+
+       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);
+
+       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));
+       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();
+
+       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);

diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py
index 0e3a48e73f611c6119632873e42af892a9ae073c..c169c835e38a3a6310298bec3c2d5eb932db5a52 100644 (file)
--- a/test/py/tests/test_ut.py
+++ b/test/py/tests/test_ut.py
@@ -500,5 +500,11 @@ def test_ut(u_boot_console, ut_subtest):
             execute command 'ut foo bar'
     """
 
-    output = u_boot_console.run_command('ut ' + ut_subtest)
+    if ut_subtest == 'hush hush_test_simple_dollar':
+        # ut hush hush_test_simple_dollar prints "Unknown command" on purpose.
+        with u_boot_console.disable_check('unknown_command'):
+            output = u_boot_console.run_command('ut ' + ut_subtest)
+        assert('Unknown command \'quux\' - try \'help\'' in output)
+    else:
+        output = u_boot_console.run_command('ut ' + ut_subtest)
     assert output.endswith('Failures: 0')