Improved reporting by printf tests.

diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c
index 3e48f2ad6569a9998d2c9d8ecfb8e961f055a497..27b4bc26bab9b587ec755b6962d3be03eaa95e75 100644 (file)
--- a/functions/_PDCLIB/print.c
+++ b/functions/_PDCLIB/print.c
@@ -538,7 +538,8 @@ static int testprintf( char * buffer, size_t n, const char * format, ... )
 
 #define TEST_CONVERSION_ONLY
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
 
 int main( void )
 {

diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c
index a34558992e5b84a717282dc5da67a976cdaeec8b..cf30e40ef12d7c4630be5d148f83fbbade245c89 100644 (file)
--- a/functions/stdio/snprintf.c
+++ b/functions/stdio/snprintf.c
@@ -31,7 +31,8 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict
 
 #define testprintf( s, n, format, ... ) snprintf( s, n, format, __VA_ARGS__ )
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
 
 int main( void )
 {

diff --git a/functions/stdio/sprintf.c b/functions/stdio/sprintf.c
index 972f6655245b44f401f1901ac076c7a5ca1e170e..9b0ac81e35a969a7c2ac0e64054b0fb4ba1abdb9 100644 (file)
--- a/functions/stdio/sprintf.c
+++ b/functions/stdio/sprintf.c
@@ -32,7 +32,8 @@ int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ..
 
 #define testprintf( s, n, format, ... ) sprintf( s, format, __VA_ARGS__ )
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
 
 int main( void )
 {

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index fd9b4ac3fc34e5cb57477395371164b6536e3eaf..9768c0a02504d45b9cf74a45b3ce51a8771c8d98 100644 (file)
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -64,7 +64,8 @@ static int testprintf( char * s, size_t n, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
 
 int main( void )
 {

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index 733dcd452807f882d56b14af88dd7669a26ac1df..d3920fa5884e754ebbf49fb5721ad70e42d4fb12 100644 (file)
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -36,7 +36,8 @@ static int testprintf( char * s, size_t n, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
 
 int main( void )
 {

diff --git a/testing/printf_testcases.incl b/testing/printf_testcases.incl
index 84c7968f40d48e76486cfaeedb7b752083f22ae8..b3e5ea7a1f6ccb1100e714b9402fbadf5161e63b 100644 (file)
--- a/testing/printf_testcases.incl
+++ b/testing/printf_testcases.incl
@@ -148,213 +148,213 @@
 
 
     TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-128" ) == 0 );
+    TESTCASE_SPRINTF( "-128" );
     TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "127" ) == 0 );
+    TESTCASE_SPRINTF( "127" );
     TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" ) == 0 );
+    TESTCASE_SPRINTF( "0" );
     TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-32768" ) == 0 );
+    TESTCASE_SPRINTF( "-32768" );
     TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 );
-    TESTCASE_SPRINTF( strcmp( buffer, "32767" ) == 0 );
+    TESTCASE_SPRINTF( "32767" );
     TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" ) == 0 );
+    TESTCASE_SPRINTF( "0" );
     TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" ) == 0 );
+    TESTCASE_SPRINTF( "0" );
     TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == LONG_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" LONG_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" LONG_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == LONG_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, LONG_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( LONG_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" ) == 0 );
+    TESTCASE_SPRINTF( "0" );
     TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == LLONG_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" LLONG_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" LLONG_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == LLONG_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, LLONG_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( LLONG_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" ) == 0 );
+    TESTCASE_SPRINTF( "0" );
     TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "255" ) == 0 );
+    TESTCASE_SPRINTF( "255" );
     TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "255" ) == 0 );
+    TESTCASE_SPRINTF( "255" );
     TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 );
-    TESTCASE_SPRINTF( strcmp( buffer, "65535" ) == 0 );
+    TESTCASE_SPRINTF( "65535" );
     TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 );
-    TESTCASE_SPRINTF( strcmp( buffer, "65535" ) == 0 );
+    TESTCASE_SPRINTF( "65535" );
     TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, UINT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( UINT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%u", -1u ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, UINT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( UINT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == ULONG_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, ULONG_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( ULONG_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == ULONG_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, ULONG_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( ULONG_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == ULLONG_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, ULLONG_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( ULLONG_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == ULLONG_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, ULLONG_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( ULLONG_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "F" INT_HEXDIG ) == 0 );
+    TESTCASE_SPRINTF( "F" INT_HEXDIG );
     TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == (int)strlen( INT_HEXDIG ) + 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0XF" INT_HEXDIG ) == 0 );
+    TESTCASE_SPRINTF( "0XF" INT_HEXDIG );
     TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "f" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "f" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == (int)strlen( INT_HEXDIG ) + 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xf" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "0xf" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == (int)strlen( INT_OCTDIG ) );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_OCTDIG ) == 0 );
+    TESTCASE_SPRINTF( INT_OCTDIG );
     TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == (int)strlen( INT_OCTDIG ) + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" INT_OCTDIG ) == 0 );
+    TESTCASE_SPRINTF( "0" INT_OCTDIG );
     /* TODO: This test case is broken, doesn't test what it was intended to. */
     TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 );
-    TESTCASE_SPRINTF( strcmp( buffer, "%.0#o" ) == 0 );
+    TESTCASE_SPRINTF( "%.0#o" );
     TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+0" ) == 0 );
+    TESTCASE_SPRINTF( "+0" );
     TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, UINT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( UINT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, UINT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( UINT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, " " INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( " " INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, " 0" ) == 0 );
+    TESTCASE_SPRINTF( " 0" );
     TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, UINT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( UINT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "% u", -1u ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, UINT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( UINT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, " " INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( " " INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, " -" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( " -" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "  " INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "  " INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR " " ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR " " );
     TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR " " ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR " " );
     TESTCASE( testprintf( buffer, 100, "%-" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR "  " ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR "  " );
     TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "0" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-0" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-0" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%0" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "00" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "00" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_LESS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_LESS1 "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-0" sym2s(INT_DIG) "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-0" sym2s(INT_DIG) "d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS1 "d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS1 "d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR " " ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR " " );
     TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS2 "d", INT_MIN ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR " " ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR " " );
     TESTCASE( testprintf( buffer, 100, "%-0" INT_DIG_PLUS2 "d", INT_MAX ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR "  " ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR "  " );
     /* FIXME: This test not yet 32/64 bit agnostic */
     TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 );
-    TESTCASE_SPRINTF( strcmp( buffer, "          00000000002147483647" ) == 0 );
+    TESTCASE_SPRINTF( "          00000000002147483647" );
     TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "f" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "f" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xf" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "0xf" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == (int)strlen( INT_HEXDIG ) + 3 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xf" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "0xf" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "-" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "-" INT_MIN_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xf" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "0xf" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xf" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "0xf" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == UINT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xf" INT_hexdig ) == 0 );
+    TESTCASE_SPRINTF( "0xf" INT_hexdig );
     TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == INT_DIG );
-    TESTCASE_SPRINTF( strcmp( buffer, INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == INT_DIG + 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "+" INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "+" INT_MAX_DEZ_STR );
 #ifndef TEST_CONVERSION_ONLY
     TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == INT_DIG + 2 );
-    TESTCASE_SPRINTF( strcmp( buffer, "- " INT_MAX_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "- " INT_MAX_DEZ_STR );
     TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == INT_DIG * 2 + 6 );
-    TESTCASE_SPRINTF( strcmp( buffer, "- " INT_MAX_DEZ_STR " % -" INT_MIN_DEZ_STR ) == 0 );
+    TESTCASE_SPRINTF( "- " INT_MAX_DEZ_STR " % -" INT_MIN_DEZ_STR );
 #endif
     TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 );
-    TESTCASE_SPRINTF( strcmp( buffer, "x" ) == 0 );
+    TESTCASE_SPRINTF( "x" );
     TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
-    TESTCASE_SPRINTF( strcmp( buffer, "abcdef" ) == 0 );
+    TESTCASE_SPRINTF( "abcdef" );
     /* FIXME: This test not yet 32/64 bit agnostic */
     TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0xdeadbeef" ) == 0 );
+    TESTCASE_SPRINTF( "0xdeadbeef" );
     TESTCASE( testprintf( buffer, 100, "%#6x", 1 ) == 6 );
-    TESTCASE_SPRINTF( strcmp( buffer, "0x0001" ) == 0 );
+    TESTCASE_SPRINTF( "0x0001" );
 #ifndef TEST_CONVERSION_ONLY
     {
         int val1, val2;
         TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 );
-        TESTCASE_SPRINTF( strcmp( buffer, "123456789" ) == 0 ); /* FIXME */
+        TESTCASE_SPRINTF( "123456789" ); /* FIXME */
         TESTCASE( val1 == 6 );
         TESTCASE( val2 == 9 );
     }