Index: /trunk/psLib/test/sysUtils/Makefile
===================================================================
--- /trunk/psLib/test/sysUtils/Makefile	(revision 1697)
+++ /trunk/psLib/test/sysUtils/Makefile	(revision 1698)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.19 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-09-07 19:04:15 $
+##  $Revision: 1.20 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-09-07 19:57:06 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26,10 +26,6 @@
          tst_psLogMsg     \
          tst_psStringCopy \
-         tst_psTrace00    \
-         tst_psTrace01    \
-         tst_psTrace02    \
-         tst_psTrace03    \
-         tst_psTrace04
-
+         tst_psTrace
+         
 OBJS = $(addsuffix .o,$(TARGET))
 
Index: /trunk/psLib/test/sysUtils/tst_psTrace.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace.c	(revision 1698)
+++ /trunk/psLib/test/sysUtils/tst_psTrace.c	(revision 1698)
@@ -0,0 +1,256 @@
+/*****************************************************************************
+    This code will test whether trace levels can be set successfully.
+ 
+    XXX: For the last two testpoints, must verify that the results are
+    correct, and put that verification in the test as well.
+ *****************************************************************************/
+#include <stdio.h>
+#include "pslib.h"
+#include "psTest.h"
+
+
+static int testTrace00(void);
+static int testTrace01(void);
+static int testTrace02(void);
+static int testTrace03(void);
+static int testTrace04(void);
+static int testTrace05(void);
+static int testTrace06(void);
+
+testDescription tests[] = {
+                              {testTrace00, 0, "psTraceSetLevel() and psTraceGetLevel()", 0, false},
+                              {testTrace01, 1, "psTraceSetLevel(): set multiple components in one call", 0, false},
+                              {testTrace02, 2, "psTraceSetLevel(): test static inheritance", 0, false},
+                              {testTrace03, 3, "psTraceReset()", 0, false},
+                              {testTrace04, 4, "psTrace()", 0, false},
+                              {testTrace05, 5, "psTracePrintLevels()", 0, false},
+                              {testTrace06, 6, "Testing psTraceReset", 0, false},
+                              {NULL}
+                          };
+
+int main( int argc, char* argv[] )
+{
+    psLogSetLevel( PS_LOG_INFO );
+
+    return ( ! runTestSuite( stderr, "psTrace", tests, argc, argv ) );
+}
+
+static int testTrace00(void)
+{
+    int i;
+    int lev = 0;
+
+    for (i=0;i<10;i++) {
+        (void)psTraceSetLevel(".", i);
+        lev = psTraceGetLevel(".");
+        if (lev != i) {
+            printf("ERROR: (.) expected trace level was %d, actual was %d\n",
+                   i, lev);
+            return 1;
+        }
+    }
+    (void)psTraceSetLevel(".", 3);
+
+    for (i=5;i<10;i++) {
+        (void)psTraceSetLevel(".NODE00", i);
+        lev = psTraceGetLevel(".NODE00");
+        if (lev != i) {
+            printf("ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
+                   i, lev);
+            return 2;
+        }
+
+        lev = psTraceGetLevel(".");
+        if (lev != 3) {
+            printf("ERROR: (.) expected trace level was %d, actual was %d\n",
+                   i, 3);
+            return 3;
+        }
+    }
+
+
+    (void)psTraceSetLevel(".NODE00.NODE01", 4);
+    for (i=0;i<10;i++) {
+        (void)psTraceSetLevel(".NODE00.NODE01", i);
+        lev = psTraceGetLevel(".NODE00.NODE01");
+        if (lev != i) {
+            printf("ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
+                   i, lev);
+            return 4;
+        }
+    }
+
+    return 0;
+}
+
+static int testTrace01(void)
+{
+    (void)psTraceSetLevel(".A.B.C.D.E", 5);
+
+    psTracePrintLevels();
+
+    return 0;
+}
+
+static int testTrace02(void)
+{
+    psTraceSetLevel(".A.B", 2);
+    psTraceSetLevel(".A.B.C.D.E", 5);
+    psTracePrintLevels();
+    psTraceSetLevel(".A.B", 10);
+    psTracePrintLevels();
+
+    return 0;
+}
+
+static int testTrace03(void)
+{
+    int i = 0;
+    int lev = 0;
+
+    for (i=0;i<10;i++) {
+        (void)psTraceSetLevel(".", i);
+        psTraceReset();
+
+        lev = psTraceGetLevel(".");
+        if (lev != PS_UNKNOWN_TRACE_LEVEL) {
+            printf("ERROR: expected trace level was %d, actual was %d\n",
+                   PS_UNKNOWN_TRACE_LEVEL, lev);
+            return 1;
+        }
+    }
+    (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 successFlag = false;levels were not settable?\n");
+        return 2;
+    }
+
+    psTraceReset();
+    if ((PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".")) ||
+            (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a")) ||
+            (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a.b")) ||
+            (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a.b.c"))) {
+        printf("ERROR: trace levels were not reset properly\n");
+        return 3;
+    }
+
+    return 0;
+}
+
+
+static int testTrace04(void)
+{
+    FILE *fp;
+    int nb = 0;
+
+    fp = fopen("tst_psTrace02_OUT", "w");
+    for (nb = 0 ; nb<4;nb++) {
+        if (nb == 0)
+            psTraceSetDestination(stdout);
+        if (nb == 1)
+            psTraceSetDestination(stderr);
+        if (nb == 2)
+            psTraceSetDestination(NULL);
+        if (nb == 3)
+            psTraceSetDestination(fp);
+
+        printPositiveTestHeader(stdout,
+                                "psTrace functions",
+                                "psTrace()");
+
+        (void)psTraceSetLevel(".", 4);
+        psTrace(".", 5, "(0) This message should not be displayed (%x)\n",
+                0xbeefface);
+        (void)psTraceSetLevel(".", 7);
+        psTrace(".", 5, "(0) This message should be displayed (%x)\n",
+                0xbeefface);
+
+        (void)psTraceSetLevel(".a", 4);
+        psTrace(".a", 5, "(1) This message should not be displayed (%x)\n",
+                0xbeefface);
+        (void)psTraceSetLevel(".a", 7);
+        psTrace(".a", 5, "(1) This message should be displayed (%x)\n",
+                0xbeefface);
+
+
+        (void)psTraceSetLevel(".a.b", 4);
+        psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n",
+                0xbeefface);
+        (void)psTraceSetLevel(".a.b", 7);
+        psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n",
+                0xbeefface);
+
+    }
+
+    fclose(fp);
+
+    return(0);
+}
+
+static int testTrace05(void)
+{
+    (void)psTraceSetLevel(".", 9);
+
+    (void)psTraceSetLevel(".a", 8);
+    (void)psTraceSetLevel(".b", 7);
+    (void)psTraceSetLevel(".c", 5);
+
+    (void)psTraceSetLevel(".a.a", 4);
+    (void)psTraceSetLevel(".a.b", 3);
+
+    (void)psTraceSetLevel(".b.a", 2);
+    (void)psTraceSetLevel(".b.b", 1);
+
+    (void)psTraceSetLevel(".c.a", 0);
+    (void)psTraceSetLevel(".c.b", 3);
+    (void)psTraceSetLevel(".c.c", 5);
+
+    psTracePrintLevels();
+
+    return 0;
+
+}
+
+static int testTrace06(void)
+{
+    (void)psTraceSetLevel(".", 9);
+
+    (void)psTraceSetLevel(".a", 8);
+    (void)psTraceSetLevel(".b", 7);
+    (void)psTraceSetLevel(".c", 5);
+
+    (void)psTraceSetLevel(".a.a", 4);
+    (void)psTraceSetLevel(".a.b", 3);
+
+    (void)psTraceSetLevel(".b.a", 2);
+    (void)psTraceSetLevel(".b.b", 1);
+
+    (void)psTraceSetLevel(".c.a", 0);
+    (void)psTraceSetLevel(".c.b", 3);
+    (void)psTraceSetLevel(".c.c", 5);
+
+    psTraceReset();
+
+    if ((psTraceGetLevel(".")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".a")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".b")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".c")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".a.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".a.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".b.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".b.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".c.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".c.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
+            (psTraceGetLevel(".c.c")!=PS_UNKNOWN_TRACE_LEVEL)) {
+        return 1;
+    }
+
+    return 0;
+}
+
Index: unk/psLib/test/sysUtils/tst_psTrace00.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace00.c	(revision 1697)
+++ 	(revision )
@@ -1,103 +1,0 @@
-/*****************************************************************************
-    This code will test whether trace levels can be set successfully.
- 
-    XXX: For the last two testpoints, must verify that the results are
-    correct, and put that verification in the test as well.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib.h"
-#include "psTest.h"
-
-int main()
-{
-    int i = 0;
-    int lev = 0;
-    int testStatus = true;
-
-    // XXX: Should we test this behavior?
-    //(void)psTraceSetLevel("", 0);
-
-    printPositiveTestHeader(stdout,
-                            "psTrace functions",
-                            "psTraceSetLevel() and psTraceGetLevel()");
-    for (i=0;i<10;i++) {
-        (void)psTraceSetLevel(".", i);
-        lev = psTraceGetLevel(".");
-        if (lev != i) {
-            printf("ERROR: (.) expected trace level was %d, actual was %d\n",
-                   i, lev);
-            testStatus = false;
-        }
-    }
-    (void)psTraceSetLevel(".", 3);
-
-    for (i=5;i<10;i++) {
-        (void)psTraceSetLevel(".NODE00", i);
-        lev = psTraceGetLevel(".NODE00");
-        if (lev != i) {
-            printf("ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
-                   i, lev);
-            testStatus = false;
-        }
-
-        lev = psTraceGetLevel(".");
-        if (lev != 3) {
-            printf("ERROR: (.) expected trace level was %d, actual was %d\n",
-                   i, 3);
-            testStatus = false;
-        }
-    }
-
-
-    (void)psTraceSetLevel(".NODE00.NODE01", 4);
-    for (i=0;i<10;i++) {
-        (void)psTraceSetLevel(".NODE00.NODE01", i);
-        lev = psTraceGetLevel(".NODE00.NODE01");
-        if (lev != i) {
-            printf("ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
-                   i, lev);
-            testStatus = false;
-        }
-    }
-
-    printFooter(stdout,
-                "psTrace functions",
-                "Testing psTraceSetLevel and psTraceGetLevel",
-                testStatus);
-
-
-
-    printPositiveTestHeader(stdout,
-                            "psTrace functions",
-                            "psTraceSetLevel(): set multiple components in one call");
-
-    psTraceReset();
-
-    (void)psTraceSetLevel(".A.B.C.D.E", 5);
-
-    psTracePrintLevels();
-
-    printFooter(stdout,
-                "psTrace functions",
-                "psTraceSetLevel(): set multiple components in one call",
-                testStatus);
-
-
-    printPositiveTestHeader(stdout,
-                            "psTrace functions",
-                            "psTraceSetLevel(): test static inheritance");
-
-    psTraceReset();
-    psTraceSetLevel(".A.B", 2);
-    psTraceSetLevel(".A.B.C.D.E", 5);
-    psTracePrintLevels();
-    psTraceSetLevel(".A.B", 10);
-    psTracePrintLevels();
-
-    printFooter(stdout,
-                "psTrace functions",
-                "psTraceSetLevel(): test static inheritance",
-                testStatus);
-
-    return(!testStatus);
-}
Index: unk/psLib/test/sysUtils/tst_psTrace01.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace01.c	(revision 1697)
+++ 	(revision )
@@ -1,56 +1,0 @@
-/*****************************************************************************
-    This code will test whether trace levels can be reset successfully.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib.h"
-#include "psTest.h"
-
-int main()
-{
-    int i = 0;
-    int lev = 0;
-    int successFlag = true;
-
-    printPositiveTestHeader(stdout,
-                            "psTrace functions",
-                            "psTraceReset()");
-
-    for (i=0;i<10;i++) {
-        (void)psTraceSetLevel(".", i);
-        psTraceReset();
-
-        lev = psTraceGetLevel(".");
-        if (lev != PS_UNKNOWN_TRACE_LEVEL) {
-            printf("ERROR: expected trace level was %d, actual was %d\n",
-                   PS_UNKNOWN_TRACE_LEVEL, lev);
-            successFlag = false;
-        }
-    }
-    (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 ((PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".")) ||
-            (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a")) ||
-            (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a.b")) ||
-            (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a.b.c"))) {
-        printf("ERROR: trace levels were not reset properly\n");
-        successFlag = false;
-    }
-
-    printFooter(stdout,
-                "psTrace functions",
-                "psTraceReset()",
-                successFlag);
-
-    return(!successFlag);
-}
Index: unk/psLib/test/sysUtils/tst_psTrace02.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace02.c	(revision 1697)
+++ 	(revision )
@@ -1,61 +1,0 @@
-/*****************************************************************************
-    This code will test whether trace messages can be successfully displayed
-    and not displayed.
- 
-    NOTE: We must verify the output for the tst_psTrace02_OUT somewhere.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib.h"
-#include "psTest.h"
-
-int main()
-{
-    FILE *fp;
-    int nb = 0;
-
-    fp = fopen("tst_psTrace02_OUT", "w");
-    for (nb = 0 ; nb<4;nb++) {
-        if (nb == 0)
-            psTraceSetDestination(stdout);
-        if (nb == 1)
-            psTraceSetDestination(stderr);
-        if (nb == 2)
-            psTraceSetDestination(NULL);
-        if (nb == 3)
-            psTraceSetDestination(fp);
-
-        printPositiveTestHeader(stdout,
-                                "psTrace functions",
-                                "psTrace()");
-
-        (void)psTraceSetLevel(".", 4);
-        psTrace(".", 5, "(0) This message should not be displayed (%x)\n",
-                0xbeefface);
-        (void)psTraceSetLevel(".", 7);
-        psTrace(".", 5, "(0) This message should be displayed (%x)\n",
-                0xbeefface);
-
-        (void)psTraceSetLevel(".a", 4);
-        psTrace(".a", 5, "(1) This message should not be displayed (%x)\n",
-                0xbeefface);
-        (void)psTraceSetLevel(".a", 7);
-        psTrace(".a", 5, "(1) This message should be displayed (%x)\n",
-                0xbeefface);
-
-
-        (void)psTraceSetLevel(".a.b", 4);
-        psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n",
-                0xbeefface);
-        (void)psTraceSetLevel(".a.b", 7);
-        psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n",
-                0xbeefface);
-
-        printFooter(stdout,
-                    "psTrace functions",
-                    "psTrace()",
-                    true);
-    }
-    fclose(fp);
-
-    return(0);
-}
Index: unk/psLib/test/sysUtils/tst_psTrace03.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace03.c	(revision 1697)
+++ 	(revision )
@@ -1,39 +1,0 @@
-/*****************************************************************************
-    This code will test whether trace messages can be printed successfully
-    with psTracePrintLevels().
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib.h"
-#include "psTest.h"
-
-int main()
-{
-    printPositiveTestHeader(stdout,
-                            "psTrace functions",
-                            "psTracePrintLevels()");
-
-    (void)psTraceSetLevel(".", 9);
-
-    (void)psTraceSetLevel(".a", 8);
-    (void)psTraceSetLevel(".b", 7);
-    (void)psTraceSetLevel(".c", 5);
-
-    (void)psTraceSetLevel(".a.a", 4);
-    (void)psTraceSetLevel(".a.b", 3);
-
-    (void)psTraceSetLevel(".b.a", 2);
-    (void)psTraceSetLevel(".b.b", 1);
-
-    (void)psTraceSetLevel(".c.a", 0);
-    (void)psTraceSetLevel(".c.b", 3);
-    (void)psTraceSetLevel(".c.c", 5);
-
-    psTracePrintLevels();
-
-    printFooter(stdout,
-                "psTrace functions",
-                "psTracePrintLevels()",
-                true);
-
-    return(0);
-}
Index: unk/psLib/test/sysUtils/tst_psTrace04.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace04.c	(revision 1697)
+++ 	(revision )
@@ -1,54 +1,0 @@
-/*****************************************************************************
-    This code will test whether trace messages
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib.h"
-#include "psTest.h"
-
-int main()
-{
-    printPositiveTestHeader(stdout,
-                            "psTrace functions",
-                            "Testing psTraceReset()");
-    (void)psTraceSetLevel(".", 9);
-
-    (void)psTraceSetLevel(".a", 8);
-    (void)psTraceSetLevel(".b", 7);
-    (void)psTraceSetLevel(".c", 5);
-
-    (void)psTraceSetLevel(".a.a", 4);
-    (void)psTraceSetLevel(".a.b", 3);
-
-    (void)psTraceSetLevel(".b.a", 2);
-    (void)psTraceSetLevel(".b.b", 1);
-
-    (void)psTraceSetLevel(".c.a", 0);
-    (void)psTraceSetLevel(".c.b", 3);
-    (void)psTraceSetLevel(".c.c", 5);
-
-    psTraceReset();
-
-    if ((psTraceGetLevel(".")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".c")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".a.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".a.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".b.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".b.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".c.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".c.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel(".c.c")!=PS_UNKNOWN_TRACE_LEVEL)) {
-        printFooter(stdout,
-                    "psTrace functions",
-                    "psTraceReset() did not reset all levels of the tree.",
-                    false);
-        return(1);
-    } else {
-        printFooter(stdout,
-                    "psTrace functions",
-                    "psTraceReset()",
-                    true);
-        return(0);
-    }
-}
Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr	(revision 1698)
+++ /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr	(revision 1698)
@@ -0,0 +1,66 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{psTraceSetLevel() and psTraceGetLevel()}           *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{psTraceSetLevel() and psTraceGetLevel()} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{psTraceSetLevel(): set multiple components in one call} *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{psTraceSetLevel(): set multiple components in one call} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{psTraceSetLevel(): test static inheritance}        *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{psTraceSetLevel(): test static inheritance} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{psTraceReset()}                                    *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{psTraceReset()} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{psTrace()}                                         *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+     (0) This message should be displayed (beefface)
+     (1) This message should be displayed (beefface)
+     (2) This message should be displayed (beefface)
+
+---> TESTPOINT PASSED (psTrace{psTrace()} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{psTracePrintLevels()}                              *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{psTracePrintLevels()} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{Testing psTraceReset}                              *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{Testing psTraceReset} | tst_psTrace.c)
+
Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace.stdout	(revision 1698)
+++ /trunk/psLib/test/sysUtils/verified/tst_psTrace.stdout	(revision 1698)
@@ -0,0 +1,59 @@
+.                    0
+ A                   0
+  B                  0
+   C                 0
+    D                0
+     E               5
+.                    0
+ A                   0
+  B                  2
+   C                 2
+    D                2
+     E               5
+.                    0
+ A                   0
+  B                  10
+   C                 2
+    D                2
+     E               5
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace functions{psTrace()}                               *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+     (0) This message should be displayed (beefface)
+     (1) This message should be displayed (beefface)
+     (2) This message should be displayed (beefface)
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace functions{psTrace()}                               *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace functions{psTrace()}                               *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+     (0) This message should be displayed (beefface)
+     (1) This message should be displayed (beefface)
+     (2) This message should be displayed (beefface)
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace functions{psTrace()}                               *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+.                    9
+ a                   8
+  a                  4
+  b                  3
+ b                   7
+  a                  2
+  b                  1
+ c                   5
+  a                  0
+  b                  3
+  c                  5
Index: unk/psLib/test/sysUtils/verified/tst_psTrace00.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace00.stdout	(revision 1697)
+++ 	(revision )
@@ -1,9 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace00.c                                            *
-*            TestPoint: psTrace functions{psTraceSetLevel() and psTraceGetLevel()} *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTrace functions{Testing psTraceSetLevel and psTraceGetLevel} | tst_psTrace00.c)
-
Index: unk/psLib/test/sysUtils/verified/tst_psTrace01.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace01.stdout	(revision 1697)
+++ 	(revision )
@@ -1,9 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace01.c                                            *
-*            TestPoint: psTrace functions{psTraceReset()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTrace functions{psTraceReset()} | tst_psTrace01.c)
-
Index: unk/psLib/test/sysUtils/verified/tst_psTrace02.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stderr	(revision 1697)
+++ 	(revision )
@@ -1,3 +1,0 @@
-     (0) This message should be displayed (beefface)
-     (1) This message should be displayed (beefface)
-     (2) This message should be displayed (beefface)
Index: unk/psLib/test/sysUtils/verified/tst_psTrace02.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stdout	(revision 1697)
+++ 	(revision )
@@ -1,42 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace02.c                                            *
-*            TestPoint: psTrace functions{psTrace()}                               *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-     (0) This message should be displayed (beefface)
-     (1) This message should be displayed (beefface)
-     (2) This message should be displayed (beefface)
-
----> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace02.c                                            *
-*            TestPoint: psTrace functions{psTrace()}                               *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace02.c                                            *
-*            TestPoint: psTrace functions{psTrace()}                               *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-     (0) This message should be displayed (beefface)
-     (1) This message should be displayed (beefface)
-     (2) This message should be displayed (beefface)
-
----> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace02.c                                            *
-*            TestPoint: psTrace functions{psTrace()}                               *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c)
-
Index: unk/psLib/test/sysUtils/verified/tst_psTrace03.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace03.stdout	(revision 1697)
+++ 	(revision )
@@ -1,20 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace03.c                                            *
-*            TestPoint: psTrace functions{psTracePrintLevels()}                    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-.                    9
- a                   8
-  a                  4
-  b                  3
- b                   7
-  a                  2
-  b                  1
- c                   5
-  a                  0
-  b                  3
-  c                  5
-
----> TESTPOINT PASSED (psTrace functions{psTracePrintLevels()} | tst_psTrace03.c)
-
Index: unk/psLib/test/sysUtils/verified/tst_psTrace04.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace04.stdout	(revision 1697)
+++ 	(revision )
@@ -1,9 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTrace04.c                                            *
-*            TestPoint: psTrace functions{Testing psTraceReset()}                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTrace functions{psTraceReset()} | tst_psTrace04.c)
-
