You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2019/06/14 21:05:48 UTC
[qpid-dispatch] branch master updated: DISPATCH-1359: Change ctest
timeout default value
This is an automated email from the ASF dual-hosted git repository.
chug pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new b172f50 DISPATCH-1359: Change ctest timeout default value
b172f50 is described below
commit b172f501028b36d786b4c83bcee1e195cd17fcf2
Author: Chuck Rolke <ch...@apache.org>
AuthorDate: Fri Jun 14 16:59:38 2019 -0400
DISPATCH-1359: Change ctest timeout default value
The default timeout is 360 seconds. The previous value of 300 seconds was
too tight on many CI build systems.
A single timeout value in seconds may be specified on the CMake command line:
-DDISPATCH_TEST_TIMEOUT=300
The single default applies to all tests.
---
CMakeLists.txt | 4 ++++
tests/CMakeLists.txt | 22 ----------------------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f892590..aef5687 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,10 @@ if(UNITTEST2_MISSING)
# add bogus test for folk who may have missed the cmake warning
add_test(WARNING_python_unittest2_module_NOT_INSTALLED false)
else(UNITTEST2_MISSING)
+ if (NOT DEFINED DISPATCH_TEST_TIMEOUT)
+ set (DISPATCH_TEST_TIMEOUT "360")
+ endif (NOT DEFINED DISPATCH_TEST_TIMEOUT)
+ SET(DART_TESTING_TIMEOUT ${DISPATCH_TEST_TIMEOUT} CACHE STRING "Default CTest timeout in seconds")
include (CTest)
endif(UNITTEST2_MISSING)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2abf79b..2fcff52 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,15 +17,6 @@
## under the License.
##
-# Define short and long test timeouts in seconds.
-# These make be specified on cmake command line.
-if (NOT DEFINED TEST_TIMEOUT_SHORT)
- set (TEST_TIMEOUT_SHORT "10")
-endif (NOT DEFINED TEST_TIMEOUT_SHORT)
-if (NOT DEFINED TEST_TIMEOUT_LONG)
- set (TEST_TIMEOUT_LONG "300")
-endif (NOT DEFINED TEST_TIMEOUT_LONG)
-
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src
@@ -64,31 +55,19 @@ target_link_libraries(unit_tests_size qpid-dispatch)
set(TEST_WRAP ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/run.py)
add_test(unit_tests_size_10000 ${TEST_WRAP} unit_tests_size 10000)
-set_tests_properties(unit_tests_size_10000 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_512 ${TEST_WRAP} unit_tests_size 512)
-set_tests_properties(unit_tests_size_512 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_10 ${TEST_WRAP} unit_tests_size 10)
-set_tests_properties(unit_tests_size_10 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_7 ${TEST_WRAP} unit_tests_size 7)
-set_tests_properties(unit_tests_size_7 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_5 ${TEST_WRAP} unit_tests_size 5)
-set_tests_properties(unit_tests_size_5 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_3 ${TEST_WRAP} unit_tests_size 3)
-set_tests_properties(unit_tests_size_3 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_2 ${TEST_WRAP} unit_tests_size 2)
-set_tests_properties(unit_tests_size_2 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests_size_1 ${TEST_WRAP} unit_tests_size 1)
-set_tests_properties(unit_tests_size_1 PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(unit_tests ${TEST_WRAP} unit_tests ${CMAKE_CURRENT_SOURCE_DIR}/threads4.conf)
-set_tests_properties(unit_tests PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
# Unit test python modules
add_test(router_engine_test ${TEST_WRAP} unit2 -v router_engine_test)
-set_tests_properties(router_engine_test PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(management_test ${TEST_WRAP} unit2 -v management)
-set_tests_properties(management_test PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
add_test(router_policy_test ${TEST_WRAP} unit2 -v router_policy_test)
-set_tests_properties(router_policy_test PROPERTIES TIMEOUT ${TEST_TIMEOUT_SHORT})
if(USE_LIBWEBSOCKETS)
set(SYSTEM_TESTS_HTTP system_tests_http)
@@ -151,7 +130,6 @@ foreach(py_test_module
)
add_test(${py_test_module} ${TEST_WRAP} unit2 -v ${py_test_module})
- set_tests_properties(${py_test_module} PROPERTIES TIMEOUT ${TEST_TIMEOUT_LONG})
list(APPEND SYSTEM_TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${py_test_module}.py)
endforeach()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org