X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=testing%2F_PDCLIB_test.h;h=b6bc9179a8de99b20d53734da58a7af2e2f4f08d;hb=refs%2Fheads%2Fbranches%2Fretrace;hp=4eaa9d284333531d824f39c824d462cc03840efe;hpb=0f88da0454edf3c1ca1a7f786c2fd9afdef0eb9c;p=pdclib

diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h
index 4eaa9d2..b6bc917 100644
--- a/testing/_PDCLIB_test.h
+++ b/testing/_PDCLIB_test.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* PDCLib testing suite <_PDCLIB_test.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,10 +9,16 @@
 /* -------------------------------------------------------------------------- */
 
 #include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <assert.h>
 
+/* Some strings used for <string.h> and <stdlib.h> testing. */
 static char const abcde[] = "abcde";
 static char const abcdx[] = "abcdx";
 static char const teststring[] = "1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ\nabcdefghijklmnopqrstuvwxyz\n";
+
+/* Temporary file names */
 static char const testfile[]="testing/testfile";
 static char const testfile1[]="testing/testfile1";
 static char const testfile2[]="testing/testfile2";
@@ -23,14 +27,19 @@ static char const testfile2[]="testing/testfile2";
 
 static int TEST_RESULTS = 0;
 
+/* TESTCASE() - generic test */
 #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 ); }
-
+/* TESTCASE_NOREG() - PDCLib-only test */
 #ifndef REGTEST
-#define TESTCASE_NOREG( x ) TESTCASE( x )
+    #define TESTCASE_NOREG( x ) TESTCASE( x )
 #else
-#define TESTCASE_NOREG( x )
+    #define TESTCASE_NOREG( x )
+#endif
+
+/* Include printf() / scanf() test macros if required */
+
+#if defined( _PDCLIB_FILEIO ) || defined( _PDCLIB_STRINGIO )
+#include "_PDCLIB_iotest.h"
 #endif