Mainly reorganising of the database and removing unneeded local variables.

Broke up the runtest subroutine into running the test and reporting on the
test.

Includes fix for Cactus/451 (don't report NaNs/Infs which should be there)


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2720 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 12 insertions, 11 deletions

diff --git a/lib/sbin/RunTest.pl b/lib/sbin/RunTest.pl
index 9a7a7827..62dffe56 100644
--- a/lib/sbin/RunTest.pl
+++ b/lib/sbin/RunTest.pl
@@ -5,25 +5,22 @@
 
 require "lib/sbin/RunTestUtils.pl";
 
-$prompt = shift;
-$home_dir = shift;
-
+# Read options from command line
+$prompt = shift;   
 $prompt =~ tr/A-Z/a-z/;
-
+$home_dir = shift;
 $config = shift;;
 
-# Set up RunTest configuration
-%config_data = &Configure($config,$home_dir);
-$sep= "/";
-
 &PrintHeader;
 
-# Look to see if MPI is dfined
-$mpi = ParseExtras(%config_data);
+# Set up RunTest configuration
+%config_data = &Configure($config,$home_dir);
 
 # Get the executable
 $executable = ParseExecutable(%config_data);
 
+# Look to see if MPI is dfined
+$mpi = ParseExtras(%config_data);
 if ($mpi)
 {
   $numprocs = &defprompt("  Enter number of processors","2");
@@ -38,7 +35,7 @@ else
 %testdata = &InitialiseTestData();
 
 # Find test parameter files
-%testdata = &ParseTests(%config_data);
+%testdata = &FindAllTests(%config_data);
 
 # Parse test parameter files
 %testdata = &ParseAllParameterFiles(%testdata);
@@ -64,6 +61,7 @@ while ($choice !~ /^Q/i)
     print "  Customize testsuite checking [C]\n";
     print "  Quit [Q]\n\n";
     $choice = &defprompt("  Select choice: ","E");
+    print "\n";
     
     if ($choice =~ /^[EO]/i) 
     {
@@ -83,6 +81,7 @@ while ($choice !~ /^Q/i)
 	    %testdata = &RunTest($test,$thorn,%testdata);
 	  }
 	  %testdata = &CompareTestFiles($test,$thorn,%testdata);
+	  %testdata = &ReportOnTest($test,$thorn,%testdata);
 	}
       }
 
@@ -100,6 +99,7 @@ while ($choice !~ /^Q/i)
 	print "    \"$testdata{\"$thorn $test DESC\"}\"\n";
 	%testdata = &RunTest($tests[2*$i],$tests[2*$i+1],%testdata);
 	%testdata = &CompareTestFiles($tests[2*$i],$tests[2*$i+1],%testdata);
+	%testdata = &ReportOnTest($tests[2*$i],$tests[2*$i+1],%testdata);
       }
     }
     elsif ($choice =~ /^R/i)
@@ -110,6 +110,7 @@ while ($choice !~ /^Q/i)
 	print "    \"$testdata{\"$thorn $test DESC\"}\"\n";
 	%testdata = &RunTest($test,$thorn,%testdata);
 	%testdata = &CompareTestFiles($test,$thorn,%testdata);
+	%testdata = &ReportOnTest($test,$thorn,%testdata);
       }
       else
       {