commit c16ffb2ea315da8ed10e7365ab0ed843fde7022f
author Simon Glass <sjg@chromium.org> Mon Jan 20 14:25:44 2025 -0700
committer Tom Rini <trini@konsulko.com> Fri Jan 24 14:34:40 2025 -0600
tree 80b99671469110de2b6383bbde8530337b8beac6
parent f7ad509bf4b03cf4150284c58dc555f8293b1052

test: Drop the function for running mbr tests

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

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

include/test/suites.h

diff --git a/include/test/suites.h b/include/test/suites.h
index 72f98eb..612167f 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -39,7 +39,6 @@
 		   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_mbr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_measurement(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_mem(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[]);

test/cmd/mbr.c

diff --git a/test/cmd/mbr.c b/test/cmd/mbr.c
index ad85992..45bab04 100644
--- a/test/cmd/mbr.c
+++ b/test/cmd/mbr.c
@@ -471,11 +471,3 @@
 
 /* Declare mbr test */
 UNIT_TEST(mbr_test_run, UTF_CONSOLE, mbr);
-
-int do_ut_mbr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	struct unit_test *tests = UNIT_TEST_SUITE_START(mbr);
-	const int n_ents = UNIT_TEST_SUITE_COUNT(mbr);
-
-	return cmd_ut_category("mbr", "mbr_test_", tests, n_ents, argc, argv);
-}

test/cmd_ut.c

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index a196702..1a69b1c 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -159,7 +159,7 @@
 #endif
 #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_MBR) && defined(CONFIG_CMD_MMC) \
         && defined(CONFIG_MMC_SANDBOX) && defined(CONFIG_MMC_WRITE)
-	SUITE_CMD(mbr, do_ut_mbr),
+	SUITE(mbr),
 #endif
 	SUITE_CMD(mem, do_ut_mem),
 #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_SETEXPR)