From 8b2a0a65f21d03774edafa97dfa33ec48a2637cd Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 7 Dec 2013 19:36:22 +0000 Subject: [PATCH] Testsuite: Bugfix: Use the correct mpirun executable as found by FindMPI.cmake git-svn-id: https://svn.dealii.org/trunk@31919 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_add_test.cmake | 2 +- deal.II/cmake/setup_testsuite.cmake | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/macros/macro_add_test.cmake b/deal.II/cmake/macros/macro_add_test.cmake index c4a2b90a1e..96c677b5c1 100644 --- a/deal.II/cmake/macros/macro_add_test.cmake +++ b/deal.II/cmake/macros/macro_add_test.cmake @@ -131,7 +131,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file) SET(_diff_target ${_test_name}.mpirun${_n_cpu}.${_build_lowercase}.diff) # diff target name SET(_test_full ${_category}/${_test_name}.mpirun=${_n_cpu}.${_build_lowercase}) # full test name SET(_test_directory ${CMAKE_CURRENT_BINARY_DIR}/${_target}/mpirun=${_n_cpu}) # directory to run the test in - SET(_run_command mpirun -np ${_n_cpu} ${CMAKE_CURRENT_BINARY_DIR}/${_target}/${_target}) # the command to issue + SET(_run_command ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${_n_cpu} ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_target}/${_target} ${MPIEXEC_POSTFLAGS}) # the command to issue ENDIF() diff --git a/deal.II/cmake/setup_testsuite.cmake b/deal.II/cmake/setup_testsuite.cmake index 98580373d0..564a99acbf 100644 --- a/deal.II/cmake/setup_testsuite.cmake +++ b/deal.II/cmake/setup_testsuite.cmake @@ -91,7 +91,15 @@ SET(_options) LIST(APPEND _options -DDEAL_II_SOURCE_DIR=${CMAKE_SOURCE_DIR}) LIST(APPEND _options -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR}) FOREACH(_var - DIFF_DIR NUMDIFF_DIR TEST_DIFF TEST_PICKUP_REGEX TEST_TIME_LIMIT + DIFF_DIR + NUMDIFF_DIR + TEST_DIFF + TEST_PICKUP_REGEX + TEST_TIME_LIMIT + MPIEXEC + MPIEXEC_NUMPROC_FLAG + MPIEXEC_PREFLAGS + MPIEXEC_POSTFLAGS ) # always undefine: LIST(APPEND _options "-U${_var}") -- 2.39.5