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/Makefile | 2 +- test/cmd/mem.c | 19 ------------------- test/cmd_ut.c | 2 +- 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 test/cmd/mem.c
diff --git a/include/test/suites.h b/include/test/suites.h index 612167fe053..cb6b6fba240 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -40,7 +40,6 @@ int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, 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_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[]); int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/test/cmd/Makefile b/test/cmd/Makefile index f83c53696d0..d8a5e77402d 100644 --- a/test/cmd/Makefile +++ b/test/cmd/Makefile @@ -10,7 +10,7 @@ endif ifdef CONFIG_CONSOLE_RECORD obj-$(CONFIG_CMD_PAUSE) += test_pause.o endif -obj-y += exit.o mem.o +obj-y += exit.o obj-$(CONFIG_X86) += cpuid.o msr.o obj-$(CONFIG_CMD_ADDRMAP) += addrmap.o obj-$(CONFIG_CMD_BDI) += bdinfo.o diff --git a/test/cmd/mem.c b/test/cmd/mem.c deleted file mode 100644 index 2b78e421a9c..00000000000 --- a/test/cmd/mem.c +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Executes tests for memory-related commands - * - * Copyright 2020 Google LLC - */ - -#include <command.h> -#include <test/suites.h> -#include <test/test.h> - -int do_ut_mem(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(mem); - const int n_ents = UNIT_TEST_SUITE_COUNT(mem); - - return cmd_ut_category("mem", "mem_test_", tests, n_ents, argc, - argv); -} diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 1a69b1c215b..8ab29046969 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -161,7 +161,7 @@ static struct suite suites[] = { && defined(CONFIG_MMC_SANDBOX) && defined(CONFIG_MMC_WRITE) SUITE(mbr), #endif - SUITE_CMD(mem, do_ut_mem), + SUITE(mem), #if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_SETEXPR) SUITE_CMD(setexpr, do_ut_setexpr), #endif