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/Makefile | 2 -- test/cmd/cmd_ut_cmd.c | 20 -------------------- test/cmd_ut.c | 2 +- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 test/cmd/cmd_ut_cmd.c
diff --git a/include/test/suites.h b/include/test/suites.h index b6af9295424..21158692e9b 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_cmd(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[]); diff --git a/test/cmd/Makefile b/test/cmd/Makefile index 583e7c2eec4..f83c53696d0 100644 --- a/test/cmd/Makefile +++ b/test/cmd/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-y += cmd_ut_cmd.o - obj-$(CONFIG_$(XPL_)CMDLINE) += command.o ifdef CONFIG_HUSH_PARSER obj-$(CONFIG_CONSOLE_RECORD) += test_echo.o diff --git a/test/cmd/cmd_ut_cmd.c b/test/cmd/cmd_ut_cmd.c deleted file mode 100644 index ad192563c5a..00000000000 --- a/test/cmd/cmd_ut_cmd.c +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright 2023 Google LLC - * Written by Simon Glass sjg@chromium.org - * - * Unit tests for command functions - */ - -#include <command.h> -#include <test/cmd.h> -#include <test/suites.h> -#include <test/ut.h> - -int do_ut_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(cmd); - const int n_ents = UNIT_TEST_SUITE_COUNT(cmd); - - return cmd_ut_category("cmd", "cmd_test_", tests, n_ents, argc, argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 2ee9b589b52..761556cc763 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -129,7 +129,7 @@ static struct suite suites[] = { SUITE_CMD(bootstd, do_ut_bootstd), #endif #ifdef CONFIG_CMDLINE - SUITE_CMD(cmd, do_ut_cmd), + SUITE(cmd), #endif SUITE_CMD(common, do_ut_common), #if defined(CONFIG_UT_DM)