Commit e7a1ee32 authored by Sebastien Jourdain's avatar Sebastien Jourdain

Revert "Revert "Add support for multi-server testing""

This reverts commit 055fb78b.
parent 055fb78b
......@@ -418,6 +418,11 @@ set (XdmfGridAttributes_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
set (XYChart_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
set (ZLibXDMF_ENABLE_COLLAB ${PARAVIEW_COLLABORATION_TESTING})
set(TESTS_WITH_MULTI_SERVERS_3
${CMAKE_CURRENT_SOURCE_DIR}/TestMultiServer3.xml
)
IF (PARAVIEW_DATA_ROOT)
set (TESTS_WITHOUT_BASELINES
${TESTS_WITHOUT_BASELINES}
......@@ -460,4 +465,7 @@ IF (PARAVIEW_DATA_ROOT)
BASELINE_DIR ${PARAVIEW_DATA_ROOT}/Baseline
TEST_SCRIPTS ${TESTS_WITH_BASELINES})
add_multi_server_tests("pvcs-multi-servers" 3
BASELINE_DIR ${PARAVIEW_DATA_ROOT}/Baseline
TEST_SCRIPTS ${TESTS_WITH_MULTI_SERVERS_3})
ENDIF (PARAVIEW_DATA_ROOT)
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,55,8,/0:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,55,8,/0:0" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="ArrowSource" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,76,11,/1:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,76,11,/1:0" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="ConeSource" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,67,10,/2:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,67,10,/2:0" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="CylinderSource" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/Resolution/LineEdit" command="set_string" arguments="60" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/Resolution/LineEdit" command="set_string" arguments="60" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,60,7,/3:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,60,7,/3:0" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="RTAnalyticSource" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Clip" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/ClipFunction/pqImplicitPlaneWidget/show3DWidget" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Layout #1" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/TestMultiServer1.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Layout #2" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget2/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/TestMultiServer2.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Layout #4" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget4/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/TestMultiServer4.png" width="300" height="300" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Layout #3" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget3/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/TestMultiServer3.png" width="300" height="300" />
</pqevents>
......@@ -136,3 +136,26 @@ FUNCTION(add_multi_client_tests prefix)
endif()
endforeach(test_script)
ENDFUNCTION(add_multi_client_tests)
FUNCTION(add_multi_server_tests prefix nbServers)
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR" "" ${ARGN})
foreach (test_script ${ACT_TEST_SCRIPTS})
get_filename_component(test_name ${test_script} NAME_WE)
set (extra_args)
process_args(extra_args)
add_test("${prefix}.${test_name}"
${PARAVIEW_SMTESTDRIVER_EXECUTABLE}
--test-multi-servers ${nbServers}
--server ${PARAVIEW_SERVER_EXECUTABLE}
--client ${CLIENT_EXECUTABLE}
-dr
--disable-light-kit
--test-directory=${PARAVIEW_TEST_DIR}
--test-script=${test_script}
${extra_args}
--exit
)
endforeach(test_script)
ENDFUNCTION(add_multi_server_tests)
This diff is collapsed.
......@@ -138,7 +138,6 @@ private:
// identifies how to connect to the server.
std::string ServerURL;
int RenderServerNumProcesses;
double TimeOut;
double ServerExitTimeOut; // time to wait for servers to finish.
int TestRenderServer;
......@@ -147,6 +146,7 @@ private:
int AllowErrorInOutput;
int TestRemoteRendering;
int TestMultiClient;
int NumberOfServers;
// Specify if the -rc flag was passed or not
int ReverseConnection;
......
......@@ -60,6 +60,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QApplication>
#include <QDebug>
#include <QMainWindow>
#include <QString>
#include <QStringList>
#include <QTimer>
......@@ -92,7 +93,20 @@ void pqCommandLineOptionsBehavior::processCommandLineOptions()
}
else if (server_url)
{
if (!pqServerConnectReaction::connectToServer(pqServerResource(server_url)))
if(strchr(server_url, '|') != NULL)
{
// We should connect multiple times
QStringList urls = QString(server_url).split(QRegExp("\\|"), QString::SkipEmptyParts);
foreach(QString url, urls)
{
if (!pqServerConnectReaction::connectToServer(pqServerResource(url)))
{
qCritical() << "Could not connect to requested server \""
<< url << "\". Creating default builtin connection.";
}
}
}
else if (!pqServerConnectReaction::connectToServer(pqServerResource(server_url)))
{
qCritical() << "Could not connect to requested server \""
<< server_url << "\". Creating default builtin connection.";
......
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