Commit 3d11639a authored by Ben Boeckel's avatar Ben Boeckel
Browse files

Update the Cxx test call sites

Change-Id: I10a54acbd076e055d8071414f2fff1ebafe1653d
parent cd4fc15a
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestDaxThreshold.cxx
TestDaxThreshold2.cxx
TestDaxMarchingCubes.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestUsePiston.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
if(VTK_MPI_MAX_NUMPROCS GREATER 1)
include(vtkMPI)
......
# add tests that do not require data
vtk_add_test_cxx(NO_DATA NO_VALID
TestContextScene.cxx
TestControlPointsItem.cxx
TestControlPointsItemEvents.cxx
set(TestChartUnicode_ARGS
DATA{../Data/Fonts/DejaVuSans.ttf}
-E 25
)
set(TestChartsOn3D_ARGS
-E 16
)
set(TestColorTransferFunction_ARGS
-E 80
)
set(TestContextUnicode_ARGS
DATA{../Data/Fonts/DejaVuSans.ttf}
)
set(TestControlPointsHandleItem_ARGS
-E 30
)
set(TestLinePlot_ARGS
-E 25
)
set(TestLinePlot2_ARGS
-E 25
)
set(TestLinePlotInteraction_ARGS
-E 25
)
set(TestMultipleRenderers_ARGS
-E 25
)
set(TestMultipleScalarsToColors_ARGS
-E 25
)
set(TestParallelCoordinates_ARGS
-E 15
)
set(TestParallelCoordinatesDouble_ARGS
-E 15
)
set(TestChartUnicode_ARGS DATA{../Data/Fonts/DejaVuSans.ttf})
set(TestContextUnicode_ARGS DATA{../Data/Fonts/DejaVuSans.ttf})
# add tests that require data
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestContextScene.cxx,NO_DATA,NO_VALID
TestControlPointsItem.cxx,NO_DATA,NO_VALID
TestControlPointsItemEvents.cxx,NO_DATA,NO_VALID
TestAxes.cxx
TestBagPlot.cxx
TestBarGraph.cxx
TestBarGraphHorizontal.cxx
TestBoxPlot.cxx
TestCategoryLegend.cxx
TestColorTransferFunction.cxx,-E80
TestColorTransferFunction.cxx
TestChartDouble.cxx
TestChartMatrix.cxx
TestChartUnicode.cxx,-E25
TestChartsOn3D.cxx,-E16
TestChartUnicode.cxx
TestChartsOn3D.cxx
TestChartXYZ.cxx
TestContext.cxx
TestContextImage.cxx
TestContextUnicode.cxx
TestControlPointsHandleItem.cxx,-E30
TestControlPointsHandleItem.cxx
TestDiagram.cxx
TestFunctionalBagPlot.cxx
TestHistogram2D.cxx
TestInteractiveChartXYZ.cxx
TestLegendHiddenPlots.cxx
TestLinePlot.cxx,-E25
TestLinePlot.cxx
TestLinePlotDouble.cxx
TestLinePlotDouble2.cxx
TestLinePlot3D.cxx
TestLinePlotAxisFonts.cxx
TestLinePlot2.cxx,-E25
TestLinePlotInteraction.cxx,-E25
TestLinePlot2.cxx
TestLinePlotInteraction.cxx
TestLinePlotSelection.cxx
TestLinePlotSelection2.cxx
TestMultipleChartRenderers.cxx
TestMultipleRenderers.cxx,-E25
TestMultipleScalarsToColors.cxx,-E25
TestParallelCoordinates.cxx,-E15
TestParallelCoordinatesDouble.cxx,-E15
TestMultipleRenderers.cxx
TestMultipleScalarsToColors.cxx
TestParallelCoordinates.cxx
TestParallelCoordinatesDouble.cxx
TestPieChart.cxx
TestPlotMatrix.cxx
TestScalarsToColors.cxx
......@@ -58,5 +88,6 @@ vtk_add_test_cxx(
TestSurfacePlot.cxx
TestZoomAxis.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
vtk_test_cxx_executable(${vtk-module}CxxTests tests
RENDERING_FACTORY
)
vtk_add_test_cxx(NO_VALID
TestCategoricalColors.cxx
TestNamedColors.cxx
)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestCategoricalColors.cxx,NO_VALID
TestColorSeries.cxx
TestNamedColors.cxx,NO_VALID
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
UnitTestParametricSpline.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
......@@ -4,7 +4,8 @@ set(TestSystemInformation_ARGS ${CMAKE_BINARY_DIR})
# Tell TestXMLFileOutputWindow where to write test file
set(TestXMLFileOutputWindow_ARGS ${CMAKE_BINARY_DIR}/Testing/Temporary/XMLFileOutputWindow.txt)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
UnitTestMath.cxx
TestArrayAPI.cxx
TestArrayAPIConvenience.cxx
......@@ -59,6 +60,6 @@ vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
#otherLookupTableWithEnabling.cxx
otherStringArray.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests
vtkTestNewVar.cxx)
vtk_test_cxx_executable(${vtk-module}CxxTests tests
vtkTestNewVar.cxx
)
......@@ -172,7 +172,7 @@ struct Transpose
//
//
int main(int vtkNotUsed(argc), char *vtkNotUsed(argv)[])
int TestArrayCasting(int vtkNotUsed(argc), char *vtkNotUsed(argv)[])
{
try
{
......
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestColor.cxx
TestVector.cxx
TestVectorOperators.cxx
......@@ -44,13 +45,12 @@ vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
TestStructuredData.cxx
TestDataObjectTypes.cxx
)
vtk_add_test_cxx(NO_VALID NO_OUTPUT
TestCellIterators.cxx
)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests data_tests
TestCellIterators.cxx,NO_VALID,NO_OUTPUT
TestQuadraticPolygonFilters.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
set(all_tests
${tests}
${data_tests}
)
vtk_test_cxx_executable(${vtk-module}CxxTests all_tests)
vtk_add_test_cxx(NO_DATA NO_VALID
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID
TestCopyAttributeData.cxx
TestImageDataToStructuredGrid.cxx
TestSetInputDataObject.cxx
TestTemporalSupport.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestAmoebaMinimizer.cxx
TestMatrix3x3.cxx
TestPolynomialSolversUnivariate.cxx
TestQuaternion.cxx
)
if(NOT VTK_LEGACY_REMOVE)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests extra_tests
NO_DATA NO_VALID NO_OUTPUT
TestFastNumericConversion.cxx
)
list(APPEND tests
${extra_tests})
endif()
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(TestPolygonBuilder.cxx NO_DATA NO_VALID NO_OUTPUT)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestPolygonBuilder.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestDirectory.cxx
otherTimerLog.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestTransform.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestBallAndStick.cxx
TestPDBBallAndStick.cxx
TestBondColorModeDiscreteByAtom.cxx
......@@ -16,8 +16,8 @@ vtk_add_test_cxx(
TestProteinRibbon.cxx
TestSimpleBondPerceiver.cxx,NO_VALID
TestVDWSpheres.cxx
TestCMLMoleculeReader.cxx
)
vtk_test_cxx_executable(${vtk-module}CxxTests tests
RENDERING_FACTORY
)
vtk_add_test_cxx(TestCMLMoleculeReader.cxx)
vtk_test_cxx_executable(${vtk-module}CxxTests RENDERING_FACTORY)
......@@ -28,10 +28,13 @@ if(BUILD_TESTING)
set(TestParticleReader_ARGS
"${VTK_TEST_DATA_DIR}/Data/golf.csv"
${VTK_TEST_OUTPUT_DIR}/TestParticleReader.vtp)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-example}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestParticleReader.cxx
TestDumpXMLFile.cxx
)
vtk_test_cxx_executable(${vtk-example}CxxTests RENDERING_FACTORY)
vtk_test_cxx_executable(${vtk-example}CxxTests tests
RENDERING_FACTORY
)
endif()
endif()
......@@ -22,9 +22,11 @@ if(BUILD_TESTING)
######## Regression Testing ########
set(vtk-example ImageProcessingExamples)
set(TestImageSlicing_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestImageSlicing.cxx
)
vtk_test_cxx_executable(${vtk-example}CxxTests RENDERING_FACTORY)
vtk_test_cxx_executable(${vtk-example}CxxTests tests
RENDERING_FACTORY
)
endif()
endif()
......@@ -41,12 +41,14 @@ if(BUILD_TESTING)
set(TestMedical2_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
set(TestMedical3_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
set(TestMedical4_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestMedical1.cxx
TestMedical2.cxx
TestMedical3.cxx
TestMedical4.cxx
)
vtk_test_cxx_executable(${vtk-example}CxxTests RENDERING_FACTORY)
vtk_test_cxx_executable(${vtk-example}CxxTests tests
RENDERING_FACTORY
)
endif()
endif()
......@@ -39,13 +39,20 @@ if(BUILD_TESTING)
.5 "DATA{${VTK_TEST_INPUT_DIR}/cow.vtp}"
${VTK_TEST_OUTPUT_DIR}/Delaunay3DAlpha.vtu
)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-module}CxxTests data_tests
TestFinance.cxx
)
vtk_add_test_cxx(NO_DATA NO_VALID NO_OUTPUT
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestDelaunay3D.cxx
TestDelaunay3DAlpha.cxx
)
vtk_test_cxx_executable(${vtk-example}CxxTests RENDERING_FACTORY)
set(all_tests
${data_tests}
${tests}
)
vtk_test_cxx_executable(${vtk-example}CxxTests all_tests
RENDERING_FACTORY
)
endif()
endif()
......@@ -31,11 +31,13 @@ if(BUILD_TESTING)
set(vtk-example VisualizationAlgorithmsExamples)
set(TestFilledContours_ARGS "DATA{${VTK_TEST_INPUT_DIR}/filledContours.vtp}" 10)
set(TestBandedContours_ARGS "DATA{${VTK_TEST_INPUT_DIR}/filledContours.vtp}" 10)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestTubesWithVaryingRadiusAndColors.cxx
TestFilledContours.cxx
TestBandedContours.cxx
)
vtk_test_cxx_executable(${vtk-example}CxxTests RENDERING_FACTORY)
vtk_test_cxx_executable(${vtk-example}CxxTests tests
RENDERING_FACTORY
)
endif()
endif()
......@@ -28,11 +28,13 @@ if(BUILD_TESTING)
if(vtkTestingRendering_LOADED)
######## Regression Testing ########
set(vtk-example WidgetsExamples)
vtk_add_test_cxx(
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestSlider.cxx
TestSlider2D.cxx
TestBalloonWidget.cxx
)
vtk_test_cxx_executable(${vtk-example}CxxTests RENDERING_FACTORY)
vtk_test_cxx_executable(${vtk-example}CxxTests tests
RENDERING_FACTORY
)
endif()
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