test: Drop the function for running bootstd 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 78f5cdb4bdfb655c8018eb682ae67529ef893784..692633dcaa40384a2b4f9161b0c425c2187be170 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -34,8 +34,6 @@ int cmd_ut_category(struct unit_test_state *uts, const char *name,
                    const char *prefix, struct unit_test *tests, int n_ents,
                    int argc, char *const argv[]);
 
-int do_ut_bootstd(struct unit_test_state *uts, 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[]);
 
 #endif /* __TEST_SUITES_H__ */

diff --git a/test/boot/bootstd_common.c b/test/boot/bootstd_common.c
index e28cae7f374d3fd6f320c0057f7db0fa06ae12f5..6a84810983c9a136e3d7f6df8d52b64154948244 100644 (file)
--- a/test/boot/bootstd_common.c
+++ b/test/boot/bootstd_common.c
@@ -100,13 +100,3 @@ void bootstd_reset_usb(void)
 {
        usb_started = false;
 }
-
-int do_ut_bootstd(struct unit_test_state *uts, struct cmd_tbl *cmdtp, int flag,
-                 int argc, char *const argv[])
-{
-       struct unit_test *tests = UNIT_TEST_SUITE_START(bootstd);
-       const int n_ents = UNIT_TEST_SUITE_COUNT(bootstd);
-
-       return cmd_ut_category(uts, "bootstd", "bootstd_",
-                              tests, n_ents, argc, argv);
-}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index c4a42ee2e20f4b739a58a6205a1f1c14d4f85820..1885c78be410c427c7ad061654e662403c383888 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -125,9 +125,7 @@ static struct suite suites[] = {
        SUITE(bdinfo, "bdinfo (board info) command"),
        SUITE(bloblist, "bloblist implementation"),
        SUITE(bootm, "bootm command"),
-#ifdef CONFIG_UT_BOOTSTD
-       SUITE_CMD(bootstd, do_ut_bootstd, "standard boot implementation"),
-#endif
+       SUITE(bootstd, "standard boot implementation"),
        SUITE(cmd, "various commands"),
        SUITE(common, "tests for common/ directory"),
        SUITE(dm, "driver model"),