Changeset 2140

Timestamp:

06/29/08 10:26:00 (2 months ago)

Author:

peter

Message:

tsuite/auto/checkall.pl:

• Treat sims that returned EXIT_FAILURE as "failed" rather than "crashed".
  
• Treat sims with warnings as a separate class rather than "failed".
  

Files:

• trunk/tsuite/auto/checkall.pl (modified) (8 diffs)

trunk/tsuite/auto/checkall.pl

@@ -29 +29 @@
 $nOK = 0;
 $nSkip = 0;
+$nFail = 0;
 $nCrash = 0;
 $nBotch = 0;
+$nWarn = 0;
 
 open( CRASHED, ">crashed.txt" );
@@ -53 +55 @@
     {
         $checkEnd = 0;
+        $nWarnMessage = 0;
         $lgCrash = 0;
+        $lgFailure = 0;
         $lgBotch = 0;
         $lgAtmosNotFound = 0;
@@ -64 +68 @@
             {
                 print SERIOUS "$output: $_";
+                if( /W-/ )
+                {
+                    ++$nWarnMessage;
+                }
             }
             if( /botch/ )
@@ -94 +102 @@
                 $lgCrash = 1;
             }
-# this is the last line, so lgBotch is already determined.
-            if( /something went wrong\]/ && !$lgBotch )
-            {
-                $lgCrash = 1;
+# this is the last line, so lgBotch and nWarnMessage are already determined.
+            if( /something went wrong\]/ && !$lgBotch && $nWarnMessage == 0 )
+            {
+                $lgFailure = 1;
+                ++$checkEnd;
             }
             if( /Error: stellar atmosphere file not found./ )
@@ -115 +124 @@
             print SERIOUS "$output: crashed\n";
             $lgSeriousProblems = 1;
+        }
+        elsif( $lgFailure )
+        {
+            ++$nFail;
+            print SERIOUS "$output: returned with FAILURE status\n";
+            $lgSeriousProblems = 1;
+        }
+        elsif( $nWarnMessage > 0 )
+        {
+            ++$nWarn;
         }
         elsif( $lgBotch )
@@ -140 +159 @@
 close( SKIP );
 
-if( $nMod != $nOK+$nSkip+$nCrash+$nBotch )
+if( $nMod != $nOK+$nSkip+$nCrash+$nFail+$nWarn+$nBotch )
 {
     print STDERR "\nINTERNAL ERROR: the number of sims don't add up!!!!!\n\n";
@@ -149 +168 @@
 if( -s "serious.txt" )
 {
-    print "\nWARNING! crashes, botches or warnings were found. This is a serious problem.\n";
+    print "\nWARNING! crashes, failures, botches or warnings were found. This is a serious problem.\n";
     if( $nCrash > 0 )
     {
@@ -215 +234 @@
     printf( ", %i crashed", $nCrash );
 }
+if( $nFail > 0 )
+{
+    printf( ", %i failed", $nFail );
+}
+if( $nWarn > 0 )
+{
+    printf( ", %i have warnings", $nWarn );
+}
 if( $nBotch > 0 )
 {