From 841f70f6da7f764296e6f907c70dbfb48e388a9e Mon Sep 17 00:00:00 2001
From: rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Wed, 19 Sep 2012 15:50:07 +0000
Subject: make sure testsuite can find MPI when CACTUS_CONFIGS_DIR is set

patch by Steve Brandt


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4874 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/sbin/RunTestUtils.pl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl
index 736ab935..86c05f0e 100644
--- a/lib/sbin/RunTestUtils.pl
+++ b/lib/sbin/RunTestUtils.pl
@@ -524,12 +524,16 @@ sub ParseExtras
   my($config_data) = @_;
   my($mpi,$dir,$sep,$extradir,$capabilitydir);
 
-  $dir = $config_data->{"CCTK_DIR"};
   $sep = $config_data->{"SEPARATOR"};
   $config = $config_data->{"CONFIG"};
+  if(defined($ENV{CACTUS_CONFIGS_DIR})) {
+    $dir = $ENV{CACTUS_CONFIGS_DIR};
+  } else {
+    $dir = $config_data->{"CCTK_DIR"}.${sep}."configs";
+  }
 
-  $extradir = "$dir${sep}configs${sep}$config${sep}config-data${sep}cctk_Extradefs.h";
-  $capabilitydir = "$dir${sep}configs${sep}$config${sep}bindings${sep}Configuration${sep}Capabilities${sep}cctki_MPI.h";
+  $extradir = "${dir}${sep}$config{$sep}config-data${sep}cctk_Extradefs.h";
+  $capabilitydir = "${dir}${sep}$config${sep}bindings${sep}Configuration${sep}Capabilities${sep}cctki_MPI.h";
 
   $mpi = 0;
 
-- 
cgit v1.2.3