[PATCH v2 29/44] test: Drop the function for running hush tests

[Simon Glass]

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 include/test/suites.h   |  1 -
 test/cmd_ut.c           |  2 +-
 test/hush/Makefile      |  1 -
 test/hush/cmd_ut_hush.c | 19 -------------------
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 test/hush/cmd_ut_hush.c

diff --git a/include/test/suites.h b/include/test/suites.h
index 54fddaa6bac..b96a78f7129 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -32,7 +32,6 @@ int cmd_ut_category(const char *name, const char *prefix,
 
 int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc,
 		  char *const argv[]);
-int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 611171740a9..c892891d6c8 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -178,7 +178,7 @@ static struct suite suites[] = {
 	SUITE(addrmap),
 #endif
 #if CONFIG_IS_ENABLED(HUSH_PARSER)
-	SUITE_CMD(hush, do_ut_hush),
+	SUITE(hush),
 #endif
 #ifdef CONFIG_CMD_LOADM
 	SUITE_CMD(loadm, do_ut_loadm),
diff --git a/test/hush/Makefile b/test/hush/Makefile
index 4c3a0be857a..febdc82e8aa 100644
--- a/test/hush/Makefile
+++ b/test/hush/Makefile
@@ -3,7 +3,6 @@
 # (C) Copyright 2021
 # Francis Laniel, Amarula Solutions, francis.laniel at amarulasolutions.com
 
-obj-y += cmd_ut_hush.o
 obj-y += if.o
 ifdef CONFIG_CONSOLE_RECORD
 obj-y += dollar.o
diff --git a/test/hush/cmd_ut_hush.c b/test/hush/cmd_ut_hush.c
deleted file mode 100644
index 141203d766b..00000000000
--- a/test/hush/cmd_ut_hush.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * (C) Copyright 2021
- * Francis Laniel, Amarula Solutions, francis.laniel at amarulasolutions.com
- */
-
-#include <command.h>
-#include <test/hush.h>
-#include <test/suites.h>
-#include <test/ut.h>
-
-int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	struct unit_test *tests = UNIT_TEST_SUITE_START(hush);
-	const int n_ents = UNIT_TEST_SUITE_COUNT(hush);
-
-	return cmd_ut_category("hush", "hush_test_",
-			       tests, n_ents, argc, argv);
-}
-- 
2.43.0