Changeset d16fc78 in mainline for kernel/test

Timestamp:

2010-11-26T01:07:42Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

855e0d8

Parents:

1e27d85

Message:

• verify the correctness of printf()'s and friends' attributes in compile time (use NVERIFY_PRINTF define to suppress the checks)
• separate non-C99 compliant printf() checks to a standalone 'print5' test and u

se NVERIFY_PRINTF for it

• improve 'print2' test (use portable constant macros and explicit types)

Location:

kernel/test/print

Files:

• print1.c (modified) (1 diff)
• print2.c (modified) (2 diffs)
• print4.c (modified) (2 diffs)
• print5.c (added)
• print5.def (added)

kernel/test/print/print1.c

@@ -48 +48 @@
         TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
         
-        TPRINTF("Testing printf(\"%%s\", NULL):\n");
-        TPRINTF("Expected output: \"(NULL)\"\n");
-        TPRINTF("Real output:     \"%s\"\n\n", NULL);
-        
         return NULL;
 }

kernel/test/print/print2.c

@@ -32 +32 @@
 const char *test_print2(void)
 {
-        TPRINTF("Testing printf(\"%%c %%3.2c %%-3.2c %%2.3c %%-2.3c\", 'a', 'b', 'c', 'd', 'e'):\n");
-        TPRINTF("Expected output: [a] [  b] [c  ] [ d] [e ]\n");
-        TPRINTF("Real output:     [%c] [%3.2c] [%-3.2c] [%2.3c] [%-2.3c]\n\n", 'a', 'b', 'c', 'd', 'e');
+        TPRINTF("Testing printf(\"%%c\", 'a'):\n");
+        TPRINTF("Expected output: [a]\n");
+        TPRINTF("Real output:     [%c]\n\n", 'a');
         
         TPRINTF("Testing printf(\"%%d %%3.2d %%-3.2d %%2.3d %%-2.3d\", 1, 2, 3, 4, 5):\n");
@@ -48 +48 @@
         TPRINTF("Real output:     [%#x] [%#5.3x] [%#-5.3x] [%#3.5x] [%#-3.5x]\n\n", 17, 18, 19, 20, 21);
         
-        unative_t nat = 0x12345678u;
+        unative_t nat = UINTN_C(0x12345678);
         
-        TPRINTF("Testing printf(\"%%#" PRIx64 " %%#" PRIx32 " %%#" PRIx16 " %%#" PRIx8 " %%#" PRIxn " %%#" PRIx64 " %%s\", 0x1234567887654321ll, 0x12345678, 0x1234, 0x12, nat, 0x1234567887654321ull, \"Lovely string\"):\n");
+        TPRINTF("Testing printf(\"%%#" PRIx64 " %%#" PRIx32 " %%#" PRIx16 " %%#" PRIx8 " %%#" PRIxn " %%#" PRIx64 " %%s\", (uint64_t) UINT64_C(0x1234567887654321), (uint32_t) UINT32_C(0x12345678), (uint16_t) UINT16_C(0x1234), (uint8_t) UINT8_C(0x12), nat, (uint64_t) UINT64_C(0x1234567887654321), \"Lovely string\"):\n");
         TPRINTF("Expected output: [0x1234567887654321] [0x12345678] [0x1234] [0x12] [0x12345678] [0x1234567887654321] \"Lovely string\"\n");
-        TPRINTF("Real output:     [%#" PRIx64 "] [%#" PRIx32 "] [%#" PRIx16 "] [%#" PRIx8 "] [%#" PRIxn "] [%#" PRIx64 "] \"%s\"\n\n", 0x1234567887654321ll, 0x12345678, 0x1234, 0x12, nat, 0x1234567887654321ull, "Lovely string");
+        TPRINTF("Real output:     [%#" PRIx64 "] [%#" PRIx32 "] [%#" PRIx16 "] [%#" PRIx8 "] [%#" PRIxn "] [%#" PRIx64 "] \"%s\"\n\n", (uint64_t) UINT64_C(0x1234567887654321), (uint32_t) UINT32_C(0x12345678), (uint16_t) UINT16_C(0x1234), (uint8_t) UINT8_C(0x12), nat, (uint64_t) UINT64_C(0x1234567887654321), "Lovely string");
         
         return NULL;

kernel/test/print/print4.c

@@ -44 +44 @@
                 TPRINTF("  ");
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");
@@ -56 +56 @@
                 uint8_t index;
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");