From 50bf4aa801b7359e7821164a067a2af2b3d98c99 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 13 Aug 2020 11:41:15 +0200
Subject: [PATCH] [T] Added DISABLED-option to AddTest() and OgsTest().
---
scripts/cmake/test/AddTest.cmake | 11 ++++++++---
scripts/cmake/test/OgsTest.cmake | 5 ++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 0a4bb755c93..1704da6ebac 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -17,7 +17,8 @@
# OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
# VIS <vtu output file(s)> # optional for documentation
# RUNTIME <in seconds> # optional for optimizing ctest duration
-# values should be taken from eve serial job
+# values should be taken from envinf job
+# DISABLED # optional, disables the test
# )
#
# Conditional arguments:
@@ -43,7 +44,7 @@ function (AddTest)
set(LARGE_RUNTIME 60)
# parse arguments
- set(options NONE)
+ set(options DISABLED)
set(oneValueArgs EXECUTABLE PATH NAME WRAPPER TESTER ABSTOL RELTOL RUNTIME DEPENDS)
set(multiValueArgs EXECUTABLE_ARGS DATA DIFF_DATA WRAPPER_ARGS REQUIREMENTS VIS)
cmake_parse_arguments(AddTest "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -272,6 +273,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
if(DEFINED MPI_PROCESSORS)
set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCESSORS})
endif()
+ set_tests_properties(${TEST_NAME} PROPERTIES DISABLED ${AddTest_DISABLED})
if(TARGET ${AddTest_EXECUTABLE})
add_dependencies(ctest ${AddTest_EXECUTABLE})
@@ -300,6 +302,9 @@ Use six arguments version of AddTest with absolute and relative tolerances")
--debug-output
WORKING_DIRECTORY ${AddTest_SOURCE_PATH}
)
- set_tests_properties(${TESTER_NAME} PROPERTIES DEPENDS ${TEST_NAME})
+ set_tests_properties(${TESTER_NAME} PROPERTIES
+ DEPENDS ${TEST_NAME}
+ DISABLED ${AddTest_DISABLED}
+ )
endfunction()
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index 108c898a84c..43f488c1010 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -5,6 +5,7 @@ function (OgsTest)
if(NOT OGS_BUILD_CLI OR NOT BUILD_TESTING)
return()
endif()
+ set(options DISABLED)
set(oneValueArgs PROJECTFILE RUNTIME)
set(multiValueArgs WRAPPER)
cmake_parse_arguments(OgsTest "${options}" "${oneValueArgs}"
@@ -52,7 +53,9 @@ function (OgsTest)
set_tests_properties(${TEST_NAME} PROPERTIES
ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>
- COST ${OgsTest_RUNTIME})
+ COST ${OgsTest_RUNTIME}
+ DISABLED ${OgsTest_DISABLED}
+ )
if(TARGET ${OgsTest_EXECUTABLE})
add_dependencies(ctest ${OgsTest_EXECUTABLE})
--
GitLab