public inbox for u-boot@lists.denx.de
 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 21/28] test: hush: Fix if tests for hush 2021
Date: Fri, 17 Jun 2022 00:31:51 +0200	[thread overview]
Message-ID: <20220616223158.9225-22-francis.laniel@amarulasolutions.com> (raw)
In-Reply-To: <20220616223158.9225-1-francis.laniel@amarulasolutions.com>

Modifies the command run for hush 2021 when using string comparison operator.
Indeed, '<' and '>' must be escaped to be used as these operators.

Signed-off-by: Francis Laniel <francis.laniel@amarulasolutions.com>
---
 test/hush/if.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/test/hush/if.c b/test/hush/if.c
index a57d88850f..f4aebc58b3 100644
--- a/test/hush/if.c
+++ b/test/hush/if.c
@@ -9,6 +9,7 @@
 #include <env_attr.h>
 #include <test/hush.h>
 #include <test/ut.h>
+#include <asm/global_data.h>
 
 /*
  * All tests will execute the following:
@@ -35,10 +36,15 @@ static int hush_test_if_base(struct unit_test_state *uts)
 }
 HUSH_TEST(hush_test_if_base, 0);
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static int hush_test_if_basic_operators(struct unit_test_state *uts)
 {
 	char if_formatted[128];
 
+	if (gd->flags & GD_FLG_HUSH_2021_PARSER)
+		console_record_reset_enable();
+
 	sprintf(if_formatted, if_format, "test aaa = aaa");
 	ut_assertok(run_command(if_formatted, 0));
 
@@ -52,15 +58,54 @@ static int hush_test_if_basic_operators(struct unit_test_state *uts)
 	ut_asserteq(1, run_command(if_formatted, 0));
 
 	sprintf(if_formatted, if_format, "test aaa < bbb");
+	if (gd->flags & GD_FLG_HUSH_2021_PARSER) {
+		/*
+		 * We need to escape < and > to use as them as string comparison
+		 * operator.
+		 * Otherwise, they are interpreted as redirection operators
+		 * which is not supported in U-Boot.
+		 */
+		ut_asserteq(1, run_command(if_formatted, 0));
+		/* Next lines contains error message (which is on two lines). */
+		ut_assert_skipline();
+		ut_assert_skipline();
+		ut_assert_console_end();
+
+		sprintf(if_formatted, if_format, "test aaa \\< bbb");
+	}
 	ut_assertok(run_command(if_formatted, 0));
 
 	sprintf(if_formatted, if_format, "test bbb < aaa");
+	if (gd->flags & GD_FLG_HUSH_2021_PARSER) {
+		ut_asserteq(1, run_command(if_formatted, 0));
+		ut_assert_skipline();
+		ut_assert_skipline();
+		ut_assert_console_end();
+
+		sprintf(if_formatted, if_format, "test bbb \\< aaa");
+	}
 	ut_asserteq(1, run_command(if_formatted, 0));
 
 	sprintf(if_formatted, if_format, "test bbb > aaa");
+	if (gd->flags & GD_FLG_HUSH_2021_PARSER) {
+		ut_asserteq(1, run_command(if_formatted, 0));
+		ut_assert_skipline();
+		ut_assert_skipline();
+		ut_assert_console_end();
+
+		sprintf(if_formatted, if_format, "test bbb \\> aaa");
+	}
 	ut_assertok(run_command(if_formatted, 0));
 
 	sprintf(if_formatted, if_format, "test aaa > bbb");
+	if (gd->flags & GD_FLG_HUSH_2021_PARSER) {
+		ut_asserteq(1, run_command(if_formatted, 0));
+		ut_assert_skipline();
+		ut_assert_skipline();
+		ut_assert_console_end();
+
+		sprintf(if_formatted, if_format, "test aaa \\> bbb");
+	}
 	ut_asserteq(1, run_command(if_formatted, 0));
 
 	sprintf(if_formatted, if_format, "test 123 -eq 123");
-- 
2.25.1


  parent reply	other threads:[~2022-06-16 22:41 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 ` [RFC PATCH v4 05/28] test: hush: Test hush variable expansion Francis Laniel
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 ` Francis Laniel [this message]
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-22-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox