Commit 3b1be340 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'failing-tests' into master

eed2d396 Removed debug output from test CMakeLists
124660c2 Fixed up some GLSL test logic
6f5d37ed Fixed a few segfaults in tests
parents 09f4188b eed2d396
......@@ -6,6 +6,7 @@ vtk_module(vtkFiltersGeneral
vtkFiltersCore
TEST_DEPENDS
vtkRenderingOpenGL
vtkRenderingFreeTypeOpenGL
vtkRenderingAnnotation
vtkTestingRendering
)
......@@ -13,7 +13,6 @@ set(TestsToRun ${Tests})
list(REMOVE_ITEM TestsToRun CxxTests.cxx)
# Add all the executables
message("${TestsToRun}")
foreach(test ${TestsToRun})
get_filename_component(TName ${test} NAME_WE)
if(VTK_DATA_ROOT)
......@@ -26,4 +25,4 @@ foreach(test ${TestsToRun})
add_test(NAME ${vtk-module}Cxx-${TName}
COMMAND ${vtk-module}CxxTests ${TName})
endif()
endforeach()
\ No newline at end of file
endforeach()
......@@ -10,7 +10,7 @@ vtk_module(vtkImagingCore
vtkFiltersModeling
vtkFiltersGeneral
vtkFiltersHybrid
vtkRenderingCore
vtkRenderingOpenGL
vtkTestingRendering
vtkInteractionImage
vtkImagingMath # Move tests
......
......@@ -112,6 +112,7 @@ if(VTK_USE_DISPLAY AND VTK_DATA_ROOT)
)
endif()
set(VTK_USE_GLSL_SHADERS TRUE)
if(VTK_USE_GLSL_SHADERS)
# Tests testing GLSL Shaders.
set(RenderingTestsWithArguments
......@@ -201,6 +202,8 @@ foreach(exe
endif()
endforeach()
IF(VTK_USE_GLSL_SHADERS AND VTK_USE_DISPLAY)
set_tests_properties(TestGenericVertexAttributesGLSLDepthPeelingPass PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR:.*vtkOpenGLProperty.*Couldn't build the shader program. At this point , it can be an error in a shader or a driver bug.")
ENDIF(VTK_USE_GLSL_SHADERS AND VTK_USE_DISPLAY)
if(VTK_USE_GLSL_SHADERS)
set_tests_properties(
${vtk-module}Cxx-TestGenericVertexAttributesGLSLDepthPeelingPass
PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR:.*vtkOpenGLProperty.*Couldn't build the shader program. At this point , it can be an error in a shader or a driver bug.")
endif()
Markdown is supported
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