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 16/24] test: hush: Fix instructions list tests for hush 2021
Date: Tue, 7 Nov 2023 23:41:13 +0200 [thread overview]
Message-ID: <20231107214121.132079-17-francis.laniel@amarulasolutions.com> (raw)
In-Reply-To: <20231107214121.132079-1-francis.laniel@amarulasolutions.com>
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.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
---
test/hush/list.c | 69 +++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 65 insertions(+), 4 deletions(-)
diff --git a/test/hush/list.c b/test/hush/list.c
index 052cf2783c..6f8f10f15e 100644
--- a/test/hush/list.c
+++ b/test/hush/list.c
@@ -9,6 +9,7 @@
#include <env_attr.h>
#include <test/hush.h>
#include <test/ut.h>
+#include <asm/global_data.h>
static int hush_test_semicolon(struct unit_test_state *uts)
{
@@ -46,12 +47,43 @@ static int hush_test_or(struct unit_test_state *uts)
}
HUSH_TEST(hush_test_or, 0);
+DECLARE_GLOBAL_DATA_PTR;
+
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));
- ut_asserteq(1, run_command("false && false || true", 0));
- ut_asserteq(1, run_command("false && true || true", 0));
+
+ if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+ ut_asserteq(1, run_command("false && false || true", 0));
+ } else if (gd->flags & GD_FLG_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));
+ }
+
+ if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+ ut_asserteq(1, run_command("false && true || true", 0));
+ } else if (gd->flags & GD_FLG_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));
+ }
+
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 +101,37 @@ 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));
- ut_assertok(run_command("true || true && false", 0));
- ut_assertok(run_command("true || false && false", 0));
+
+ if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+ ut_assertok(run_command("true || true && false", 0));
+ } else if (gd->flags & GD_FLG_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));
+ }
+
+ if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+ ut_assertok(run_command("true || false && false", 0));
+ } else if (gd->flags & GD_FLG_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));
+ }
+
ut_assertok(run_command("true || false && true", 0));
ut_assertok(run_command("true || true && true", 0));
--
2.34.1
next prev parent reply other threads:[~2023-11-07 21:44 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 ` [PATCH v11 04/24] test: hush: Test hush variable expansion Francis Laniel
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 ` Francis Laniel [this message]
2023-11-07 21:41 ` [PATCH v11 17/24] test: hush: Fix variable expansion tests for hush 2021 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-17-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.