From 450c9abcba596daa1c01798f31f5a35bd999c65d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 2 Jun 2020 11:49:46 +0200
Subject: [PATCH] [CMake] Removed parallel option for ctest targets.
Use env var CTEST_PARALLEL_LEVEL instead.
---
ThirdParty/container-maker | 2 +-
scripts/cmake/test/Test.cmake | 17 ++---------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 1260fd50f67..c188dfa770c 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 1260fd50f674c4c00ce719d97c5c2bad275f2765
+Subproject commit c188dfa770c0e299a890da523d70558b35db81f3
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index e125f69ab43..01f26f592f9 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -31,19 +31,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/MeshTest.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/OgsTest.cmake)
-set(NUM_CTEST_PROCESSORS 3)
-if(DEFINED ENV{CTEST_NUM_THREADS})
- set(NUM_CTEST_PROCESSORS $ENV{CTEST_NUM_THREADS})
-elseif(DEFINED ENV{NUM_THREADS})
- set(NUM_CTEST_PROCESSORS $ENV{NUM_THREADS})
-endif()
-
-if(DEFINED ENV{CTEST_LARGE_NUM_THREADS})
- set(NUM_CTEST_LARGE_PROCESSORS $ENV{CTEST_LARGE_NUM_THREADS})
-else()
- set(NUM_CTEST_LARGE_PROCESSORS ${NUM_CTEST_PROCESSORS})
-endif()
-
if(CMAKE_CONFIGURATION_TYPES)
set(CONFIG_PARAMETER --build-config "$<CONFIGURATION>")
endif()
@@ -75,7 +62,7 @@ add_custom_target(
--force-new-ctest-process
--output-on-failure --output-log Tests/ctest.log
--exclude-regex LARGE
- ${CONFIG_PARAMETER} --parallel ${NUM_CTEST_PROCESSORS}
+ ${CONFIG_PARAMETER}
--timeout 900 # 15 minutes
DEPENDS ${test_dependencies} ctest-cleanup
USES_TERMINAL
@@ -101,7 +88,7 @@ add_custom_target(
--force-new-ctest-process
--output-on-failure --output-log Tests/ctest-large.log
--tests-regex LARGE
- ${CONFIG_PARAMETER} --parallel ${NUM_CTEST_LARGE_PROCESSORS}
+ ${CONFIG_PARAMETER}
--timeout 3600
DEPENDS ${test_dependencies} ctest-large-cleanup
USES_TERMINAL
--
GitLab