From ba4b3fecd51a28e4496d5f329896a02bb4ec55ab Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 12 May 2021 10:08:44 +0200
Subject: [PATCH] [ctest] Disabled timeout.
Does not work on CI under load.
---
scripts/cmake/test/AddTest.cmake | 7 +++++--
scripts/cmake/test/MeshTest.cmake | 5 ++++-
scripts/cmake/test/OgsTest.cmake | 7 +++++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 1fe4689786c..8399b1a2328 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -419,13 +419,16 @@ Use six arguments version of AddTest with absolute and relative tolerances"
list(APPEND labels large)
endif()
- set_tests_properties( ${TEST_NAME}
+ set_tests_properties(${TEST_NAME}
PROPERTIES
COST ${AddTest_RUNTIME}
DISABLED ${AddTest_DISABLED}
LABELS "${labels}"
- TIMEOUT ${timeout}
)
+ # Disabled for the moment, does not work with CI under load
+ # if(NOT OGS_COVERAGE)
+ # set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT ${timeout})
+ # endif()
add_dependencies(ctest ${AddTest_EXECUTABLE})
add_dependencies(ctest-large ${AddTest_EXECUTABLE})
diff --git a/scripts/cmake/test/MeshTest.cmake b/scripts/cmake/test/MeshTest.cmake
index e4548f1f257..6ead62b290e 100644
--- a/scripts/cmake/test/MeshTest.cmake
+++ b/scripts/cmake/test/MeshTest.cmake
@@ -202,8 +202,11 @@ function(MeshTest)
PROPERTIES
COST ${MeshTest_RUNTIME}
LABELS "meshtest;${labels}"
- TIMEOUT ${timeout}
)
+ # Disabled for the moment, does not work with CI under load
+ # if(NOT OGS_COVERAGE)
+ # set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT ${timeout})
+ # endif()
if(TARGET ${MeshTest_EXECUTABLE})
add_dependencies(ctest ${MeshTest_EXECUTABLE})
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 53bc851ae49..538be4c3d99 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -69,12 +69,15 @@ function(OgsTest)
list(APPEND labels large)
endif()
- set_tests_properties( ${TEST_NAME}
+ set_tests_properties(${TEST_NAME}
PROPERTIES
ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>
COST ${OgsTest_RUNTIME}
DISABLED ${OgsTest_DISABLED}
LABELS "${labels}"
- TIMEOUT ${timeout}
)
+ # Disabled for the moment, does not work with CI under load
+ # if(NOT OGS_COVERAGE)
+ # set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT ${timeout})
+ # endif()
endfunction()
--
GitLab