Changeset 3696 for trunk/psModules/test/runTest

Timestamp:

Apr 12, 2005, 11:51:00 AM (21 years ago)

Author:

desonia

Message:

adjusted to match the latest SDRS for psLib (change of function names).

File:

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

trunk/psModules/test/runTest

@@ -26 +26 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-04-01 21:52:22 $
+#  $Date: 2005-04-12 21:51:00 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -43 +43 @@
     "resetStdout!" => \$resetStdout,
     "verified=s"   => \$verifiedDir,
-    "help!"        => \$help
+    "help!"        => \$help,
+    "quiet!"       => \$quiet,
+    "printpassfail!"     => \$verbose
 );
 
 if ($help || $#ARGV < 0) {
-    print
-"Usage: runTest [--reset] [--resetStderr] [--resetStdout] [--verified=DIR] testfile(s)\n\n";
+    print "Usage: runTest  [--help] [--verified=DIR] [--quiet] [--printpassfail] \\\n",
+          "                [--reset] [--resetStderr] [--resetStdout] testfile(s)\n\n";
     exit(0);
 }
@@ -75 +77 @@
     # Check if a temp directory already exists in the current work directory
     if ( !( -e "temp" ) ) {
-
         # Create temp directory to store STDOUT, STDERR files during test run
         `mkdir temp`;
-
-        # Display message of new directory created
-        print("Creating temp directory\n");
     }
 
@@ -87 +85 @@
 
         # Display message that verified subdirectory doesn't exist
-        print("        Verified directory doesn't exist.\n");
+        print STDERR "        Verified directory doesn't exist.\n";
 
         # Exit script since the test cannot be run with verified files
@@ -95 +93 @@
     # Check if the test driver file exists and is executable
     if ( ( -e $testFile ) && ( -x $testFile ) ) {
-
-        # Display message the test driver is being executed
-        print("--- Executing test driver: $testFile\n");
 
         # Invoke the test driver
@@ -112 +107 @@
             # Display failure message with return value to user
             if ( $? != 0 && ( $testFile !~ /^A/i ) ) {
-                print("Failed - Test Driver returned $?, expected 0.\n");
+                print STDERR "Failed - Test Driver returned $?, expected 0.\n";
             }
             elsif ( $? == 0 && ( $testFile =~ /^A/i ) ) {
-                print("Failed - Test Driver returned $?, expected abort.\n");
+                print STDERR "Failed - Test Driver returned $?, expected abort.\n";
             }
             $exitValue |= 64;
@@ -144 +139 @@
             s/v\d+.\d+.\d+/vX.X.X/g;
 
+            if (m/TestPoint:\s*([^\*]+)/) {
+                $testfile = $1;
+            }
+            if (m/^---> TESTPOINT\s(\S+)/) {
+                print "\t$testfile- $1\n" if ($verbose || $1 eq "FAILED");
+                if ($1 eq "FAILED") {
+                    print $testoutput;
+                }
+            }
+
             # Filter lines with malloc.  This is an artifact of memory testing
             # with the Mac testbed
@@ -177 +182 @@
             s/v\d+.\d+.\d+/vX.X.X/g;
 
+            if (m/\*\*\*\*\*\* TESTPOINT \*\*\*\*\*\*/) {
+                $testoutput = $_;
+            }
+            $testoutput += $_;
+
+            if (m/ TestPoint:\s*([^\*]+)/) {
+                $testfile = $1;
+            }
+            if (m/^---> TESTPOINT\s(\S+)/) {
+                print "\t$testfile- $1\n" if ($verbose || $1 eq "FAILED");
+                if ($1 eq "FAILED") {
+                    print $testoutput;
+                }
+            }
+
             # Filter lines with malloc.  This is an artifact of memory testing
             # with the Mac testbed
+
             if ( !m/\*\*\*\smalloc/ ) {
                 print MODFILE ($_);
@@ -193 +214 @@
 
         # Compare STDOUT capture with verified file
-        $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
+        $exitValue = &compareStream("$verifiedDir/$testFile.stdout");
 
         # Check exit value to determine if verified file doesn't exist
@@ -218 +239 @@
         # Since test driver doesn't exist or is not executable then display
         # message to user.
-        print(
-"        Need to specify an executable test file within directory.\n"
-        );
+        print STDERR "\tNeed to specify an executable test file.\n";
 
         # Exit value set to indicate test driver doesn't exist or not executable
@@ -231 +250 @@
 # of a failed test
 if ( ( $exitValue >> 3 ) != 0 ) {
-    print("Test failed - return status = $exitValue\n\n");
+    print STDERR "Test failed - return status = $exitValue\n\n";
 }
 else {
-    print("Test successful\n\n");
+    exit(0);
 }
 exit($exitValue);
@@ -272 +291 @@
             || m/\|A\|/i )
         {
+            print STDERR "\tFailed - File $fileName contains error strings.\n";
             if ( $fileName =~ m/out/ ) {
-                print(
-                    "        Failed - File $fileName contains error strings.\n"
-                );
                 $returnVal = 64;
             }
             elsif ( $fileName =~ m/err/ ) {
-                print(
-                    "        Failed - File $fileName contains error strings.\n"
-                );
                 $returnVal = 128;
             }
@@ -305 +319 @@
 #
 #      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 +332 @@
 
     # Check for existence of verified STD stream files
-    if ( -e $streamFile ) {
+    if ( !( -e $streamFile ) ) {
+
+        # Set exit value bit 1 to indicate proper failure
+        if ( $streamFile =~ /out$/ ) {
+            $returnVal |= 2;
+        }
+        elsif ( $streamFile =~ /err$/ ) {
+            $returnVal |= 4;
+        }
+    }
+    else {
 
         # Verified STD stream file exists
@@ -337 +363 @@
 
                 # Display message of the failure of difference to user
-                print("        Failed - STDOUT difference\n$diffstdout\n");
+                print STDERR "\tFailed - STDOUT differences\n";
 
                 # Exit value to indicate STDOUT did not compare
@@ -345 +371 @@
 
                 # Display message of the failure of difference to user
-                print("        Failed - STDERR difference\n$diffstdout\n");
+                print STDERR "\tFailed - STDERR differences\n";
 
                 # Exit value to indicate STDERR did not compare