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

Fix windows tests and disable the image extract ones

parent 00fc7b49
......@@ -28,6 +28,10 @@
<pqevent object="pqClientMainWindow/catalystInspectorDock/ExportInspector/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/filterFormat" command="activated" arguments="XMLPUnstructuredGridWriter" />
<pqevent object="pqClientMainWindow/catalystInspectorDock/ExportInspector/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/filterExtract" command="set_boolean" arguments="true" />
<!-- export cinema image database -->
<pqevent object="pqClientMainWindow/catalystInspectorDock/ExportInspector/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/viewFormat" command="activated" arguments="Cinema image database (*.cdb)" />
<pqevent object="pqClientMainWindow/catalystInspectorDock/ExportInspector/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/viewExtract" command="set_boolean" arguments="true" />
<!-- set root directory for interactive export -->
<pqevent object="pqClientMainWindow/catalystInspectorDock/ExportInspector/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/scrollArea_2/qt_scrollarea_viewport/container/1pqProxyWidget0/RootDirectory/RootDirectory" command="set_string" arguments="$PARAVIEW_TEST_ROOT/cinema/interactive/CinemaExportNoTimesteps.cdb" />
......
......@@ -310,37 +310,40 @@ if (PARAVIEW_BUILD_QT_GUI)
set_tests_properties(CinemaExportGeometry PROPERTIES RUN_SERIAL ON)
_set_standard_test_properties(CinemaExportGeometry)
add_test(NAME CinemaExportGeometryAndImages
COMMAND ${CMAKE_COMMAND}
-DPARAVIEW_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::paraview>
-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>
-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
-DCINEMA_INPUT_DATA:FILEPATH=${CMAKE_BINARY_DIR}/ExternalData/Testing/Data/can.ex2
-DCINEMA_BATCH_SCRIPT:FILEPATH=cinema/CinemaExportGeometryAndImages.py
-DTEST_NAME:STRING=CinemaExportGeometryAndImages
-P ${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportFullWorkflowTest.cmake)
set_tests_properties(CinemaExportGeometryAndImages PROPERTIES RUN_SERIAL ON)
_set_standard_test_properties(CinemaExportGeometryAndImages)
add_test(NAME CinemaExportNoTimesteps
COMMAND ${CMAKE_COMMAND}
-DPARAVIEW_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::paraview>
-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>
-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
-DCINEMA_INPUT_DATA:FILEPATH=${CMAKE_BINARY_DIR}/ExternalData/Testing/Data/cube.vtu
-DCINEMA_BATCH_SCRIPT:FILEPATH=cinema/CinemaExportNoTimesteps.py
-DTEST_NAME:STRING=CinemaExportNoTimesteps
-P ${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportFullWorkflowTest.cmake)
set_tests_properties(CinemaExportNoTimesteps PROPERTIES RUN_SERIAL ON)
_set_standard_test_properties(CinemaExportNoTimesteps)
# Windows builds do not export cinema image databases as of 07-23-19
if(NOT WIN32)
add_test(NAME CinemaExportGeometryAndImages
COMMAND ${CMAKE_COMMAND}
-DPARAVIEW_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::paraview>
-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>
-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
-DCINEMA_INPUT_DATA:FILEPATH=${CMAKE_BINARY_DIR}/ExternalData/Testing/Data/can.ex2
-DCINEMA_BATCH_SCRIPT:FILEPATH=cinema/CinemaExportGeometryAndImages.py
-DTEST_NAME:STRING=CinemaExportGeometryAndImages
-P ${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportFullWorkflowTest.cmake)
set_tests_properties(CinemaExportGeometryAndImages PROPERTIES RUN_SERIAL ON)
_set_standard_test_properties(CinemaExportGeometryAndImages)
add_test(NAME CinemaExportNoTimesteps
COMMAND ${CMAKE_COMMAND}
-DPARAVIEW_EXECUTABLE:FILEPATH=$<TARGET_FILE:ParaView::paraview>
-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>
-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
-DCINEMA_INPUT_DATA:FILEPATH=${CMAKE_BINARY_DIR}/ExternalData/Testing/Data/cube.vtu
-DCINEMA_BATCH_SCRIPT:FILEPATH=cinema/CinemaExportNoTimesteps.py
-DTEST_NAME:STRING=CinemaExportNoTimesteps
-P ${CMAKE_CURRENT_SOURCE_DIR}/CinemaExportFullWorkflowTest.cmake)
set_tests_properties(CinemaExportNoTimesteps PROPERTIES RUN_SERIAL ON)
_set_standard_test_properties(CinemaExportNoTimesteps)
endif()
ENDIF ()
endif()
......@@ -60,7 +60,7 @@ elseif("${TEST_NAME}" MATCHES "CinemaExport" )
if(WIN32)
# prepping the output python script
execute_process_with_echo(COMMAND
@powershell -Command "(get-content ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}).replace(\"'cube.vtu'\",\"'input'\") | set-content -Path ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}"
powershell.exe -Command "(get-content ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}).replace(\"'cube.vtu'\",\"'input'\") | set-content -Path ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}"
)
else()
# prepping the output python script
......@@ -72,7 +72,7 @@ elseif("${TEST_NAME}" MATCHES "CinemaExport" )
if(WIN32)
# prepping the output python script
execute_process_with_echo(COMMAND
@powershell -Command "(get-content ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}).replace(\"'can.ex2'\",\"'input'\") | set-content -Path ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}"
powershell.exe -Command "(get-content ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}).replace(\"'can.ex2'\",\"'input'\") | set-content -Path ${COPROCESSING_TEST_DIR}/${CINEMA_BATCH_SCRIPT}"
)
else()
# prepping the output python script
......@@ -97,32 +97,23 @@ if(rv)
message(FATAL_ERROR "pvbatch return value was = '${rv}' ")
endif()
if("${TEST_NAME}" STREQUAL "CinemaExportGeometry")
message("${CINEMA_DATABASE_TESTER}")
execute_process_with_echo(COMMAND
${CINEMA_DATABASE_TESTER}
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/CinemaExportGeometry.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/CinemaExportGeometry.cdb
RESULT_VARIABLE rv)
if(rv)
message(FATAL_ERROR "CoProcessingCompareImageTester second image return value was = '${rv}' ")
endif()
elseif("${TEST_NAME}" STREQUAL "CinemaExportGeometryAndImages")
if(WIN32)
message("${CINEMA_DATABASE_TESTER}")
execute_process_with_echo(COMMAND
execute_process_with_echo(COMMAND
python.exe
${CINEMA_DATABASE_TESTER}
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/CinemaExportGeometryAndImages.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/CinemaExportGeometryAndImages.cdb
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb
RESULT_VARIABLE rv)
if(rv)
message(FATAL_ERROR "CoProcessingCompareImageTester second image return value was = '${rv}' ")
endif()
elseif("${TEST_NAME}" STREQUAL "CinemaExportNoTimesteps")
else()
message("${CINEMA_DATABASE_TESTER}")
execute_process_with_echo(COMMAND
execute_process_with_echo(COMMAND
${CINEMA_DATABASE_TESTER}
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/CinemaExportNoTimesteps.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/CinemaExportNoTimesteps.cdb
--interactive ${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb
--batch ${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb
RESULT_VARIABLE rv)
if(rv)
message(FATAL_ERROR "CoProcessingCompareImageTester second image return value was = '${rv}' ")
......@@ -143,30 +134,32 @@ endif()
if("${TEST_NAME}" MATCHES "CinemaExportGeometry")
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb/can.ex2_0.vtm")
message(FATAL_ERROR "Geometry did not export during interactive (can.ex2_*.vtm)")
message(FATAL_ERROR "Geometry did not export interactively (can.ex2_*.vtm)")
endif()
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb/can.ex2_0.vtm")
message(FATAL_ERROR "Geometry did not export during batch (can.ex2_*.vtm)")
endif()
return()
if(NOT "${TEST_NAME}" MATCHES "CinemaExportGeometryAndImages")
return()
endif()
elseif("${TEST_NAME}" MATCHES "CinemaExportNoTime")
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb/cube.vtu_0.pvtu")
message(FATAL_ERROR "Geometry did not export during interactive (cube.vtu_*.pvtu)")
message(FATAL_ERROR "Geometry did not export interactively (cube.vtu_*.pvtu)")
endif()
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb/cube.vtu_0.pvtu")
message(FATAL_ERROR "Geometry did not export during batch (cube.vtu_*.pvtu)")
endif()
return()
endif()
# There is an extra cinema directory for the batch use-case
if("${TEST_NAME}" MATCHES "CinemaExportGeometryAndImages")
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb/cinema/RenderView1/info.json")
message(FATAL_ERROR "Cinema images did not export during batch")
if("${TEST_NAME}" MATCHES "CinemaExportNoTime" OR "${TEST_NAME}" MATCHES "CinemaExportGeometryAnd")
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb/Renderview1/info.json")
message(FATAL_ERROR "Image database did not export interactively (RenderView*)")
endif()
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/interactive/${TEST_NAME}.cdb/RenderView1/info.json")
message(FATAL_ERROR "Cinema images did not export during batch")
# There is an extra cinema directory for the batch use-case
if(NOT EXISTS "${COPROCESSING_TEST_DIR}/cinema/batch/${TEST_NAME}.cdb/cinema/RenderView1/info.json")
message(FATAL_ERROR "Image database did not export during batch (RenderView*)")
endif()
return()
endif()
if("${TEST_NAME}" STREQUAL "ExportNow")
......
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