Changeset 560 for trunk/psLib/test/sysUtils

Timestamp:

May 1, 2004, 1:04:35 PM (22 years ago)

Author:

gusciora

Message:

This is a fairly large checkin. I had been sitting on a lot of test code
that was not quite in sync with the current test harness. I modified it
somewhat so it mostly works with the test harness, though there are still
problems with the printFooter() function not having a status for "status
unknown". Also, the runTest is not correctly parsing my date strings in
psLogMsg calls. Also, I added an individual entry for each test in the
Makefile in the test directory. I did this because the generic rules were
failing, and I did not want to break the tests for those people who were
successfully using the generic rules.

Location:

trunk/psLib/test/sysUtils

Files:

• Makefile (modified) (6 diffs)
• tst_psHash00.c (added)
• tst_psHash01.c (added)
• tst_psHash02.c (added)
• tst_psHash03.c (added)
• tst_psHash04.c (added)
• tst_psLogMsg00.c (added)
• tst_psLogMsg01.c (added)
• tst_psLogMsg02.c (added)
• tst_psLogMsg03.c (added)
• tst_psTrace00.c (modified) (5 diffs)
• tst_psTrace01.c (modified) (3 diffs)
• tst_psTrace02.c (modified) (2 diffs)
• tst_psTrace03.c (modified) (2 diffs)
• tst_psTrace04.c (added)
• verified/tst_psHash00.stderr (added)
• verified/tst_psHash00.stdout (added)
• verified/tst_psHash01.stderr (added)
• verified/tst_psHash01.stdout (added)
• verified/tst_psHash02.stderr (added)
• verified/tst_psHash02.stdout (added)
• verified/tst_psHash03.stderr (added)
• verified/tst_psHash03.stdout (added)
• verified/tst_psHash04.stderr (added)
• verified/tst_psHash04.stdout (added)
• verified/tst_psLogMsg00.stderr (added)
• verified/tst_psLogMsg00.stdout (added)
• verified/tst_psLogMsg01.stderr (added)
• verified/tst_psLogMsg01.stdout (added)
• verified/tst_psLogMsg02.stderr (added)
• verified/tst_psLogMsg02.stdout (added)
• verified/tst_psLogMsg03.stderr (added)
• verified/tst_psLogMsg03.stdout (added)
• verified/tst_psTrace00.stderr (modified) (1 diff)
• verified/tst_psTrace00.stdout (modified) (1 diff)
• verified/tst_psTrace01.stderr (modified) (1 diff)
• verified/tst_psTrace01.stdout (modified) (1 diff)
• verified/tst_psTrace02.stdout (modified) (1 diff)
• verified/tst_psTrace03.stdout (modified) (2 diffs)
• verified/tst_psTrace04.stderr (added)
• verified/tst_psTrace04.stdout (added)

trunk/psLib/test/sysUtils/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.5 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-04-30 06:19:57 $
+##  $Revision: 1.6 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-05-01 23:04:35 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -10 +10 @@
 ###############################################################################
 
+###############################################################################
+#    Note: I added specific entries for the psTrace files.  The reason I did
+#    this was because the generic rules were failing on the existing test
+#    code (and hence, on my tst_psTraceXX.c code as well).  I am tempted to
+#    fix the generic rules, but that might break existing codes.  When this
+#    problem is resolved, I'll remove the specific rules for psTrace.  -GLG
+#    Also, psLogMsg.
+#    Also, psHash.
+###############################################################################
 include ../../src/Makefile.Globals
 
@@ -20 +29 @@
          atst_psAbort_02    \
          atst_psAbort_03    \
-         tst_psTrace00      \
-         tst_psTrace01      \
-         tst_psTrace02      \
-         tst_psTrace03      \
          tst_psStringCopy
+TARGET_TRACE = tst_psTrace00 tst_psTrace01 tst_psTrace02 tst_psTrace03 \
+               tst_psTrace04
+TARGET_LOGMSG = tst_psLogMsg00 tst_psLogMsg01 tst_psLogMsg02 tst_psLogMsg03
+TARGET_HASH = tst_psHash00 tst_psHash01 tst_psHash02 tst_psHash03 tst_psHash04
 
-all: $(TARGET)
+all:            $(TARGET)
+psTrace:        $(TARGET_TRACE)
+psLogMsg:       $(TARGET_LOGMSG)
+psHash: $(TARGET_HASH)
 
 tst_psError: tst_psError.o
@@ -37 +49 @@
         @echo "    Deleting executable and binary files for 'test/sysUtils'"
         $(RM) $(TARGET) *.o *.lint
+
+tst_psHash00:   tst_psHash00.c
+        $(CC) tst_psHash00.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psHash00
+
+tst_psHash01:   tst_psHash01.c
+        $(CC) tst_psHash01.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psHash01
+
+tst_psHash02:   tst_psHash02.c
+        $(CC) tst_psHash02.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psHash02
+
+tst_psHash03:   tst_psHash03.c
+        $(CC) tst_psHash03.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psHash03
+
+tst_psHash04:   tst_psHash04.c
+        $(CC) tst_psHash04.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psHash04
+
+tst_psLogMsg00: tst_psLogMsg00.c
+        $(CC) tst_psLogMsg00.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psLogMsg00
+
+tst_psLogMsg01: tst_psLogMsg01.c
+        $(CC) tst_psLogMsg01.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psLogMsg01
+
+tst_psLogMsg02: tst_psLogMsg02.c
+        $(CC) tst_psLogMsg02.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psLogMsg02
+
+tst_psLogMsg03: tst_psLogMsg03.c
+        $(CC) tst_psLogMsg03.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psLogMsg03
 
 tst_psTrace00:  tst_psTrace00.c
@@ -50 +89 @@
         $(CC) tst_psTrace03.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psTrace03
 
+tst_psTrace04:  tst_psTrace04.c
+        $(CC) tst_psTrace04.c $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -I$(PSLIB_INCL_DIR) -I.. -o tst_psTrace04
+
 %.o : %.c
         $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -I$(PSLIB_INCL_DIR) -c -o $@ $<
@@ -60 +102 @@
 
 distclean:
-        rm DistCleanFiles
+        rm -rf $(TARGET_TRACE) $(TARGET_LOGMSG) $(TARGET_HASH)

trunk/psLib/test/sysUtils/tst_psTrace00.c

@@ -10 +10 @@
     int i = 0;
     int lev = 0;
-    int errorFlag = true;
+    int testStatus = true;
 
-    printPositiveTestHeader(stderr,
+    printPositiveTestHeader(stdout,
                             "psTrace functions",
-                            "Testing psSetTraceLevel and psGetTraceLevel");
+                            "psSetTraceLevel() and psGetTraceLevel()");
     for (i=0;i<10;i++) {
         psSetTraceLevel(".", i);
@@ -21 +21 @@
             printf("ERROR: (.) expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = false;
+            testStatus = false;
         }
     }
@@ -32 +32 @@
             printf("ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = false;
+            testStatus = false;
         }
 
@@ -39 +39 @@
             printf("ERROR: (.) expected trace level was %d, actual was %d\n",
                    i, 3);
-            errorFlag = false;
+            testStatus = false;
         }
     }
@@ -51 +51 @@
             printf("ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
                    i, lev);
-            errorFlag = false;
+            testStatus = false;
         }
     }
 
-    printFooter(stderr,
+    printFooter(stdout,
                 "psTrace functions",
                 "Testing psSetTraceLevel and psGetTraceLevel",
-                errorFlag);
-    exit(0);
+                testStatus);
+    exit(!testStatus);
 }

trunk/psLib/test/sysUtils/tst_psTrace01.c

@@ -12 +12 @@
     int successFlag = true;
 
-    printPositiveTestHeader(stderr,
+    printPositiveTestHeader(stdout,
                             "psTrace functions",
-                            "Testing psTraceReset()");
+                            "psTraceReset()");
 
     for (i=0;i<10;i++) {
@@ -21 +21 @@
 
         lev = psGetTraceLevel(".");
-        if (lev != UNKNOWN_TRACE_LEVEL) {
+        if (lev != DEFAULT_TRACE_LEVEL) {
             printf("ERROR: expected trace level was %d, actual was %d\n",
                    i, lev);
@@ -32 +32 @@
     psSetTraceLevel(".a.b.c", 2);
     psTraceReset();
-    if ((UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".")) ||
-            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a")) ||
-            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a.b")) ||
-            (UNKNOWN_TRACE_LEVEL != psGetTraceLevel(".a.b.c"))) {
+    if ((DEFAULT_TRACE_LEVEL != psGetTraceLevel(".")) ||
+            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a")) ||
+            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a.b")) ||
+            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a.b.c"))) {
         printf("ERROR: trace levels were not reset properly\n");
         successFlag = false;
     }
 
-    printFooter(stderr,
+    printFooter(stdout,
                 "psTrace functions",
-                "Testing psTraceReset()",
+                "psTraceReset()",
                 successFlag);
-    exit(0);
+
+    exit(!successFlag);
 }

trunk/psLib/test/sysUtils/tst_psTrace02.c

@@ -12 +12 @@
     int lev = 0;
     int errorFlag = 0;
+
+    printPositiveTestHeader(stdout,
+                            "psTrace functions",
+                            "psTrace()");
 
     psSetTraceLevel(".", 4);
@@ -35 +39 @@
             0xbeefface);
 
+    printFooter(stdout,
+                "psTrace functions",
+                "psTrace()",
+                true);
+
     exit(0);
 }

trunk/psLib/test/sysUtils/tst_psTrace03.c

@@ -9 +9 @@
 main()
 {
+    printPositiveTestHeader(stdout,
+                            "psTrace functions",
+                            "psTracePrintLevels()");
+
     psSetTraceLevel(".", 9);
 
@@ -26 +30 @@
 
     psPrintTraceLevels();
+
+    printFooter(stdout,
+                "psTrace functions",
+                "psTracePrintLevels()",
+                true);
+
     exit(0);
 }

trunk/psLib/test/sysUtils/verified/tst_psTrace00.stderr

@@ -1 @@
-/----------------------------- TESTPOINT --------------------------------\
-|   TestFile: tst_psTrace00.c                                            |
-|  TestPoint: psTrace functions{Testing psSetTraceLevel and psGetTraceLevel} |
-|   TestType: Positive                                                   |
-\------------------------------------------------------------------------/
-
-
----> TESTPOINT PASSED (psTrace functions{Testing psSetTraceLevel and psGetTraceLevel} | tst_psTrace00.c)
-

trunk/psLib/test/sysUtils/verified/tst_psTrace00.stdout

@@ +1 @@
+/----------------------------- TESTPOINT --------------------------------\
+|   TestFile: tst_psTrace00.c                                            |
+|  TestPoint: psTrace functions{psSetTraceLevel() and psGetTraceLevel()} |
+|   TestType: Positive                                                   |
+\------------------------------------------------------------------------/
+
+
+---> TESTPOINT PASSED (psTrace functions{Testing psSetTraceLevel and psGetTraceLevel} | tst_psTrace00.c)
+

trunk/psLib/test/sysUtils/verified/tst_psTrace01.stderr

@@ -1 @@
-/----------------------------- TESTPOINT --------------------------------\
-|   TestFile: tst_psTrace01.c                                            |
-|  TestPoint: psTrace functions{Testing psTraceReset()}                  |
-|   TestType: Positive                                                   |
-\------------------------------------------------------------------------/
-
-
----> TESTPOINT PASSED (psTrace functions{Testing psTraceReset()} | tst_psTrace01.c)
-

trunk/psLib/test/sysUtils/verified/tst_psTrace01.stdout

@@ +1 @@
+/----------------------------- TESTPOINT --------------------------------\
+|   TestFile: tst_psTrace01.c                                            |
+|  TestPoint: psTrace functions{psTraceReset()}                          |
+|   TestType: Positive                                                   |
+\------------------------------------------------------------------------/
+
+
+---> TESTPOINT PASSED (psTrace functions{psTraceReset()} | tst_psTrace01.c)
+

trunk/psLib/test/sysUtils/verified/tst_psTrace02.stdout

@@ +1 @@
+/----------------------------- 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)
+

trunk/psLib/test/sysUtils/verified/tst_psTrace03.stdout

@@ +1 @@
+/----------------------------- TESTPOINT --------------------------------\
+|   TestFile: tst_psTrace03.c                                            |
+|  TestPoint: psTrace functions{psTracePrintLevels()}                    |
+|   TestType: Positive                                                   |
+\------------------------------------------------------------------------/
+
 .                    9
  a                   8
@@ -10 +16 @@
   b                  3
   c                  5
+
+---> TESTPOINT PASSED (psTrace functions{psTracePrintLevels()} | tst_psTrace03.c)
+