Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

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

diff --git a/test/print_ut.c b/test/print_ut.c
index e2bcfbef00781fa779c609b9c22a290b9725b9f6..bb844d2542b7038da1020da724d987bb6fd9fca3 100644 (file)
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -9,7 +9,8 @@
 #include <display_options.h>
 #include <log.h>
 #include <mapmem.h>
-#include <version.h>
+#include <version_string.h>
+#include <vsprintf.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
@@ -29,16 +30,32 @@ static int print_guid(struct unit_test_state *uts)
        unsigned char guid[16] = {
                1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
        };
+       unsigned char guid_esp[16] = {
+               0x28, 0x73, 0x2a, 0xc1, 0x1f, 0xf8, 0xd2, 0x11,
+               0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B
+       };
        char str[40];
+       int ret;
 
        sprintf(str, "%pUb", guid);
-       ut_assertok(strcmp("01020304-0506-0708-090a-0b0c0d0e0f10", str));
+       ut_asserteq_str("01020304-0506-0708-090a-0b0c0d0e0f10", str);
        sprintf(str, "%pUB", guid);
-       ut_assertok(strcmp("01020304-0506-0708-090A-0B0C0D0E0F10", str));
+       ut_asserteq_str("01020304-0506-0708-090A-0B0C0D0E0F10", str);
        sprintf(str, "%pUl", guid);
-       ut_assertok(strcmp("04030201-0605-0807-090a-0b0c0d0e0f10", str));
+       ut_asserteq_str("04030201-0605-0807-090a-0b0c0d0e0f10", str);
+       sprintf(str, "%pUs", guid);
+       ut_asserteq_str("04030201-0605-0807-090a-0b0c0d0e0f10", str);
        sprintf(str, "%pUL", guid);
-       ut_assertok(strcmp("04030201-0605-0807-090A-0B0C0D0E0F10", str));
+       ut_asserteq_str("04030201-0605-0807-090A-0B0C0D0E0F10", str);
+       sprintf(str, "%pUs", guid_esp);
+       if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) { /* brace needed */
+               ut_asserteq_str("system", str);
+       } else {
+               ut_asserteq_str("c12a7328-f81f-11d2-ba4b-00a0c93ec93b", str);
+       }
+       ret = snprintf(str, 4, "%pUL", guid);
+       ut_asserteq(0, str[3]);
+       ut_asserteq(36, ret);
 
        return 0;
 }
@@ -101,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 */
@@ -153,6 +170,10 @@ static int print_display_buffer(struct unit_test_state *uts)
        u8 *buf;
        int i;
 
+       /* This test requires writable memory at zero */
+       if (IS_ENABLED(CONFIG_X86))
+               return -EAGAIN;
+
        buf = map_sysmem(0, BUF_SIZE);
        memset(buf, '\0', BUF_SIZE);
        for (i = 0; i < 0x11; i++)
@@ -258,6 +279,10 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        u8 *buf;
        int i;
 
+       /* This test requires writable memory at zero */
+       if (IS_ENABLED(CONFIG_X86))
+               return -EAGAIN;
+
        buf = map_sysmem(0, BUF_SIZE);
        memset(buf, '\0', BUF_SIZE);
        for (i = 0; i < 0x11; i++)
@@ -266,16 +291,21 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        /* bytes */
        console_record_reset();
        print_hex_dump_bytes("", DUMP_PREFIX_ADDRESS, buf, 0x12);
-       ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff  ..\"3DUfw........");
-       ut_assert_nextline("00000010: 10 00                                            ..");
+       ut_assert_nextline("%0*lx: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff  ..\"3DUfw........",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
+       ut_assert_nextline("%0*lx: 10 00                                            ..",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x10UL);
        ut_assert_console_end();
 
        /* line length */
        console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 8, 1, buf, 0x12, true);
-       ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77  ..\"3DUfw");
-       ut_assert_nextline("00000008: 88 99 aa bb cc dd ee ff  ........");
-       ut_assert_nextline("00000010: 10 00                    ..");
+       ut_assert_nextline("%0*lx: 00 11 22 33 44 55 66 77  ..\"3DUfw",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
+       ut_assert_nextline("%0*lx: 88 99 aa bb cc dd ee ff  ........",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x8UL);
+       ut_assert_nextline("%0*lx: 10 00                    ..",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x10UL);
        ut_assert_console_end();
        unmap_sysmem(buf);
 
@@ -283,31 +313,39 @@ static int print_do_hex_dump(struct unit_test_state *uts)
        console_record_reset();
        buf[0x41] = 0x41;
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0x40, 1, buf, 0x42, true);
-       ut_assert_nextline("00000000: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ..\"3DUfw........................................................");
-       ut_assert_nextline("00000040: 00 41                                                                                                                                                                                            .A");
+       ut_assert_nextline("%0*lx: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ..\"3DUfw........................................................",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
+       ut_assert_nextline("%0*lx: 00 41                                                                                                                                                                                            .A",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x40UL);
        ut_assert_console_end();
 
        /* 16-bit */
        console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0, 2, buf, 0x12, true);
-       ut_assert_nextline("00000000: 1100 3322 5544 7766 9988 bbaa ddcc ffee  ..\"3DUfw........");
-       ut_assert_nextline("00000010: 0010                                     ..");
+       ut_assert_nextline("%0*lx: 1100 3322 5544 7766 9988 bbaa ddcc ffee  ..\"3DUfw........",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
+       ut_assert_nextline("%0*lx: 0010                                     ..",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x10UL);
        ut_assert_console_end();
        unmap_sysmem(buf);
 
        /* 32-bit */
        console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0, 4, buf, 0x14, true);
-       ut_assert_nextline("00000000: 33221100 77665544 bbaa9988 ffeeddcc  ..\"3DUfw........");
-       ut_assert_nextline("00000010: 00000010                             ....");
+       ut_assert_nextline("%0*lx: 33221100 77665544 bbaa9988 ffeeddcc  ..\"3DUfw........",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
+       ut_assert_nextline("%0*lx: 00000010                             ....",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x10UL);
        ut_assert_console_end();
        unmap_sysmem(buf);
 
        /* 64-bit */
        console_record_reset();
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 16, 8, buf, 0x18, true);
-       ut_assert_nextline("00000000: 7766554433221100 ffeeddccbbaa9988  ..\"3DUfw........");
-       ut_assert_nextline("00000010: 0000000000000010                   ........");
+       ut_assert_nextline("%0*lx: 7766554433221100 ffeeddccbbaa9988  ..\"3DUfw........",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
+       ut_assert_nextline("%0*lx: 0000000000000010                   ........",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x10UL);
        ut_assert_console_end();
        unmap_sysmem(buf);
 
@@ -320,7 +358,8 @@ static int print_do_hex_dump(struct unit_test_state *uts)
                buf[4 + i] = 126 + i;
        buf[8] = 255;
        print_hex_dump("", DUMP_PREFIX_ADDRESS, 0, 1, buf, 10, true);
-       ut_assert_nextline("00000000: 00 1f 20 21 7e 7f 80 81 ff 99                    .. !~.....");
+       ut_assert_nextline("%0*lx: 00 1f 20 21 7e 7f 80 81 ff 99                    .. !~.....",
+                          IS_ENABLED(CONFIG_PHYS_64BIT) ? 16 : 8, 0x0UL);
        ut_assert_console_end();
        unmap_sysmem(buf);
 
@@ -328,6 +367,32 @@ static int print_do_hex_dump(struct unit_test_state *uts)
 }
 PRINT_TEST(print_do_hex_dump, UT_TESTF_CONSOLE_REC);
 
+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);
+       ret = snprintf(buf, 4, "%s:%d", "abc", 9999);
+       ut_asserteq(8, ret);
+       return 0;
+}
+PRINT_TEST(snprint, 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);