test: Drop the function for running lib tests

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/test/suites.h b/include/test/suites.h
index 587d6a5b4739a7b1001efe356d16717caee4eb6f..08b35b276beeb755407f3673262d296d530bf1e1 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -38,7 +38,6 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc,
 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_lib(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[]);

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index db96a4ac2acc743862e8f0a0e5e806403d0970c5..27d090c7225c67c2e479b94d4bd01b66d219acc1 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -152,7 +152,7 @@ static struct suite suites[] = {
        SUITE_CMD(overlay, do_ut_overlay),
 #endif
 #ifdef CONFIG_UT_LIB
-       SUITE_CMD(lib, do_ut_lib),
+       SUITE(lib),
 #endif
 #ifdef CONFIG_UT_LOG
        SUITE_CMD(log, do_ut_log),

diff --git a/test/lib/Makefile b/test/lib/Makefile
index 24ce6ed8f00e7f7163fa08fcf0f9c5cb1b0bc61c..f136cac5ce78e5d9e87ddc9e1fc487e7e5c68f42 100644 (file)
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -6,7 +6,6 @@
 obj-$(CONFIG_$(XPL_)UT_COMPRESSION) += compression.o
 
 ifeq ($(CONFIG_XPL_BUILD),)
-obj-y += cmd_ut_lib.o
 obj-y += abuf.o
 obj-y += alist.o
 obj-$(CONFIG_EFI_LOADER) += efi_device_path.o

diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c
deleted file mode 100644 (file)
index 90a8c07..0000000
--- a/test/lib/cmd_ut_lib.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2019 Heinrich Schuchardt <xypron.glpk@gmx.de>
- *
- * Unit tests for library functions
- */
-
-#include <command.h>
-#include <test/lib.h>
-#include <test/suites.h>
-#include <test/ut.h>
-
-int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       struct unit_test *tests = UNIT_TEST_SUITE_START(lib);
-       const int n_ents = UNIT_TEST_SUITE_COUNT(lib);
-
-       return cmd_ut_category("lib", "lib_test_", tests, n_ents, argc, argv);
-}