Use the new suite-runner to run these tests instead.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
include/test/suites.h | 1 - test/cmd_ut.c | 2 +- test/dm/Makefile | 2 -- test/dm/test-dm.c | 15 --------------- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 test/dm/test-dm.c
diff --git a/include/test/suites.h b/include/test/suites.h index d6c0061ff87..414613c593e 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -37,7 +37,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); -int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_exit(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 1fda67abd95..a0905ec54b7 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -133,7 +133,7 @@ static struct suite suites[] = { #endif SUITE(common), #if defined(CONFIG_UT_DM) - SUITE_CMD(dm, do_ut_dm), + SUITE(dm), #endif #if defined(CONFIG_UT_ENV) SUITE_CMD(env, do_ut_env), diff --git a/test/dm/Makefile b/test/dm/Makefile index bcb52ef1067..e44f3d89e77 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -3,8 +3,6 @@ # Copyright (c) 2013 Google, Inc # Copyright 2022-2023 Arm Limited and/or its affiliates open-source-office@arm.com
-obj-$(CONFIG_UT_DM) += test-dm.o - # Tests for particular subsystems - when enabling driver model for a new # subsystem you must add sandbox tests here. ifeq ($(CONFIG_XPL_BUILD),y) diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c deleted file mode 100644 index 8f83110163a..00000000000 --- a/test/dm/test-dm.c +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2013 Google, Inc - */ - -#include <test/suites.h> -#include <test/test.h> - -int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(dm); - const int n_ents = UNIT_TEST_SUITE_COUNT(dm); - - return cmd_ut_category("dm", "dm_test_", tests, n_ents, argc, argv); -}