[PATCH v2 33/44] test: Drop the function for running upl tests

[Simon Glass]

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

It is not clear that these actually work, since they are not enabled on
sandbox for some reason.

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

(no changes since v1)

 include/test/suites.h | 1 -
 test/boot/upl.c       | 8 --------
 test/cmd_ut.c         | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h
index cd758b8c464..20e6a2a113b 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -35,6 +35,5 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc,
 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,
 		  char *const argv[]);
-int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif /* __TEST_SUITES_H__ */
diff --git a/test/boot/upl.c b/test/boot/upl.c
index 2c9b8bc8bc0..aa58cdf083b 100644
--- a/test/boot/upl.c
+++ b/test/boot/upl.c
@@ -426,11 +426,3 @@ static int upl_test_info_norun(struct unit_test_state *uts)
 	return 0;
 }
 UPL_TEST(upl_test_info_norun, UTF_CONSOLE | UTF_MANUAL);
-
-int do_ut_upl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	struct unit_test *tests = UNIT_TEST_SUITE_START(upl);
-	const int n_ents = UNIT_TEST_SUITE_COUNT(upl);
-
-	return cmd_ut_category("upl", "cmd_upl_", tests, n_ents, argc, argv);
-}
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index ed6bc3a9a49..efcac626a5b 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -190,7 +190,7 @@ static struct suite suites[] = {
 	SUITE(seama),
 #endif
 #ifdef CONFIG_CMD_UPL
-	SUITE_CMD(upl, do_ut_upl),
+	SUITE(upl),
 #endif
 };
 
-- 
2.43.0