Changeset 5024

Timestamp:

Sep 13, 2005, 10:26:33 AM (21 years ago)

Author:

drobbin

Message:

copied pslib runTest to support the "--printdiff" option

File:

• trunk/psModules/test/runTest (modified) (8 diffs)

trunk/psModules/test/runTest

@@ -26 +26 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-04-12 21:51:00 $
+#  $Date: 2005-09-13 20:26:33 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -39 +39 @@
 # Assign variables based on the presence of command line options to the script
 GetOptions(
-    "reset!"       => \$reset,
-    "resetStderr!" => \$resetStderr,
-    "resetStdout!" => \$resetStdout,
-    "verified=s"   => \$verifiedDir,
-    "help!"        => \$help,
-    "quiet!"       => \$quiet,
-    "printpassfail!"     => \$verbose
+    "reset!"         => \$reset,
+    "resetStderr!"   => \$resetStderr,
+    "resetStdout!"   => \$resetStdout,
+    "verified=s"     => \$verifiedDir,
+    "help!"          => \$help,
+    "quiet!"         => \$quiet,
+    "printpassfail!" => \$verbose,
+    "printdiff!"     => \$printdiff
 );
 
 if ($help || $#ARGV < 0) {
-    print "Usage: runTest  [--help] [--verified=DIR] [--quiet] [--printpassfail] \\\n",
-          "                [--reset] [--resetStderr] [--resetStdout] testfile(s)\n\n";
+    print "\nUsage: runTest  [--help] [--quiet] [--resetStderr] [--resetStdout] [--reset] \\\n",
+          "                [--verified=DIR] [--printpassfail] [--printdiff] testfile(s)\n\n",
+          "Options include:\n",
+          "    --help           Prints this help message\n",
+          "    --quiet          Suppresses all messages\n",
+          "    --resetStderr    Resets the STDERR expected output file in the verified\n",
+          "                     directory\n",
+          "    --resetStdout    Resets the STDOUT expected output file in the verified\n",
+          "                     directory\n",
+          "    --reset          Equivalent to --resetStderr plus --resetStdout\n",
+          "    --verified=DIR   Specifies the location of the verified directory\n",
+          "    --printpassfail  Prints a PASS or FAIL message for each test in each file\n",
+          "    --printdiff      Prints any differences found in the test output and\n",
+          "                     verified expected output.\n\n";
     exit(0);
 }
@@ -138 +151 @@
             s/allocate \d+ bytes at/allocate <N> bytes at/g;
             s/v\d+.\d+.\d+/vX.X.X/g;
-
+            s/'xxx' \(\d+\)/'xxx' \(NUM\)/;
             if (m/TestPoint:\s*([^\*]+)/) {
                 $testfile = $1;
@@ -181 +194 @@
             s/allocate \d+ bytes at/allocate <N> bytes at/g;
             s/v\d+.\d+.\d+/vX.X.X/g;
+            s/'xxx' \(\d+\)/'xxx' \(NUM\)/;
 
             if (m/\*\*\*\*\*\* TESTPOINT \*\*\*\*\*\*/) {
@@ -255 +269 @@
     exit(0);
 }
+
 exit($exitValue);
 
@@ -352 +367 @@
 
         # Perform difference on the STD stream files
-        $diffstdout = `diff $streamFile $tempFile`;
+        $diffstdout = `diff -b -y --suppress-common-lines $streamFile $tempFile`;
 
         # Check the return value of the difference
@@ -364 +379 @@
                 # Display message of the failure of difference to user
                 print STDERR "\tFailed - STDOUT differences\n";
-
+                print STDERR $diffstdout if $printdiff;
                 # Exit value to indicate STDOUT did not compare
                 $returnVal |= 8;
@@ -372 +387 @@
                 # Display message of the failure of difference to user
                 print STDERR "\tFailed - STDERR differences\n";
+                print STDERR $diffstdout if $printdiff;
 
                 # Exit value to indicate STDERR did not compare