test: Drop the function for running optee 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 692633d..a2f982b 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -34,6 +34,4 @@ 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_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
-
 #endif /* __TEST_SUITES_H__ */

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 1885c78..6d1e20e 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -141,9 +141,7 @@ static struct suite suites[] = {
        SUITE(mbr, "mbr command"),
        SUITE(measurement, "TPM-based measured boot"),
        SUITE(mem, "memory-related commands"),
-#ifdef CONFIG_UT_OPTEE
-       SUITE_CMD(optee, do_ut_optee, "OP-TEE"),
-#endif
+       SUITE(optee, "OP-TEE"),
        SUITE(pci_mps, "PCI Express Maximum Payload Size"),
        SUITE(seama, "seama command parameters loading and decoding"),
        SUITE(setexpr, "setexpr command"),

diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c
index 71833e5..df7b877 100644 (file)
--- a/test/optee/cmd_ut_optee.c
+++ b/test/optee/cmd_ut_optee.c
@@ -170,17 +170,3 @@ static int optee_fdt_copy_already_filled(struct unit_test_state *uts)
        return 0;
 }
 OPTEE_TEST(optee_fdt_copy_already_filled, 0);
-
-int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       struct unit_test *tests = UNIT_TEST_SUITE_START(optee);
-       const int n_ents = UNIT_TEST_SUITE_COUNT(optee);
-       struct unit_test_state *uts;
-       void *fdt_base = &__dtb_test_optee_base_begin;
-       int ret = -ENOMEM;
-
-       ret = cmd_ut_category("optee", "", tests, n_ents, argc, argv);
-
-       free(fdt);
-       return ret;
-}