You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2019/11/25 17:38:01 UTC

[qpid-dispatch] branch master updated: NO-JIRA -Default the DISPATCH_TEST_TIMEOUT to 600 seconds. Travis will use this going forward. This closes #628.

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

gmurthy 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 79636b0  NO-JIRA -Default the DISPATCH_TEST_TIMEOUT to 600 seconds. Travis will use this going forward. This closes #628.
79636b0 is described below

commit 79636b02428eeeb7aa74e4f9d96600abf1fbccfb
Author: Ganesh Murthy <gm...@apache.org>
AuthorDate: Fri Nov 22 12:22:29 2019 -0500

    NO-JIRA -Default the DISPATCH_TEST_TIMEOUT to 600 seconds. Travis will use this going forward. This closes #628.
---
 .travis.yml    | 2 +-
 CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index efe6ce6..aa89cca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,7 +104,7 @@ before_script:
 - source qpid-proton/build/config.sh
 - mkdir build
 - pushd build
-- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DDISPATCH_TEST_TIMEOUT=600 ${DISPATCH_CMAKE_ARGS}
+- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${DISPATCH_CMAKE_ARGS}
 - cmake --build . --target install -- -j $NPROC
 
 script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7357aa..6dd9733 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ endif(PYTHON_VERSION_MAJOR EQUAL 2 AND PYTHON_VERSION_MINOR LESS 7)
 
 if(NOT UNITTEST_MISSING)
   if (NOT DEFINED DISPATCH_TEST_TIMEOUT)
-    set(DISPATCH_TEST_TIMEOUT "360")
+    set(DISPATCH_TEST_TIMEOUT "600")
   endif (NOT DEFINED DISPATCH_TEST_TIMEOUT)
   SET(DART_TESTING_TIMEOUT ${DISPATCH_TEST_TIMEOUT} CACHE STRING "Default CTest timeout in seconds")
   include (CTest)


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