Index: trunk/psLib/test/psTest.h
===================================================================
--- trunk/psLib/test/psTest.h	(revision 637)
+++ trunk/psLib/test/psTest.h	(revision 1193)
@@ -20,31 +20,62 @@
 {
     testFcn     fcn;
+    int         testPointNumber;
     const char* testPointName;
     int         expectedReturn;
+    bool        isDuplicateEntry;
 }
 testDescription;
 
-#define runTest(filePtr, packageName, testPointName, fcn, expectedReturn) \
-p_runTest(filePtr, __FILE__, packageName, testPointName, fcn, expectedReturn)
+#define runTest(filePtr, packageName, testPointName, fcn, expectedReturn, useFork) \
+p_runTest(filePtr, __FILE__, packageName, testPointName, fcn, expectedReturn, useFork)
 
-#define runTestSuite(filePtr, packageName, tests) \
-p_runTestSuite(filePtr, __FILE__, packageName, tests)
+#define runTestSuite(filePtr, packageName, tests, argc, argv) \
+p_runTestSuite(filePtr, __FILE__, packageName, tests, argc, argv)
 
 
 /////////////////////////// PRIVATE FUNCTIONS //////////////////////////////
 
-bool p_runTest(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
-               testFcn fcn, int expectedReturn);
+bool p_runTest(
+    FILE *fp,
+    const char* testPointFile,
+    const char* packageName,
+    const char* testPointName,
+    testFcn fcn,
+    int expectedReturn,
+    bool useFork
+);
 
-bool p_runTestSuite(FILE *fp, const char* testPointFile, const char* packageName, testDescription tests[]);
+bool p_runTestSuite(
+    FILE *fp,
+    const char* testPointFile,
+    const char* packageName,
+    testDescription tests[],
+    int argc,
+    char * const argv[]
+);
 
-void p_printPositiveTestHeader(FILE *fp, const char* testPointFile, const char* packageName,
-                               const char* testPointName);
+void p_printPositiveTestHeader(
+    FILE *fp,
+    const char* testPointFile,
+    const char* packageName,
+    const char* testPointName
+);
 
-void p_printNegativeTestHeader(FILE *fp, const char* testPointFile, const char* packageName,
-                               const char* testPointName,const char* expectedError, int exitValue);
+void p_printNegativeTestHeader(
+    FILE *fp,
+    const char* testPointFile,
+    const char* packageName,
+    const char* testPointName,
+    const char* expectedError,
+    int exitValue
+);
 
-void p_printFooter(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
-                   bool success);
+void p_printFooter(
+    FILE *fp,
+    const char* testPointFile,
+    const char* packageName,
+    const char* testPointName,
+    bool success
+);
 
 #endif