commit 727fca02bb0c9a6e6cdef2e8b7b6faf79bb2427d
author Jiri Daněk <jdanek@redhat.com> Wed Aug 26 21:27:09 2020 +0200
committer GitHub <noreply@github.com> Wed Aug 26 21:27:09 2020 +0200
tree 1ca1bdde76ea0eec476e595462103b6a8966cd30
parent 6444ac2e2b8a7a652317b7dcf6576c5a904a67b3

PROTON-2270 remove explicit threaderciser test timeout; set a global one for Travis (#270)

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 80555a8..6693a2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -163,4 +163,5 @@
 - cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install -DPYTHON_EXECUTABLE="$(which ${PYTHON})" ${QPID_PROTON_CMAKE_ARGS}
 
 script:
-- cmake --build . --target install -- -j$(nproc) && eval ctest -V ${QPID_PROTON_CTEST_ARGS}
+# travis timeouts a job after 600 s elapses without any new output being printed; use 360 s here to preempt that
+- cmake --build . --target install -- -j$(nproc) && eval ctest --timeout 360 -V ${QPID_PROTON_CTEST_ARGS}

c/tests/CMakeLists.txt

diff --git a/c/tests/CMakeLists.txt b/c/tests/CMakeLists.txt
index 70cc5dc..487c297 100644
--- a/c/tests/CMakeLists.txt
+++ b/c/tests/CMakeLists.txt
@@ -101,7 +101,6 @@
         PREPEND_ENVIRONMENT ${test_env}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMAND $<TARGET_FILE:c-threaderciser>)
-      set_tests_properties (c-threaderciser PROPERTIES TIMEOUT 120)
     endif()
 
     if(WIN32)