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>

diff --git a/include/test/suites.h b/include/test/suites.h
index 72f98eb355876ea7684b30e07ae64e0fe9f3bd40..612167fe053df3968a45711e5a25970b5c260933 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -39,7 +39,6 @@ int do_ut_bloblist(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_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[]);

diff --git a/test/cmd/mbr.c b/test/cmd/mbr.c
index ad859921ce50826a1f1f4ece1120cb6d51447d38..45bab04923ac0262fb12ac536ad937fbce4f0892 100644 (file)
--- a/test/cmd/mbr.c
+++ b/test/cmd/mbr.c
@@ -471,11 +471,3 @@ static int mbr_test_run(struct unit_test_state *uts)
 
 /* 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);
-}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index a196702dd1708e3f16ac88cb1deea9efab5197b0..1a69b1c215b72afd1c88846f31b3a84700ab4b52 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -159,7 +159,7 @@ static struct suite suites[] = {
 #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)