crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-29 06:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

MPI_DIR is not a env. var in CMakeLists for testing

Browse source
This commit is contained in:
Bryan Herman 2014-02-25 17:09:59 -05:00
parent e915e5db18
commit 22b298f9c1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -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})

2
tests/run_tests.py
View file

@ -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