Skip to content
Snippets Groups Projects
Commit c7ed0db6 authored by David Doria's avatar David Doria
Browse files

BUG: Several tests required VTK_DATA but were not guarded.

These tests were failing on machines that did not have VTK_DATA
but should not have been run at all in that case.

Change-Id: I2a09bbccbe27f785ce9a6c2e1aecd266c181abe5
parent 134fc72c
No related branches found
No related tags found
No related merge requests found
......@@ -19,11 +19,14 @@ TARGET_LINK_LIBRARIES(BandedContours vtkHybrid)
######## Regression Testing ########
SET(KIT VisualizationAlgorithmsExamples)
SET(MyTests
TestTubesWithVaryingRadiusAndColors.cxx
TestFilledContours.cxx
TestBandedContours.cxx
)
IF (VTK_DATA_ROOT)
SET(MyTests ${MyTests} TestTubesWithVaryingRadiusAndColors.cxx)
ENDIF (VTK_DATA_ROOT)
INCLUDE(vtkTestingObjectFactory)
ADD_EXECUTABLE(${KIT}CxxTests ${KIT}CxxTests.cxx
${MyTests})
......
......@@ -26,6 +26,9 @@ INCLUDE(vtkTestingObjectFactory)
ADD_EXECUTABLE(${KIT}CxxTests ${KIT}CxxTests.cxx
${MyTests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkWidgets)
ADD_TEST(${KIT}-Slider ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests TestSlider)
ADD_TEST(${KIT}-Slider2D ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests TestSlider2D)
ADD_TEST(${KIT}-BalloonWidget ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests TestBalloonWidget)
IF (VTK_DATA_ROOT)
ADD_TEST(${KIT}-Slider ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests TestSlider)
ADD_TEST(${KIT}-Slider2D ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests TestSlider2D)
ADD_TEST(${KIT}-BalloonWidget ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests TestBalloonWidget)
ENDIF (VTK_DATA_ROOT)
......@@ -7,43 +7,18 @@ IF(VTK_USE_DISPLAY)
# add tests that do not require data
SET(MyTests
BoxWidget.cxx
BoxWidget2.cxx
# ScaledBoxWidget2.cxx
TestAffineWidget.cxx
TestAngleWidget2D.cxx
TestAngleWidget3D.cxx
# TestAxesTransformWidget.cxx
TestBalloonWidget.cxx
TestBorderWidget.cxx
TestButtonWidget.cxx
TestCameraWidget.cxx
# TestCaptionWidget.cxx
TestCellCentersPointPlacer.cxx
TestCenteredSliderWidget2D.cxx
TestCheckerboardWidget.cxx
TestContourWidget2.cxx
TestDistanceWidget.cxx
TestDistanceWidget3D.cxx
TestFixedSizeHandleRepresentation3D.cxx
TestHandleWidget.cxx
TestHandleWidget2D.cxx
TestImplicitPlaneWidget.cxx
TestImplicitPlaneWidget2.cxx
TestImplicitPlaneWidget2b.cxx
TestLogoWidget.cxx
TestOrientationMarkerWidget.cxx
TestPlaybackWidget.cxx
TestProgrammaticPlacement.cxx
TestRectilinearWipeWidget.cxx
TestSeedWidget.cxx
TestSliderWidget.cxx
TestSliderWidget2D.cxx
TestTextWidget.cxx
TerrainPolylineEditor.cxx
TestDijkstraGraphGeodesicPath.cxx
TestParallelopipedWidget.cxx
TestSeedWidgetNonUniformRepresentations.cxx
TestPolyPlane.cxx
vtkAngleWidgetTest1.cxx
vtkBiDimensionalWidgetTest1.cxx
......@@ -69,7 +44,6 @@ SET(MyTests
# vtkPointHandleRepresentation2DTest1.cxx
# vtkPointHandleRepresentation3DTest1.cxx
# vtkConstrainedPointHandleRepresentationTest1
TestPointHandleRepresentation3D.cxx
# vtkSphereHandleRepresentationTest1.cxx
# vtkPolygonalHandleRepresentation3DTest1.cxx
# vtkOrientedPolygonalHandleRepresentation3DTest1.cxx
......@@ -78,33 +52,59 @@ SET(MyTests
IF (VTK_DATA_ROOT)
# add tests that require data
SET(MyTests ${MyTests}
BoxWidget.cxx
BoxWidget2.cxx
ImagePlaneWidget.cxx
TestAngleWidget2D.cxx
TestAngleWidget3D.cxx
TestBalloonWidget.cxx
TestBiDimensionalWidget.cxx
TestBorderWidget.cxx
TestBrokenLineWidget.cxx
TestDijkstraImageGeodesicPath.cxx
TestImageActorContourWidget.cxx
TestCameraWidget.cxx
TestCellCentersPointPlacer.cxx
TestCenteredSliderWidget2D.cxx
TestCheckerboardWidget.cxx
TestConstrainedHandleWidget.cxx
TestSurfaceConstrainedHandleWidget.cxx
TestPolygonalRepresentationHandleWidget.cxx
TestPolygonalHandleRepresentations.cxx
TestPolygonalSurfaceConstrainedDistanceWidget.cxx
TestSphereHandleWidget.cxx
TestContourWidget2.cxx
TestDistanceWidget.cxx
TestDijkstraImageGeodesicPath.cxx
TestFixedSizeHandleRepresentation3D.cxx
TestFocalPlaneContour.cxx
#TestOrientedGlyphContour.cxx
TestHandleWidget2D.cxx
TestImageActorContourWidget.cxx
TestImageTracerWidget.cxx
TestImplicitPlaneWidget.cxx
TestImplicitPlaneWidget2.cxx
TestImplicitPlaneWidget2b.cxx
TestLineWidget.cxx
TestLineWidget2.cxx
TestLogoWidgetAlphaBlending.cxx
TestLogoWidgetDepthPeeling.cxx
TestOrientationMarkerWidget.cxx
TestOrthoPlanes.cxx
TestPlaneWidget.cxx
TestPlaybackWidget.cxx
TestPointHandleRepresentation3D.cxx
TestPointWidget.cxx
TestParallelopipedWidget.cxx
TestPolygonalRepresentationHandleWidget.cxx
TestPolygonalHandleRepresentations.cxx
TestPolygonalSurfaceConstrainedDistanceWidget.cxx
TestSeedWidget.cxx
TestSeedWidgetNonUniformRepresentations.cxx
TestSphereHandleWidget.cxx
#TestOrientedGlyphContour.cxx
TestResliceCursorWidget2.cxx
TestResliceCursorWidget3.cxx
TestScalarBarWidget.cxx
TestSeedWidget2.cxx
TestSliderWidget.cxx
TestSliderWidget2D.cxx
TestSplineWidget.cxx
TestSurfaceConstrainedHandleWidget.cxx
TestTensorProbeWidget.cxx
TestTextWidget.cxx
)
ENDIF (VTK_DATA_ROOT)
......
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