When finding the active thorns of a parameter file, concatenate all ActiveThorns lines (as more than one may exist).

Fixes PR1493.


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

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl
index 33950b2c..ef5fe31d 100644
--- a/lib/sbin/RunTestUtils.pl
+++ b/lib/sbin/RunTestUtils.pl
@@ -88,6 +88,8 @@ sub ParseParFile($thorn,$arrangement,$parfile,$config_data)
   # Give a default test name in case none is specified in the parameter file.
   $desc = "$arrangement/$thorn/test/$parfile";
     
+  $active = "";
+
   while (<IN>)
   {
     $line = $_;
@@ -96,12 +98,12 @@ sub ParseParFile($thorn,$arrangement,$parfile,$config_data)
     {
       if($line =~ m/(.*)\"/)
       {
-        $active .= $1;
+        $active .= " ".$1;
         $processing_active = 0;
       }
       else
       {
-        $active .= $line;
+        $active .= " ".$line;
       }
     }
     elsif ($line =~ m/^\s*\!\s*DESC(RIPTION)?\s*\"(.*)\"\s*$/i)
@@ -110,11 +112,11 @@ sub ParseParFile($thorn,$arrangement,$parfile,$config_data)
     }
     elsif ($line =~ m/^\s*ActiveThorns\s*=\s*\"(.*)\"/i)
     {
-      $active = $1;
+      $active .= " ".$1;
     }
     elsif($line =~ m/^\s*ActiveThorns\s*=\s*\"(.*)/i)
     {
-      $active = $1;
+      $active .= " ".$1;
       $processing_active = 1;
     }
   }