summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-05-20 14:27:30 -0500
committerTom Rini <trini@konsulko.com>2015-05-21 09:16:17 -0400
commitc812f722f8bdf2785cfebf4fd272afe2117d6469 (patch)
tree97b5cdb8f918817b4011e5d7c6e04cf5f3d913dd /test
parent40441e0bd34425994c6feb7a3e78fa84b23d7244 (diff)
downloadtalos-obmc-uboot-c812f722f8bdf2785cfebf4fd272afe2117d6469.tar.gz
talos-obmc-uboot-c812f722f8bdf2785cfebf4fd272afe2117d6469.zip
test: dm: Move the time test over to the ut command
Unify the command for running unit tests further by moving the "ut_time" command over to "ut time". Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'test')
-rw-r--r--test/Kconfig5
-rw-r--r--test/Makefile2
-rw-r--r--test/cmd_ut.c6
-rw-r--r--test/time_ut.c8
4 files changed, 11 insertions, 10 deletions
diff --git a/test/Kconfig b/test/Kconfig
index 6f918edfea..32a974e28c 100644
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -1,10 +1,11 @@
config UNIT_TEST
bool
-config CMD_UT_TIME
+config UT_TIME
bool "Unit tests for time functions"
+ select UNIT_TEST
help
- Enables the 'ut_time' command which tests that the time functions
+ Enables the 'ut time' command which tests that the time functions
work correctly. The test is fairly simple and will not catch all
problems. But if you are having problems with udelay() and the like,
this is a good place to start.
diff --git a/test/Makefile b/test/Makefile
index 3d9968c76d..0f5de57399 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,4 +8,4 @@ obj-$(CONFIG_UNIT_TEST) += cmd_ut.o
obj-$(CONFIG_UNIT_TEST) += ut.o
obj-$(CONFIG_SANDBOX) += command_ut.o
obj-$(CONFIG_SANDBOX) += compression.o
-obj-$(CONFIG_CMD_UT_TIME) += time_ut.o
+obj-$(CONFIG_UT_TIME) += time_ut.o
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 08001cdbc0..a65bfeaf31 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -16,6 +16,9 @@ static cmd_tbl_t cmd_ut_sub[] = {
#if defined(CONFIG_UT_DM)
U_BOOT_CMD_MKENT(dm, CONFIG_SYS_MAXARGS, 1, do_ut_dm, "", ""),
#endif
+#ifdef CONFIG_UT_TIME
+ U_BOOT_CMD_MKENT(time, CONFIG_SYS_MAXARGS, 1, do_ut_time, "", ""),
+#endif
};
static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -59,6 +62,9 @@ static char ut_help_text[] =
#ifdef CONFIG_UT_DM
"ut dm [test-name]\n"
#endif
+#ifdef CONFIG_UT_TIME
+ "ut time - Very basic test of time functions\n"
+#endif
;
#endif
diff --git a/test/time_ut.c b/test/time_ut.c
index 6b52245d7f..8ca9fcb6aa 100644
--- a/test/time_ut.c
+++ b/test/time_ut.c
@@ -116,7 +116,7 @@ static int test_udelay(void)
return 0;
}
-static int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int ret = 0;
@@ -129,9 +129,3 @@ static int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return ret ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
}
-
-U_BOOT_CMD(
- ut_time, 1, 1, do_ut_time,
- "Very basic test of time functions",
- ""
-);
OpenPOWER on IntegriCloud