Commit cf426181 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot

Merge topic 'cleanup_parallel_tests'

8d10b66f Attempt to make these tests less flaky.
6165d262 Force a few tests to run as serial.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !57
parents f011a679 8d10b66f
...@@ -418,6 +418,13 @@ set (Contour_FORCE_SERIAL TRUE) # since this uses popup-menu ...@@ -418,6 +418,13 @@ set (Contour_FORCE_SERIAL TRUE) # since this uses popup-menu
set (Calculator_FORCE_SERIAL TRUE) # since this uses popup-menu set (Calculator_FORCE_SERIAL TRUE) # since this uses popup-menu
set (LogColorMap_FORCE_SERIAL TRUE) # since this uses popup-menu set (LogColorMap_FORCE_SERIAL TRUE) # since this uses popup-menu
set (ColorOpacityTableEditing_FORCE_SERIAL TRUE) # since this uses popup-menu set (ColorOpacityTableEditing_FORCE_SERIAL TRUE) # since this uses popup-menu
set (FindWidget_FORCE_SERIAL TRUE) # Uses inline edit popups
set (PropertyLink_FORCE_SERIAL TRUE)
set (TestPythonView_FORCE_SERIAL TRUE) # Seems to work better in serial.
set (Contour_FORCE_SERIAL TRUE) # Uses inline edit popups
set (SaveColorMap_FORCE_SERIAL TRUE) # Uses inline edit popups
set (CategoricalColors_FORCE_SERIAL TRUE) # Uses inline edit popups
set (ChartAxisRangeAndLabels_FORCE_SERIAL TRUE) # Uses inline edit popups
# Set properties for CTH tests # Set properties for CTH tests
set(CTHAMRContour_DISABLE_CS TRUE) set(CTHAMRContour_DISABLE_CS TRUE)
......
...@@ -362,11 +362,8 @@ FUNCTION(add_multi_client_tests prefix) ...@@ -362,11 +362,8 @@ FUNCTION(add_multi_client_tests prefix)
${extra_args} ${extra_args}
--exit --exit
) )
if (${test_name}_FORCE_SERIAL) # all 'collab' tests are always run in serial i.e. one at a time.
set_tests_properties("${prefix}.${test_name}" PROPERTIES RUN_SERIAL ON) set_tests_properties("${prefix}.${test_name}" PROPERTIES RUN_SERIAL ON)
message(STATUS "Running in serial \"${prefix}.${test_name}\"")
endif ()
set_tests_properties("${prefix}.${test_name}" PROPERTIES LABELS "PARAVIEW") set_tests_properties("${prefix}.${test_name}" PROPERTIES LABELS "PARAVIEW")
endif() endif()
endforeach() endforeach()
......
...@@ -27,6 +27,11 @@ Wavelet1 = Wavelet() ...@@ -27,6 +27,11 @@ Wavelet1 = Wavelet()
w = XMLPImageDataWriter(FileName=fname) w = XMLPImageDataWriter(FileName=fname)
w.UpdatePipeline() w.UpdatePipeline()
if pm.GetSymmetricMPIMode() == True:
# need to barrier to ensure that all ranks have updated.
controller = pm.GetGlobalController()
controller.Barrier()
r = XMLPartitionedImageDataReader(FileName = fname) r = XMLPartitionedImageDataReader(FileName = fname)
r.UpdatePipeline() r.UpdatePipeline()
......
...@@ -17,6 +17,12 @@ fname = smtesting.TempDir+"/stlfile.stl" ...@@ -17,6 +17,12 @@ fname = smtesting.TempDir+"/stlfile.stl"
writer = servermanager.writers.PSTLWriter(Input=sphere, FileName=fname) writer = servermanager.writers.PSTLWriter(Input=sphere, FileName=fname)
writer.UpdatePipeline() writer.UpdatePipeline()
pm = servermanager.vtkProcessModule.GetProcessModule()
if pm.GetSymmetricMPIMode() == True:
# need to barrier to ensure that all ranks have updated.
controller = pm.GetGlobalController()
controller.Barrier()
reader = servermanager.sources.stlreader(FileNames=(fname,)) reader = servermanager.sources.stlreader(FileNames=(fname,))
view = servermanager.CreateRenderView(); view = servermanager.CreateRenderView();
......
...@@ -8,6 +8,8 @@ set (xmls ...@@ -8,6 +8,8 @@ set (xmls
${CMAKE_CURRENT_SOURCE_DIR}/NonOrthographicOrthographicView.xml ${CMAKE_CURRENT_SOURCE_DIR}/NonOrthographicOrthographicView.xml
) )
set (NonOrthogonalSliceView_FORCE_SERIAL TRUE)
add_client_tests("pv" add_client_tests("pv"
LOAD_PLUGIN "NonOrthogonalSource" LOAD_PLUGIN "NonOrthogonalSource"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR} BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
......
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