[Cmake-commits] CMake branch, next, updated. v2.8.2-1096-gdb16b4c

[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  db16b4c5e8edd9983e85f8c5c036a462c5456c5a (commit)
       via  1e4fd5fc9cf294400a2d6b07a02368da942187bc (commit)
      from  0d0b39dec91fae1187047e672ed12ef0659925a7 (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=db16b4c5e8edd9983e85f8c5c036a462c5456c5a
commit db16b4c5e8edd9983e85f8c5c036a462c5456c5a
Merge: 0d0b39d 1e4fd5f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 22 14:37:11 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 22 14:37:11 2010 -0400

    Merge topic 'add-cse-contract-test' into next
    
    1e4fd5f Enable overriding contract test timeout values.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e4fd5fc9cf294400a2d6b07a02368da942187bc
commit 1e4fd5fc9cf294400a2d6b07a02368da942187bc
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 22 14:31:36 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Oct 22 14:31:36 2010 -0400

    Enable overriding contract test timeout values.
    
    Use a longer value as the default timeout (6 hours).
    
    For a per-contract-test timeout value, set ${project}_TEST_TIMEOUT
    in the project's RunTest.cmake file. To use a longer value for
    all non-specific contract tests, set a CMake cache variable
    named CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT.
    
    All timeout values are in seconds.
    
    Also, patch up last commit to defer evaluation of ENV{HOME}
    until EnforceConfig.cmake is included at ctest time. This
    allows Windows machines to have "\\" characters in the HOME
    environment variable if they want to.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ed12c65..5155858 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -23,7 +23,7 @@ IF(DEFINED ENV{HOME} AND NOT CTEST_NO_TEST_HOME)
   SET(TEST_HOME_ENV_CODE "# Fake a user home directory to avoid polluting the real one.
 # But provide original ENV{HOME} value in ENV{CTEST_REAL_HOME} for tests that
 # need access to the real HOME directory.
-SET(ENV{CTEST_REAL_HOME} \"$ENV{HOME}\")
+SET(ENV{CTEST_REAL_HOME} \"\$ENV{HOME}\")
 SET(ENV{HOME} \"${TEST_HOME}\")
 ")
 ENDIF()
@@ -1776,7 +1776,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     INCLUDE(Contracts/${project}/RunTest.cmake)
     ADD_TEST_MACRO(Contracts.${project}
       ${${project}_RUN_TEST})
-    SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT 5400)
+    # Contract test timeout in seconds.
+    # Default to 6 hours.
+    IF(DEFINED ${project}_TEST_TIMEOUT)
+      SET(timeout ${${project}_TEST_TIMEOUT})
+    ELSEIF(CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT)
+      SET(timeout ${CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT})
+    ELSE()
+      SET(timeout 21600)
+    ENDIF()
+    SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT ${timeout})
   ENDFOREACH()
 ENDIF(BUILD_TESTING)
 

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

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


hooks/post-receive
-- 
CMake