Changeset 2275 for trunk/psModules/src/psTest.c

Timestamp:

Nov 3, 2004, 4:02:10 PM (22 years ago)

Author:

desonia

Message:

fixed problems with psError and associate parameter checking macros.

File:

• trunk/psModules/src/psTest.c (modified) (12 diffs)

trunk/psModules/src/psTest.c

@@ -28 +28 @@
 #define HEADER_BOTTOM "\\**********************************************************************************/\n\n"
 
-bool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName,
-                     testDescription tests[], int argc, char * const argv[] )
-{
-    bool success = true;
-    bool runAll = true;
-    bool useFork = true;
-    bool found;
-    int c;
-    int n;
+psBool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName,
+                       testDescription tests[], psS32 argc, char * const argv[] )
+{
+    psBool success = true;
+    psBool runAll = true;
+    psBool useFork = true;
+    psBool found;
+    psS32 c;
+    psS32 n;
     extern char *optarg;
 
@@ -62 +62 @@
                 printf( "Testpoints:\n" );
                 runAll = false;
-                for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
                     printf( "    %6d - %s \n", tests[ index ].testPointNumber,
                             tests[ index ].testPointName );
@@ -70 +70 @@
             case 't':
                 runAll = false;
-                for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
                     if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) {
                         success = p_runTest( fp,
@@ -85 +85 @@
                 runAll = false;
                 if ( sscanf( optarg, "%i", &n ) != 1 ) {
-                    psError( __func__, "Failed to parse the testpoint number (%s).",
-                             optarg );
+                    psError(PS_ERR_UNKNOWN, true, "Failed to parse the testpoint number (%s).",
+                            optarg );
                     break;
                 }
                 found = false;
-                for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
                     if ( n == tests[ index ].testPointNumber ) {
                         found = true;
@@ -103 +103 @@
                 }
                 if ( ! found ) {
-                    psError( __func__, "The specified testpoint number (%d) doesn't exist in this test driver.",
-                             n );
+                    psError(PS_ERR_UNKNOWN, true, "The specified testpoint number (%d) doesn't exist in this test driver.",
+                            n );
                     break;
                 }
                 break;
             case '?':
-                psError( __func__, "Option %s is not recognized and is ignored.", optarg );
+                psError(PS_ERR_UNKNOWN, true, "Option %s is not recognized and is ignored.", optarg );
                 break;
             }
@@ -116 +116 @@
 
     if ( runAll ) {
-        for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+        for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
             if ( ! tests[ index ].isDuplicateEntry ) {
                 success = p_runTest( fp,
@@ -130 +130 @@
 
     if ( ! success ) {
-        psError( testPointFile, "One or more tests failed" );
+        psError( PS_ERR_UNKNOWN, true,
+                 "One or more tests failed" );
     }
 
@@ -136 +137 @@
 }
 
-bool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
-                testFcn fcn, int expectedReturn, bool useFork )
-{
-    int childReturn = 0;
+psBool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
+                  testFcn fcn, psS32 expectedReturn, psBool useFork )
+{
+    psS32 childReturn = 0;
     pid_t child;
 
@@ -147 +148 @@
         child = fork();
         if ( child == 0 ) {                   // I am the child process, run the test
-            int currentId = psMemGetId();
-            int retVal = fcn();
+            psS32 currentId = psMemGetId();
+            psS32 retVal = fcn();
             if ( retVal == 0 ) { // only bother checking memory if test executed to end.
                 if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) {
-                    psError( __func__, "Memory Leaks Detected" );
+                    psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" );
                     retVal = 64;
                 }
@@ -171 +172 @@
         }
     } else {
-        int currentId = psMemGetId();
+        psS32 currentId = psMemGetId();
         childReturn = fcn();
         if ( childReturn == 0 ) { // only bother checking memory if test executed to end.
             if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) {
-                psError( __func__, "Memory Leaks Detected" );
+                psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" );
                 childReturn = 64;
             }
@@ -215 +216 @@
                                 const char* testPointName,
                                 const char* expectedError,
-                                int exitValue )
+                                psS32 exitValue )
 {
     char TP[ 80 ];
@@ -235 +236 @@
                     const char* packageName,
                     const char* testPointName,
-                    bool success )
+                    psBool success )
 {
     if ( success ) {