All of lore.kernel.org
 help / color / mirror / Atom feed
From: Francis Laniel <francis.laniel@amarulasolutions.com>
To: u-boot@lists.denx.de
Cc: Marek Behun <marek.behun@nic.cz>,
	Michael Nazzareno Trimarchi <michael@amarulasolutions.com>,
	Simon Glass <sjg@chromium.org>, Wolfgang Denk <wd@denx.de>,
	Harald Seiler <hws@denx.de>, Tom Rini <trini@konsulko.com>,
	Francis Laniel <francis.laniel@amarulasolutions.com>
Subject: [RFC PATCH v4 05/28] test: hush: Test hush variable expansion
Date: Fri, 17 Jun 2022 00:31:35 +0200	[thread overview]
Message-ID: <20220616223158.9225-6-francis.laniel@amarulasolutions.com> (raw)
In-Reply-To: <20220616223158.9225-1-francis.laniel@amarulasolutions.com>

Verifies shell variables are replaced by their values.

Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
---
 test/hush/Makefile |   1 +
 test/hush/dollar.c | 167 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)
 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..27feda2970
--- /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("%s", "");
+	ut_assert_console_end();
+
+	ut_assertok(run_command("echo ${dollar_foo}", 0));
+	ut_assert_nextline("%s", "");
+	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);
-- 
2.25.1


  parent reply	other threads:[~2022-06-16 22:34 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-16 22:31 [RFC PATCH v4 00/28] Modernize U-Boot shell Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 01/28] video: sandbox: Add dummy function for sandbox_sdl_remove_display() Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 02/28] test: Add framework to test hush behavior Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 03/28] test: hush: Test hush if/else Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 04/28] test/py: hush_if_test: Remove the test file Francis Laniel
2022-06-16 22:31 ` Francis Laniel [this message]
2022-06-16 22:31 ` [RFC PATCH v4 06/28] test: hush: Test hush commands list Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 07/28] test: hush: Test hush loops Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 08/28] cli: Add Busybox upstream hush.c file Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 09/28] cli: Port Busybox 2021 hush to U-Boot Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 10/28] cli: Add menu for hush parser Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 11/28] global_data.h: add GD_FLG_HUSH_OLD_PARSER flag Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 12/28] cmd: Add new parser command Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 13/28] cli: Enables using hush 2021 parser as command line parser Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 14/28] cli: hush_2021: Enable variables expansion for hush 2021 Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 15/28] cli: hush_2021: Add functions to be called from run_command() Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 16/28] cli: add hush 2021 as parser for run_command*() Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 17/28] test: hush: Fix instructions list tests for hush 2021 Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 18/28] test: hush: Fix variable expansion " Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 19/28] cli: hush_2021: Enable using \< and \> as string compare operators Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 20/28] cli: hush_2021: Enable if keyword Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 21/28] test: hush: Fix if tests for hush 2021 Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 22/28] cli: hush_2021: Enable loops Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 23/28] test: hush: Fix loop tests for hush 2021 Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 24/28] Modernize U-Boot shell Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 25/28] cli: hush_2021: Add upstream commits up to 6th February 2022 Francis Laniel
2022-06-20 19:11   ` Tom Rini
2022-08-12 20:56     ` Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 26/28] for test purpose only: Comment out dollar tests which prints error messages Francis Laniel
2022-06-17 14:02   ` Tom Rini
2022-08-12 21:12     ` Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 27/28] for test purpose only: Comment out failed function which fails only in CI Francis Laniel
2022-06-17 14:49   ` Tom Rini
2022-10-10 20:52     ` [PATCH] for debug purpose only: add print to debug odd behavior Francis Laniel
2022-06-16 22:31 ` [RFC PATCH v4 28/28] board: keymile: common: Use environment to store IVM_* variables Francis Laniel
2022-06-17 14:48   ` Tom Rini
2022-06-20 14:46     ` Aleksandar Gerasimovski
2022-06-20 15:27       ` Holger Brunck
2022-06-20 15:35         ` Tom Rini
2022-06-20 16:08           ` Holger Brunck
2022-06-20 17:33             ` Tom Rini
2022-08-12 21:01               ` Francis Laniel
2022-08-15  8:13                 ` Holger Brunck
2022-06-17 14:50 ` [RFC PATCH v4 00/28] Modernize U-Boot shell 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=20220616223158.9225-6-francis.laniel@amarulasolutions.com \
    --to=francis.laniel@amarulasolutions.com \
    --cc=hws@denx.de \
    --cc=marek.behun@nic.cz \
    --cc=michael@amarulasolutions.com \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=wd@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.