Skip to content
Snippets Groups Projects
Verified Commit 450c9abc authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Removed parallel option for ctest targets.

Use env var CTEST_PARALLEL_LEVEL instead.
parent 3edb399a
No related branches found
No related tags found
No related merge requests found
Subproject commit 1260fd50f674c4c00ce719d97c5c2bad275f2765 Subproject commit c188dfa770c0e299a890da523d70558b35db81f3
...@@ -31,19 +31,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/AddTest.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/MeshTest.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/OgsTest.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) if(CMAKE_CONFIGURATION_TYPES)
set(CONFIG_PARAMETER --build-config "$<CONFIGURATION>") set(CONFIG_PARAMETER --build-config "$<CONFIGURATION>")
endif() endif()
...@@ -75,7 +62,7 @@ add_custom_target( ...@@ -75,7 +62,7 @@ add_custom_target(
--force-new-ctest-process --force-new-ctest-process
--output-on-failure --output-log Tests/ctest.log --output-on-failure --output-log Tests/ctest.log
--exclude-regex LARGE --exclude-regex LARGE
${CONFIG_PARAMETER} --parallel ${NUM_CTEST_PROCESSORS} ${CONFIG_PARAMETER}
--timeout 900 # 15 minutes --timeout 900 # 15 minutes
DEPENDS ${test_dependencies} ctest-cleanup DEPENDS ${test_dependencies} ctest-cleanup
USES_TERMINAL USES_TERMINAL
...@@ -101,7 +88,7 @@ add_custom_target( ...@@ -101,7 +88,7 @@ add_custom_target(
--force-new-ctest-process --force-new-ctest-process
--output-on-failure --output-log Tests/ctest-large.log --output-on-failure --output-log Tests/ctest-large.log
--tests-regex LARGE --tests-regex LARGE
${CONFIG_PARAMETER} --parallel ${NUM_CTEST_LARGE_PROCESSORS} ${CONFIG_PARAMETER}
--timeout 3600 --timeout 3600
DEPENDS ${test_dependencies} ctest-large-cleanup DEPENDS ${test_dependencies} ctest-large-cleanup
USES_TERMINAL USES_TERMINAL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment