From: Francis Laniel <francis.laniel@amarulasolutions.com>
To: u-boot@lists.denx.de
Cc: Michael Nazzareno Trimarchi <michael@amarulasolutions.com>,
Tom Rini <trini@konsulko.com>, Harald Seiler <hws@denx.de>,
Simon Glass <sjg@chromium.org>,
Francis Laniel <francis.laniel@amarulasolutions.com>
Subject: [PATCH v11 04/24] test: hush: Test hush variable expansion
Date: Tue, 7 Nov 2023 23:41:01 +0200 [thread overview]
Message-ID: <20231107214121.132079-5-francis.laniel@amarulasolutions.com> (raw)
In-Reply-To: <20231107214121.132079-1-francis.laniel@amarulasolutions.com>
Verifies shell variables are replaced by their values.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
---
test/hush/Makefile | 1 +
test/hush/dollar.c | 167 +++++++++++++++++++++++++++++++++++++++
test/py/tests/test_ut.py | 8 +-
3 files changed, 175 insertions(+), 1 deletion(-)
create mode 100644 test/hush/dollar.c
diff --git a/test/hush/Makefile b/test/hush/Makefile
index a3c9ae5106..feb4f71956 100644
--- 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
index 0000000000..defb2c3fd0
--- /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 1d9149a3f6..faef5fe874 100644
--- a/test/py/tests/test_ut.py
+++ b/test/py/tests/test_ut.py
@@ -499,5 +499,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')
--
2.34.1
next prev parent reply other threads:[~2023-11-07 21:42 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 21:40 [PATCH v11 00/24] Modernize U-Boot shell Francis Laniel
2023-11-07 21:40 ` [PATCH v11 01/24] test: Add framework to test hush behavior Francis Laniel
2023-11-07 21:40 ` [PATCH v11 02/24] test: hush: Test hush if/else Francis Laniel
2023-11-07 21:41 ` [PATCH v11 03/24] test/py: hush_if_test: Remove the test file Francis Laniel
2023-11-07 21:41 ` Francis Laniel [this message]
2023-11-07 21:41 ` [PATCH v11 05/24] test: hush: Test hush commands list Francis Laniel
2023-11-07 21:41 ` [PATCH v11 06/24] test: hush: Test hush loops Francis Laniel
2023-11-07 21:41 ` [PATCH v11 07/24] cli: Add Busybox upstream hush.c file Francis Laniel
2023-11-07 21:41 ` [PATCH v11 08/24] cli: Port Busybox 2021 hush to U-Boot Francis Laniel
2023-11-09 13:37 ` Tom Rini
2023-11-09 19:12 ` [PATCH] squash! Remove some ifndef __U_BOOT__ checks in new hush Tom Rini
2023-11-07 21:41 ` [PATCH v11 09/24] cli: Add menu for hush parser Francis Laniel
2023-11-09 13:38 ` Tom Rini
2023-11-07 21:41 ` [PATCH v11 10/24] global_data.h: add GD_FLG_HUSH_OLD_PARSER flag Francis Laniel
2023-11-07 21:41 ` [PATCH v11 11/24] cmd: Add new cli command Francis Laniel
2023-11-07 21:41 ` [PATCH v11 12/24] cli: Enables using hush 2021 parser as command line parser Francis Laniel
2023-11-07 21:41 ` [PATCH v11 13/24] cli: hush_2021: Enable variables expansion for hush 2021 Francis Laniel
2023-11-07 21:41 ` [PATCH v11 14/24] cli: hush_2021: Add functions to be called from run_command() Francis Laniel
2023-11-07 21:41 ` [PATCH v11 15/24] cli: add hush 2021 as parser for run_command*() Francis Laniel
2023-11-07 21:41 ` [PATCH v11 16/24] test: hush: Fix instructions list tests for hush 2021 Francis Laniel
2023-11-07 21:41 ` [PATCH v11 17/24] test: hush: Fix variable expansion " Francis Laniel
2023-11-07 21:41 ` [PATCH v11 18/24] cli: hush_2021: Enable using < and > as string compare operators Francis Laniel
2023-11-07 21:41 ` [PATCH v11 19/24] cli: hush_2021: Enable if keyword Francis Laniel
2023-11-07 21:41 ` [PATCH v11 20/24] cli: hush_2021: Enable loops Francis Laniel
2023-11-07 21:41 ` [PATCH v11 21/24] test: hush: Fix loop tests for hush 2021 Francis Laniel
2023-11-07 21:41 ` [PATCH v11 22/24] cli: hush_2021: Add upstream commits up to 2nd October 2023 Francis Laniel
2023-11-07 21:41 ` [PATCH v11 23/24] DO NOT MERGE: only to make CI happy Francis Laniel
2023-11-09 13:37 ` Tom Rini
2023-11-07 21:41 ` [PATCH v11 24/24] DO NOT MERGE: ci: Build the world in any case Francis Laniel
2023-11-08 22:56 ` Tom Rini
2023-11-08 12:14 ` [PATCH v11 00/24] Modernize U-Boot shell Peter Robinson
2023-11-09 1:15 ` Simon Glass
2023-11-09 2:42 ` Tom Rini
2023-11-09 13:37 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231107214121.132079-5-francis.laniel@amarulasolutions.com \
--to=francis.laniel@amarulasolutions.com \
--cc=hws@denx.de \
--cc=michael@amarulasolutions.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.