Merge pull request #67 from junghans/patch-2

cmake: clarify test parallelization
icl-utk-edu · Oct 24, 2024 · 192e67b · 192e67b
2 parents cbfe134 + bd250fa
commit 192e67b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmake/MakeTest.cmake b/cmake/MakeTest.cmake
@@ -8,6 +8,7 @@ message(STATUS "heFFTe post-installation testing")
 macro(heffte_add_mpi_test)
     cmake_parse_arguments(_heffte "" "NAME;COMMAND;RANKS" "" ${ARGN} )
     add_test(${_heffte_NAME} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${_heffte_RANKS} ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_heffte_COMMAND} ${MPIEXEC_POSTFLAGS})
+    set_tests_properties(${_heffte_NAME} PROPERTIES PROCESSORS ${_heffte_RANKS})
     unset(_heffte_NAME)
     unset(_heffte_RANKS)
     unset(_heffte_COMMAND)

diff --git a/cmake/heffte_macros.cmake b/cmake/heffte_macros.cmake
@@ -57,7 +57,7 @@ endmacro()
 macro(heffte_add_mpi_test)
     cmake_parse_arguments(_heffte "" "NAME;COMMAND;RANKS" "" ${ARGN} )
     add_test(${_heffte_NAME} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${_heffte_RANKS} ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_heffte_COMMAND} ${MPIEXEC_POSTFLAGS})
-    set_tests_properties(${_heffte_NAME} PROPERTIES RUN_SERIAL ${Heffte_SEQUENTIAL_TESTING})
+    set_tests_properties(${_heffte_NAME} PROPERTIES PROCESSORS ${_heffte_RANKS} RUN_SERIAL ${Heffte_SEQUENTIAL_TESTING})
     unset(_heffte_NAME)
     unset(_heffte_RANKS)
     unset(_heffte_COMMAND)