Prepare v2023.10

[platform/kernel/u-boot.git] / test / print_ut.c

diff --git a/test/print_ut.c b/test/print_ut.c
index 194387f..47a6ce5 100644 (file)
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -118,7 +118,7 @@ static int print_printf(struct unit_test_state *uts)
        snprintf(str, 0, "testing none");
        ut_asserteq('x', *str);
 
-       sprintf(big_str, "_%ls_", L"foo");
+       sprintf(big_str, "_%ls_", u"foo");
        ut_assertok(strcmp("_foo_", big_str));
 
        /* Test the banner function */
@@ -345,31 +345,23 @@ 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";
        int ret;
 
+       ret = snprintf(buf, 5, "%d", 12345678);
+       ut_asserteq_str("1234", buf);
+       ut_asserteq(8, ret);
+       ret = snprintf(buf, 5, "0x%x", 0x1234);
+       ut_asserteq_str("0x12", buf);
+       ut_asserteq(6, ret);
+       ret = snprintf(buf, 5, "0x%08x", 0x1234);
+       ut_asserteq_str("0x00", buf);
+       ut_asserteq(10, ret);
+       ret = snprintf(buf, 3, "%s", "abc");
+       ut_asserteq_str("ab", buf);
+       ut_asserteq(3, ret);
        ret = snprintf(buf, 4, "%s:%s", "abc", "def");
        ut_asserteq(0, buf[3]);
        ut_asserteq(7, ret);
@@ -379,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);