Changeset 1136

Timestamp:

Jun 29, 2004, 3:05:37 PM (22 years ago)

Author:

desonia

Message:

fixed trace tests to compile but fail if psLib was compiled with PS_NO_TRACE set.

Location:

trunk/psLib/test/sysUtils

Files:

• builddir/tst_psTrace00.d (modified) (1 diff)
• builddir/tst_psTrace01.d (modified) (1 diff)
• builddir/tst_psTrace02.d (modified) (1 diff)
• builddir/tst_psTrace03.d (modified) (1 diff)
• builddir/tst_psTrace04.d (modified) (1 diff)
• tst_psTrace00.c (modified) (3 diffs)
• tst_psTrace01.c (modified) (2 diffs)
• tst_psTrace02.c (modified) (1 diff)
• tst_psTrace03.c (modified) (1 diff)
• tst_psTrace04.c (modified) (1 diff)

trunk/psLib/test/sysUtils/builddir/tst_psTrace00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace04.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h \
-  ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
   ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \

trunk/psLib/test/sysUtils/tst_psTrace00.c

@@ -16 +16 @@
                             "psTraceSetLevel() and psTraceGetLevel()");
     for (i=0;i<10;i++) {
-        psTraceSetLevel(".", i);
+        (void)psTraceSetLevel(".", i);
         lev = psTraceGetLevel(".");
         if (lev != i) {
@@ -24 +24 @@
         }
     }
-    psTraceSetLevel(".", 3);
+    (void)psTraceSetLevel(".", 3);
 
     for (i=5;i<10;i++) {
-        psTraceSetLevel(".NODE00", i);
+        (void)psTraceSetLevel(".NODE00", i);
         lev = psTraceGetLevel(".NODE00");
         if (lev != i) {
@@ -44 +44 @@
 
 
-    psTraceSetLevel(".NODE00.NODE01", 4);
+    (void)psTraceSetLevel(".NODE00.NODE01", 4);
     for (i=0;i<10;i++) {
-        psTraceSetLevel(".NODE00.NODE01", i);
+        (void)psTraceSetLevel(".NODE00.NODE01", i);
         lev = psTraceGetLevel(".NODE00.NODE01");
         if (lev != i) {

trunk/psLib/test/sysUtils/tst_psTrace01.c

@@ -17 +17 @@
 
     for (i=0;i<10;i++) {
-        psTraceSetLevel(".", i);
+        (void)psTraceSetLevel(".", i);
         psTraceReset();
 
@@ -27 +27 @@
         }
     }
-    psTraceSetLevel(".", 5);
-    psTraceSetLevel(".a", 4);
-    psTraceSetLevel(".a.b", 3);
-    psTraceSetLevel(".a.b.c", 2);
+    (void)psTraceSetLevel(".", 5);
+    (void)psTraceSetLevel(".a", 4);
+    (void)psTraceSetLevel(".a.b", 3);
+    (void)psTraceSetLevel(".a.b.c", 2);
+    if ((5 != psTraceGetLevel(".")) ||
+            (4 != psTraceGetLevel(".a")) ||
+            (3 != psTraceGetLevel(".a.b")) ||
+            (2 != psTraceGetLevel(".a.b.c"))) {
+        printf("ERROR: trace levels were not settable?\n");
+        successFlag = false;
+    }
+
     psTraceReset();
     if ((DEFAULT_TRACE_LEVEL != psTraceGetLevel(".")) ||

trunk/psLib/test/sysUtils/tst_psTrace02.c

@@ -29 +29 @@
                                 "psTrace()");
 
-        psTraceSetLevel(".", 4);
+        (void)psTraceSetLevel(".", 4);
         psTrace(".", 5, "(0) This message should not be displayed (%x)\n",
                 0xbeefface);
-        psTraceSetLevel(".", 7);
+        (void)psTraceSetLevel(".", 7);
         psTrace(".", 5, "(0) This message should be displayed (%x)\n",
                 0xbeefface);
 
-        psTraceSetLevel(".a", 4);
+        (void)psTraceSetLevel(".a", 4);
         psTrace(".a", 5, "(1) This message should not be displayed (%x)\n",
                 0xbeefface);
-        psTraceSetLevel(".a", 7);
+        (void)psTraceSetLevel(".a", 7);
         psTrace(".a", 5, "(1) This message should be displayed (%x)\n",
                 0xbeefface);
 
 
-        psTraceSetLevel(".a.b", 4);
+        (void)psTraceSetLevel(".a.b", 4);
         psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n",
                 0xbeefface);
-        psTraceSetLevel(".a.b", 7);
+        (void)psTraceSetLevel(".a.b", 7);
         psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n",
                 0xbeefface);

trunk/psLib/test/sysUtils/tst_psTrace03.c

@@ -13 +13 @@
                             "psTracePrintLevels()");
 
-    psTraceSetLevel(".", 9);
+    (void)psTraceSetLevel(".", 9);
 
-    psTraceSetLevel(".a", 8);
-    psTraceSetLevel(".b", 7);
-    psTraceSetLevel(".c", 5);
+    (void)psTraceSetLevel(".a", 8);
+    (void)psTraceSetLevel(".b", 7);
+    (void)psTraceSetLevel(".c", 5);
 
-    psTraceSetLevel(".a.a", 4);
-    psTraceSetLevel(".a.b", 3);
+    (void)psTraceSetLevel(".a.a", 4);
+    (void)psTraceSetLevel(".a.b", 3);
 
-    psTraceSetLevel(".b.a", 2);
-    psTraceSetLevel(".b.b", 1);
+    (void)psTraceSetLevel(".b.a", 2);
+    (void)psTraceSetLevel(".b.b", 1);
 
-    psTraceSetLevel(".c.a", 0);
-    psTraceSetLevel(".c.b", 3);
-    psTraceSetLevel(".c.c", 5);
+    (void)psTraceSetLevel(".c.a", 0);
+    (void)psTraceSetLevel(".c.b", 3);
+    (void)psTraceSetLevel(".c.c", 5);
 
     psTracePrintLevels();

trunk/psLib/test/sysUtils/tst_psTrace04.c

@@ -12 +12 @@
                             "psTrace functions",
                             "Testing psTraceReset()");
-    psTraceSetLevel(".", 9);
+    (void)psTraceSetLevel(".", 9);
 
-    psTraceSetLevel(".a", 8);
-    psTraceSetLevel(".b", 7);
-    psTraceSetLevel(".c", 5);
+    (void)psTraceSetLevel(".a", 8);
+    (void)psTraceSetLevel(".b", 7);
+    (void)psTraceSetLevel(".c", 5);
 
-    psTraceSetLevel(".a.a", 4);
-    psTraceSetLevel(".a.b", 3);
+    (void)psTraceSetLevel(".a.a", 4);
+    (void)psTraceSetLevel(".a.b", 3);
 
-    psTraceSetLevel(".b.a", 2);
-    psTraceSetLevel(".b.b", 1);
+    (void)psTraceSetLevel(".b.a", 2);
+    (void)psTraceSetLevel(".b.b", 1);
 
-    psTraceSetLevel(".c.a", 0);
-    psTraceSetLevel(".c.b", 3);
-    psTraceSetLevel(".c.c", 5);
+    (void)psTraceSetLevel(".c.a", 0);
+    (void)psTraceSetLevel(".c.b", 3);
+    (void)psTraceSetLevel(".c.c", 5);
 
     psTraceReset();