Better error reporting on printf's.

diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c
index 8f019796c757342a5610e29e6e92f575d01d3daa..424228b29e837397cbb092aff6dd2a52d6334c33 100644 (file)
--- a/functions/_PDCLIB/print.c
+++ b/functions/_PDCLIB/print.c
@@ -507,6 +507,7 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
 }
 
 #ifdef TEST
+#define _PDCLIB_FILEID "_PDCLIB/print.c"
 #include <_PDCLIB_test.h>
 
 #include <limits.h>
@@ -538,9 +539,6 @@ static int testprintf( char * buffer, const char * format, ... )
 
 #define TEST_CONVERSION_ONLY
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
 int main( void )
 {
     char target[100];

diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c
index 851aefb5b699ccc859909ab6937e4b40755b6ff6..3cc30fcba55a4fe3eec0803f86219e207fb05610 100644 (file)
--- a/functions/stdio/snprintf.c
+++ b/functions/stdio/snprintf.c
@@ -24,6 +24,7 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/snprintf.c"
 #include <_PDCLIB_test.h>
 
 #include <string.h>
@@ -31,9 +32,6 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict
 
 #define testprintf( s, format, ... ) snprintf( s, 100, format, __VA_ARGS__ )
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
 int main( void )
 {
     char target[100];

diff --git a/functions/stdio/sprintf.c b/functions/stdio/sprintf.c
index ca7e2d18e4bcf778ea7ed34b1c91694baf266608..9c7e17a2bf57149d99ffe1bfc730ce94c2a0f0fc 100644 (file)
--- a/functions/stdio/sprintf.c
+++ b/functions/stdio/sprintf.c
@@ -25,6 +25,7 @@ int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ..
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/sprintf.c"
 #include <_PDCLIB_test.h>
 
 #include <string.h>
@@ -32,9 +33,6 @@ int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ..
 
 #define testprintf( s, format, ... ) sprintf( s, format, __VA_ARGS__ )
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
 int main( void )
 {
     char target[100];

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index 165ed54ce3a1fb600e317a383c7075edbd955a6f..9e54dca1bb392076e07c0566fa6449403b24b90b 100644 (file)
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -48,6 +48,7 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vsnprintf.c"
 #include <_PDCLIB_test.h>
 
 #include <limits.h>
@@ -64,9 +65,6 @@ static int testprintf( char * s, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
 int main( void )
 {
     char target[100];

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index 803485e48032528cb390dcf899469d202de17185..bdb8a796df47b081ab6774532879e0dc3da85f4a 100644 (file)
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -20,6 +20,7 @@ int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, v
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vsprintf.c"
 #include <_PDCLIB_test.h>
 
 #include <limits.h>
@@ -36,9 +37,6 @@ static int testprintf( char * s, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
 int main( void )
 {
     char target[100];

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index 7a7ff0504961624accc330f593a196051d5d4253..4eaa9d284333531d824f39c824d462cc03840efe 100644 (file)
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -26,6 +26,9 @@ static int TEST_RESULTS = 0;
 #define TESTCASE( x ) if ( x ) {} \
                       else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - %s\n", __LINE__, #x ); }
 
+#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ " (" _PDCLIB_FILEID "), line %d - \"%s\" != \"%s\"\n", __LINE__, target, x ); }
+
 #ifndef REGTEST
 #define TESTCASE_NOREG( x ) TESTCASE( x )
 #else