[Cmake-commits] CMake branch, next, updated. v3.0.0-3933-g2bbd819

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2bbd81924b5ccfbe69a5d9964fa6618abd85aa2b (commit)
       via  a73373a8c8ca261398b605572c6e23936496056d (commit)
      from  faea5f229a9dc2afe657347a1a763ba892a0da83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bbd81924b5ccfbe69a5d9964fa6618abd85aa2b
commit 2bbd81924b5ccfbe69a5d9964fa6618abd85aa2b
Merge: faea5f2 a73373a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 25 11:46:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 11:46:22 2014 -0400

    Merge topic 'CTestTestTimeout-increase' into next
    
    a73373a8 CTestTestTimeout: increase the timeout for all platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a73373a8c8ca261398b605572c6e23936496056d
commit a73373a8c8ca261398b605572c6e23936496056d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 25 17:44:09 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jun 25 17:44:09 2014 +0200

    CTestTestTimeout: increase the timeout for all platforms
    
    Slow or busy machines not running Cygwin may also fail the 1 second timeout:
    
    CMake Error at CTestTestTimeout/test.cmake:38 (message):
      Log does not exist:
    
        .../Tests/CTestTestTimeout/timeout.log
    
    http://open.cdash.org/testDetails.php?test=264045338&build=3382733
    http://open.cdash.org/testDetails.php?test=263904235&build=3382056

diff --git a/Tests/CTestTestTimeout/CMakeLists.txt b/Tests/CTestTestTimeout/CMakeLists.txt
index 2e3bd6a..c6cbc47 100644
--- a/Tests/CTestTestTimeout/CMakeLists.txt
+++ b/Tests/CTestTestTimeout/CMakeLists.txt
@@ -3,11 +3,8 @@ project(CTestTestTimeout)
 include(CTest)
 
 if(NOT TIMEOUT)
-  if(CYGWIN)
-    set(TIMEOUT 4) # Cygwin CMake sometimes takes > 1 second to load!
-  else()
-    set(TIMEOUT 1)
-  endif()
+  # Give the process time to load and start running.
+  set(TIMEOUT 4)
 endif()
 
 add_definitions(-DTIMEOUT=${TIMEOUT})

-----------------------------------------------------------------------

Summary of changes:
 Tests/CTestTestTimeout/CMakeLists.txt |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake