Moved printf() family tests to unified testing.

git-svn-id: https://srv7.svn-repos.de/dev34/pdclib/trunk@439 546481bc-9713-0410-bf18-d3337bbf4a3e

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index 88a39c439c45f52168decbe458d8180dbc408eb7..e3fbdab0c048ea83d3b06dbe55799694cbc0cc01 100644 (file)
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -34,210 +34,7 @@ int main( void )
 {
     FILE * buffer;
     TESTCASE( ( buffer = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    //TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    //TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    //TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    //TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    //TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    //TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    //TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    //TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    //TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    //TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    //TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    //TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    //TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    //TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    //TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    //TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        //TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     TESTCASE( fclose( buffer ) == 0 );
     char readbuffer[1000];
     TESTCASE( ( buffer = fopen( "testfile", "r" ) ) != NULL );

diff --git a/functions/stdio/printf_testcases.incl b/functions/stdio/printf_testcases.incl
index b0a945a05dada59223f84ca2fdf82bfe104f1e0a..fb8b0b672363ac086ea41715a7920a18807c703e 100644 (file)
--- a/functions/stdio/printf_testcases.incl
+++ b/functions/stdio/printf_testcases.incl
@@ -1,106 +1,204 @@
-    TESTPRINT( 4, "%hhd", CHAR_MIN );
-    TESTPRINT( 3, "%hhd", CHAR_MAX );
-    TESTPRINT( 1, "%hhd", 0 );
-    TESTPRINT( 6, "%hd", SHRT_MIN );
-    TESTPRINT( 5, "%hd", SHRT_MAX );
-    TESTPRINT( 1, "%hd", 0 );
-    TESTPRINT( 11, "%d", INT_MIN );
-    TESTPRINT( 10, "%d", INT_MAX );
-    TESTPRINT( 1, "%d", 0 );
-    TESTPRINT( 11, "%ld", LONG_MIN );
-    TESTPRINT( 10, "%ld", LONG_MAX );
-    TESTPRINT( 1, "%ld", 0l );
-    TESTPRINT( 20, "%lld", LLONG_MIN );
-    TESTPRINT( 19, "%lld", LLONG_MAX );
-    TESTPRINT(  100, "%lld", 0ll ) );
-    TESTPRINT( 3, "%hhu", UCHAR_MAX );
-    TESTPRINT( 3, "%hhu", (unsigned char)-1 );
-    TESTPRINT( 5, "%hu", USHRT_MAX );
-    TESTPRINT( 5, "%hu", (unsigned short)-1 );
-    TESTPRINT( 10, "%u", UINT_MAX );
-    TESTPRINT( 10, "%u", -1u );
-    TESTPRINT( 10, "%lu", ULONG_MAX );
-    TESTPRINT( 10, "%lu", -1ul );
-    TESTPRINT( 20, "%llu", ULLONG_MAX );
-    TESTPRINT( 20, "%llu", -1ull );
-    TESTPRINT( 8, "%X", UINT_MAX );
-    TESTPRINT( 10, "%#X", -1u );
-    TESTPRINT( 8, "%x", UINT_MAX );
-    TESTPRINT( 10, "%#x", -1u );
-    TESTPRINT( 11, "%o", UINT_MAX );
-    TESTPRINT( 12, "%#o", -1u );
-    /* TODO: TESTPRINT( 5, "%.0#o", 0 ); */
-    TESTPRINT( 11, "%+d", INT_MIN );
-    TESTPRINT( 11, "%+d", INT_MAX );
-    TESTPRINT( 2, "%+d", 0 );
-    TESTPRINT( 10, "%+u", UINT_MAX );
-    TESTPRINT( 10, "%+u", -1u );
-    TESTPRINT( 11, "% d", INT_MIN );
-    TESTPRINT( 11, "% d", INT_MAX );
-    TESTPRINT( 2, "% d", 0 );
-    TESTPRINT( 10, "% u", UINT_MAX );
-    TESTPRINT( 10, "% u", -1u );
-    TESTPRINT( 11, "%9d", INT_MIN );
-    TESTPRINT( 10, "%9d", INT_MAX );
-    TESTPRINT( 11, "%10d", INT_MIN );
-    TESTPRINT( 10, "%10d", INT_MAX );
-    TESTPRINT( 11, "%11d", INT_MIN );
-    TESTPRINT( 11, "%11d", INT_MAX );
-    TESTPRINT( 12, "%12d", INT_MIN );
-    TESTPRINT( 12, "%12d", INT_MAX );
-    TESTPRINT( 11, "%-9d", INT_MIN );
-    TESTPRINT( 10, "%-9d", INT_MAX );
-    TESTPRINT( 11, "%-10d", INT_MIN );
-    TESTPRINT( 10, "%-10d", INT_MAX );
-    TESTPRINT( 11, "%-11d", INT_MIN );
-    TESTPRINT( 11, "%-11d", INT_MAX );
-    TESTPRINT( 12, "%-12d", INT_MIN );
-    TESTPRINT( 12, "%-12d", INT_MAX );
-    TESTPRINT( 11, "%09d", INT_MIN );
-    TESTPRINT( 10, "%09d", INT_MAX );
-    TESTPRINT( 11, "%010d", INT_MIN );
-    TESTPRINT( 10, "%010d", INT_MAX );
-    TESTPRINT( 11, "%011d", INT_MIN );
-    TESTPRINT( 11, "%011d", INT_MAX );
-    TESTPRINT( 12, "%012d", INT_MIN );
-    TESTPRINT( 12, "%012d", INT_MAX );
-    TESTPRINT( 11, "%-09d", INT_MIN );
-    TESTPRINT( 10, "%-09d", INT_MAX );
-    TESTPRINT( 11, "%-010d", INT_MIN );
-    TESTPRINT( 10, "%-010d", INT_MAX );
-    TESTPRINT( 11, "%-011d", INT_MIN );
-    TESTPRINT( 11, "%-011d", INT_MAX );
-    TESTPRINT( 12, "%-012d", INT_MIN );
-    TESTPRINT( 12, "%-012d", INT_MAX );
-    TESTPRINT( 30, "%030.20d", INT_MAX );
-    TESTPRINT( 8, "%.6x", UINT_MAX );
-    TESTPRINT( 10, "%#6.3x", UINT_MAX );
-    TESTPRINT( 10, "%#3.6x", UINT_MAX );
-    TESTPRINT( 11, "%.6d", INT_MIN );
-    TESTPRINT( 11, "%6.3d", INT_MIN );
-    TESTPRINT( 11, "%3.6d", INT_MIN );
-    TESTPRINT( 10, "%#0.6x", UINT_MAX );
-    TESTPRINT( 10, "%#06.3x", UINT_MAX );
-    TESTPRINT( 10, "%#03.6x", UINT_MAX );
-    TESTPRINT( 10, "%#0.6d", INT_MAX );
-    TESTPRINT( 10, "%#06.3d", INT_MAX );
-    TESTPRINT( 10, "%#03.6d", INT_MAX );
-    TESTPRINT( 11, "%#+.6d", INT_MAX );
-    TESTPRINT( 11, "%#+6.3d", INT_MAX );
-    TESTPRINT( 11, "%#+3.6d", INT_MAX );
-    TESTPRINT( 11, "%+0.6d", INT_MAX );
-    TESTPRINT( 11, "%+06.3d", INT_MAX );
-    TESTPRINT( 11, "%+03.6d", INT_MAX );
-    TESTPRINT( 12, "- %d", INT_MAX );
-    TESTPRINT( 26, "- %d %% %d", INT_MAX, INT_MIN );
-    TESTPRINT( 1, "%c", 'x' );
-    TESTPRINT( 6, "%s", "abcdef" );
-    TESTPRINT( 10, "%p", (void *)0xdeadbeef );
+    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
+    //TESTCASE( strcmp( buffer, "-128" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
+    //TESTCASE( strcmp( buffer, "127" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
+    //TESTCASE( strcmp( buffer, "0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
+    //TESTCASE( strcmp( buffer, "-32768" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
+    //TESTCASE( strcmp( buffer, "32767" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
+    //TESTCASE( strcmp( buffer, "0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
+    //TESTCASE( strcmp( buffer, "0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == ( _PDCLIB_LONG_BYTES == 4 ) ? 11 : 20 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == ( _PDCLIB_LONG_BYTES == 4 ) ? 10 : 19 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
+    //TESTCASE( strcmp( buffer, "0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
+    //TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
+    //TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
+    //TESTCASE( strcmp( buffer, "0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
+    //TESTCASE( strcmp( buffer, "255" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
+    //TESTCASE( strcmp( buffer, "255" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
+    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
+    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == ( _PDCLIB_LONG_BYTES == 4 ) ? 10 : 19 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == ( _PDCLIB_LONG_BYTES == 4 ) ? 10 : 19 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
+    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
+    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
+    //TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
+    //TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
+    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
+    //TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
+    /* TODO: This test case is broken, doesn't test what it was intended to. */
+    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
+    //TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
+    //TESTCASE( strcmp( buffer, "+0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
+    //TESTCASE( strcmp( buffer, " 0" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
+    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
+    //TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
+    //TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
+    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
+    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
+    //TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
+    //TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
+    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
+    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
+    //TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
+    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
+    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
+    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
+    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
+    //TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
+    //TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
+    //TESTCASE( strcmp( buffer, "x" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
+    //TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
+    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
+    //TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 ); /* FIXME */
     {
-    int val1, val2;
-    TESTPRINT( 9, "123456%n789%n", &val1, &val2 );
-    TESTCASE( val1 == 6 );
-    TESTCASE( val2 == 9 );
+        int val1, val2;
+        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
+        //TESTCASE( strcmp( buffer, "123456789" ) == 0 ); /* FIXME */
+        TESTCASE( val1 == 6 );
+        TESTCASE( val2 == 9 );
     }
-    // 985 bytes from buffer
-    TESTCASE( memcmp( read "-1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648  2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647  -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647            00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef123456789", 985 ) == 0 );

diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c
index 9fd2dd743097117fd0306130ea293ee888072912..a2d8441bae9900a145b9e0ce0eb77106b30ad304 100644 (file)
--- a/functions/stdio/snprintf.c
+++ b/functions/stdio/snprintf.c
@@ -34,258 +34,7 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict
 int main( void )
 {
     char buffer[100];
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 8, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483" ) == 0 );
-    TESTCASE( testprintf( buffer, 8, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-214748" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 13, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 13, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }
 

diff --git a/functions/stdio/sprintf.c b/functions/stdio/sprintf.c
index 41bcc10be3c313cd890939fb84e365eaa2435ba0..50e13cd3c2bd95067656114fd80aa5c60774da03 100644 (file)
--- a/functions/stdio/sprintf.c
+++ b/functions/stdio/sprintf.c
@@ -35,210 +35,7 @@ int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ..
 int main( void )
 {
     char buffer[100];
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }
 

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 8e24d795c55476f3336417aee1c7e769a7e5f1bc..6f4b32689d86be354e3fb280ddc3facad3bb7def 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -68,210 +68,7 @@ int main( void )
 {
     FILE * buffer;
     TESTCASE( ( buffer = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    //TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    //TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    //TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    //TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    //TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    //TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    //TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    //TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    //TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    //TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    //TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    //TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    //TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    //TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    //TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    //TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        //TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     TESTCASE( fclose( buffer ) == 0 );
     char readbuffer[1000];
     TESTCASE( ( buffer = fopen( "testfile", "r" ) ) != NULL );

diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c
index 552a8f8971bf2db4c3105aa3dcc4b55e0ec786c1..58e4748c6a1ede25bba056b5b5daaff6b4ef00cb 100644 (file)
--- a/functions/stdio/vprintf.c
+++ b/functions/stdio/vprintf.c
@@ -37,210 +37,7 @@ int main( void )
 {
     FILE * buffer;
     TESTCASE( ( buffer = freopen( "testfile", "w", stdout ) ) != NULL );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    //TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    //TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    //TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    //TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    //TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    //TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    //TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    //TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    //TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    //TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    //TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    //TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    //TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    //TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    //TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    //TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    //TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    //TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    //TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    //TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    //TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    //TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        //TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     TESTCASE( fclose( buffer ) == 0 );
     char readbuffer[1000];
     TESTCASE( ( buffer = fopen( "testfile", "r" ) ) != NULL );

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index c2be5f9bbe9077d2ba9a461be0892b6e8cb03853..0cccf7a0842d5814953d10c5b53d825104029a2b 100644 (file)
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -68,258 +68,7 @@ static int testprintf( char * s, size_t n, const char * format, ... )
 int main( void )
 {
     char buffer[100];
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 8, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483" ) == 0 );
-    TESTCASE( testprintf( buffer, 8, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-214748" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 9, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 10, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 11, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -21474836" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 12, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -214748364" ) == 0 );
-    TESTCASE( testprintf( buffer, 13, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 13, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }
 

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index 9f6cdd2a7d1a33f51336242209009baa43b00298..80180f57f08edf126e530c1a7227a95aaa1a485d 100644 (file)
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -40,210 +40,7 @@ static int testprintf( char * s, size_t n, const char * format, ... )
 int main( void )
 {
     char buffer[100];
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    TESTCASE( strcmp( buffer, "-128" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "127" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    TESTCASE( strcmp( buffer, "-32768" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "32767" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 );
-    TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 );
-    TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    TESTCASE( strcmp( buffer, "0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    TESTCASE( strcmp( buffer, "255" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    TESTCASE( strcmp( buffer, "65535" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 );
-    TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "37777777777" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 );
-    TESTCASE( strcmp( buffer, "037777777777" ) == 0 );
-    /* TODO: This test case is broken, doesn't test what it was intended to. */
-    TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    TESTCASE( strcmp( buffer, "%.0#o" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, "+0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    TESTCASE( strcmp( buffer, " 0" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 );
-    TESTCASE( strcmp( buffer, "4294967295" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, " 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, " -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "  2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "02147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-02147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "2147483647 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 );
-    TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "2147483647  " ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    TESTCASE( strcmp( buffer, "          00000000002147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 );
-    TESTCASE( strcmp( buffer, "ffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 );
-    TESTCASE( strcmp( buffer, "-2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 );
-    TESTCASE( strcmp( buffer, "2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 );
-    TESTCASE( strcmp( buffer, "+2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 );
-    TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 );
-    TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    TESTCASE( strcmp( buffer, "x" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
-    TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
-    {
-        int val1, val2;
-        TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        TESTCASE( strcmp( buffer, "123456789" ) == 0 );
-        TESTCASE( val1 == 6 );
-        TESTCASE( val2 == 9 );
-    }
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }