Better error reporting on printf's.

[pdclib] / testing / _PDCLIB_test.h

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index ad02b0fb71839924851a9f00f5ec30e5a63f7091..4eaa9d284333531d824f39c824d462cc03840efe 100644 (file)
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -12,22 +12,25 @@
 
 #include <stdio.h>
 
-char const abcde[] = "abcde";
-char const abcdx[] = "abcdx";
-char const * teststring = "1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ\nabcdefghijklmnopqrstuvwxyz\n";
+static char const abcde[] = "abcde";
+static char const abcdx[] = "abcdx";
+static char const teststring[] = "1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ\nabcdefghijklmnopqrstuvwxyz\n";
+static char const testfile[]="testing/testfile";
+static char const testfile1[]="testing/testfile1";
+static char const testfile2[]="testing/testfile2";
 
-int NO_TESTDRIVER = 0;
+#define NO_TESTDRIVER 0
 
-static int rc = 0;
+static int TEST_RESULTS = 0;
 
 #define TESTCASE( x ) if ( x ) {} \
-                      else { rc += 1; printf( "FAILED: " __FILE__ ", line %d - %s\n", __LINE__, #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
 #define TESTCASE_NOREG( x )
 #endif
-
-#define TEST_RESULTS  rc
-