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_ut.c | 2 +- test/log/Makefile | 2 -- test/log/log_ut.c | 20 -------------------- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 test/log/log_ut.c
diff --git a/include/test/suites.h b/include/test/suites.h index 08b35b276be..72f98eb3558 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_log(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[]); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index ba101a48b98..c490498b4c5 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -155,7 +155,7 @@ static struct suite suites[] = { SUITE(lib), #endif #ifdef CONFIG_UT_LOG - SUITE_CMD(log, do_ut_log), + SUITE(log), #endif #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_MBR) && defined(CONFIG_CMD_MMC) \ && defined(CONFIG_MMC_SANDBOX) && defined(CONFIG_MMC_WRITE) diff --git a/test/log/Makefile b/test/log/Makefile index 08eea70e344..24b7c46786d 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -7,8 +7,6 @@ obj-$(CONFIG_CMD_LOG) += log_filter.o
ifdef CONFIG_UT_LOG
-obj-y += log_ut.o - ifdef CONFIG_SANDBOX obj-$(CONFIG_LOG_SYSLOG) += syslog_test.o obj-$(CONFIG_LOG_SYSLOG) += syslog_test_ndebug.o diff --git a/test/log/log_ut.c b/test/log/log_ut.c deleted file mode 100644 index 2aa3afe286a..00000000000 --- a/test/log/log_ut.c +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2020, Heinrich Schuchardt xypron.glpk@gmx.de - * - * Logging function tests. - */ - -#include <console.h> -#include <log.h> -#include <test/log.h> -#include <test/suites.h> - -int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(log); - const int n_ents = UNIT_TEST_SUITE_COUNT(log); - - return cmd_ut_category("log", "log_test_", - tests, n_ents, argc, argv); -}