test: Move time tests into the lib suite

There is no particular need for the time tests to have their own test
command. Move them into the lib suite instead.

Update the test functions to match the normal unit-test signature.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Rini <trini@konsulko.com> # rpi_3, rpi_4, rpi_arm64, am64x_evm_a53, am64-sk
This commit is contained in:
Simon Glass 2024-11-02 13:37:02 -06:00 committed by Tom Rini
parent 890d91ff35
commit dd0057dacb
2 changed files with 10 additions and 25 deletions

View file

@ -99,9 +99,6 @@ static struct cmd_tbl cmd_ut_sub[] = {
U_BOOT_CMD_MKENT(setexpr, CONFIG_SYS_MAXARGS, 1, do_ut_setexpr, "", U_BOOT_CMD_MKENT(setexpr, CONFIG_SYS_MAXARGS, 1, do_ut_setexpr, "",
""), ""),
#endif #endif
#ifdef CONFIG_UT_TIME
U_BOOT_CMD_MKENT(time, CONFIG_SYS_MAXARGS, 1, do_ut_time, "", ""),
#endif
#ifdef CONFIG_MEASURED_BOOT #ifdef CONFIG_MEASURED_BOOT
U_BOOT_CMD_MKENT(measurement, CONFIG_SYS_MAXARGS, 1, do_ut_measurement, U_BOOT_CMD_MKENT(measurement, CONFIG_SYS_MAXARGS, 1, do_ut_measurement,
"", ""), "", ""),
@ -238,9 +235,6 @@ U_BOOT_LONGHELP(ut,
"\nsetexpr - setexpr command" "\nsetexpr - setexpr command"
#ifdef CONFIG_CMD_SEAMA #ifdef CONFIG_CMD_SEAMA
"\nseama - seama command parameters loading and decoding" "\nseama - seama command parameters loading and decoding"
#endif
#ifdef CONFIG_UT_TIME
"\ntime - very basic test of time functions"
#endif #endif
); );

View file

@ -4,12 +4,13 @@
* Written by Simon Glass <sjg@chromium.org> * Written by Simon Glass <sjg@chromium.org>
*/ */
#include <command.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <test/lib.h>
#include <test/ut.h>
static int test_get_timer(void) static int test_get_timer(struct unit_test_state *uts)
{ {
ulong base, start, next, diff; ulong base, start, next, diff;
int iter; int iter;
@ -42,8 +43,9 @@ static int test_get_timer(void)
return 0; return 0;
} }
LIB_TEST(test_get_timer, 0);
static int test_timer_get_us(void) static int test_timer_get_us(struct unit_test_state *uts)
{ {
ulong prev, next, min = 1000000; ulong prev, next, min = 1000000;
long delta; long delta;
@ -76,8 +78,9 @@ static int test_timer_get_us(void)
return 0; return 0;
} }
LIB_TEST(test_timer_get_us, 0);
static int test_time_comparison(void) static int test_time_comparison(struct unit_test_state *uts)
{ {
ulong start_us, end_us, delta_us; ulong start_us, end_us, delta_us;
long error; long error;
@ -97,8 +100,9 @@ static int test_time_comparison(void)
return 0; return 0;
} }
LIB_TEST(test_time_comparison, 0);
static int test_udelay(void) static int test_udelay(struct unit_test_state *uts)
{ {
long error; long error;
ulong start, delta; ulong start, delta;
@ -116,17 +120,4 @@ static int test_udelay(void)
return 0; return 0;
} }
LIB_TEST(test_udelay, 0);
int do_ut_time(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
int ret = 0;
ret |= test_get_timer();
ret |= test_timer_get_us();
ret |= test_time_comparison();
ret |= test_udelay();
printf("Test %s\n", ret ? "failed" : "passed");
return ret ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
}