Changeset 17515 for trunk/psLib/test/sys/tap_psTrace.c

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

File:

• trunk/psLib/test/sys/tap_psTrace.c (modified) (8 diffs)

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
+
 }