[Cmake-commits] CMake branch, next, updated. v2.8.3-1285-g8c041fa

[David Cole]

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  8c041faf14490aa4e8838032085940dd15d642c5 (commit)
       via  42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3 (commit)
      from  f4ab3012ad34e31a67b7fe5c5e9554b3592c339a (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=8c041faf14490aa4e8838032085940dd15d642c5
commit 8c041faf14490aa4e8838032085940dd15d642c5
Merge: f4ab301 42b26ee
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jan 11 15:32:48 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 11 15:32:48 2011 -0500

    Merge topic 'increase-ep-test-timeout' into next
    
    42b26ee ExternalProject Test: Increase test timeout value


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3
commit 42b26ee5db46d8f8ee5b79e234fd212d61e5b3a3
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jan 11 15:24:50 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Jan 11 15:24:50 2011 -0500

    ExternalProject Test: Increase test timeout value
    
    Previously, it was hard-coded at 1000 seconds. Now it uses
    the value of CMAKE_LONG_TEST_TIMEOUT, which has a minimum
    value of 1500 seconds, but might have a longer value depending
    on the CTEST_TEST_TIMEOUT value of the driving dashboard.
    
    This should help avoid test failures on overloaded dashboard
    machines where it really does take that long to finish the
    test successfully.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index faaa177..d872fa7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -792,11 +792,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --test-command ${CMAKE_CTEST_COMMAND} -V
     )
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject")
-  # The ExternalProject test takes 900 seconds on some machines!
-  GET_TEST_PROPERTY(ExternalProject TIMEOUT PREVIOUS_TIMEOUT)
-  IF("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
-    SET_TESTS_PROPERTIES(ExternalProject PROPERTIES TIMEOUT 1000)
-  ENDIF("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
+  SET_TESTS_PROPERTIES(ExternalProject PROPERTIES
+    TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
 
   # do each of the tutorial steps
   FOREACH(STP RANGE 1 7)

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

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


hooks/post-receive
-- 
CMake