Commit b3f95969 authored by Ben Boeckel's avatar Ben Boeckel

cmake: update to new testing macro variable names

parent 36c9fa34
......@@ -27,9 +27,9 @@ function(vtk_add_gl2ps_test_cxx)
# Convert ps to png
add_test(NAME ${vtk-module}Cxx-${TName}-RasterizePNG
COMMAND ${CMAKE_COMMAND}
"-DPSFILE=${VTK_TEST_OUTPUT_DIR}/${TName}.ps"
"-DPNGFILE=${VTK_TEST_OUTPUT_DIR}/${TName}-raster.png"
"-DPDFPNGFILE=${VTK_TEST_OUTPUT_DIR}/${TName}-raster-pdf.png"
"-DPSFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.ps"
"-DPNGFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png"
"-DPDFPNGFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster-pdf.png"
"-DGS_EXECUTABLE=${VTK_GHOSTSCRIPT_EXECUTABLE}"
-DREMOVEPS=1
-DRASTERIZE_PDF=${RASTERIZE_PDF}
......@@ -39,7 +39,7 @@ function(vtk_add_gl2ps_test_cxx)
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}"
REQUIRED_FILES
"${VTK_TEST_OUTPUT_DIR}/${TName}.ps"
"${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.ps"
LABELS "${${vtk-module}_TEST_LABELS}"
)
......@@ -54,34 +54,34 @@ function(vtk_add_gl2ps_test_cxx)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPNG
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-D "${_vtk_build_TEST_DATA_DIRECTORY}"
-T "${_vtk_build_TEST_OUTPUT_DIRECTORY}"
-E "${_error_threshold}"
-V "DATA{../Data/Baseline/${TName}-rasterRef.png,:}"
--test-file "${VTK_TEST_OUTPUT_DIR}/${TName}-raster.png"
--test-file "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png"
)
set_tests_properties("${vtk-module}Cxx-${TName}-VerifyRasterizedPNG"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}-RasterizePNG"
REQUIRED_FILES
"${VTK_TEST_OUTPUT_DIR}/${TName}-raster.png"
"${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png"
LABELS "${${vtk-module}_TEST_LABELS}"
)
if(${RASTERIZE_PDF})
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPDFPNG
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-D "${_vtk_build_TEST_DATA_DIRECTORY}"
-T "${_vtk_build_TEST_OUTPUT_DIRECTORY}"
-E "${_error_threshold}"
-V "DATA{../Data/Baseline/${TName}-rasterRef.png,:}"
--test-file "${VTK_TEST_OUTPUT_DIR}/${TName}-raster-pdf.png"
--test-file "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster-pdf.png"
)
set_tests_properties("${vtk-module}Cxx-${TName}-VerifyRasterizedPDFPNG"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}-RasterizePNG"
REQUIRED_FILES
"${VTK_TEST_OUTPUT_DIR}/${TName}-raster-pdf.png"
"${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster-pdf.png"
LABELS "${${vtk-module}_TEST_LABELS}"
)
endif()
......@@ -98,8 +98,8 @@ function(vtk_add_pdf_test_cxx)
# Convert pdf to png
add_test(NAME ${vtk-module}Cxx-${TName}-RasterizePDFToPNG
COMMAND ${CMAKE_COMMAND}
"-DPDFFILE=${VTK_TEST_OUTPUT_DIR}/${TName}.pdf"
"-DPDFPNGFILE=${VTK_TEST_OUTPUT_DIR}/${TName}-rasterPDF.png"
"-DPDFFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.pdf"
"-DPDFPNGFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-rasterPDF.png"
"-DGS_EXECUTABLE=${VTK_GHOSTSCRIPT_EXECUTABLE}"
-DREMOVEPDF=1
-DRASTERIZE_PDF=1
......@@ -109,7 +109,7 @@ function(vtk_add_pdf_test_cxx)
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}"
REQUIRED_FILES
"${VTK_TEST_OUTPUT_DIR}/${TName}.pdf"
"${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.pdf"
LABELS "${${vtk-module}_TEST_LABELS}"
)
......@@ -124,17 +124,17 @@ function(vtk_add_pdf_test_cxx)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPDFPNG
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-D "${_vtk_build_TEST_DATA_DIRECTORY}"
-T "${_vtk_build_TEST_OUTPUT_DIRECTORY}"
-E "${_error_threshold}"
-V "DATA{../Data/Baseline/${TName}-rasterPDFRef.png,:}"
--test-file "${VTK_TEST_OUTPUT_DIR}/${TName}-rasterPDF.png"
--test-file "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-rasterPDF.png"
)
set_tests_properties("${vtk-module}Cxx-${TName}-VerifyRasterizedPDFPNG"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}-RasterizePDFToPNG"
REQUIRED_FILES
"${VTK_TEST_OUTPUT_DIR}/${TName}-rasterPDF.png"
"${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-rasterPDF.png"
LABELS "${${vtk-module}_TEST_LABELS}"
)
endforeach()
......
......@@ -3,7 +3,7 @@ SET(CMAKE_TESTDRIVER_BEFORE_TESTMAIN
// Set defaults
vtkTestingInteractor::ValidBaseline = \"Use_-V_for_Baseline\";
vtkTestingInteractor::TempDirectory =
std::string(\"${VTK_TEST_OUTPUT_DIR}\");
std::string(\"${_vtk_build_TEST_OUTPUT_DIRECTORY}\");
vtkTestingInteractor::DataDirectory = std::string(\"Use_-D_for_Data\");
int interactive = 0;
......
......@@ -16,8 +16,8 @@ function(vtk_add_svg_test)
# Convert svg to png
add_test(NAME ${vtk-module}Cxx-${TName}-RasterizePNG
COMMAND ${CMAKE_COMMAND}
"-DSVGFILE=${VTK_TEST_OUTPUT_DIR}/${TName}.svg"
"-DPNGFILE=${VTK_TEST_OUTPUT_DIR}/${TName}-raster.png"
"-DSVGFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.svg"
"-DPNGFILE=${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png"
"-DCONVERTER=${VTK_WKHTMLTOIMAGE_EXECUTABLE}"
-DREMOVESVG=1
-P "${vtkTestingSVG_SOURCE_DIR}/RasterizeSVG.cmake"
......@@ -25,7 +25,7 @@ function(vtk_add_svg_test)
set_tests_properties("${vtk-module}Cxx-${TName}-RasterizePNG"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}"
REQUIRED_FILES "${VTK_TEST_OUTPUT_DIR}/${TName}.svg"
REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.svg"
LABELS "${${vtk-module}_TEST_LABELS}"
)
......@@ -40,16 +40,16 @@ function(vtk_add_svg_test)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPNG
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-D "${_vtk_build_TEST_DATA_DIRECTORY}"
-T "${_vtk_build_TEST_OUTPUT_DIRECTORY}"
-E "${_error_threshold}"
-V "DATA{../Data/Baseline/${TName}-rasterRef.png,:}"
--test-file "${VTK_TEST_OUTPUT_DIR}/${TName}-raster.png"
--test-file "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png"
)
set_tests_properties("${vtk-module}Cxx-${TName}-VerifyRasterizedPNG"
PROPERTIES
DEPENDS "${vtk-module}Cxx-${TName}-RasterizePNG"
REQUIRED_FILES "${VTK_TEST_OUTPUT_DIR}/${TName}-raster.png"
REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png"
LABELS "${${vtk-module}_TEST_LABELS}"
)
endforeach()
......
......@@ -47,8 +47,8 @@ if(BUILD_TESTING)
set(vtk-example IOExamples)
set(TestDumpXMLFile_ARGS "DATA{${VTK_TEST_INPUT_DIR}/cow.vtp}")
set(TestParticleReader_ARGS
"${VTK_TEST_DATA_DIR}/Data/golf.csv"
${VTK_TEST_OUTPUT_DIR}/TestParticleReader.vtp)
"${_vtk_build_TEST_DATA_DIRECTORY}/Data/golf.csv"
${_vtk_build_TEST_OUTPUT_DIRECTORY}/TestParticleReader.vtp)
vtk_add_test_cxx(${vtk-example}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
TestParticleReader.cxx
......
......@@ -34,7 +34,7 @@ if(BUILD_TESTING)
if(vtkTestingRendering_LOADED)
######## Regression Testing ########
set(vtk-example ImageProcessingExamples)
set(TestImageSlicing_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
set(TestImageSlicing_ARGS ${_vtk_build_TEST_DATA_DIRECTORY}/Data/headsq/quarter)
set(TestImageBenchmark_ARGS
"--threads" "2" "--filter" "resize:kernelsize=4")
vtk_add_test_cxx(${vtk-example}CxxTests tests
......
......@@ -35,10 +35,10 @@ if(BUILD_TESTING)
if(vtkTestingRendering_LOADED)
######## Regression Testing ########
set(vtk-example MedicalExamples)
set(TestMedical1_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
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)
set(TestMedical1_ARGS ${_vtk_build_TEST_DATA_DIRECTORY}/Data/headsq/quarter)
set(TestMedical2_ARGS ${_vtk_build_TEST_DATA_DIRECTORY}/Data/headsq/quarter)
set(TestMedical3_ARGS ${_vtk_build_TEST_DATA_DIRECTORY}/Data/headsq/quarter)
set(TestMedical4_ARGS ${_vtk_build_TEST_DATA_DIRECTORY}/Data/headsq/quarter)
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestMedical1.cxx
TestMedical2.cxx
......
......@@ -31,11 +31,11 @@ if(BUILD_TESTING)
set(TestFinance_ARGS "DATA{${VTK_TEST_INPUT_DIR}/financial.txt}")
set(TestDelaunay3D_ARGS
"DATA{${VTK_TEST_INPUT_DIR}/cow.vtp}"
${VTK_TEST_OUTPUT_DIR}/Delaunay3D.vtu
${_vtk_build_TEST_OUTPUT_DIRECTORY}/Delaunay3D.vtu
)
set(TestDelaunay3DAlpha_ARGS
.5 "DATA{${VTK_TEST_INPUT_DIR}/cow.vtp}"
${VTK_TEST_OUTPUT_DIR}/Delaunay3DAlpha.vtu
${_vtk_build_TEST_OUTPUT_DIRECTORY}/Delaunay3DAlpha.vtu
)
vtk_add_test_cxx(${vtk-example}CxxTests data_tests
TestFinance.cxx
......
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