Changeset 17515 for trunk/psLib/test/sys

Timestamp:

May 4, 2008, 2:09:04 PM (18 years ago)

Author:

eugene

Message:

merging from eam_branch_20080430 : cleanups for tests, minor fixes from tests, reduced verbosity level in some places, add UPDATE and RESET directives to MULTI and METADATA in config files

Location:

trunk/psLib/test/sys

Files:

• tap_psError.c (modified) (9 diffs)
• tap_psString.c (modified) (3 diffs)
• tap_psTrace.c (modified) (8 diffs)

trunk/psLib/test/sys/tap_psError.c

@@ -5 +5 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-05-01 00:08:52 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2008-05-05 00:09:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include "pstap.h"
 
+// XXX in this file, several operations are only validated by printing an output to the screen.   
+// we should define an output file and compare the contents of the output file to expectations.
+// I've commented out these features for now
+
+# if (0)
 // Function used in testError02 to verify the psErrorStackPrintV function
 static void myErrorStackPrint(
@@ -32 +37 @@
     va_end(ap);
 }
-
+# endif
 
 psS32 main( psS32 argc, char* argv[] )
@@ -83 +88 @@
             psErrorCode code=PS_ERR_BAD_PARAMETER_VALUE;
             ok(psError(code, true, "Error code = %d", code) == code, "Failed return value verify.");
-            psErrorStackPrint(stderr,"ERROR STACK PRINT Test1A");
+            // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1A");
             ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }
@@ -94 +99 @@
             ok(psError(code+1, true, "Error code = %d", code+1) == code+1,
                  "Failed return with empty string.");
-            psErrorStackPrint(stderr,"ERROR STACK PRINT Test1B");
+            // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1B");
             ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }
@@ -104 +109 @@
             ok(psError(-1, true, "Error code = %d", -1) == -1,
                  "Failed return with undefined code.");
-            psErrorStackPrint(stderr,"ERROR STACK PRINT Test1D");
+            // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1D");
             ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }
@@ -115 +120 @@
             ok(psError(code, false, "Error code = %d", code) == code,
                 "Failed return with false new arg.");
-            psErrorStackPrint(stderr,"ERROR STACK PRINT Test1E");
+            // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1E");
             ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }
@@ -124 +129 @@
             psMemId id = psMemGetId();
             ok(psError(9, true, "Errno code = %d", 9) == 9, "Error Code" );
-            psErrorStackPrint(stderr,"ERROR STACK PRINT Test1F");
+            // psErrorStackPrint(stderr,"ERROR STACK PRINT Test1F");
             ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }
@@ -138 +143 @@
             ok(psError(code, true, "Error code = %d", code) == code,
                 "Failed return value verify.");
-            myErrorStackPrint(stderr,"ERROR STACK PRINT Test%dA",2);
+            // myErrorStackPrint(stderr,"ERROR STACK PRINT Test%dA",2);
             ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
         }

trunk/psLib/test/sys/tap_psString.c

@@ -20 +20 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-06-13 23:32:11 $
+ *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2008-05-05 00:09:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(68);
+    plan_tests(65);
 
 
@@ -455 +455 @@
         psFree(str);
 
-        char charStr[10];
-        ok(!psMemCheckType(PS_DATA_STRING, charStr),
-            "Input string is a psDataType");
+        // XXX EAM this function raises an abort since we are trying to test a non-psLib memory block
+        // char charStr[10];
+        // ok(!psMemCheckType(PS_DATA_STRING, charStr), "Input string is a psDataType");
+
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }

trunk/psLib/test/sys/tap_psTrace.c

@@ -19 +19 @@
     plan_tests(54);
 
+# define DEBUG 1
+# if (DEBUG)
+    FILE *output = fopen ("/dev/null", "w");
+    int outFD = fileno (output);
+# else
+    int outFD = 2;
+# endif
+
     // testTrace00()
     {
         psMemId id = psMemGetId();
         psS32 lev = 0;
-        (void)psTraceSetDestination(2);
+        (void)psTraceSetDestination(outFD);
         for (int i=0;i<10;i++) {
             (void)psTraceSetLevel(".", i);
@@ -58 +66 @@
     {
         psMemId id = psMemGetId();
-        (void)psTraceSetDestination(2);
+        (void)psTraceSetDestination(outFD);
         (void)psTraceSetLevel(".A.B.C.D.E", 5);
         psTrace(".A.C.D.C",1,"You should not see this");
@@ -72 +80 @@
         psMemId id = psMemGetId();
         psTraceReset();
-        (void)psTraceSetDestination(2);
+        (void)psTraceSetDestination(outFD);
         (void)psTraceSetLevel(".A.B", 2);
         (void)psTraceSetLevel(".A.B.C.D.E", 5);
@@ -97 +105 @@
     {
         psMemId id = psMemGetId();
-        (void)psTraceSetDestination(2);
+        (void)psTraceSetDestination(outFD);
 
         for (int i=0;i<10;i++) {
@@ -134 +142 @@
         for (int nb = 0 ; nb<4;nb++) {
             if (nb == 0)
-                (void)psTraceSetDestination(1);
+                (void)psTraceSetDestination(((outFD == 2) ? 1 : outFD));
             if (nb == 1)
-                (void)psTraceSetDestination(2);
+                (void)psTraceSetDestination(((outFD == 2) ? 2 : outFD));
             if (nb == 2)
-                (void)psTraceSetDestination(0);
+                (void)psTraceSetDestination(((outFD == 2) ? 0 : outFD));
             if (nb == 3)
                 (void)psTraceSetDestination(FD);
@@ -174 +182 @@
     {
         psMemId id = psMemGetId();
-        (void)psTraceSetDestination(2);
+        (void)psTraceSetDestination(outFD);
         (void)psTraceSetLevel(".", 9);
         (void)psTraceSetLevel(".a", 8);
@@ -213 +221 @@
     {
         psMemId id = psMemGetId();
-        (void)psTraceSetDestination(2);
+        (void)psTraceSetDestination(outFD);
         (void)psTraceSetLevel(".", 9);
         (void)psTraceSetLevel(".a", 8);
@@ -287 +295 @@
         ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
     }
+
+# if (DEBUG)
+    close (outFD);
+# endif
+
 }