Changeset 3127 for trunk/psLib/test/runTest

Timestamp:

Feb 4, 2005, 12:49:39 PM (21 years ago)

Author:

desonia

Message:

general autoconf cleanup.

Location:

trunk/psLib

Files:

• . (modified) (1 prop)
• test/runTest (modified) (11 diffs)

trunk/psLib

@@ +1 @@
+DoxygenLog
 bin
 lib

@@ +1 @@
+DoxygenLog
 bin
 lib

trunk/psLib/test/runTest

@@ -28 +28 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-03 00:54:12 $
+#  $Date: 2005-02-04 22:49:37 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -36 +36 @@
 # Provides functions for handling psS64 command line options
 use Getopt::Long;
+
+$verifiedDir = "verified";
 
 # Assign variables based on the presence of command line options to the script
@@ -42 +44 @@
     "resetStderr!" => \$resetStderr,
     "resetStdout!" => \$resetStdout,
+    "verified=s"   => \$verifiedDir,
     "help!"        => \$help
 );
@@ -83 +86 @@
 
     # Check if a verified directory exists in the current work directory
-    if ( !( -e "verified" ) ) {
+    if ( !( -e $verifiedDir ) ) {
 
         # Display message that verified subdirectory doesn't exist
@@ -133 +136 @@
             # Open mod file to place filtered STDOUT
             open( MODFILE,  "> temp/$testFile.stdout.mod" );
-            open( MODFILE2, "> verified/$testFile.stdout" ) if $resetStdout;
+            open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
 
            # Replace the variable date, time and host information with constants
@@ -143 +146 @@
                 s/$hostname\s*/<HOST>/g;
                 s/: Line \d+/: Line <LINENO>/g;
-                s/\:\d+/\:<LINENO>/g;
+                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -166 +169 @@
             # Open mod file to place filtered STDERR
             open( MODFILE,  "> temp/$testFile.stderr.mod" );
-            open( MODFILE2, "> verified/$testFile.stderr" ) if $resetStderr;
+            open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
 
            # Replace the variable date, time and host information with constants
@@ -174 +177 @@
                 s/$hostname\s*/<HOST>/g;
                 s/: Line \d+/: Line <LINENO>/g;
-                s/\:\d+/\:<LINENO>/g;
+                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -193 +196 @@
 
             # Compare STDOUT capture with verified file
-            $exitValue |= &compareStream("verified/$testFile.stdout");
+            $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
 
             # Check exit value to determine if verified file doesn't exist
@@ -204 +207 @@
 
             # Compare STDERR capture with verified file
-            $exitValue |= &compareStream("verified/$testFile.stderr");
+            $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
 
             # Check exit value to determine if verified file doesn't exist
@@ -330 +333 @@
         # Create name of the temp file to compare
         $tempFile = $streamFile;
-        $tempFile =~ s/verified/temp/;
+        $tempFile =~ s/$verifiedDir/temp/;
         $tempFile = $tempFile . ".mod";
 

@@ +1 @@
+DoxygenLog
 bin
 lib