From 22b298f9c12225dabfc0449e38a429265705179b Mon Sep 17 00:00:00 2001
From: Bryan Herman <bherman@mit.edu>
Date: Tue, 25 Feb 2014 17:09:59 -0500
Subject: [PATCH] MPI_DIR is not a env. var in CMakeLists for testing

---
 src/CMakeLists.txt | 4 +---
 tests/run_tests.py | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1217811411..3ceaaaaceb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,6 @@ if($ENV{FC} MATCHES "mpi.*")
   message("-- Detected MPI wrapper: $ENV{FC}")
   add_definitions(-DMPI)
   set(MPI_ENABLED TRUE)
-  get_filename_component(MPI_DIR $ENV{FC} PATH) 
 elseif($ENV{FC} MATCHES "h5fc$")
   message("-- Detected HDF5 wrapper: $ENV{FC}")
   add_definitions(-DHDF5)
@@ -39,7 +38,6 @@ elseif($ENV{FC} MATCHES "h5pfc$")
   message("-- Detected parallel HDF5 wrapper: $ENV{FC}")
   add_definitions(-DMPI -DHDF5)
   set(MPI_ENABLED TRUE)
-  get_filename_component(MPI_DIR $ENV{FC} PATH) 
 endif()
 
 #===============================================================================
@@ -252,7 +250,7 @@ foreach(test ${TESTS})
     add_test(NAME ${TEST_NAME} 
       WORKING_DIRECTORY ${TEST_PATH} 
       COMMAND ${PYTHON_EXECUTABLE} ${TEST_NAME} --exe $<TARGET_FILE:openmc>
-      --mpi_exec ${MPI_DIR}/mpiexec)
+      --mpi_exec $ENV{MPI_DIR}/bin/mpiexec)
 
   else(${MPI_ENABLED})
 
diff --git a/tests/run_tests.py b/tests/run_tests.py
index 7d518673ad..9d686b68a6 100755
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -55,6 +55,8 @@ class Test(object):
         if self.petsc:
             self.cmake.append('-Dpetsc=on')
             os.environ['PETSC_DIR'] = PETSC_DIR
+        if self.mpi:
+            os.environ['MPI_DIR'] = MPI_DIR
 
     def run_cmake(self):
         os.environ['FC'] = self.fc