Changeset 3246 for trunk/psLib/test/runTest

Timestamp:

Feb 16, 2005, 3:58:43 PM (21 years ago)

Author:

desonia

Message:

changed the prototype of psMetadataLookup_.

File:

• trunk/psLib/test/runTest (modified) (4 diffs)

trunk/psLib/test/runTest

@@ -26 +26 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-15 19:53:19 $
+#  $Date: 2005-02-17 01:58:42 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -119 +119 @@
             $exitValue |= 64;
         }
-        else {
-
-            # Test driver succeeded.
-
-            # Create filtered version of stdout and stderr
-
-            # Open the STDOUT file for reading
-            open( OUTFILE, "< temp/$testFile.stdout" );
-
-            # Open mod file to place filtered STDOUT
-            open( MODFILE,  "> temp/$testFile.stdout.mod" );
-            open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
-
-           # Replace the variable date, time and host information with constants
-            $hostname = `hostname`;
-            chop $hostname;
-            while (<OUTFILE>) {
-                s/\s+\d+:\d+:\d+\w/<TIME>/g;
-                s/\d+:\d+:\d+/<DATE>/g;
-                s/$hostname\s*/<HOST>/g;
-                s/: Line \d+/: Line <LINENO>/g;
-                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
-                s/allocate \d+ bytes at/allocate <N> bytes at/g;
-
-              # Filter lines with malloc.  This is an artifact of memory testing
-              # with the Mac testbed
-                if ( !m/\*\*\*\smalloc/ ) {
-                    print MODFILE ($_);
-                    print MODFILE2 ($_) if $resetStdout;
-                }
-            }
-
-            # Close mod file
-            close(MODFILE);
-            close(MODFILE2) if $resetStdout;
-
-            # Close STDERR file
-            close(OUTFILE);
-
-            # Open the STDERR file for reading
-            open( OUTFILE, "< temp/$testFile.stderr" );
-
-            # Open mod file to place filtered STDERR
-            open( MODFILE,  "> temp/$testFile.stderr.mod" );
-            open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
-
-           # Replace the variable date, time and host information with constants
-            while (<OUTFILE>) {
-                s/\s+\d+:\d+:\d+\w/<TIME>/g;
-                s/\d+:\d+:\d+/<DATE>/g;
-                s/$hostname\s*/<HOST>/g;
-                s/: Line \d+/: Line <LINENO>/g;
-                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
-                s/allocate \d+ bytes at/allocate <N> bytes at/g;
-
-              # Filter lines with malloc.  This is an artifact of memory testing
-              # with the Mac testbed
-                if ( !m/\*\*\*\smalloc/ ) {
-                    print MODFILE ($_);
-                    print MODFILE2 ($_) if $resetStderr;
-                }
-            }
-
-            # Close mod file
-            close(MODFILE);
-            close(MODFILE2) if $resetStderr;
-
-            # Close STDERR file
-            close(OUTFILE);
-
-            # Compare STDOUT capture with verified file
-            $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
-
-            # Check exit value to determine if verified file doesn't exist
-            if ( $exitValue & 2 ) {
-
-                # STDOUT verified doesn't exist.  Search STDOUT capture
-                # for strings indicating error or failure
-                $exitValue |= &errorStrSearch("$testFile.stdout");
-            }
-
-            # Compare STDERR capture with verified file
-            $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
-
-            # Check exit value to determine if verified file doesn't exist
-            if ( $exitValue & 4 ) {
-
-                # STDERR verified doesn't exist.  Search STDERR capture
-                # for strings indicating error or failure
-                $exitValue |= &errorStrSearch("$testFile.stderr");
-            }
-        }
-    }
+
+        # Test driver succeeded.
+
+        # Create filtered version of stdout and stderr
+
+        # Open the STDOUT file for reading
+        open( OUTFILE, "< temp/$testFile.stdout" );
+
+        # Open mod file to place filtered STDOUT
+        open( MODFILE,  "> temp/$testFile.stdout.mod" );
+        open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
+
+        # Replace the variable date, time and host information with constants
+        $hostname = `hostname`;
+        chop $hostname;
+        while (<OUTFILE>) {
+            s/\s+\d+:\d+:\d+\w/<TIME>/g;
+            s/\d+:\d+:\d+/<DATE>/g;
+            s/$hostname\s*/<HOST>/g;
+            s/: Line \d+/: Line <LINENO>/g;
+            s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
+            s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
+            s/allocate \d+ bytes at/allocate <N> bytes at/g;
+
+            # Filter lines with malloc.  This is an artifact of memory testing
+            # with the Mac testbed
+            if ( !m/\*\*\*\smalloc/ ) {
+                print MODFILE ($_);
+                print MODFILE2 ($_) if $resetStdout;
+            }
+        }
+
+        # Close mod file
+        close(MODFILE);
+        close(MODFILE2) if $resetStdout;
+
+        # Close STDERR file
+        close(OUTFILE);
+
+        # Open the STDERR file for reading
+        open( OUTFILE, "< temp/$testFile.stderr" );
+
+        # Open mod file to place filtered STDERR
+        open( MODFILE,  "> temp/$testFile.stderr.mod" );
+        open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
+
+        # Replace the variable date, time and host information with constants
+        while (<OUTFILE>) {
+            s/\s+\d+:\d+:\d+\w/<TIME>/g;
+            s/\d+:\d+:\d+/<DATE>/g;
+            s/$hostname\s*/<HOST>/g;
+            s/: Line \d+/: Line <LINENO>/g;
+            s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
+            s/\s+[\_\-\/\.\w]+\:\d+/ FILE\:LINENO/g;
+            s/allocate \d+ bytes at/allocate <N> bytes at/g;
+
+            # Filter lines with malloc.  This is an artifact of memory testing
+            # with the Mac testbed
+            if ( !m/\*\*\*\smalloc/ ) {
+                print MODFILE ($_);
+                print MODFILE2 ($_) if $resetStderr;
+            }
+        }
+
+        # Close mod file
+        close(MODFILE);
+        close(MODFILE2) if $resetStderr;
+
+        # Close STDERR file
+        close(OUTFILE);
+
+        # Compare STDOUT capture with verified file
+        $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
+
+        # Check exit value to determine if verified file doesn't exist
+        if ( $exitValue & 2 ) {
+
+            # STDOUT verified doesn't exist.  Search STDOUT capture
+            # for strings indicating error or failure
+            $exitValue |= &errorStrSearch("$testFile.stdout");
+        }
+
+        # Compare STDERR capture with verified file
+        $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
+
+        # Check exit value to determine if verified file doesn't exist
+        if ( $exitValue & 4 ) {
+
+            # STDERR verified doesn't exist.  Search STDERR capture
+            # for strings indicating error or failure
+            $exitValue |= &errorStrSearch("$testFile.stderr");
+        }
+   }
     else {
 
@@ -303 +303 @@
 #
 #      Return:   0  -  Compare successful
-#                2  -  STDOUT verified file doesn't exist
-#                4  -  STDERR verified file doesn't exist
 #                8  -  STDOUT verified file doesn't compare
 #               16  -  STDERR verified file doesn't compare
@@ -316 +314 @@
 
     # Check for existence of verified STD stream files
-    if ( !( -e $streamFile ) ) {
-
-        # Display message to user that verified STDOUT file doesn't exist
-        print("        File $streamFile doesn't exist.\n");
-    }
-    else {
+    if ( -e $streamFile ) {
 
         # Verified STD stream file exists