You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2020/08/26 19:27:21 UTC

[qpid-proton] branch master updated: PROTON-2270 remove explicit threaderciser test timeout; set a global one for Travis (#270)

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/master by this push:
     new 727fca0  PROTON-2270 remove explicit threaderciser test timeout; set a global one for Travis (#270)
727fca0 is described below

commit 727fca02bb0c9a6e6cdef2e8b7b6faf79bb2427d
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Wed Aug 26 21:27:09 2020 +0200

    PROTON-2270 remove explicit threaderciser test timeout; set a global one for Travis (#270)
---
 .travis.yml            | 3 ++-
 c/tests/CMakeLists.txt | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 80555a8..6693a2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -163,4 +163,5 @@ before_script:
 - 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}
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 @@ if (CMAKE_CXX_COMPILER)
         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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org