Commit 7da0bc3d authored by Marcus D. Hanwell's avatar Marcus D. Hanwell

Moving rendering tests to more appropriate places

Many of the OpenGL tests were for RenderingCore API, others were from
RenderingImage and RenderingLabel. Moving them to more appropriate
locations, this makes it easier to validate some of the OpenGL2
implementations now we have a concept of multiple rendering backends.

Change-Id: I48db6a50ddc3d64d899a6b99b8cd21960fa26055
parent f97f9dfb
......@@ -2,15 +2,26 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
FrustumClip.cxx
Mace.cxx
RGrid.cxx
TestAssemblyBounds.cxx,NO_VALID
TestPickingManager.cxx,NO_VALID
TestActor2DTextures.cxx
TestActorLightingFlag.cxx
TestAnimationScene.cxx
TestAreaSelections.cxx
TestAssemblyBounds.cxx,NO_VALID
TestBackfaceCulling.cxx
TestBareScalarsToColors.cxx
TestFollowerPicking.cxx
TestGlyph3DMapper.cxx
TestGlyph3DMapperMasking.cxx
TestGlyph3DMapperOrientationArray.cxx
TestGlyph3DMapperPicking.cxx
TestPickingManager.cxx,NO_VALID
TestMapVectorsAsRGBColors.cxx
TestMapVectorsToColors.cxx
TestSplitViewportStereoHorizontal.cxx
otherLookupTable.cxx,NO_VALID
otherLookupTableWithEnabling.cxx,NO_VALID
RenderNonFinite.cxx
SurfacePlusEdges.cxx
# TestViewDependentErrorMetric.cxx # Loads of extra deps - move?
# TestHierarchicalBoxPipeline.cxx # legacy code
)
......
......@@ -14,4 +14,8 @@ vtk_module(vtkRenderingCore
vtkTestingCore
vtkTestingRendering
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingFreeType
vtkInteractionStyle
vtkFiltersSources
vtkImagingSources
)
......@@ -5,4 +5,11 @@ vtk_module(vtkRenderingImage
DEPENDS
vtkImagingCore
vtkRenderingCore
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
vtkRendering${VTK_RENDERING_BACKEND}
vtkInteractionStyle
vtkImagingSources
vtkFiltersModeling
)
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestDynamic2DLabelMapper.cxx
TestLabelPlacer.cxx
TestLabelPlacer2D.cxx
TestLabelPlacerCoincidentPoints.cxx
TestLabelPlacementMapper2D.cxx
TestLabelPlacementMapperCoincidentPoints.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
......@@ -5,4 +5,10 @@ vtk_module(vtkRenderingLabel
vtkRenderingFreeType
PRIVATE_DEPENDS
vtkFiltersExtraction
TEST_DEPENDS
vtkIOXML
vtkTestingCore
vtkTestingRendering
vtkRendering${VTK_RENDERING_BACKEND}
vtkInteractionStyle
)
......@@ -7,39 +7,12 @@ INCLUDE_DIRECTORIES(
vtk_add_test_cxx(${vtk-module}CxxTests render_window_tests
otherCoordinate.cxx,NO_DATA,NO_VALID
LoadOpenGLExtension.cxx
TestActorLightingFlag.cxx
TestAnimationScene.cxx
TestBackfaceCulling.cxx
TestCellPickerImage.cxx
TestDynamic2DLabelMapper.cxx
TestFBO.cxx,NO_VALID
TestFollowerPicking.cxx
TestGlyph3DMapper.cxx
TestGlyph3DMapperMasking.cxx
TestGlyph3DMapperOrientationArray.cxx
TestGlyph3DMapperPicking.cxx
TestGPUInfo.cxx,NO_VALID
TestGradientBackground.cxx
TestHomogeneousTransformOfActor.cxx
TestImageResliceMapperAlpha.cxx
TestImageResliceMapperBackground.cxx
TestImageResliceMapperInterpolation.cxx
TestImageResliceMapperOffAxis.cxx
TestImageResliceMapperOrient3D.cxx
TestImageResliceMapperSlab.cxx
TestImageSliceMapperAlpha.cxx
TestImageSliceMapperBackground.cxx
TestImageSliceMapperOrient2D.cxx
TestImageSliceMapperOrient3D.cxx
TestImageSliceMapperInterpolation.cxx
TestImageStack.cxx
TestInteractorStyleImageProperty.cxx,NO_VALID
TestInteractorTimers.cxx,NO_VALID
TestLabelPlacer.cxx
TestLabelPlacer2D.cxx
TestLabelPlacerCoincidentPoints.cxx
TestLabelPlacementMapper2D.cxx
TestLabelPlacementMapperCoincidentPoints.cxx
TestLODActor.cxx,NO_VALID
TestManyActors.cxx,NO_VALID
TestMonitors.cxx,NO_VALID
......@@ -87,7 +60,6 @@ endif()
include_directories(${OPENGL_INCLUDE_DIR})
vtk_add_test_cxx(${vtk-module}CxxTests ogl_tests
TestAreaSelections.cxx
TestGlyph3DMapperArrow.cxx
TestImageSliceMapperBorder.cxx
TestImageResliceMapperBorder.cxx
......@@ -101,8 +73,6 @@ vtk_add_test_cxx(${vtk-module}CxxTests ogl_tests
TestTStripsNormalsColorsTCoords.cxx
TestTStripsNormalsTCoords.cxx
TestTStripsTCoords.cxx
RenderNonFinite.cxx
SurfacePlusEdges.cxx
TestLabelPlacementMapper.cxx
)
if(NOT VTK_REPLACE_OPENGL_OVERRIDES)
......
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