There is no particular need for the str tests to have their own test suite. Move them into the lib suite instead.
Signed-off-by: Simon Glass sjg@chromium.org ---
test/cmd_ut.c | 4 ---- test/lib/str.c | 31 ++++++++++--------------------- 2 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/test/cmd_ut.c b/test/cmd_ut.c index f4129dcf6cc..f064dd72461 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -112,7 +112,6 @@ static struct cmd_tbl cmd_ut_sub[] = { #ifdef CONFIG_SANDBOX U_BOOT_CMD_MKENT(bootm, CONFIG_SYS_MAXARGS, 1, do_ut_bootm, "", ""), #endif - U_BOOT_CMD_MKENT(str, CONFIG_SYS_MAXARGS, 1, do_ut_str, "", ""), #ifdef CONFIG_CMD_ADDRMAP U_BOOT_CMD_MKENT(addrmap, CONFIG_SYS_MAXARGS, 1, do_ut_addrmap, "", ""), #endif @@ -235,9 +234,6 @@ U_BOOT_LONGHELP(ut, "\npci_mps - PCI Express Maximum Payload Size" #endif "\nsetexpr - setexpr command" -#ifdef CONFIG_SANDBOX - "\nstr - basic test of string functions" -#endif #ifdef CONFIG_CMD_SEAMA "\nseama - seama command parameters loading and decoding" #endif diff --git a/test/lib/str.c b/test/lib/str.c index 96e048975d8..3cc9dfea6aa 100644 --- a/test/lib/str.c +++ b/test/lib/str.c @@ -4,7 +4,7 @@ */
#include <vsprintf.h> -#include <test/suites.h> +#include <test/lib.h> #include <test/test.h> #include <test/ut.h>
@@ -19,9 +19,6 @@ static const char str5[] = "0x9876543210the last time I was deloused"; static const char str6[] = "0778octal is seldom used"; static const char str7[] = "707it is a piece of computing history";
-/* Declare a new str test */ -#define STR_TEST(_name, _flags) UNIT_TEST(_name, _flags, str_test) - static int str_upper(struct unit_test_state *uts) { char out[TEST_STR_SIZE]; @@ -58,7 +55,7 @@ static int str_upper(struct unit_test_state *uts)
return 0; } -STR_TEST(str_upper, 0); +LIB_TEST(str_upper, 0);
static int run_strtoul(struct unit_test_state *uts, const char *str, int base, ulong expect_val, int expect_endp_offset, bool upper) @@ -112,7 +109,7 @@ static int str_simple_strtoul(struct unit_test_state *uts)
return 0; } -STR_TEST(str_simple_strtoul, 0); +LIB_TEST(str_simple_strtoul, 0);
static int run_strtoull(struct unit_test_state *uts, const char *str, int base, unsigned long long expect_val, int expect_endp_offset, @@ -175,7 +172,7 @@ static int str_simple_strtoull(struct unit_test_state *uts)
return 0; } -STR_TEST(str_simple_strtoull, 0); +LIB_TEST(str_simple_strtoull, 0);
static int str_hextoul(struct unit_test_state *uts) { @@ -187,7 +184,7 @@ static int str_hextoul(struct unit_test_state *uts)
return 0; } -STR_TEST(str_hextoul, 0); +LIB_TEST(str_hextoul, 0);
static int str_dectoul(struct unit_test_state *uts) { @@ -199,7 +196,7 @@ static int str_dectoul(struct unit_test_state *uts)
return 0; } -STR_TEST(str_dectoul, 0); +LIB_TEST(str_dectoul, 0);
static int str_itoa(struct unit_test_state *uts) { @@ -219,7 +216,7 @@ static int str_itoa(struct unit_test_state *uts)
return 0; } -STR_TEST(str_itoa, 0); +LIB_TEST(str_itoa, 0);
static int str_xtoa(struct unit_test_state *uts) { @@ -239,7 +236,7 @@ static int str_xtoa(struct unit_test_state *uts)
return 0; } -STR_TEST(str_xtoa, 0); +LIB_TEST(str_xtoa, 0);
static int str_trailing(struct unit_test_state *uts) { @@ -271,7 +268,7 @@ static int str_trailing(struct unit_test_state *uts)
return 0; } -STR_TEST(str_trailing, 0); +LIB_TEST(str_trailing, 0);
static int test_str_to_list(struct unit_test_state *uts) { @@ -351,12 +348,4 @@ static int test_str_to_list(struct unit_test_state *uts)
return 0; } -STR_TEST(test_str_to_list, 0); - -int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) -{ - struct unit_test *tests = UNIT_TEST_SUITE_START(str_test); - const int n_ents = UNIT_TEST_SUITE_COUNT(str_test); - - return cmd_ut_category("str", "str_", tests, n_ents, argc, argv); -} +LIB_TEST(test_str_to_list, 0);