Merge topic 'improve-parallel-rendering-tests'

450a89e0

 Improved a few parallel rendering tests.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1616

Rendering/Parallel/Testing/Cxx/CMakeLists.txt

@@ -15,13 +15,10 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
 vtk_test_cxx_executable(${vtk-module}CxxTests tests)
 
 vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests
-  RENDERING_DATA
-  TestSimplePCompositeZPass.cxx
+  TestSimplePCompositeZPass.cxx,TESTING_DATA
+  TestParallelRendering.cxx,TESTING_DATA
   ${extra_opengl_tests}
   )
-vtk_add_test_mpi(${vtk-module}CxxTests-MPI no_data_tests
-  TestParallelRendering.cxx
-  )
 
 set(all_tests
   ${tests}

Rendering/Parallel/Testing/Cxx/TestParallelRendering.cxx

@@ -18,7 +18,7 @@
 #include "vtkMPICommunicator.h"
 #include "vtkMPIController.h"
 #include "vtkSynchronizedRenderWindows.h"
-#include "vtkSynchronizedRenderers.h"
+#include "vtkCompositedSynchronizedRenderers.h"
 #include "vtkTestUtilities.h"
 #include "vtkRegressionTestImage.h"
 #include "vtkRenderWindowInteractor.h"
@@ -109,7 +109,8 @@ void MyProcess::Execute()
   syncWindows->SetParallelController(this->Controller);
   syncWindows->SetIdentifier(1);
 
-  vtkSynchronizedRenderers* syncRenderers = vtkSynchronizedRenderers::New();
+  vtkCompositedSynchronizedRenderers* syncRenderers =
+    vtkCompositedSynchronizedRenderers::New();
   syncRenderers->SetRenderer(renderer);
   syncRenderers->SetParallelController(this->Controller);
   //syncRenderers->SetImageReductionFactor(3);
@@ -194,6 +195,5 @@ int TestParallelRendering(int argc, char *argv[])
   contr->Finalize();
   contr->Delete();
   vtkMultiProcessController::SetGlobalController(0);
-  //return !retVal;
-  return 0;
+  return !retVal;
 }

Rendering/Parallel/Testing/Data/Baseline/TestParallelRendering.png.md5

+2dfa743d851ae91dd2df5fdf5e3aec04

Rendering/Parallel/Testing/Data/Baseline/TestSimplePCompositeZPass.png.md5

+fba04c35eae9b62d9f4355d80a5d976c