Commit 5b2620ad authored by Bill Lorensen's avatar Bill Lorensen
Browse files

ENH: Use new testing framework.

parent 5dca988d
...@@ -11,6 +11,7 @@ IF (VTK_DATA_ROOT) ...@@ -11,6 +11,7 @@ IF (VTK_DATA_ROOT)
TestExodusImplicitArrays.cxx TestExodusImplicitArrays.cxx
#TestLabelPlacerExodus.cxx #TestLabelPlacerExodus.cxx
TestLegendScaleActor.cxx TestLegendScaleActor.cxx
TestPolyDataSilhouette.cxx
TestPieChartActor.cxx TestPieChartActor.cxx
TestSpiderPlotActor.cxx TestSpiderPlotActor.cxx
TestVRMLNormals.cxx TestVRMLNormals.cxx
...@@ -27,24 +28,29 @@ IF (VTK_DATA_ROOT) ...@@ -27,24 +28,29 @@ IF (VTK_DATA_ROOT)
ENDIF (VTK_USE_GLSL_SHADERS AND WIN32) ENDIF (VTK_USE_GLSL_SHADERS AND WIN32)
ENDIF (VTK_DATA_ROOT) ENDIF (VTK_DATA_ROOT)
# remove some tests if there is no display # remove some tests if there is no display of if they need args
IF(NOT VTK_USE_DISPLAY) IF(NOT VTK_USE_DISPLAY)
REMOVE(MyTests REMOVE(MyTests
TestBarChartActor.cxx TestBarChartActor.cxx
TestLegendScaleActor.cxx TestLegendScaleActor.cxx
TestPieChartActor.cxx TestPieChartActor.cxx
TestPolyDataSilhouette.cxx
TestSpiderPlotActor.cxx TestSpiderPlotActor.cxx
X3DTest.cxx X3DTest.cxx
) )
ENDIF(NOT VTK_USE_DISPLAY) ENDIF(NOT VTK_USE_DISPLAY)
CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests} IF (VTK_DATA_ROOT)
EXTRA_INCLUDE vtkTestDriver.h) ADD_TEST(TestPolyDataSilhouette ${CXX_TEST_PATH}/${KIT}CxxTests
TestPolyDataSilhouette ${VTK_DATA_ROOT}/Data/cow.vtp)
ENDIF (VTK_DATA_ROOT)
INCLUDE(${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests}) ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkHybrid vtkRendering vtkImaging vtkIO ) TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkHybrid vtkRendering vtkImaging vtkIO )
SET (TestsToRun ${Tests}) SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx TestImageStencilData.cxx) REMOVE (TestsToRun ${KIT}CxxTests.cxx TestPolyDataSilhouette.cxx TestImageStencilData.cxx)
# #
# Add all the executables # Add all the executables
......
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