Commit be9f3417 authored by Ethan Stam's avatar Ethan Stam
Browse files

Use pvpython to compare results and add time_source.pvsm to CMakeLists.txt

parent da60f939
......@@ -94,6 +94,7 @@ ExternalData_Expand_Arguments(ParaViewData _
"DATA{${paraview_test_data_directory_input}/Data/testxmlpartds.vtpd}"
"DATA{${paraview_test_data_directory_input}/Data/testxmlpartds/,REGEX:.*}"
"DATA{${paraview_test_data_directory_input}/Data/timestep_0_15.vts}"
"DATA{${paraview_test_data_directory_input}/Data/time_source.pvsm}"
"DATA{${paraview_test_data_directory_input}/Data/tube.exo}"
"DATA{${paraview_test_data_directory_input}/Data/vehicle_data.csv}"
"DATA{${paraview_test_data_directory_input}/Data/viscoplastic-ring.h5}"
......
......@@ -300,6 +300,7 @@ if (PARAVIEW_BUILD_QT_GUI)
-DCOPROCESSING_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary
-DPARAVIEW_TEST_XML:FILEPATH=${ParaView_SOURCE_DIR}/Applications/ParaView/Testing/XML/CinemaExportGeometry.xml
-DPVBATCH_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::pvbatch>
-DPVPYTHON_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::pvpython>
-DCOPROCESSING_DATA_DIR:PATH=${paraview_test_data_directory_output}
-DCOPROCESSING_DRIVER_SCRIPT:FILEPATH=${CMAKE_SOURCE_DIR}/Examples/Catalyst/SampleScripts/filedriver.py
-DCINEMA_DATABASE_TESTER:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportCheck.py
......@@ -317,6 +318,7 @@ if (PARAVIEW_BUILD_QT_GUI)
-DCOPROCESSING_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary
-DPARAVIEW_TEST_XML:FILEPATH=${ParaView_SOURCE_DIR}/Applications/ParaView/Testing/XML/CinemaExportGeometryAndImages.xml
-DPVBATCH_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::pvbatch>
-DPVPYTHON_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::pvpython>
-DCOPROCESSING_DATA_DIR:PATH=${paraview_test_data_directory_output}
-DCOPROCESSING_DRIVER_SCRIPT:FILEPATH=${CMAKE_SOURCE_DIR}/Examples/Catalyst/SampleScripts/filedriver.py
-DCINEMA_DATABASE_TESTER:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportCheck.py
......@@ -333,6 +335,7 @@ if (PARAVIEW_BUILD_QT_GUI)
-DCOPROCESSING_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary
-DPARAVIEW_TEST_XML:FILEPATH=${ParaView_SOURCE_DIR}/Applications/ParaView/Testing/XML/CinemaExportNoTimesteps.xml
-DPVBATCH_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::pvbatch>
-DPVPYTHON_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::pvpython>
-DCOPROCESSING_DATA_DIR:PATH=${paraview_test_data_directory_output}
-DCOPROCESSING_DRIVER_SCRIPT:FILEPATH=${CMAKE_SOURCE_DIR}/Examples/Catalyst/SampleScripts/filedriver.py
-DCINEMA_DATABASE_TESTER:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportCheck.py
......
......@@ -4,6 +4,7 @@
# COPROCESSING_TEST_DIR -- path to temporary dir
# PARAVIEW_TEST_XML -- xml to run
# PVBATCH_EXECUTABLE -- path to pvbatch
# PVPYTHON_EXECUTABLE -- path to pvpython
# COPROCESSING_DRIVER_SCRIPT -- driver py script
# COPROCESSING_IMAGE_TESTER -- path to CoProcessingCompareImagesTester
# COPROCESSING_DATA_DIR -- path to data dir for baselines
......@@ -66,7 +67,6 @@ elseif("${TEST_NAME}" MATCHES "CinemaExport" )
file(WRITE "${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}" "${batch_script_data}")
endif()
# run the batch script
execute_process_with_echo(COMMAND
${PVBATCH_EXECUTABLE} -sym -dr
......@@ -81,10 +81,14 @@ if(rv)
message(FATAL_ERROR "pvbatch return value was = '${rv}' ")
endif()
if(NOT EXISTS "${PVPYTHON_EXECUTABLE}")
message(FATAL_ERROR "'${PVPYTHON_EXECUTABLE}' does not exist")
endif()
if(WIN32)
message("${CINEMA_DATABASE_TESTER}")
execute_process_with_echo(COMMAND
python.exe
${PVPYTHON_EXECUTABLE}
${CINEMA_DATABASE_TESTER}
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb
......@@ -95,6 +99,7 @@ if(WIN32)
else()
message("${CINEMA_DATABASE_TESTER}")
execute_process_with_echo(COMMAND
${PVPYTHON_EXECUTABLE}
${CINEMA_DATABASE_TESTER}
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb
......
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