lib: Move string tests to the string module

A few string tests were added to the print module by mistake. Move them.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/test/print_ut.c b/test/print_ut.c
index 247011f2db03af9c52e253daa0a7d12193121f0c..47a6ce578405046934208b5ad16fdc71035a208e 100644 (file)
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -345,26 +345,6 @@ static int print_do_hex_dump(struct unit_test_state *uts)
 }
 PRINT_TEST(print_do_hex_dump, UT_TESTF_CONSOLE_REC);
 
-static int print_itoa(struct unit_test_state *uts)
-{
-       ut_asserteq_str("123", simple_itoa(123));
-       ut_asserteq_str("0", simple_itoa(0));
-       ut_asserteq_str("2147483647", simple_itoa(0x7fffffff));
-       ut_asserteq_str("4294967295", simple_itoa(0xffffffff));
-
-       /* Use #ifdef here to avoid a compiler warning on 32-bit machines */
-#ifdef CONFIG_PHYS_64BIT
-       if (sizeof(ulong) == 8) {
-               ut_asserteq_str("9223372036854775807",
-                               simple_itoa((1UL << 63) - 1));
-               ut_asserteq_str("18446744073709551615", simple_itoa(-1));
-       }
-#endif /* CONFIG_PHYS_64BIT */
-
-       return 0;
-}
-PRINT_TEST(print_itoa, 0);
-
 static int snprint(struct unit_test_state *uts)
 {
        char buf[10] = "xxxxxxxxx";
@@ -391,26 +371,6 @@ static int snprint(struct unit_test_state *uts)
 }
 PRINT_TEST(snprint, 0);
 
-static int print_xtoa(struct unit_test_state *uts)
-{
-       ut_asserteq_str("7f", simple_xtoa(127));
-       ut_asserteq_str("00", simple_xtoa(0));
-       ut_asserteq_str("7fffffff", simple_xtoa(0x7fffffff));
-       ut_asserteq_str("ffffffff", simple_xtoa(0xffffffff));
-
-       /* Use #ifdef here to avoid a compiler warning on 32-bit machines */
-#ifdef CONFIG_PHYS_64BIT
-       if (sizeof(ulong) == 8) {
-               ut_asserteq_str("7fffffffffffffff",
-                               simple_xtoa((1UL << 63) - 1));
-               ut_asserteq_str("ffffffffffffffff", simple_xtoa(-1));
-       }
-#endif /* CONFIG_PHYS_64BIT */
-
-       return 0;
-}
-PRINT_TEST(print_xtoa, 0);
-
 int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        struct unit_test *tests = UNIT_TEST_SUITE_START(print_test);

diff --git a/test/str_ut.c b/test/str_ut.c
index d2840d51524d4afd5fe6270ca3e29962b19741e1..6c817f6f72f1b8475c3a5532c44722279c636e8e 100644 (file)
--- a/test/str_ut.c
+++ b/test/str_ut.c
@@ -202,6 +202,46 @@ static int str_dectoul(struct unit_test_state *uts)
 }
 STR_TEST(str_dectoul, 0);
 
+static int str_itoa(struct unit_test_state *uts)
+{
+       ut_asserteq_str("123", simple_itoa(123));
+       ut_asserteq_str("0", simple_itoa(0));
+       ut_asserteq_str("2147483647", simple_itoa(0x7fffffff));
+       ut_asserteq_str("4294967295", simple_itoa(0xffffffff));
+
+       /* Use #ifdef here to avoid a compiler warning on 32-bit machines */
+#ifdef CONFIG_PHYS_64BIT
+       if (sizeof(ulong) == 8) {
+               ut_asserteq_str("9223372036854775807",
+                               simple_itoa((1UL << 63) - 1));
+               ut_asserteq_str("18446744073709551615", simple_itoa(-1));
+       }
+#endif /* CONFIG_PHYS_64BIT */
+
+       return 0;
+}
+STR_TEST(str_itoa, 0);
+
+static int str_xtoa(struct unit_test_state *uts)
+{
+       ut_asserteq_str("7f", simple_xtoa(127));
+       ut_asserteq_str("00", simple_xtoa(0));
+       ut_asserteq_str("7fffffff", simple_xtoa(0x7fffffff));
+       ut_asserteq_str("ffffffff", simple_xtoa(0xffffffff));
+
+       /* Use #ifdef here to avoid a compiler warning on 32-bit machines */
+#ifdef CONFIG_PHYS_64BIT
+       if (sizeof(ulong) == 8) {
+               ut_asserteq_str("7fffffffffffffff",
+                               simple_xtoa((1UL << 63) - 1));
+               ut_asserteq_str("ffffffffffffffff", simple_xtoa(-1));
+       }
+#endif /* CONFIG_PHYS_64BIT */
+
+       return 0;
+}
+STR_TEST(str_xtoa, 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);