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/common/Makefile | 1 - test/common/cmd_ut_common.c | 21 --------------------- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 test/common/cmd_ut_common.c
diff --git a/include/test/suites.h b/include/test/suites.h index 21158692e9b..d6c0061ff87 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_common(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[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 09538301cd7..1fda67abd95 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -131,7 +131,7 @@ static struct suite suites[] = { #ifdef CONFIG_CMDLINE SUITE(cmd), #endif - SUITE_CMD(common, do_ut_common), + SUITE(common), #if defined(CONFIG_UT_DM) SUITE_CMD(dm, do_ut_dm), #endif diff --git a/test/common/Makefile b/test/common/Makefile index 53c4f16164d..9cfb5585d78 100644 --- a/test/common/Makefile +++ b/test/common/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ -obj-y += cmd_ut_common.o obj-$(CONFIG_AUTOBOOT) += test_autoboot.o ifneq ($(CONFIG_$(XPL_)BLOBLIST),) obj-$(CONFIG_$(XPL_)CMDLINE) += bloblist.o diff --git a/test/common/cmd_ut_common.c b/test/common/cmd_ut_common.c deleted file mode 100644 index 0724c9361b8..00000000000 --- a/test/common/cmd_ut_common.c +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2019 Heinrich Schuchardt xypron.glpk@gmx.de - * Copyright (c) 2021 Steffen Jaeckel jaeckel-floss@eyet-services.de - * - * Unit tests for common functions - */ - -#include <command.h> -#include <test/common.h> -#include <test/suites.h> -#include <test/ut.h> - -int do_ut_common(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(common); - const int n_ents = UNIT_TEST_SUITE_COUNT(common); - - return cmd_ut_category("common", "common_test_", tests, n_ents, argc, - argv); -}