From a0c74c37b615b7033462f9512046520b0f27f3b0 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 13 Aug 2020 10:31:01 +0200
Subject: [PATCH] [T] Added num processor info to MPI tests.
---
scripts/cmake/test/AddTest.cmake | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 23661e1070b..0a4bb755c93 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -112,6 +112,9 @@ function (AddTest)
set(AddTest_WRAPPER_ARGS ${AddTest_WRAPPER_ARGS} --mca btl_openib_allow_ib 1)
endif()
set(WRAPPER_COMMAND ${MPIRUN_TOOL_PATH})
+ if("${AddTest_WRAPPER_ARGS}" MATCHES "-np;([0-9]*)")
+ set(MPI_PROCESSORS ${CMAKE_MATCH_1})
+ endif()
else()
message(STATUS "ERROR: mpirun was not found but is required for ${AddTest_NAME}!")
return()
@@ -266,6 +269,9 @@ Use six arguments version of AddTest with absolute and relative tolerances")
endif()
set_tests_properties(${TEST_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${PYTHONPATH}")
endif()
+ if(DEFINED MPI_PROCESSORS)
+ set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCESSORS})
+ endif()
if(TARGET ${AddTest_EXECUTABLE})
add_dependencies(ctest ${AddTest_EXECUTABLE})
--
GitLab