Commit 11257d6b authored by David Partyka's avatar David Partyka

ENH: Force client server tests to always run serially (for now).

Working progress to randomize the ports used by client server tests. When
that is complete all tests 'should' be runablle in parallel.
parent defd08cf
......@@ -22,11 +22,13 @@ set (TestIsoVolume_BREAK TRUE)
SET(SaveLargeScreenshot_THRESHOLD 10000)
add_client_tests(
TEST_SCRIPTS ${TESTS_WITHOUT_BASELINES})
TEST_SCRIPTS ${TESTS_WITHOUT_BASELINES}
PARALLEL)
IF (PARAVIEW_DATA_ROOT)
add_client_tests("pypv"
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
PARALLEL
)
add_client_server_tests("pypvcs"
......
......@@ -159,12 +159,14 @@ SET (ViewSettingsDialog_DISABLE_CRS TRUE)
SET (CutMulti_REVERSE_CONNECT TRUE)
add_client_tests("pv"
TEST_SCRIPTS ${TESTS_WITHOUT_BASELINES})
TEST_SCRIPTS ${TESTS_WITHOUT_BASELINES}
PARALLEL)
IF (PARAVIEW_DATA_ROOT)
add_client_tests("pv"
BASELINE_DIR ${PARAVIEW_DATA_ROOT}/Baseline
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
PARALLEL
)
add_client_server_tests("pvcs"
......
......@@ -22,7 +22,7 @@ ENDMACRO (process_args)
SET (TEST_GROUP_SIZE 3)
FUNCTION (add_pv_test prefix skip_test_flag_suffix)
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR;COMMAND" "" ${ARGN})
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR;COMMAND" "PARALLEL" ${ARGN})
while (ACT_TEST_SCRIPTS)
set (counter 0)
set (extra_args)
......@@ -66,6 +66,10 @@ FUNCTION (add_pv_test prefix skip_test_flag_suffix)
${extra_args}
--exit
)
if(${ACT_PARALLEL} STREQUAL "FALSE")
set_tests_properties("${prefix}${full_test_name}" PROPERTIES RUN_SERIAL ON)
endif()
#if (ACT_PARALLEL
endif (extra_args)
endwhile (ACT_TEST_SCRIPTS)
......
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