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>,
Francis Laniel <francis.laniel@amarulasolutions.com>
Subject: [RFC PATCH v1 15/21] test: hush: Fix instructions list tests for hush 2021.
Date: Fri, 31 Dec 2021 17:13:21 +0100 [thread overview]
Message-ID: <20211231161327.24918-16-francis.laniel@amarulasolutions.com> (raw)
In-Reply-To: <20211231161327.24918-1-francis.laniel@amarulasolutions.com>
This commit modifies the expected result for hush 2021.
Indeed, there were bugs in actual U-Boot hush which were fixed in upstream
Busybox.
As hush 2021 is based on upstream Busybox, these bugs no longer exist.
Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
---
test/hush/list.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/test/hush/list.c b/test/hush/list.c
index 052cf2783c..096bb4f034 100644
--- a/test/hush/list.c
+++ b/test/hush/list.c
@@ -50,8 +50,32 @@ static int hush_test_and_or(struct unit_test_state *uts)
{
/* A && B || C truth table. */
ut_asserteq(1, run_command("false && false || false", 0));
+#ifdef CONFIG_HUSH_OLD_PARSER
ut_asserteq(1, run_command("false && false || true", 0));
+#elif defined(CONFIG_HUSH_2021_PARSER)
+ /*
+ * This difference seems to come from a bug solved in Busybox hush.
+ *
+ * Indeed, the following expression can be seen like this:
+ * (false && false) || true
+ * So, (false && false) returns 1, the second false is not executed, and
+ * true is executed because of ||.
+ */
+ ut_assertok(run_command("false && false || true", 0));
+#endif /* CONFIG_HUSH_2021_PARSER */
+#ifdef CONFIG_HUSH_OLD_PARSER
ut_asserteq(1, run_command("false && true || true", 0));
+#elif defined(CONFIG_HUSH_2021_PARSER)
+ /*
+ * This difference seems to come from a bug solved in Busybox hush.
+ *
+ * Indeed, the following expression can be seen like this:
+ * (false && true) || true
+ * So, (false && true) returns 1, the true is not executed, and true is
+ * executed because of ||.
+ */
+ ut_assertok(run_command("false && true || true", 0));
+#endif /* CONFIG_HUSH_2021_PARSER */
ut_asserteq(1, run_command("false && true || false", 0));
ut_assertok(run_command("true && true || false", 0));
ut_asserteq(1, run_command("true && false || false", 0));
@@ -69,8 +93,32 @@ static int hush_test_or_and(struct unit_test_state *uts)
ut_asserteq(1, run_command("false || false && true", 0));
ut_assertok(run_command("false || true && true", 0));
ut_asserteq(1, run_command("false || true && false", 0));
+#ifdef CONFIG_HUSH_OLD_PARSER
ut_assertok(run_command("true || true && false", 0));
+#elif defined(CONFIG_HUSH_2021_PARSER)
+ /*
+ * This difference seems to come from a bug solved in Busybox hush.
+ *
+ * Indeed, the following expression can be seen like this:
+ * (true || true) && false
+ * So, (true || true) returns 0, the second true is not executed, and
+ * then false is executed because of &&.
+ */
+ ut_asserteq(1, run_command("true || true && false", 0));
+#endif /* CONFIG_HUSH_2021_PARSER */
+#ifdef CONFIG_HUSH_OLD_PARSER
ut_assertok(run_command("true || false && false", 0));
+#elif defined(CONFIG_HUSH_2021_PARSER)
+ /*
+ * This difference seems to come from a bug solved in Busybox hush.
+ *
+ * Indeed, the following expression can be seen like this:
+ * (true || false) && false
+ * So, (true || false) returns 0, the false is not executed, and then
+ * false is executed because of &&.
+ */
+ ut_asserteq(1, run_command("true || false && false", 0));
+#endif /* CONFIG_HUSH_2021_PARSER */
ut_assertok(run_command("true || false && true", 0));
ut_assertok(run_command("true || true && true", 0));
--
2.25.1
next prev parent reply other threads:[~2021-12-31 16:18 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-31 16:13 [RFC PATCH v1 00/21] Modernize U-Boot shell Francis Laniel
2021-12-31 16:13 ` [RFC PATCH v1 01/21] test: Add framework to test hush behavior Francis Laniel
2022-01-08 14:53 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 02/21] test: hush: Test hush if/else Francis Laniel
2022-01-08 14:53 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 03/21] test/py: hush_if_test: Remove the test file Francis Laniel
2022-01-08 14:53 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 04/21] test: hush: Test hush variable expansion Francis Laniel
2022-01-08 14:53 ` Simon Glass
2022-02-06 18:22 ` Francis Laniel
2021-12-31 16:13 ` [RFC PATCH v1 05/21] test: hush: Test hush commands list Francis Laniel
2022-01-08 14:54 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 06/21] test: hush: Test hush loops Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 07/21] cli: Add Busybox upstream hush.c file Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 08/21] cli: Port Busybox 2021 hush to U-Boot Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 09/21] cli: Add choice for hush parser Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 10/21] cli: Add HUSH_2021_PARSER to hush parser choice Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 11/21] cli: Enables using hush 2021 parser as command line parser Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 12/21] cli: hush_2021: Enable variables expansion for hush 2021 Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 13/21] cli: hush_2021: Add functions to be called from run_command() Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 14/21] cli: Modify run_command() to add hush 2021 as parser Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` Francis Laniel [this message]
2022-01-12 20:03 ` [RFC PATCH v1 15/21] test: hush: Fix instructions list tests for hush 2021 Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 16/21] test: hush: Fix variable expansion " Francis Laniel
2022-01-12 20:03 ` Simon Glass
2022-02-06 18:23 ` Francis Laniel
2022-02-07 20:22 ` Simon Glass
2022-03-24 1:49 ` Francis Laniel
2021-12-31 16:13 ` [RFC PATCH v1 17/21] cli: hush_2021: Enable using \< and \> as string compare operators Francis Laniel
2022-01-12 20:03 ` Simon Glass
2022-02-06 18:23 ` Francis Laniel
2021-12-31 16:13 ` [RFC PATCH v1 18/21] cli: hush_2021: Enable if keyword Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 19/21] test: hush: Fix if tests for hush 2021 Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 20/21] cli: hush_2021: Enable loops Francis Laniel
2022-01-12 20:03 ` Simon Glass
2021-12-31 16:13 ` [RFC PATCH v1 21/21] test: hush: Fix loop tests for hush 2021 Francis Laniel
2022-01-12 20:03 ` Simon Glass
2022-01-31 22:15 ` [RFC PATCH v1 00/21] 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=20211231161327.24918-16-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=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.