test: Drop the function for running env 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 414613c593e576f9ee9b7bfedcfef29849c5cfbe..b78436fe2b2c150527bb33a06041ab5ab90e8009 100644 (file)
--- 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_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_exit(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_font(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index a0905ec54b7c23ab1cb59f51f2ea89111f8de319..155b187ad4b3a78220b1fe5ea0131841233d0917 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -136,7 +136,7 @@ static struct suite suites[] = {
        SUITE(dm),
 #endif
 #if defined(CONFIG_UT_ENV)
-       SUITE_CMD(env, do_ut_env),
+       SUITE(env),
 #endif
        SUITE_CMD(exit, do_ut_exit),
 #ifdef CONFIG_CMD_FDT

diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c
index 332139bb803a85fcb7997a907ee57f67b714d570..81d1bb2f80d5f930562753354f30b5293c45613d 100644 (file)
--- a/test/env/cmd_ut_env.c
+++ b/test/env/cmd_ut_env.c
@@ -4,7 +4,6 @@
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
  */
 
-#include <command.h>
 #include <test/env.h>
 #include <test/suites.h>
 #include <test/ut.h>
@@ -74,11 +73,3 @@ static int env_test_env_cmd(struct unit_test_state *uts)
        return 0;
 }
 ENV_TEST(env_test_env_cmd, UTF_CONSOLE);
-
-int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       struct unit_test *tests = UNIT_TEST_SUITE_START(env);
-       const int n_ents = UNIT_TEST_SUITE_COUNT(env);
-
-       return cmd_ut_category("env", "env_test_", tests, n_ents, argc, argv);
-}