diff options
| author | rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-09-19 15:50:07 +0000 |
|---|---|---|
| committer | rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-09-19 15:50:07 +0000 |
| commit | 841f70f6da7f764296e6f907c70dbfb48e388a9e (patch) | |
| tree | 777de02ea569862873cd39cb2a7dc0e7e0c6c1d5 /lib | |
| parent | 4a68eb77e50d9dae0422fed4338f6146c37625dc (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbin/RunTestUtils.pl | 10 |
1 files changed, 7 insertions, 3 deletions
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; |