Use the new suite-runner to run these tests instead.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/test/suites.h | 1 - test/cmd/mbr.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 72f98eb3558..612167fe053 100644 --- 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 ad859921ce5..45bab04923a 100644 --- 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 c490498b4c5..f5fbcf0d686 100644 --- 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)