Ignore duplicate entries in the ThornList file when querying thorns with

testsuites.


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

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl
index d5dd86ad..f6b48e54 100644
--- a/lib/sbin/RunTestUtils.pl
+++ b/lib/sbin/RunTestUtils.pl
@@ -278,6 +278,7 @@ sub FindTestParameterFiles
   my($testdata,$config_data) = @_;
   my($config,$config_dir);
   my($thorn);
+  my(%found_thorns) = ();
 
   $config      = $config_data->{"CONFIG"};
   $configs_dir = $config_data->{"CONFIGSDIR"};
@@ -294,17 +295,22 @@ sub FindTestParameterFiles
     $fullthorn = $1;
     next if (! $fullthorn);
 
-    $testdata->{"FULL"} .= "$fullthorn ";
-
     $fullthorn =~ m:^\s*([^\s]*)/([^\s]*)\s*:;
 
+    $arrangement = $1;
     $thorn = $2;
+
+    # skip duplicate entries in the ThornList
+    next if (defined $found_thorns{"$arrangement/$thorn"});
+    $found_thorns{"$arrangement/$thorn"} = 1;
+
+    $testdata->{"FULL"} .= "$fullthorn ";
     $testdata->{"THORNS"} .= "$thorn ";
-    $testdata->{"$thorn ARRANGEMENT"} = "$1";
+    $testdata->{"$thorn ARRANGEMENT"} = "$arrangement";
 
-    if ($testdata->{"ARRANGEMENTS"} !~ m:\s$1\s:)
+    if ($testdata->{"ARRANGEMENTS"} !~ m:\s$arrangement\s:)
     {
-      $testdata->{"ARRANGEMENTS"} .= "$1 ";
+      $testdata->{"ARRANGEMENTS"} .= "$arrangement ";
     }
 
     $thorntestdir = "$config_data->{\"CCTK_DIR\"}${sep}arrangements${sep}$fullthorn${sep}test";