Commit c7bc5eb3 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

Dynamically build up a list of excluded tests

Also excluded ThirdParty from coverage as many things from Utilities
moved there. This should suppress all of the header test warnings and
give us a clearer indication of the change in coverage since
modularization.

Change-Id: Ia73e0a94bdf7ddee936ee95e794e25b1a8695c08
parent 90fe8fd7
......@@ -3,22 +3,7 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE
Example-vtkLocal
Example-vtkMy
# These tests do not actually run any VTK code
HeaderTesting-Charts
HeaderTesting-Common
HeaderTesting-Filtering
HeaderTesting-GenericFiltering
HeaderTesting-Geovis
HeaderTesting-Graphics
HeaderTesting-Hybrid
HeaderTesting-Imaging
HeaderTesting-Infovis
HeaderTesting-IO
HeaderTesting-Parallel
HeaderTesting-Rendering
HeaderTesting-Views
HeaderTesting-VolumeRendering
HeaderTesting-Widgets
@memcheck_excluded_tests@
PrintSelf-Charts
PrintSelf-Common
......@@ -308,6 +293,7 @@ SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
# Exclude files from the Utilities directories
".*/Utilities/.*"
".*/ThirdParty/.*"
)
IF(@CMAKE_COMPILER_IS_GNUCXX@)
......
......@@ -369,7 +369,7 @@ VTK_AUTOINIT(${vtk-module})
if(BUILD_TESTING AND PYTHON_EXECUTABLE AND NOT ${vtk-module}_NO_HeaderTest)
string(TOUPPER "${vtk-module}" MOD)
add_test(NAME ${vtk-module}.HeaderTest
add_test(NAME ${vtk-module}-HeaderTest
COMMAND ${PYTHON_EXECUTABLE} ${VTK_SOURCE_DIR}/Testing/Core/HeaderTesting.py
${CMAKE_CURRENT_SOURCE_DIR} ${MOD}_EXPORT
)
......
......@@ -374,6 +374,15 @@ if(BUILD_DOCUMENTATION)
add_subdirectory(Utilities/Doxygen)
endif()
# Configure the CTestCustom.cmake file now that everything is done.
set(memcheck_excluded_tests " # These tests do not run any VTK code\n")
foreach(vtk-module ${VTK_MODULES_ALL})
set(memcheck_excluded_tests
"${memcheck_excluded_tests} ${vtk-module}-HeaderTest\n")
endforeach()
configure_file("${VTK_CMAKE_DIR}/CTestCustom.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake" @ONLY)
#-----------------------------------------------------------------------------
# The commands in this directory are intended to be executed as
# the end of the whole configuration process, as a "last step".
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment