Added back prompt command to scripts this means that

gmake <config>-testsuite PROMPT=no

will run through with the defaults for everything, including running all
the tests, and then stop.


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

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/sbin/RunTest.pl b/lib/sbin/RunTest.pl
index 08912f89..6963fa09 100644
--- a/lib/sbin/RunTest.pl
+++ b/lib/sbin/RunTest.pl
@@ -9,12 +9,12 @@ require "lib/sbin/RunTestUtils.pl";
 $prompt = shift;   
 $prompt =~ tr/A-Z/a-z/;
 $home_dir = shift;
-$config = shift;;
+$config = shift;
 
 &PrintHeader;
 
 # Set up RunTest configuration
-$config_data = &Configure($config,$home_dir);
+$config_data = &Configure($config,$home_dir,$prompt);
 
 # Initialise testdata database
 $testdata = &InitialiseTestData();
@@ -30,6 +30,8 @@ $testdata = &ParseAllParameterFiles($testdata);
 # Print database
 #&PrintDataBase($testdata);
 
+$haverunall = 0;
+
 while ($choice !~ /^Q/i)
 {
   undef($thorn);
@@ -49,7 +51,16 @@ while ($choice !~ /^Q/i)
     print "  Compare all files in the test output directories [O]\n";
     print "  Customize testsuite checking [C]\n";
     print "  Quit [Q]\n\n";
-    $choice = &defprompt("  Select choice: ","E");
+
+    if ($haverunall == 1)
+    {
+      $choice = &defprompt("  Select choice: ","Q");
+    }
+    else
+    {
+      $choice = &defprompt("  Select choice: ","E");
+    }
+
     print "\n";
     
     if ($choice =~ /^[EIO]/i) 
@@ -82,6 +93,9 @@ while ($choice !~ /^Q/i)
 
       # Write results of all tests
       &WriteFullResults($rundata,$testdata);
+      
+      $haverunall = 1;
+
     } 
     elsif ($choice =~ /^[AT]/i)
     {