Commit 6d846c40 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Testing enhancements.

* Disable combining of tests. That adds unnecessary variability.
* Add mechanism to for non-parallel test runs.
parent ecf0c285
......@@ -142,6 +142,10 @@ IF ("1" STREQUAL ${HAS_NUMPY})
SET(TESTS_WITH_BASELINES ${TESTS_WITH_BASELINES} ${CMAKE_CURRENT_SOURCE_DIR}/FindDataDialog.xml)
ENDIF ("1" STREQUAL ${HAS_NUMPY})
# These tests cannot be run using ctest -j since they are affected by focus
# changed events.
set (AnimatePipelineTime_FORCE_SERIAL TRUE)
# Set properties for CTH tests
set(CTHAMRBaseline_BREAK TRUE)
......
......@@ -23,5 +23,4 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.1/Viewport" command="mouseRelease" arguments="(0.421603,0.503333,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/TitleBar" command="mousePress" arguments="1,1,0,150,9" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/TitleBar" command="mouseRelease" arguments="1,0,0,150,9" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
</pqevents>
......@@ -19,7 +19,7 @@ ENDMACRO (process_args)
#Determine how many tests are to be grouped.
SET (TEST_GROUP_SIZE 3)
SET (TEST_GROUP_SIZE 1)
FUNCTION (add_pv_test prefix skip_test_flag_suffix)
PV_PARSE_ARGUMENTS(ACT "TEST_SCRIPTS;BASELINE_DIR;COMMAND" "" ${ARGN})
......@@ -27,6 +27,8 @@ FUNCTION (add_pv_test prefix skip_test_flag_suffix)
set (counter 0)
set (extra_args)
set (full_test_name)
set (force_serial FALSE)
while (${counter} LESS ${TEST_GROUP_SIZE})
list(LENGTH ACT_TEST_SCRIPTS num_tests)
if (num_tests)
......@@ -57,6 +59,9 @@ FUNCTION (add_pv_test prefix skip_test_flag_suffix)
if (DEFINED ${test_name}_BREAK)
set (counter 100000) # stop the group.
endif (DEFINED ${test_name}_BREAK)
if (${test_name}_FORCE_SERIAL)
set (force_serial TRUE)
endif (${test_name}_FORCE_SERIAL)
endwhile (${counter} LESS ${TEST_GROUP_SIZE})
if (extra_args)
......@@ -66,6 +71,10 @@ FUNCTION (add_pv_test prefix skip_test_flag_suffix)
${extra_args}
--exit
)
if (force_serial)
set_tests_properties("${prefix}${full_test_name}" PROPERTIES RUN_SERIAL ON)
message(STATUS "Running in serial \"${prefix}${full_test_name}\"")
endif()
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