From 3c87d75fa39d9a641afb36cddb0abb6e92639bfe Mon Sep 17 00:00:00 2001 From: Ben Boeckel <ben.boeckel@kitware.com> Date: Fri, 14 Mar 2014 19:40:07 -0400 Subject: [PATCH] Update the Python test call sites Change-Id: I5f19b101063e1a25d4f5db5c4356ce5efffbd90d --- .../Piston/Testing/Python/CMakeLists.txt | 86 ++++---- Charts/Core/Testing/Python/CMakeLists.txt | 26 +-- .../Testing/Python/CMakeLists.txt | 10 +- Common/Core/Testing/Python/CMakeLists.txt | 39 ++-- .../DataModel/Testing/Python/CMakeLists.txt | 32 +-- .../Testing/Python/CMakeLists.txt | 7 +- .../Transforms/Testing/Python/CMakeLists.txt | 12 +- Filters/AMR/Testing/Python/CMakeLists.txt | 28 ++- Filters/Core/Testing/Python/CMakeLists.txt | 118 +++++------ .../Extraction/Testing/Python/CMakeLists.txt | 14 +- Filters/General/Testing/Python/CMakeLists.txt | 92 ++++----- .../Geometry/Testing/Python/CMakeLists.txt | 14 +- Filters/Hybrid/Testing/Python/CMakeLists.txt | 46 ++--- .../Modeling/Testing/Python/CMakeLists.txt | 52 ++--- .../Parallel/Testing/Python/CMakeLists.txt | 12 +- .../Testing/Python/CMakeLists.txt | 8 +- Filters/Sources/Testing/Python/CMakeLists.txt | 16 +- .../Statistics/Testing/Python/CMakeLists.txt | 7 +- .../Testing/Python/CMakeLists.txt | 14 +- Filters/Texture/Testing/Python/CMakeLists.txt | 12 +- Filters/Verdict/Testing/Python/CMakeLists.txt | 5 +- IO/Core/Testing/Python/CMakeLists.txt | 7 +- IO/EnSight/Testing/Python/CMakeLists.txt | 50 ++--- IO/GeoJSON/Testing/Python/CMakeLists.txt | 5 +- IO/Geometry/Testing/Python/CMakeLists.txt | 30 +-- IO/Image/Testing/Python/CMakeLists.txt | 20 +- IO/Import/Testing/Python/CMakeLists.txt | 4 +- IO/MINC/Testing/Python/CMakeLists.txt | 12 +- IO/NetCDF/Testing/Python/CMakeLists.txt | 12 +- IO/PLY/Testing/Python/CMakeLists.txt | 4 +- IO/Parallel/Testing/Python/CMakeLists.txt | 6 +- IO/XML/Testing/Python/CMakeLists.txt | 14 +- Imaging/Core/Testing/Python/CMakeLists.txt | 184 +++++++++--------- Imaging/Hybrid/Testing/Python/CMakeLists.txt | 10 +- .../Style/Testing/Python/CMakeLists.txt | 20 +- .../Widgets/Testing/Python/CMakeLists.txt | 12 +- Parallel/Core/Testing/Python/CMakeLists.txt | 6 +- .../Annotation/Testing/Python/CMakeLists.txt | 20 +- Rendering/Core/Testing/Python/CMakeLists.txt | 85 ++++---- .../FreeType/Testing/Python/CMakeLists.txt | 8 +- Rendering/LOD/Testing/Python/CMakeLists.txt | 4 +- Rendering/Label/Testing/Python/CMakeLists.txt | 6 +- .../OpenGL/Testing/Python/CMakeLists.txt | 8 +- Rendering/Tk/Testing/Python/CMakeLists.txt | 9 +- .../Volume/Testing/Python/CMakeLists.txt | 44 +++-- 45 files changed, 655 insertions(+), 575 deletions(-) diff --git a/Accelerators/Piston/Testing/Python/CMakeLists.txt b/Accelerators/Piston/Testing/Python/CMakeLists.txt index bb11ae28e35..9ab7f56ff0c 100644 --- a/Accelerators/Piston/Testing/Python/CMakeLists.txt +++ b/Accelerators/Piston/Testing/Python/CMakeLists.txt @@ -1,46 +1,44 @@ -if (VTK_PYTHON_EXE) - # - # Test base functionality. - # - set(TestConversion_OPTS NO_VALID) - foreach ( tfile - TestConversion - TestContour - TestRendering - TestThreshold - TestSlice - TestSort - ) - set(${tfile}_ARGS --normalize) - vtk_add_test_python(${tfile}.py NO_RT ${${tfile}_OPTS}) - endforeach ( ) +# +# Exercise origin and spacing aspect of vtkImageData +# +set(vtk_test_prefix Placed) +vtk_add_test_python( + NO_OUTPUT NO_RT + TestContour.py + TestThreshold.py + TestSlice.py + TestSort.py + ) +unset(vtk_test_prefix) - # - # Exercise origin and spacing aspect of vtkImageData - # - foreach ( tfile - Contour - Threshold - Slice - Sort - ) - ExternalData_add_test(VTKData - NAME ${vtk-module}Python-TestPlaced${tfile} - COMMAND ${VTK_PYTHON_EXE} - ${CMAKE_CURRENT_SOURCE_DIR}/Test${tfile}.py - -B "DATA{../Data/Baseline/,REGEX:Test${tfile}(_[0-9]+)?.png}" - -D ${VTK_TEST_DATA_DIR}/Data) - endforeach ( ) +# +# Exercise thrust to gl direct on GPU rendering. +# +set(vtk_test_prefix Direct) +set(Rendering_ARGS --gpu_render) +vtk_add_test_python( + NO_RT NO_OUTPUT + TestRendering.py + ) +unset(vtk_test_prefix) - # - # Exercise thrust to gl direct on GPU rendering. - # - ExternalData_add_test(VTKData - NAME ${vtk-module}Python-TestDirectRendering - COMMAND ${VTK_PYTHON_EXE} - ${CMAKE_CURRENT_SOURCE_DIR}/TestRendering.py - -B "DATA{../Data/Baseline/,REGEX:TestRendering(_[0-9]+)?.png}" - -D ${VTK_TEST_DATA_DIR}/Data - --gpu_render) - -endif () +# +# Test base functionality. +# +set(python_tests + TestConversion + TestContour + TestRendering + TestThreshold + TestSlice + TestSort + ) +set(test_files) +foreach(test IN LISTS python_tests) + set(${test}_ARGS --normalize) + list(APPEND test_files ${test}.py) +endforeach() +vtk_add_test_python( + NO_RT NO_VALID + ${test_files} + ) diff --git a/Charts/Core/Testing/Python/CMakeLists.txt b/Charts/Core/Testing/Python/CMakeLists.txt index a05c76cf4f8..d9a88d8441c 100644 --- a/Charts/Core/Testing/Python/CMakeLists.txt +++ b/Charts/Core/Testing/Python/CMakeLists.txt @@ -1,16 +1,10 @@ -if(VTK_PYTHON_EXE) - # These tests should use vtk.test.Testing. - set(tests - TestBarGraph - TestLinePlot - TestStackedPlot - TestLinePlotColors - TestParallelCoordinatesColors - TestScatterPlotColors - ) - foreach(tfile ${tests}) - vtk_add_test_python(${tfile}.py NO_RT NO_OUTPUT) - endforeach() -else() - message(FATAL_ERROR "No Python tests added!") -endif() +# These tests should use vtk.test.Testing. +vtk_add_test_python( + NO_RT NO_OUTPUT + TestBarGraph.py + TestLinePlot.py + TestStackedPlot.py + TestLinePlotColors.py + TestParallelCoordinatesColors.py + TestScatterPlotColors.py + ) diff --git a/Common/ComputationalGeometry/Testing/Python/CMakeLists.txt b/Common/ComputationalGeometry/Testing/Python/CMakeLists.txt index 8073a4643b6..6c81d51a843 100644 --- a/Common/ComputationalGeometry/Testing/Python/CMakeLists.txt +++ b/Common/ComputationalGeometry/Testing/Python/CMakeLists.txt @@ -1,4 +1,6 @@ -vtk_add_test_python(CSpline.py) -vtk_add_test_python(KSpline.py) -vtk_add_test_python(TestParametricFunctions.py NO_RT) -vtk_add_test_python(closedSplines.py) +vtk_add_test_python( + CSpline.py + KSpline.py + TestParametricFunctions.py,NO_RT + closedSplines.py + ) diff --git a/Common/Core/Testing/Python/CMakeLists.txt b/Common/Core/Testing/Python/CMakeLists.txt index da70e5c0978..ce04dd7db73 100644 --- a/Common/Core/Testing/Python/CMakeLists.txt +++ b/Common/Core/Testing/Python/CMakeLists.txt @@ -1,21 +1,18 @@ -if(VTK_PYTHON_EXE) - foreach(tfile - PythonSmoke - TestArrayArguments - TestExecuteMethodFinalizeCrash - TestGhost - TestIgnoreBTX - TestMutable - TestNumpySupport - TestOperators - TestPointers - TestStrings - TestSubClass - TestTerminationCrash - TestVariant - TestWeakref - TestCommand - ) - vtk_add_test_python(${tfile}.py NO_DATA NO_VALID NO_OUTPUT) - endforeach() -endif() +vtk_add_test_python( + NO_DATA NO_VALID NO_OUTPUT + PythonSmoke.py + TestArrayArguments.py + TestExecuteMethodFinalizeCrash.py + TestGhost.py + TestIgnoreBTX.py + TestMutable.py + TestNumpySupport.py + TestOperators.py + TestPointers.py + TestStrings.py + TestSubClass.py + TestTerminationCrash.py + TestVariant.py + TestWeakref.py + TestCommand.py + ) diff --git a/Common/DataModel/Testing/Python/CMakeLists.txt b/Common/DataModel/Testing/Python/CMakeLists.txt index 8845ddb1fdb..a6590106093 100644 --- a/Common/DataModel/Testing/Python/CMakeLists.txt +++ b/Common/DataModel/Testing/Python/CMakeLists.txt @@ -1,15 +1,17 @@ -vtk_add_test_python(ImplicitSum.py) -vtk_add_test_python(LineIntersectQuadraticCells.py) -vtk_add_test_python(PerlinNoise.py) -vtk_add_test_python(SelectionLoop.py) -vtk_add_test_python(TestNumericArrayImageData.py NO_DATA NO_VALID) -vtk_add_test_python(TestQuadricClustering.py) -vtk_add_test_python(TestStructuredGrid.py) -vtk_add_test_python(TestTemplates.py NO_DATA NO_VALID) -vtk_add_test_python(headBone.py) -vtk_add_test_python(scalarColors.py) -vtk_add_test_python(scalarConn.py) -vtk_add_test_python(TestConvexPointSet.py) -vtk_add_test_python(otherDataSetAttributes.py NO_DATA NO_VALID NO_RT) -vtk_add_test_python(quadricCut.py NO_RT) -vtk_add_test_python(TestICPTransform.py NO_RT) +vtk_add_test_python( + ImplicitSum.py + LineIntersectQuadraticCells.py + PerlinNoise.py + SelectionLoop.py + TestNumericArrayImageData.py,NO_DATA,NO_VALID + TestQuadricClustering.py + TestStructuredGrid.py + TestTemplates.py,NO_DATA,NO_VALID + headBone.py + scalarColors.py + scalarConn.py + TestConvexPointSet.py + otherDataSetAttributes.py,NO_DATA,NO_VALID,NO_RT + quadricCut.py,NO_RT + TestICPTransform.py,NO_RT + ) diff --git a/Common/ExecutionModel/Testing/Python/CMakeLists.txt b/Common/ExecutionModel/Testing/Python/CMakeLists.txt index 9a6ed2fb8fa..926e9b11fc8 100644 --- a/Common/ExecutionModel/Testing/Python/CMakeLists.txt +++ b/Common/ExecutionModel/Testing/Python/CMakeLists.txt @@ -1,3 +1,4 @@ -if(VTK_PYTHON_EXE) - vtk_add_test_python(TestReleaseData.py NO_DATA NO_VALID NO_OUTPUT) -endif() \ No newline at end of file +vtk_add_test_python( + NO_DATA NO_VALID NO_OUTPUT + TestReleaseData.py + ) diff --git a/Common/Transforms/Testing/Python/CMakeLists.txt b/Common/Transforms/Testing/Python/CMakeLists.txt index 3fc3b88482d..feff4b825d6 100644 --- a/Common/Transforms/Testing/Python/CMakeLists.txt +++ b/Common/Transforms/Testing/Python/CMakeLists.txt @@ -1,5 +1,7 @@ -vtk_add_test_python(MatrixToTransform.py) -vtk_add_test_python(TestThinPlateWarp.py) -vtk_add_test_python(TestThinPlateWarp3D.py) -vtk_add_test_python(cylindrical.py) -vtk_add_test_python(spherical.py) +vtk_add_test_python( + MatrixToTransform.py + TestThinPlateWarp.py + TestThinPlateWarp3D.py + cylindrical.py + spherical.py + ) diff --git a/Filters/AMR/Testing/Python/CMakeLists.txt b/Filters/AMR/Testing/Python/CMakeLists.txt index eaf20c2ad7b..0bf4bf2ea97 100644 --- a/Filters/AMR/Testing/Python/CMakeLists.txt +++ b/Filters/AMR/Testing/Python/CMakeLists.txt @@ -1,10 +1,22 @@ if(VTK_PYTHON_EXE) - foreach(tfile - TestAMRResampleFilter - TestAMRExtractLevel - TestAMRSliceFilter - ) - vtk_add_test_python(${tfile}.py NO_VALID NO_OUTPUT) - set_tests_properties(${vtk-module}Python-${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "Error") + set(python_tests + TestAMRResampleFilter + TestAMRExtractLevel + TestAMRSliceFilter + ) + set(test_files) + foreach(test IN LISTS python_tests) + list(APPEND test_files + ${test}.py) endforeach() -endif() \ No newline at end of file + vtk_add_test_python( + NO_VALID NO_OUTPUT + ${test_files} + ) + foreach(test IN LISTS python_tests) + set_tests_properties(${vtk-module}Python-${test} + PROPERTIES + FAIL_REGULAR_EXPRESSION "Error" + ) + endforeach() +endif() diff --git a/Filters/Core/Testing/Python/CMakeLists.txt b/Filters/Core/Testing/Python/CMakeLists.txt index 7004681a44a..5574a7253f6 100644 --- a/Filters/Core/Testing/Python/CMakeLists.txt +++ b/Filters/Core/Testing/Python/CMakeLists.txt @@ -1,57 +1,61 @@ -vtk_add_test_python(CellDataToPointData.py) -vtk_add_test_python(Delaunay2D.py) -vtk_add_test_python(Delaunay2DAlpha.py) -vtk_add_test_python(Delaunay2DTransform.py) -vtk_add_test_python(Delaunay3D.py) -vtk_add_test_python(Delaunay3DAlphaTest.py) -vtk_add_test_python(QuadricDecimation.py) -vtk_add_test_python(StreamPolyData.py) -vtk_add_test_python(TestGridSynchronizedTemplates3D.py) -vtk_add_test_python(TestMarchingSquares.py) -vtk_add_test_python(TestRectilinearSynchronizedTemplates.py) -vtk_add_test_python(TestSynchronizedTemplates2D.py) -vtk_add_test_python(TestSynchronizedTemplates3D.py) -vtk_add_test_python(TestContourGrid.py NO_VALID) -vtk_add_test_python(TestTensorGlyph.py NO_RT) -vtk_add_test_python(TestTextureGlyph.py) -vtk_add_test_python(TestTriangleFilter.py) -vtk_add_test_python(capCow.py) -vtk_add_test_python(capSphere.py) -vtk_add_test_python(clipArt.py) -vtk_add_test_python(combStreamers.py) -vtk_add_test_python(combStreamers2.py) -vtk_add_test_python(constrainedDelaunay.py) -vtk_add_test_python(contourCells.py) -vtk_add_test_python(contourQuadraticCells.py) -vtk_add_test_python(createBFont.py) -vtk_add_test_python(cutLoop.py) -vtk_add_test_python(dispPlot.py) -vtk_add_test_python(fieldToPolyData.py) -vtk_add_test_python(fieldToRGrid.py) -vtk_add_test_python(fieldToSGrid.py) -vtk_add_test_python(fieldToUGrid.py) -vtk_add_test_python(glyphComb.py) -vtk_add_test_python(hull.py) -vtk_add_test_python(mergeFilter.py) -vtk_add_test_python(multipleComponentContour.py) -vtk_add_test_python(multipleIso.py) -vtk_add_test_python(polyConn.py) -vtk_add_test_python(probeComb.py) -vtk_add_test_python(reverseNormals.py) -vtk_add_test_python(smoothMeshOnMesh.py) -vtk_add_test_python(streamComb.py) -vtk_add_test_python(streamSurface.py) -vtk_add_test_python(streamSurface2.py) -vtk_add_test_python(stripF.py) -vtk_add_test_python(teapotHulls.py) -vtk_add_test_python(tubeComb.py) -vtk_add_test_python(deciFranFace.py NO_RT) -vtk_add_test_python(deciPlane NO_RT) -vtk_add_test_python(financialField NO_RT) -vtk_add_test_python(skinOrder NO_RT) -vtk_add_test_python(MassProperties NO_RT) -vtk_add_test_python(financialField2 NO_RT) -vtk_add_test_python(financialField3 NO_RT) -vtk_add_test_python(TestContourCases.py NO_DATA NO_VALID) -vtk_add_test_python(pointsPrecisions.py NO_OUTPUT NO_DATA NO_VALID NO_RT) -vtk_add_test_python(TestCompositeCutter.py NO_VALID) +# Data files: +# deciPlane,NO_RT +# financialField,NO_RT +# skinOrder,NO_RT +# MassProperties,NO_RT +# financialField2,NO_RT +# financialField3,NO_RT + +vtk_add_test_python( + CellDataToPointData.py + Delaunay2D.py + Delaunay2DAlpha.py + Delaunay2DTransform.py + Delaunay3D.py + Delaunay3DAlphaTest.py + QuadricDecimation.py + StreamPolyData.py + TestGridSynchronizedTemplates3D.py + TestMarchingSquares.py + TestRectilinearSynchronizedTemplates.py + TestSynchronizedTemplates2D.py + TestSynchronizedTemplates3D.py + TestContourGrid.py,NO_VALID + TestTensorGlyph.py,NO_RT + TestTextureGlyph.py + TestTriangleFilter.py + capCow.py + capSphere.py + clipArt.py + combStreamers.py + combStreamers2.py + constrainedDelaunay.py + contourCells.py + contourQuadraticCells.py + createBFont.py + cutLoop.py + dispPlot.py + fieldToPolyData.py + fieldToRGrid.py + fieldToSGrid.py + fieldToUGrid.py + glyphComb.py + hull.py + mergeFilter.py + multipleComponentContour.py + multipleIso.py + polyConn.py + probeComb.py + reverseNormals.py + smoothMeshOnMesh.py + streamComb.py + streamSurface.py + streamSurface2.py + stripF.py + teapotHulls.py + tubeComb.py + deciFranFace.py,NO_RT + TestContourCases.py,NO_DATA,NO_VALID + pointsPrecisions.py,NO_OUTPUT,NO_DATA,NO_VALID,NO_RT + TestCompositeCutter.py,NO_VALID + ) diff --git a/Filters/Extraction/Testing/Python/CMakeLists.txt b/Filters/Extraction/Testing/Python/CMakeLists.txt index dc038249dcb..4f7403156dc 100644 --- a/Filters/Extraction/Testing/Python/CMakeLists.txt +++ b/Filters/Extraction/Testing/Python/CMakeLists.txt @@ -1,6 +1,8 @@ -vtk_add_test_python(ExtractEdgesQuadraticCells.py) -vtk_add_test_python(ExtractTensors.py) -vtk_add_test_python(extractPolyData.py) -vtk_add_test_python(extractRectGrid.py) -vtk_add_test_python(extractUGrid.py) -vtk_add_test_python(extractVectors.py) +vtk_add_test_python( + ExtractEdgesQuadraticCells.py + ExtractTensors.py + extractPolyData.py + extractRectGrid.py + extractUGrid.py + extractVectors.py + ) diff --git a/Filters/General/Testing/Python/CMakeLists.txt b/Filters/General/Testing/Python/CMakeLists.txt index 2a16d01862e..f4a63afa250 100644 --- a/Filters/General/Testing/Python/CMakeLists.txt +++ b/Filters/General/Testing/Python/CMakeLists.txt @@ -1,45 +1,47 @@ -vtk_add_test_python(Canny.py) -vtk_add_test_python(OBBCylinder.py) -vtk_add_test_python(TestCellDerivs.py) -vtk_add_test_python(TestClipClosedSurface.py) -vtk_add_test_python(TestClipOutline.py) -vtk_add_test_python(TestCurvatures.py) -vtk_add_test_python(TestDeformPointSet.py) -vtk_add_test_python(TestDiscreteMarchingCubes.py) -vtk_add_test_python(TestGraphLayoutFilter.py) -vtk_add_test_python(TestMultiBlockStreamer.py) -vtk_add_test_python(TestRectilinearGridToTetrahedra.py) -vtk_add_test_python(TestSplineFilter.py) -vtk_add_test_python(WarpToImage.py) -vtk_add_test_python(blankGrid.py) -vtk_add_test_python(clipComb.py) -vtk_add_test_python(clipHex.py) -vtk_add_test_python(clipImage.py) -vtk_add_test_python(clipPyramid.py) -vtk_add_test_python(clipQuadraticCells.py) -vtk_add_test_python(clipTet.py) -vtk_add_test_python(clipVolume.py) -vtk_add_test_python(clipVolume2.py) -vtk_add_test_python(clipVolume3.py) -vtk_add_test_python(clipWedge.py) -vtk_add_test_python(contoursToSurface.py) -vtk_add_test_python(cursor3D.py) -vtk_add_test_python(dicer.py) -vtk_add_test_python(edgePoints.py) -vtk_add_test_python(mcubes.py) -vtk_add_test_python(recursiveDC.py) -vtk_add_test_python(splitVectors.py) -vtk_add_test_python(streamTracer.py) -vtk_add_test_python(subPixelPositionMin.py) -vtk_add_test_python(testDataSetTriangleFilter.py) -vtk_add_test_python(testDataSetTriangleFilter2.py) -vtk_add_test_python(testReflect.py) -vtk_add_test_python(warplens.py) -vtk_add_test_python(TestRandomAttributeGenerator.py) -vtk_add_test_python(TestRandomAttributeGeneratorScalar.py) -vtk_add_test_python(WarpScalarImage.py) -vtk_add_test_python(WarpVectorImage.py) -vtk_add_test_python(cursor2D.py) -vtk_add_test_python(spatialRepAll.py NO_RT) -vtk_add_test_python(pointsPrecisions.py NO_OUTPUT NO_DATA NO_VALID NO_RT) -vtk_add_test_python(tableBasedClip.py NO_RT) +vtk_add_test_python( + Canny.py + OBBCylinder.py + TestCellDerivs.py + TestClipClosedSurface.py + TestClipOutline.py + TestCurvatures.py + TestDeformPointSet.py + TestDiscreteMarchingCubes.py + TestGraphLayoutFilter.py + TestMultiBlockStreamer.py + TestRectilinearGridToTetrahedra.py + TestSplineFilter.py + WarpToImage.py + blankGrid.py + clipComb.py + clipHex.py + clipImage.py + clipPyramid.py + clipQuadraticCells.py + clipTet.py + clipVolume.py + clipVolume2.py + clipVolume3.py + clipWedge.py + contoursToSurface.py + cursor3D.py + dicer.py + edgePoints.py + mcubes.py + recursiveDC.py + splitVectors.py + streamTracer.py + subPixelPositionMin.py + testDataSetTriangleFilter.py + testDataSetTriangleFilter2.py + testReflect.py + warplens.py + TestRandomAttributeGenerator.py + TestRandomAttributeGeneratorScalar.py + WarpScalarImage.py + WarpVectorImage.py + cursor2D.py + spatialRepAll.py,NO_RT + pointsPrecisions.py,NO_OUTPUT,NO_DATA,NO_VALID,NO_RT + tableBasedClip.py,NO_RT + ) diff --git a/Filters/Geometry/Testing/Python/CMakeLists.txt b/Filters/Geometry/Testing/Python/CMakeLists.txt index 8be04accd07..c68a2f28261 100644 --- a/Filters/Geometry/Testing/Python/CMakeLists.txt +++ b/Filters/Geometry/Testing/Python/CMakeLists.txt @@ -1,6 +1,8 @@ -vtk_add_test_python(dataSetSurfaceFilter.py) -vtk_add_test_python(geomFilter.py) -vtk_add_test_python(officeStreamPoints.py) -vtk_add_test_python(rectGrid.py) -vtk_add_test_python(structuredGridBlanking.py) -vtk_add_test_python(TestGhostPoints.py NO_DATA NO_VALID NO_OUTPUT) +vtk_add_test_python( + dataSetSurfaceFilter.py + geomFilter.py + officeStreamPoints.py + rectGrid.py + structuredGridBlanking.py + TestGhostPoints.py,NO_DATA,NO_VALID,NO_OUTPUT + ) diff --git a/Filters/Hybrid/Testing/Python/CMakeLists.txt b/Filters/Hybrid/Testing/Python/CMakeLists.txt index 6d7a3234f41..3c736fe1cb2 100644 --- a/Filters/Hybrid/Testing/Python/CMakeLists.txt +++ b/Filters/Hybrid/Testing/Python/CMakeLists.txt @@ -1,22 +1,24 @@ -vtk_add_test_python(3DMorph.py) -vtk_add_test_python(TestFacetReader.py) -vtk_add_test_python(TestGreedyTerrainDecimation.py) -vtk_add_test_python(TestGridWarp3D.py) -vtk_add_test_python(TestGridWarpCubic.py) -vtk_add_test_python(TestGridWarpLinear.py) -vtk_add_test_python(TestGridWarpNearest.py) -vtk_add_test_python(TestImageStencilWithPolydata.py) -vtk_add_test_python(TestPCA.py) -vtk_add_test_python(TestProcrustes.py) -vtk_add_test_python(TestProjectedTerrainPath.py) -vtk_add_test_python(TestTemporalSnapToTimeStep.py NO_DATA NO_VALID) -vtk_add_test_python(WarpPolyData.py) -vtk_add_test_python(appendImplicitModel.py) -vtk_add_test_python(appendImplicitModelNoBounds.py) -vtk_add_test_python(banana.py) -vtk_add_test_python(depthSort.py) -vtk_add_test_python(earth.py) -vtk_add_test_python(imageToPolyData.py) -vtk_add_test_python(largeImageOffset.py) -vtk_add_test_python(largeImageParallel.py) -vtk_add_test_python(TestProcrustesRigidCentroid.py) +vtk_add_test_python( + 3DMorph.py + TestFacetReader.py + TestGreedyTerrainDecimation.py + TestGridWarp3D.py + TestGridWarpCubic.py + TestGridWarpLinear.py + TestGridWarpNearest.py + TestImageStencilWithPolydata.py + TestPCA.py + TestProcrustes.py + TestProjectedTerrainPath.py + TestTemporalSnapToTimeStep.py,NO_DATA,NO_VALID + WarpPolyData.py + appendImplicitModel.py + appendImplicitModelNoBounds.py + banana.py + depthSort.py + earth.py + imageToPolyData.py + largeImageOffset.py + largeImageParallel.py + TestProcrustesRigidCentroid.py + ) diff --git a/Filters/Modeling/Testing/Python/CMakeLists.txt b/Filters/Modeling/Testing/Python/CMakeLists.txt index ed4c51e8ea2..6eb2b7a5122 100644 --- a/Filters/Modeling/Testing/Python/CMakeLists.txt +++ b/Filters/Modeling/Testing/Python/CMakeLists.txt @@ -1,25 +1,27 @@ -vtk_add_test_python(Hyper.py) -vtk_add_test_python(HyperScalarBar.py) -vtk_add_test_python(KlineBottle.py) -vtk_add_test_python(TenEllip.py) -vtk_add_test_python(TestBandedContourFilter.py) -vtk_add_test_python(TestBoxFunction.py) -vtk_add_test_python(TestImageMarchingCubes.py) -vtk_add_test_python(TestRibbonAndTube.py) -vtk_add_test_python(TestRuledSurface.py) -vtk_add_test_python(TestRuledSurface2.py) -vtk_add_test_python(TestSpherePuzzle.py) -vtk_add_test_python(TestSpherePuzzleArrows.py) -vtk_add_test_python(camera.py) -vtk_add_test_python(eleState.py) -vtk_add_test_python(extrudeCopyCD.py) -vtk_add_test_python(schwarz.py) -vtk_add_test_python(smoothCyl.py) -vtk_add_test_python(smoothCyl2.py) -vtk_add_test_python(subDivideTetra.py) -vtk_add_test_python(subdividePointData.py) -vtk_add_test_python(TestFillHolesFilter.py) -vtk_add_test_python(TestNamedColorsIntegration.py NO_RT) -vtk_add_test_python(contour2DAll.py NO_RT) -vtk_add_test_python(contour3DAll.py NO_RT) -vtk_add_test_python(sync3dAll.py NO_RT) +vtk_add_test_python( + Hyper.py + HyperScalarBar.py + KlineBottle.py + TenEllip.py + TestBandedContourFilter.py + TestBoxFunction.py + TestImageMarchingCubes.py + TestRibbonAndTube.py + TestRuledSurface.py + TestRuledSurface2.py + TestSpherePuzzle.py + TestSpherePuzzleArrows.py + camera.py + eleState.py + extrudeCopyCD.py + schwarz.py + smoothCyl.py + smoothCyl2.py + subDivideTetra.py + subdividePointData.py + TestFillHolesFilter.py + TestNamedColorsIntegration.py,NO_RT + contour2DAll.py,NO_RT + contour3DAll.py,NO_RT + sync3dAll.py,NO_RT + ) diff --git a/Filters/Parallel/Testing/Python/CMakeLists.txt b/Filters/Parallel/Testing/Python/CMakeLists.txt index 490fcd162e5..a4a06ac5f49 100644 --- a/Filters/Parallel/Testing/Python/CMakeLists.txt +++ b/Filters/Parallel/Testing/Python/CMakeLists.txt @@ -1,5 +1,7 @@ -vtk_add_test_python(RectOutline.py) -vtk_add_test_python(TestCutMaterial.py) -vtk_add_test_python(TestExtractCTHPart.py) -vtk_add_test_python(TestExtrudePiece.py) -vtk_add_test_python(TestImageStreamer.py) +vtk_add_test_python( + RectOutline.py + TestCutMaterial.py + TestExtractCTHPart.py + TestExtrudePiece.py + TestImageStreamer.py + ) diff --git a/Filters/Programmable/Testing/Python/CMakeLists.txt b/Filters/Programmable/Testing/Python/CMakeLists.txt index 07e0a8f5687..5f1236892eb 100644 --- a/Filters/Programmable/Testing/Python/CMakeLists.txt +++ b/Filters/Programmable/Testing/Python/CMakeLists.txt @@ -1,3 +1,5 @@ -vtk_add_test_python(MultidimensionalSolution.py) -vtk_add_test_python(progGlyphs.py) -vtk_add_test_python(progGlyphsBySource.py) +vtk_add_test_python( + MultidimensionalSolution.py + progGlyphs.py + progGlyphsBySource.py + ) diff --git a/Filters/Sources/Testing/Python/CMakeLists.txt b/Filters/Sources/Testing/Python/CMakeLists.txt index ef5feb9218b..d38de956b4f 100644 --- a/Filters/Sources/Testing/Python/CMakeLists.txt +++ b/Filters/Sources/Testing/Python/CMakeLists.txt @@ -1,7 +1,9 @@ -vtk_add_test_python(Disk.py) -vtk_add_test_python(OSCone.py) -vtk_add_test_python(TestButtonSource.py) -vtk_add_test_python(TestRegularPolygonSource.py) -vtk_add_test_python(coneResolution.py) -vtk_add_test_python(glyph2D.py) -vtk_add_test_python(TestPlatonicSolids.py NO_RT) +vtk_add_test_python( + Disk.py + OSCone.py + TestButtonSource.py + TestRegularPolygonSource.py + coneResolution.py + glyph2D.py + TestPlatonicSolids.py,NO_RT + ) diff --git a/Filters/Statistics/Testing/Python/CMakeLists.txt b/Filters/Statistics/Testing/Python/CMakeLists.txt index 9f1e49729d6..4e0d6304901 100644 --- a/Filters/Statistics/Testing/Python/CMakeLists.txt +++ b/Filters/Statistics/Testing/Python/CMakeLists.txt @@ -1,3 +1,4 @@ -if(VTK_PYTHON_EXE) - vtk_add_test_python(kMeansDistanceCalculator.py NO_DATA NO_VALID NO_OUTPUT) -endif() +vtk_add_test_python( + NO_DATA NO_VALID NO_OUTPUT + kMeansDistanceCalculator.py + ) diff --git a/Filters/StatisticsGnuR/Testing/Python/CMakeLists.txt b/Filters/StatisticsGnuR/Testing/Python/CMakeLists.txt index 5d160359f41..ad5ea6bd9a8 100644 --- a/Filters/StatisticsGnuR/Testing/Python/CMakeLists.txt +++ b/Filters/StatisticsGnuR/Testing/Python/CMakeLists.txt @@ -1,10 +1,4 @@ -if(VTK_PYTHON_EXE) - set(tests - TestRCalculatorFilter - ) - foreach(tfile ${tests}) - vtk_add_test_python(${tfile}.py NO_VALID NO_RT NO_OUTPUT NO_DATA) - endforeach() -else() - message(FATAL_ERROR "No Python tests added!") -endif() +vtk_add_test_python( + NO_VALID NO_RT NO_OUTPUT NO_DATA + TestRCalculatorFilter.py + ) diff --git a/Filters/Texture/Testing/Python/CMakeLists.txt b/Filters/Texture/Testing/Python/CMakeLists.txt index d34a43aff27..a3489783b40 100644 --- a/Filters/Texture/Testing/Python/CMakeLists.txt +++ b/Filters/Texture/Testing/Python/CMakeLists.txt @@ -1,5 +1,7 @@ -vtk_add_test_python(AutomaticPlaneGeneration.py) -vtk_add_test_python(cylMap.py) -vtk_add_test_python(socbal.py) -vtk_add_test_python(textureThreshold.py) -vtk_add_test_python(triangularTCoords.py) +vtk_add_test_python( + AutomaticPlaneGeneration.py + cylMap.py + socbal.py + textureThreshold.py + triangularTCoords.py + ) diff --git a/Filters/Verdict/Testing/Python/CMakeLists.txt b/Filters/Verdict/Testing/Python/CMakeLists.txt index 128a9a4569a..ffbf392d19d 100644 --- a/Filters/Verdict/Testing/Python/CMakeLists.txt +++ b/Filters/Verdict/Testing/Python/CMakeLists.txt @@ -1 +1,4 @@ -vtk_add_test_python(MeshQuality.py NO_VALID NO_RT) +vtk_add_test_python( + NO_VALID NO_RT + MeshQuality.py + ) diff --git a/IO/Core/Testing/Python/CMakeLists.txt b/IO/Core/Testing/Python/CMakeLists.txt index 1bfd129c3df..eece75b2d38 100644 --- a/IO/Core/Testing/Python/CMakeLists.txt +++ b/IO/Core/Testing/Python/CMakeLists.txt @@ -1,2 +1,5 @@ -vtk_add_test_python(TestGlobFileNames.py NO_VALID NO_RT) -vtk_add_test_python(TestSortFileNames.py NO_VALID NO_RT) +vtk_add_test_python( + NO_VALID NO_RT + TestGlobFileNames.py + TestSortFileNames.py + ) diff --git a/IO/EnSight/Testing/Python/CMakeLists.txt b/IO/EnSight/Testing/Python/CMakeLists.txt index 8d6ac89ce81..b66d8a19b2a 100644 --- a/IO/EnSight/Testing/Python/CMakeLists.txt +++ b/IO/EnSight/Testing/Python/CMakeLists.txt @@ -1,24 +1,26 @@ -vtk_add_test_python(EnSight6Elements.py) -vtk_add_test_python(EnSight6ElementsBin.py) -vtk_add_test_python(EnSight6OfficeBin.py) -vtk_add_test_python(EnSightBlow1ASCII.py) -vtk_add_test_python(EnSightBlow1Bin.py) -vtk_add_test_python(EnSightBlow2ASCII.py) -vtk_add_test_python(EnSightBlow2Bin.py) -vtk_add_test_python(EnSightBlow3Bin.py) -vtk_add_test_python(EnSightBlow4Bin.py) -vtk_add_test_python(EnSightBlow5ASCII.py) -vtk_add_test_python(EnSightCompound.py) -vtk_add_test_python(EnSightGoldElements.py) -vtk_add_test_python(EnSightGoldElementsBin.py) -vtk_add_test_python(EnSightIronProtASCII.py) -vtk_add_test_python(EnSightIronProtBin.py) -vtk_add_test_python(EnSightMandelbrot.py) -vtk_add_test_python(EnSightNfacedASCII.py) -vtk_add_test_python(EnSightNfacedBin.py) -vtk_add_test_python(EnSightOfficeASCII.py) -vtk_add_test_python(EnSightOfficeBin.py) -vtk_add_test_python(EnSightRectGridASCII.py) -vtk_add_test_python(EnSightRectGridBin.py) -vtk_add_test_python(EnSightSelectArrays.py) -vtk_add_test_python(nacaBinary.py) +vtk_add_test_python( + EnSight6Elements.py + EnSight6ElementsBin.py + EnSight6OfficeBin.py + EnSightBlow1ASCII.py + EnSightBlow1Bin.py + EnSightBlow2ASCII.py + EnSightBlow2Bin.py + EnSightBlow3Bin.py + EnSightBlow4Bin.py + EnSightBlow5ASCII.py + EnSightCompound.py + EnSightGoldElements.py + EnSightGoldElementsBin.py + EnSightIronProtASCII.py + EnSightIronProtBin.py + EnSightMandelbrot.py + EnSightNfacedASCII.py + EnSightNfacedBin.py + EnSightOfficeASCII.py + EnSightOfficeBin.py + EnSightRectGridASCII.py + EnSightRectGridBin.py + EnSightSelectArrays.py + nacaBinary.py + ) diff --git a/IO/GeoJSON/Testing/Python/CMakeLists.txt b/IO/GeoJSON/Testing/Python/CMakeLists.txt index f8b5c1fdb82..9b3c70cb8ee 100644 --- a/IO/GeoJSON/Testing/Python/CMakeLists.txt +++ b/IO/GeoJSON/Testing/Python/CMakeLists.txt @@ -1 +1,4 @@ -vtk_add_test_python(TestGeoJSONWriter.py NO_VALID) +vtk_add_test_python( + NO_VALID + TestGeoJSONWriter.py + ) diff --git a/IO/Geometry/Testing/Python/CMakeLists.txt b/IO/Geometry/Testing/Python/CMakeLists.txt index df342de2545..3aa0a83675e 100644 --- a/IO/Geometry/Testing/Python/CMakeLists.txt +++ b/IO/Geometry/Testing/Python/CMakeLists.txt @@ -1,14 +1,16 @@ -vtk_add_test_python(ParticleReader.py) -vtk_add_test_python(Plot3D NO_VALID) -vtk_add_test_python(Plot3DScalars.py) -vtk_add_test_python(Plot3DVectors.py) -vtk_add_test_python(TestAVSucdReader.py) -vtk_add_test_python(TestGAMBITReader.py) -# vtk_add_test_python(TestPolygonWriters.py) # needs vtkCGMWriter (not built) -vtk_add_test_python(TestXYZMol.py) -vtk_add_test_python(caffeine.py) -vtk_add_test_python(motor.py) -vtk_add_test_python(testHexaPenta.py) -vtk_add_test_python(TestChacoReader.py) -vtk_add_test_python(TestSimplePointsReader.py) -vtk_add_test_python(TestPlot3DMeta.py) +vtk_add_test_python( + ParticleReader.py + Plot3D,NO_VALID + Plot3DScalars.py + Plot3DVectors.py + TestAVSucdReader.py + TestGAMBITReader.py + # TestPolygonWriters.py # needs vtkCGMWriter (not built) + TestXYZMol.py + caffeine.py + motor.py + testHexaPenta.py + TestChacoReader.py + TestSimplePointsReader.py + TestPlot3DMeta.py + ) diff --git a/IO/Image/Testing/Python/CMakeLists.txt b/IO/Image/Testing/Python/CMakeLists.txt index c8a7297efe2..6c1773e6df9 100644 --- a/IO/Image/Testing/Python/CMakeLists.txt +++ b/IO/Image/Testing/Python/CMakeLists.txt @@ -1,9 +1,11 @@ -vtk_add_test_python(TestBMPReader.py) -vtk_add_test_python(TestImageWriters.py) -vtk_add_test_python(TestJPEGReader.py) -vtk_add_test_python(TestMHD.py) -vtk_add_test_python(TestTIFFReader.py) -vtk_add_test_python(dem.py) -vtk_add_test_python(TestMetaImage2D.py) -vtk_add_test_python(TestSetFileNames.py) -vtk_add_test_python(TestImageJSONWriter.py NO_VALID) +vtk_add_test_python( + TestBMPReader.py + TestImageWriters.py + TestJPEGReader.py + TestMHD.py + TestTIFFReader.py + dem.py + TestMetaImage2D.py + TestSetFileNames.py + TestImageJSONWriter.py,NO_VALID + ) diff --git a/IO/Import/Testing/Python/CMakeLists.txt b/IO/Import/Testing/Python/CMakeLists.txt index 8e747fd9dc3..ee59c06a0a2 100644 --- a/IO/Import/Testing/Python/CMakeLists.txt +++ b/IO/Import/Testing/Python/CMakeLists.txt @@ -1 +1,3 @@ -vtk_add_test_python(VRMLImporter.py) +vtk_add_test_python( + VRMLImporter.py + ) diff --git a/IO/MINC/Testing/Python/CMakeLists.txt b/IO/MINC/Testing/Python/CMakeLists.txt index e87b33594c2..9592f8d1c31 100644 --- a/IO/MINC/Testing/Python/CMakeLists.txt +++ b/IO/MINC/Testing/Python/CMakeLists.txt @@ -1,5 +1,7 @@ -vtk_add_test_python(TestMNIObjects.py) -vtk_add_test_python(TestMNITagPoints.py) -vtk_add_test_python(TestMNITransforms.py) -vtk_add_test_python(TestMINCImageReader.py) -vtk_add_test_python(TestMINCImageWriter.py) +vtk_add_test_python( + TestMNIObjects.py + TestMNITagPoints.py + TestMNITransforms.py + TestMINCImageReader.py + TestMINCImageWriter.py + ) diff --git a/IO/NetCDF/Testing/Python/CMakeLists.txt b/IO/NetCDF/Testing/Python/CMakeLists.txt index 5c505713e81..5ae7ac51bc7 100644 --- a/IO/NetCDF/Testing/Python/CMakeLists.txt +++ b/IO/NetCDF/Testing/Python/CMakeLists.txt @@ -1,5 +1,7 @@ -vtk_add_test_python(NetCDFCF2DBounds.py) -vtk_add_test_python(NetCDFCFSetOutputType.py) -vtk_add_test_python(NetCDFCFSphericalCoords.py) -vtk_add_test_python(NetCDFCFUnstructured.py) -vtk_add_test_python(NetCDFReader.py) +vtk_add_test_python( + NetCDFCF2DBounds.py + NetCDFCFSetOutputType.py + NetCDFCFSphericalCoords.py + NetCDFCFUnstructured.py + NetCDFReader.py + ) diff --git a/IO/PLY/Testing/Python/CMakeLists.txt b/IO/PLY/Testing/Python/CMakeLists.txt index c59b63fcf16..7f0e14f042a 100644 --- a/IO/PLY/Testing/Python/CMakeLists.txt +++ b/IO/PLY/Testing/Python/CMakeLists.txt @@ -1 +1,3 @@ -vtk_add_test_python(TestPLYReadWrite.py) +vtk_add_test_python( + TestPLYReadWrite.py + ) diff --git a/IO/Parallel/Testing/Python/CMakeLists.txt b/IO/Parallel/Testing/Python/CMakeLists.txt index 9c000cf10f9..6209bf627df 100644 --- a/IO/Parallel/Testing/Python/CMakeLists.txt +++ b/IO/Parallel/Testing/Python/CMakeLists.txt @@ -1,2 +1,4 @@ -vtk_add_test_python(TestPDataSetReaderGrid.py) -vtk_add_test_python(TestPImageWriter.py) +vtk_add_test_python( + TestPDataSetReaderGrid.py + TestPImageWriter.py + ) diff --git a/IO/XML/Testing/Python/CMakeLists.txt b/IO/XML/Testing/Python/CMakeLists.txt index cd37de97740..675140005ad 100644 --- a/IO/XML/Testing/Python/CMakeLists.txt +++ b/IO/XML/Testing/Python/CMakeLists.txt @@ -1,6 +1,8 @@ -vtk_add_test_python(TestEmptyXML.py NO_DATA NO_VALID NO_RT) -vtk_add_test_python(TestXMLImageDataIO.py) -vtk_add_test_python(TestXMLPolyDataIO.py) -vtk_add_test_python(TestXMLRectilinearGridIO.py) -vtk_add_test_python(TestXMLStructuredGridIO.py) -vtk_add_test_python(TestXMLUnstructuredGridIO.py) +vtk_add_test_python( + TestEmptyXML.py,NO_DATA,NO_VALID,NO_RT + TestXMLImageDataIO.py + TestXMLPolyDataIO.py + TestXMLRectilinearGridIO.py + TestXMLStructuredGridIO.py + TestXMLUnstructuredGridIO.py + ) diff --git a/Imaging/Core/Testing/Python/CMakeLists.txt b/Imaging/Core/Testing/Python/CMakeLists.txt index a03a33774b7..f0a18fd0249 100644 --- a/Imaging/Core/Testing/Python/CMakeLists.txt +++ b/Imaging/Core/Testing/Python/CMakeLists.txt @@ -1,91 +1,93 @@ -vtk_add_test_python(ContinuousClose2D.py) -vtk_add_test_python(IdealHighPass.py) -vtk_add_test_python(LaplacianEdgeEnhance.py) -vtk_add_test_python(MultipleUpdateExtents.py) -vtk_add_test_python(ResliceBSpline.py) -vtk_add_test_python(ResliceColorWrap.py) -vtk_add_test_python(ResliceInformationInput.py) -vtk_add_test_python(ResliceInterpolationModes.py) -vtk_add_test_python(ResliceInterpolationOblique.py) -vtk_add_test_python(ResliceLanczosKaiser.py) -vtk_add_test_python(ResliceMirrorOblique.py) -vtk_add_test_python(ResliceMirrorPad.py) -vtk_add_test_python(ResliceOptimizationOff.py) -vtk_add_test_python(ReslicePermutations.py) -vtk_add_test_python(ReslicePermuteResample.py) -vtk_add_test_python(ReslicePermuteSlab.py) -vtk_add_test_python(ResliceSlabModes.py) -vtk_add_test_python(ResliceToColors.py) -vtk_add_test_python(ResliceWrapOblique.py) -vtk_add_test_python(ResliceWrapPad.py) -vtk_add_test_python(Spectrum.py) -vtk_add_test_python(TestAccumulate.py) -vtk_add_test_python(TestAllFlips.py) -vtk_add_test_python(TestAnisotropicDiffusion2D.py) -vtk_add_test_python(TestAnisotropicDiffusion3D.py) -vtk_add_test_python(TestButterworthHighPass.py) -vtk_add_test_python(TestButterworthLowPass.py) -vtk_add_test_python(TestCache.py) -vtk_add_test_python(TestChangeInformation.py) -vtk_add_test_python(TestCheckerboard.py) -vtk_add_test_python(TestCityBlockDistance.py) -vtk_add_test_python(TestConvolve.py) -vtk_add_test_python(TestCorrelation.py) -vtk_add_test_python(TestDivergence.py) -vtk_add_test_python(TestDotProduct.py) -vtk_add_test_python(TestEuclideanDistance.py) -vtk_add_test_python(TestEuclideanDistanceCached.py) -vtk_add_test_python(TestEuclideanToPolar.py) -vtk_add_test_python(TestFFTCorrelation.py) -vtk_add_test_python(TestGradientMagnitude.py) -vtk_add_test_python(TestGradientMagnitude2.py) -vtk_add_test_python(TestHSIToRGB.py) -vtk_add_test_python(TestHSVToRGB.py) -vtk_add_test_python(TestHybridMedian2D.py) -vtk_add_test_python(TestIdealLowPass.py) -vtk_add_test_python(TestImageCanvas.py) -vtk_add_test_python(TestImageProjection.py) -vtk_add_test_python(TestInPlaceFilter.py) -vtk_add_test_python(TestIslandRemoval2D.py) -vtk_add_test_python(TestLassoStencil.py) -vtk_add_test_python(TestMapToRGBABlockStreaming.py) -vtk_add_test_python(TestMapToWindowLevelColors.py) -vtk_add_test_python(TestMapToWindowLevelColors2.py) -vtk_add_test_python(TestMask2.py) -vtk_add_test_python(TestMedian3D.py) -vtk_add_test_python(TestNormalize.py) -vtk_add_test_python(TestOpenClose3D.py) -vtk_add_test_python(TestPermute.py) -vtk_add_test_python(TestQuantizeTo16Colors.py) -vtk_add_test_python(TestROIStencil.py) -vtk_add_test_python(TestRange3D.py) -vtk_add_test_python(TestResample.py) -vtk_add_test_python(TestSeparableFilter.py) -vtk_add_test_python(TestShiftScale.py) -vtk_add_test_python(TestShiftScale2.py) -vtk_add_test_python(TestSimpleImageExample.py) -vtk_add_test_python(TestSkeleton2D.py) -vtk_add_test_python(TestSobel2D.py) -vtk_add_test_python(TestSobel3D.py) -vtk_add_test_python(TestStencilToImage.py) -vtk_add_test_python(TestStencilWithFunction.py) -vtk_add_test_python(TestStencilWithImage.py) -vtk_add_test_python(TestVariance3D.py) -vtk_add_test_python(TestWrapPad.py) -vtk_add_test_python(resampledTexture.py) -vtk_add_test_python(voxelModel.py) -vtk_add_test_python(TestBlendStencil.py) -vtk_add_test_python(TestExtractVOI.py) -vtk_add_test_python(TestImageWeightedSum.py) -# vtk_add_test_python(WindowLevelInterface.py) # TCL test not being made as well !!! -vtk_add_test_python(imageMCAll NO_RT) -vtk_add_test_python(TestAllBlends NO_RT) -vtk_add_test_python(TestAllBlendsFloat NO_RT) -vtk_add_test_python(TestAllLogic NO_RT) -vtk_add_test_python(TestAllMaskBits NO_RT) -vtk_add_test_python(TestAllMathematics NO_RT) -vtk_add_test_python(TestAllShrinks NO_RT) -vtk_add_test_python(TestImageThresholdConnectivity NO_RT) -vtk_add_test_python(TestThreshold NO_RT) -vtk_add_test_python(TestWipe NO_RT) -vtk_add_test_python(reconstructSurface NO_RT) +vtk_add_test_python( + ContinuousClose2D.py + IdealHighPass.py + LaplacianEdgeEnhance.py + MultipleUpdateExtents.py + ResliceBSpline.py + ResliceColorWrap.py + ResliceInformationInput.py + ResliceInterpolationModes.py + ResliceInterpolationOblique.py + ResliceLanczosKaiser.py + ResliceMirrorOblique.py + ResliceMirrorPad.py + ResliceOptimizationOff.py + ReslicePermutations.py + ReslicePermuteResample.py + ReslicePermuteSlab.py + ResliceSlabModes.py + ResliceToColors.py + ResliceWrapOblique.py + ResliceWrapPad.py + Spectrum.py + TestAccumulate.py + TestAllFlips.py + TestAnisotropicDiffusion2D.py + TestAnisotropicDiffusion3D.py + TestButterworthHighPass.py + TestButterworthLowPass.py + TestCache.py + TestChangeInformation.py + TestCheckerboard.py + TestCityBlockDistance.py + TestConvolve.py + TestCorrelation.py + TestDivergence.py + TestDotProduct.py + TestEuclideanDistance.py + TestEuclideanDistanceCached.py + TestEuclideanToPolar.py + TestFFTCorrelation.py + TestGradientMagnitude.py + TestGradientMagnitude2.py + TestHSIToRGB.py + TestHSVToRGB.py + TestHybridMedian2D.py + TestIdealLowPass.py + TestImageCanvas.py + TestImageProjection.py + TestInPlaceFilter.py + TestIslandRemoval2D.py + TestLassoStencil.py + TestMapToRGBABlockStreaming.py + TestMapToWindowLevelColors.py + TestMapToWindowLevelColors2.py + TestMask2.py + TestMedian3D.py + TestNormalize.py + TestOpenClose3D.py + TestPermute.py + TestQuantizeTo16Colors.py + TestROIStencil.py + TestRange3D.py + TestResample.py + TestSeparableFilter.py + TestShiftScale.py + TestShiftScale2.py + TestSimpleImageExample.py + TestSkeleton2D.py + TestSobel2D.py + TestSobel3D.py + TestStencilToImage.py + TestStencilWithFunction.py + TestStencilWithImage.py + TestVariance3D.py + TestWrapPad.py + resampledTexture.py + voxelModel.py + TestBlendStencil.py + TestExtractVOI.py + TestImageWeightedSum.py + # WindowLevelInterface.py # TCL test not being made as well !!! + imageMCAll,NO_RT + TestAllBlends,NO_RT + TestAllBlendsFloat,NO_RT + TestAllLogic,NO_RT + TestAllMaskBits,NO_RT + TestAllMathematics,NO_RT + TestAllShrinks,NO_RT + TestImageThresholdConnectivity,NO_RT + TestThreshold,NO_RT + TestWipe,NO_RT + reconstructSurface,NO_RT + ) diff --git a/Imaging/Hybrid/Testing/Python/CMakeLists.txt b/Imaging/Hybrid/Testing/Python/CMakeLists.txt index 1a9db210cf8..48d80f4c68c 100644 --- a/Imaging/Hybrid/Testing/Python/CMakeLists.txt +++ b/Imaging/Hybrid/Testing/Python/CMakeLists.txt @@ -1,4 +1,6 @@ -vtk_add_test_python(genHead.py) -vtk_add_test_python(iceCream.py) -vtk_add_test_python(shepards.py) -vtk_add_test_python(triangularTexture.py) +vtk_add_test_python( + genHead.py + iceCream.py + shepards.py + triangularTexture.py + ) diff --git a/Interaction/Style/Testing/Python/CMakeLists.txt b/Interaction/Style/Testing/Python/CMakeLists.txt index 6f7d0bf0f2a..d55d59c681f 100644 --- a/Interaction/Style/Testing/Python/CMakeLists.txt +++ b/Interaction/Style/Testing/Python/CMakeLists.txt @@ -1,11 +1,13 @@ if(NOT VTK_OPENGL_HAS_OSMESA) - vtk_add_test_python(TestFlyTo.py) - vtk_add_test_python(TestStyleRubberBandZoom.py) - vtk_add_test_python(TestInteractorStyleTerrain.py) - vtk_add_test_python(TestStyleBaseSpike.py NO_RT) - vtk_add_test_python(TestStyleJoystickActor.py NO_RT) - vtk_add_test_python(TestStyleJoystickCamera.py NO_RT) - vtk_add_test_python(TestStyleTerrain.py NO_RT) - vtk_add_test_python(TestStyleTrackballActor.py NO_RT) - vtk_add_test_python(TestStyleTrackballCamera.py NO_RT) + vtk_add_test_python( + TestFlyTo.py + TestStyleRubberBandZoom.py + TestInteractorStyleTerrain.py + TestStyleBaseSpike.py,NO_RT + TestStyleJoystickActor.py,NO_RT + TestStyleJoystickCamera.py,NO_RT + TestStyleTerrain.py,NO_RT + TestStyleTrackballActor.py,NO_RT + TestStyleTrackballCamera.py,NO_RT + ) endif() diff --git a/Interaction/Widgets/Testing/Python/CMakeLists.txt b/Interaction/Widgets/Testing/Python/CMakeLists.txt index 65ca0e8d6f9..b6952da9dd4 100644 --- a/Interaction/Widgets/Testing/Python/CMakeLists.txt +++ b/Interaction/Widgets/Testing/Python/CMakeLists.txt @@ -1,7 +1,9 @@ if(NOT VTK_OPENGL_HAS_OSMESA) - vtk_add_test_python(TestImagePlaneWidget.py) - vtk_add_test_python(TestBoxWidget.py NO_RT) - vtk_add_test_python(TestInteractorEventRecorder.py NO_RT) - vtk_add_test_python(TestSphereWidget.py NO_RT) - vtk_add_test_python(TestTextWidget.py NO_RT) + vtk_add_test_python( + TestImagePlaneWidget.py + TestBoxWidget.py,NO_RT + TestInteractorEventRecorder.py,NO_RT + TestSphereWidget.py,NO_RT + TestTextWidget.py,NO_RT + ) endif() diff --git a/Parallel/Core/Testing/Python/CMakeLists.txt b/Parallel/Core/Testing/Python/CMakeLists.txt index 3439273d495..d83311ba47a 100644 --- a/Parallel/Core/Testing/Python/CMakeLists.txt +++ b/Parallel/Core/Testing/Python/CMakeLists.txt @@ -1,2 +1,4 @@ -vtk_add_test_python(TestPolyDataPieces.py) -vtk_add_test_python(TestUnstructuredPieces.py) +vtk_add_test_python( + TestPolyDataPieces.py + TestUnstructuredPieces.py + ) diff --git a/Rendering/Annotation/Testing/Python/CMakeLists.txt b/Rendering/Annotation/Testing/Python/CMakeLists.txt index ba2e8b91ff6..48a7083ffb3 100644 --- a/Rendering/Annotation/Testing/Python/CMakeLists.txt +++ b/Rendering/Annotation/Testing/Python/CMakeLists.txt @@ -1,9 +1,11 @@ -vtk_add_test_python(TestCaptionActor.py) -vtk_add_test_python(bore.py) -vtk_add_test_python(cubeAxes.py) -vtk_add_test_python(xyPlot.py) -vtk_add_test_python(xyPlot2.py) -vtk_add_test_python(xyPlot3.py) -vtk_add_test_python(xyPlot4.py) -vtk_add_test_python(cubeAxes2.py) -vtk_add_test_python(cubeAxes3.py) +vtk_add_test_python( + TestCaptionActor.py + bore.py + cubeAxes.py + xyPlot.py + xyPlot2.py + xyPlot3.py + xyPlot4.py + cubeAxes2.py + cubeAxes3.py + ) diff --git a/Rendering/Core/Testing/Python/CMakeLists.txt b/Rendering/Core/Testing/Python/CMakeLists.txt index 3cc790120f5..eb48aa4bc7c 100644 --- a/Rendering/Core/Testing/Python/CMakeLists.txt +++ b/Rendering/Core/Testing/Python/CMakeLists.txt @@ -1,42 +1,47 @@ -vtk_add_test_python(CamBlur.py) -vtk_add_test_python(ImageActor.py) -vtk_add_test_python(ImageActorStressed.py) -vtk_add_test_python(NoLightGeneration.py) -vtk_add_test_python(PolyDataMapperAllPolygons.py) -vtk_add_test_python(PolyDataMapperAllWireframe.py) -vtk_add_test_python(ScalarBar.py) -vtk_add_test_python(TestCameraInterpolator.py) -vtk_add_test_python(TestMapperLUT.py NO_DATA NO_VALID) -vtk_add_test_python(TestOnePoint.py) -# vtk_add_test_python(TestParallelCoordinates.py) # disabled in TCL too -vtk_add_test_python(TestRotate.py) -vtk_add_test_python(TestTransformInterpolator.py) -vtk_add_test_python(TestTriangleStripCellColor.py) -vtk_add_test_python(TransformConcatenation.py) -vtk_add_test_python(TransformCoverage.py) -vtk_add_test_python(TransformImageData.py) -vtk_add_test_python(TransformPolyData.py) -vtk_add_test_python(assembly.py) -vtk_add_test_python(cameraWarpedCone.py) -vtk_add_test_python(cowHair.py) -vtk_add_test_python(cowHair2.py) -vtk_add_test_python(pickCells.py) -vtk_add_test_python(propAssembly.py) -vtk_add_test_python(rendererSource.py) -vtk_add_test_python(rotations.py) -vtk_add_test_python(stereoDresdenMace.py) -vtk_add_test_python(PickerWithLocator.py) -vtk_add_test_python(SurfacePickerWithTexture.py) -# XML shader code removed, test needs rewriting for new API -#vtk_add_test_python(TestGenericVertexAttributesGLSL.py) -vtk_add_test_python(TestLeaderActor2D.py) -vtk_add_test_python(TestOpacity2.py) -vtk_add_test_python(TestOpacityVectors.py) -vtk_add_test_python(TestTransformCoordinateSystems.py) -vtk_add_test_python(TestWindowToImageTransparency.py) -vtk_add_test_python(TexturedSphere.py) -vtk_add_test_python(cells.py NO_RT) - if(VTK_USE_GLSL_SHADERS) - vtk_add_test_python(TestGLSLShader.py) + set(glsl_tests + TestGLSLShader.py,NO_VALID + ) endif() + +vtk_add_test_python( + CamBlur.py + ImageActor.py + ImageActorStressed.py + NoLightGeneration.py + PolyDataMapperAllPolygons.py + PolyDataMapperAllWireframe.py + ScalarBar.py + TestCameraInterpolator.py + TestMapperLUT.py,NO_DATA,NO_VALID + TestOnePoint.py + # TestParallelCoordinates.py) # disabled in TCL too + TestRotate.py + TestTransformInterpolator.py + TestTriangleStripCellColor.py + TransformConcatenation.py + TransformCoverage.py + TransformImageData.py + TransformPolyData.py + assembly.py + cameraWarpedCone.py + cowHair.py + cowHair2.py + pickCells.py + propAssembly.py + rendererSource.py + rotations.py + stereoDresdenMace.py + PickerWithLocator.py + SurfacePickerWithTexture.py + # XML shader code removed, test needs rewriting for new API + #TestGenericVertexAttributesGLSL.py + TestLeaderActor2D.py + TestOpacity2.py + TestOpacityVectors.py + TestTransformCoordinateSystems.py + TestWindowToImageTransparency.py + TexturedSphere.py + cells.py,NO_RT + ${glsl_tests} + ) diff --git a/Rendering/FreeType/Testing/Python/CMakeLists.txt b/Rendering/FreeType/Testing/Python/CMakeLists.txt index e93fba76df5..e148920d0cb 100644 --- a/Rendering/FreeType/Testing/Python/CMakeLists.txt +++ b/Rendering/FreeType/Testing/Python/CMakeLists.txt @@ -1,3 +1,5 @@ -vtk_add_test_python(OverlayTextOnImage.py) -vtk_add_test_python(multiLineText.py) -vtk_add_test_python(text.py) +vtk_add_test_python( + OverlayTextOnImage.py + multiLineText.py + text.py + ) diff --git a/Rendering/LOD/Testing/Python/CMakeLists.txt b/Rendering/LOD/Testing/Python/CMakeLists.txt index 26504231699..62110e2362e 100644 --- a/Rendering/LOD/Testing/Python/CMakeLists.txt +++ b/Rendering/LOD/Testing/Python/CMakeLists.txt @@ -1 +1,3 @@ -vtk_add_test_python(TestQuadricLODActor.py) +vtk_add_test_python( + TestQuadricLODActor.py + ) diff --git a/Rendering/Label/Testing/Python/CMakeLists.txt b/Rendering/Label/Testing/Python/CMakeLists.txt index 3bc760a391f..996fe66d62a 100644 --- a/Rendering/Label/Testing/Python/CMakeLists.txt +++ b/Rendering/Label/Testing/Python/CMakeLists.txt @@ -1,2 +1,4 @@ -vtk_add_test_python(labeledContours.py) -vtk_add_test_python(labeledMesh.py) +vtk_add_test_python( + labeledContours.py + labeledMesh.py + ) diff --git a/Rendering/OpenGL/Testing/Python/CMakeLists.txt b/Rendering/OpenGL/Testing/Python/CMakeLists.txt index edf01417109..10c8763c6f3 100644 --- a/Rendering/OpenGL/Testing/Python/CMakeLists.txt +++ b/Rendering/OpenGL/Testing/Python/CMakeLists.txt @@ -1,3 +1,5 @@ -vtk_add_test_python(TestFreetypeTextOverlay.py) -vtk_add_test_python(TestFreetypeTextMapper.py NO_RT) -vtk_add_test_python(TestFreetypeTextMapperBigger.py) +vtk_add_test_python( + TestFreetypeTextOverlay.py + TestFreetypeTextMapper.py,NO_RT + TestFreetypeTextMapperBigger.py + ) diff --git a/Rendering/Tk/Testing/Python/CMakeLists.txt b/Rendering/Tk/Testing/Python/CMakeLists.txt index bcbeb69dc70..76c55b1612a 100644 --- a/Rendering/Tk/Testing/Python/CMakeLists.txt +++ b/Rendering/Tk/Testing/Python/CMakeLists.txt @@ -1,4 +1,5 @@ -if(VTK_PYTHON_EXE) - vtk_add_test_python(TestTkRenderWidget.py NO_RT) - vtk_add_test_python(TestTkRenderWindowInteractor.py NO_RT) -endif() +vtk_add_test_python( + NO_RT + TestTkRenderWidget.py + TestTkRenderWindowInteractor.py + ) diff --git a/Rendering/Volume/Testing/Python/CMakeLists.txt b/Rendering/Volume/Testing/Python/CMakeLists.txt index 5f8d3c36556..48cb5de8af1 100644 --- a/Rendering/Volume/Testing/Python/CMakeLists.txt +++ b/Rendering/Volume/Testing/Python/CMakeLists.txt @@ -1,24 +1,26 @@ -vtk_add_test_python(TestBunykRayCastFunction.py) -vtk_add_test_python(TestLODProp3D.py) -vtk_add_test_python(TestPTZSweep.py) -vtk_add_test_python(gaussian.py) -vtk_add_test_python(volRCClipPlanes.py) -vtk_add_test_python(volRCCropRegions.py) -vtk_add_test_python(volRCRotateClip.py) -vtk_add_test_python(volTM2DCropRegions.py) -vtk_add_test_python(volTM2DRotateClip.py) -vtk_add_test_python(VolumeOutlineSource.py) -vtk_add_test_python(VolumeOutlineSourceClipped.py) -vtk_add_test_python(VolumePickerCrop.py) -vtk_add_test_python(cursor3D.py) -vtk_add_test_python(volTM3DCompressedCropRegions.py) -vtk_add_test_python(volTM3DCropRegions.py) -vtk_add_test_python(volTM3DRotateClip.py) -vtk_add_test_python(TestFixedPointRayCasterLinear.py NO_RT) -vtk_add_test_python(TestFixedPointRayCasterLinearCropped.py NO_RT) -vtk_add_test_python(TestFixedPointRayCasterNearest.py NO_RT) -vtk_add_test_python(TestFixedPointRayCasterNearestCropped.py NO_RT) -vtk_add_test_python(VolumePicker.py NO_RT) +vtk_add_test_python( + TestBunykRayCastFunction.py + TestLODProp3D.py + TestPTZSweep.py + gaussian.py + volRCClipPlanes.py + volRCCropRegions.py + volRCRotateClip.py + volTM2DCropRegions.py + volTM2DRotateClip.py + VolumeOutlineSource.py + VolumeOutlineSourceClipped.py + VolumePickerCrop.py + cursor3D.py + volTM3DCompressedCropRegions.py + volTM3DCropRegions.py + volTM3DRotateClip.py + TestFixedPointRayCasterLinear.py,NO_RT + TestFixedPointRayCasterLinearCropped.py,NO_RT + TestFixedPointRayCasterNearest.py,NO_RT + TestFixedPointRayCasterNearestCropped.py,NO_RT + VolumePicker.py,NO_RT + ) set_tests_properties(vtkRenderingVolumePython-volTM3DCompressedCropRegions PROPERTIES TIMEOUT 250) -- GitLab