Changeset 4951 for trunk/psLib/test/sys

Timestamp:

Sep 6, 2005, 2:15:51 PM (21 years ago)

Author:

drobbin

Message:

Updated/changed psTrace & psLog fxns to use fd (were FILE*) as described in SDRS

Location:

trunk/psLib/test/sys

Files:

• tst_psLogMsg.c (modified) (5 diffs)
• tst_psTrace.c (modified) (2 diffs)

trunk/psLib/test/sys/tst_psLogMsg.c

@@ -7 +7 @@
 #include "pslib_strict.h"
 #include "psTest.h"
+#include <unistd.h>
+#include <fcntl.h>
 
 static psS32 testLogMsg00();
@@ -176 +178 @@
 {
     psS32 i = 0;
-    FILE* file;
-    char line[256];
+    //    FILE* file;
+    int fd;
+    //    char line[256];
 
     printf("--------------- psLogSetDestination(PS_LOG_NONE) ----------------\n");
-    psLogSetDestination("none");
+    //    psLogSetDestination("none");
+    psLogSetDestination(0);
     for (i=0;i<10;i++) {
         psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
@@ -186 +190 @@
 
     printf("------------- psLogSetDestination(PS_LOG_TO_STDERR) -------------\n");
-    psLogSetDestination("dest:stderr");
+    //    psLogSetDestination("dest:stderr");
+    psLogSetDestination(2);
     for (i=0;i<10;i++) {
         psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
@@ -192 +197 @@
 
     printf("------------- psLogSetDestination(PS_LOG_TO_STDOUT) -------------\n");
-    psLogSetDestination("dest:stdout");
-    for (i=0;i<10;i++) {
-        psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
-    }
+    //    psLogSetDestination("dest:stdout");
+    psLogSetDestination(1);
+    for (i=0;i<10;i++) {
+        psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
+    }
+
     printf("--------------- psLogSetDestination(""file:log.txt"") ---------------\n");
-    psLogSetDestination("file:log.txt");
-    for (i=0;i<10;i++) {
-        psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
-    }
-
-    psLogSetDestination("none");
+    fd = creat("log.txt", 0666);
+    //    psLogSetDestination("file:log.txt");
+    psLogSetDestination(fd);
+    for (i=0;i<10;i++) {
+        psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
+    }
+
+
+    //    psLogSetDestination("none");
+    FILE *file;
+    char line[257];
+    //    psLogSetDestination(-1);
+    psLogSetDestination(0);
     printf("--------------------- The Contents of log.txt -------------------\n");
     file = fopen("log.txt","r");
@@ -209 +223 @@
     }
     fclose(file);
-
+    close(fd);
+
+    int fd2 = creat("/eva/log.txt", 0666);
     printf("--------------- psLogSetDestination(""file:/eva/log.txt"") ----------\n");
-    psLogSetDestination("file:/eva/log.txt");
+    //    psLogSetDestination("file:/eva/log.txt");
+    psLogSetDestination(fd2);
     for ( i=0;i<10;i++) {
         psLogMsg(__func__, i, "Hello World! My level is %d\n", i);
     }
-
-    return 0;
-}
+    close(fd2);
+
+    return 0;
+}

trunk/psLib/test/sys/tst_psTrace.c

@@ -103 +103 @@
     (void)psTraceSetLevel(".A.B.C.D.E", 5);
 
-    psTrace(".A.C.D.C",1,"You should not see this.\n");
-    psTrace(".A.B.C.D.E",2,"You should see this.\n");
-    psTrace(".A.B.C.D.E.F",3,"You should see this too.\n");
+    psTrace(".A.C.D.C",1," ","You should not see this.\n");
+    psTrace(".A.B.C.D.E",2," ","You should see this.\n");
+    psTrace(".A.B.C.D.E.F",3," ","You should see this too.\n");
 
     psTracePrintLevels();
@@ -208 +208 @@
 
         (void)psTraceSetLevel(".", 4);
-        psTrace(".", 5, "(0) This message should not be displayed (%x)\n",
+        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",
+        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",
+        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",
+        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",
+        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",
+        psTrace(".a.b", 5, " ", "(2) This message should be displayed (%x)\n",
                 0xbeefface);