Commit 85619983 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic '13471_enable_dashboard_coprocessing_tests'

b158b61b Fixing tests for static builds of ParaView.
3930eecd Better way to add coprocessing test labels.
76e2ef44 Giving coprocessing tests PARAVIEW and CATALYST labels.
parents f2e0d389 b158b61b
......@@ -41,6 +41,9 @@ add_test(NAME CoProcessingTestPythonScript
-DCOPROCESSING_TEST_SCRIPT=${CMAKE_CURRENT_SOURCE_DIR}/PythonScriptTest.py
-P ${CMAKE_CURRENT_SOURCE_DIR}/CoProcessingTestPythonScript.cmake)
set(CP_LABELS PARAVIEW CATALYST)
set_tests_properties(CoProcessingTestPythonScript PROPERTIES LABELS "${CP_LABELS}")
if (PARAVIEW_USE_MPI)
add_test(NAME PCoProcessingTestPythonScript
COMMAND ${CMAKE_COMMAND}
......@@ -58,19 +61,27 @@ if (PARAVIEW_USE_MPI)
# both the parallel and the serial tests create the same output images
# so we run this one serially so that they don't interfere.
set_tests_properties(PCoProcessingTestPythonScript PROPERTIES RUN_SERIAL ON)
set_tests_properties(PCoProcessingTestPythonScript PROPERTIES LABELS "${CP_LABELS}")
endif()
if (PARAVIEW_BUILD_QT_GUI)
add_test(NAME CoProcessingFullWorkflow
COMMAND ${CMAKE_COMMAND}
-DPARAVIEW_EXECUTABLE:FILEPATH=$<TARGET_FILE:paraview>
-DCOPROCESSING_TEST_DIR:PATH=${PARAVIEW_TEST_DIR}
-DPARAVIEW_TEST_XML:FILEPATH=${ParaView_SOURCE_DIR}/Plugins/CoProcessingScriptGenerator/Testing/CoProcessingGUI.xml
-DPVPYTHON_EXECUTABLE:FILEPATH=$<TARGET_FILE:pvpython>
-DCOPROCESSING_DRIVER_SCRIPT:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/waveletdriver.py
-DCOPROCESSING_IMAGE_TESTER:FILEPATH=$<TARGET_FILE:CoProcessingCompareImagesTester>
-DCOPROCESSING_DATA_DIR:PATH=${PARAVIEW_DATA_ROOT}
-DCOPROCESSING_OUTPUTCHECK_SCRIPT:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/outputcheck.py
-P ${CMAKE_CURRENT_SOURCE_DIR}/CoProcessingFullWorkflowTest.cmake)
# for now the full workflow test only works with the shared lib builds of
# paraview since the static build will load all of the plugins automatically
# which will add in extra properties to objects in the created script
# which can't be used when running the 'simulation' since those same
# plugins won't be loaded then.
IF ( BUILD_SHARED_LIBS )
add_test(NAME CoProcessingFullWorkflow
COMMAND ${CMAKE_COMMAND}
-DPARAVIEW_EXECUTABLE:FILEPATH=$<TARGET_FILE:paraview>
-DCOPROCESSING_TEST_DIR:PATH=${PARAVIEW_TEST_DIR}
-DPARAVIEW_TEST_XML:FILEPATH=${ParaView_SOURCE_DIR}/Plugins/CoProcessingScriptGenerator/Testing/CoProcessingGUI.xml
-DPVPYTHON_EXECUTABLE:FILEPATH=$<TARGET_FILE:pvpython>
-DCOPROCESSING_DRIVER_SCRIPT:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/waveletdriver.py
-DCOPROCESSING_IMAGE_TESTER:FILEPATH=$<TARGET_FILE:CoProcessingCompareImagesTester>
-DCOPROCESSING_DATA_DIR:PATH=${PARAVIEW_DATA_ROOT}
-DCOPROCESSING_OUTPUTCHECK_SCRIPT:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/outputcheck.py
-P ${CMAKE_CURRENT_SOURCE_DIR}/CoProcessingFullWorkflowTest.cmake)
set_tests_properties(CoProcessingFullWorkflow PROPERTIES LABELS "${CP_LABELS}")
ENDIF ( BUILD_SHARED_LIBS )
endif()
......@@ -90,13 +90,20 @@ ADD_PARAVIEW_PLUGIN(
cp_export_py.cxx
)
IF (BUILD_TESTING AND BUILD_SHARED_LIBS)
IF (BUILD_TESTING)
include(ParaViewTestingMacros)
set(CoProcessingGUI_USE_NEW_PANELS TRUE)
# this test is redundant with the CoProcessingFullWorkflow test
# in the coprocessing library but that may not be built so we
# add it here as well. this test though is a subset of that test.
add_client_tests("pv"
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/Testing/CoProcessingGUI.xml )
SET_TESTS_PROPERTIES(pv.CoProcessingGUI PROPERTIES RUN_SERIAL ON)
ENDIF (BUILD_TESTING AND BUILD_SHARED_LIBS)
IF ( BUILD_SHARED_LIBS )
set(CoProcessingGUI_USE_NEW_PANELS TRUE)
add_client_tests("pv"
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/Testing/CoProcessingGUI.xml )
SET_TESTS_PROPERTIES(pv.CoProcessingGUI PROPERTIES RUN_SERIAL ON)
ELSE ( BUILD_SHARED_LIBS )
set(CoProcessingGUI-static_USE_NEW_PANELS TRUE)
add_client_tests("pv"
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/Testing/CoProcessingGUI-static.xml )
SET_TESTS_PROPERTIES(pv.CoProcessingGUI-static PROPERTIES RUN_SERIAL ON)
ENDIF ( BUILD_SHARED_LIBS )
ENDIF (BUILD_TESTING)
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size_Custom" />
<pqevent object="pqClientMainWindow/pqLockViewSizeCustomDialog/Width" command="set_string" arguments="400" />
<pqevent object="pqClientMainWindow/pqLockViewSizeCustomDialog/Height" command="key" arguments="16777217" />
<pqevent object="pqClientMainWindow/pqLockViewSizeCustomDialog/Height" command="set_string" arguments="400" />
<pqevent object="pqClientMainWindow/pqLockViewSizeCustomDialog/ButtonBox/1QPushButton2" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqLockViewSizeCustomDialog/ButtonBox/1QPushButton0" command="activate" arguments="" />
<!--
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionManage_Plugins" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="Moments" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="CoProcessingPlugin" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/buttonBox/1QPushButton0" command="activate" arguments="" />
-->
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="RTAnalyticSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Cut" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/CutFunction/1pqProxySelectionWidget0/pqImplicitPlaneWidget/useZNormal" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,7,4,/0:0/0:1" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,7,4,/0:0/0:1" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="CoProcessingWritersMenu" />
<pqevent object="pqClientMainWindow/CoProcessingWritersMenu" command="activate" arguments="Parallel PolyData Writer" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="CoProcessing" />
<pqevent object="pqClientMainWindow/CoProcessing" command="activate" arguments="Export State" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/__qt__passive_wizardbutton1" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/1QFrame0/wizardPage2/allInputs" command="mousePress" arguments="1,1,0,11,11,/0:0" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/1QFrame0/wizardPage2/allInputs" command="mouseRelease" arguments="1,0,0,11,11,/0:0" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/1QFrame0/wizardPage2/addButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/__qt__passive_wizardbutton1" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/__qt__passive_wizardbutton1" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/1QFrame0/wizardPage_2/outputRendering" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/ExportStateWizard/1QWidget0/finishButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ExportStateWizard/ExportCoprocessingStateFileDialog" command="filesSelected" arguments="$PARAVIEW_TEST_ROOT/cptest.py" />
</pqevents>
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