Changeset 607

Timestamp:

May 7, 2004, 12:10:50 PM (22 years ago)

Author:

evanalst

Message:

Added more characters to filter out host name.

Location:

trunk/psLib/test

Files:

• FullUnitTest (modified) (3 diffs)
• runTest (modified) (4 diffs)

trunk/psLib/test/FullUnitTest

@@ -19 +19 @@
 #  RETURN : integer number of tests which failed
 #
-#  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-#  $Date: 2004-05-06 00:45:10 $
+#  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+#  $Date: 2004-05-07 22:10:50 $
 #
 #  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -537 +537 @@
        s/\d+:\d+:\d+/ <DATE> /;
        s/\s+\d+:\d+:\d+\w/ <TIME> /;
-       s/\|[\w\.]+\|/<HOST> |/;
+       s/\|[\w\.\-\_]+\|/<HOST> |/;
        print MODFILE ($_);
    }
@@ -553 +553 @@
        s/\d+:\d+:\d+/ <DATE> /;
        s/\s+\d+:\d+:\d+\w/ <TIME> /;
-       s/\|[\w\.]+\|/<HOST> |/;
+       s/\|[\w\.\-\_]+\|/<HOST> |/;
        print MODFILE ($_);
    }

trunk/psLib/test/runTest

@@ -30 +30 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2004-05-06 00:45:10 $
+#  $Date: 2004-05-07 22:10:50 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -111 +111 @@
             s/\d+:\d+:\d+/ <DATE> /;
             s/\s+\d+:\d+:\d+\w/ <TIME> /;
-            s/\|[\w\.]+\|/<HOST> |/;
+            s/\|[\w\.\-\_]+\|/<HOST> |/;
             print MODFILE ($_);
         }
@@ -127 +127 @@
             s/\d+:\d+:\d+/ <DATE> /;
             s/\s+\d+:\d+:\d+\w/ <TIME> /;
-            s/\|[\w\.]+\|/<HOST> |/;
+            s/\|[\w\.\-\_]+\|/<HOST> |/;
             print MODFILE ($_);
         }
@@ -280 +280 @@
             } elsif ( $streamFile =~ /err$/ ) {
                # Display message of the failure of difference to user
-               print("        Failed - STDERR difference\n$diffsdout\n");
+               print("        Failed - STDERR difference\n$diffstdout\n");
 
                # Exit value to indicate STDERR did not compare