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

[T] Added DISABLED-option to AddTest() and OgsTest().

parent 5fdcd8bf
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
# OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS) # OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
# VIS <vtu output file(s)> # optional for documentation # VIS <vtu output file(s)> # optional for documentation
# RUNTIME <in seconds> # optional for optimizing ctest duration # 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: # Conditional arguments:
...@@ -43,7 +44,7 @@ function (AddTest) ...@@ -43,7 +44,7 @@ function (AddTest)
set(LARGE_RUNTIME 60) set(LARGE_RUNTIME 60)
# parse arguments # parse arguments
set(options NONE) set(options DISABLED)
set(oneValueArgs EXECUTABLE PATH NAME WRAPPER TESTER ABSTOL RELTOL RUNTIME DEPENDS) set(oneValueArgs EXECUTABLE PATH NAME WRAPPER TESTER ABSTOL RELTOL RUNTIME DEPENDS)
set(multiValueArgs EXECUTABLE_ARGS DATA DIFF_DATA WRAPPER_ARGS REQUIREMENTS VIS) set(multiValueArgs EXECUTABLE_ARGS DATA DIFF_DATA WRAPPER_ARGS REQUIREMENTS VIS)
cmake_parse_arguments(AddTest "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(AddTest "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
...@@ -272,6 +273,7 @@ Use six arguments version of AddTest with absolute and relative tolerances") ...@@ -272,6 +273,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
if(DEFINED MPI_PROCESSORS) if(DEFINED MPI_PROCESSORS)
set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCESSORS}) set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCESSORS})
endif() endif()
set_tests_properties(${TEST_NAME} PROPERTIES DISABLED ${AddTest_DISABLED})
if(TARGET ${AddTest_EXECUTABLE}) if(TARGET ${AddTest_EXECUTABLE})
add_dependencies(ctest ${AddTest_EXECUTABLE}) add_dependencies(ctest ${AddTest_EXECUTABLE})
...@@ -300,6 +302,9 @@ Use six arguments version of AddTest with absolute and relative tolerances") ...@@ -300,6 +302,9 @@ Use six arguments version of AddTest with absolute and relative tolerances")
--debug-output --debug-output
WORKING_DIRECTORY ${AddTest_SOURCE_PATH} 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() endfunction()
...@@ -5,6 +5,7 @@ function (OgsTest) ...@@ -5,6 +5,7 @@ function (OgsTest)
if(NOT OGS_BUILD_CLI OR NOT BUILD_TESTING) if(NOT OGS_BUILD_CLI OR NOT BUILD_TESTING)
return() return()
endif() endif()
set(options DISABLED)
set(oneValueArgs PROJECTFILE RUNTIME) set(oneValueArgs PROJECTFILE RUNTIME)
set(multiValueArgs WRAPPER) set(multiValueArgs WRAPPER)
cmake_parse_arguments(OgsTest "${options}" "${oneValueArgs}" cmake_parse_arguments(OgsTest "${options}" "${oneValueArgs}"
...@@ -52,7 +53,9 @@ function (OgsTest) ...@@ -52,7 +53,9 @@ function (OgsTest)
set_tests_properties(${TEST_NAME} PROPERTIES set_tests_properties(${TEST_NAME} PROPERTIES
ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff> ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>
COST ${OgsTest_RUNTIME}) COST ${OgsTest_RUNTIME}
DISABLED ${OgsTest_DISABLED}
)
if(TARGET ${OgsTest_EXECUTABLE}) if(TARGET ${OgsTest_EXECUTABLE})
add_dependencies(ctest ${OgsTest_EXECUTABLE}) add_dependencies(ctest ${OgsTest_EXECUTABLE})
......
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