[Cmake-commits] CMake branch, next, updated. v2.8.6-2334-g364dd29
David Cole
david.cole at kitware.com
Fri Dec 30 15:43:47 EST 2011
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 364dd295a00da4887e31741be4a3249afbf8838f (commit)
via 4c2d70768aec9f02a66a42a19db21e9a1d513a03 (commit)
from 2ccd80971863f5c2acc9be6f21f3f60ce1b299ef (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=364dd295a00da4887e31741be4a3249afbf8838f
commit 364dd295a00da4887e31741be4a3249afbf8838f
Merge: 2ccd809 4c2d707
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Dec 30 15:43:43 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 30 15:43:43 2011 -0500
Merge topic 'update-cygwin-release-script' into next
4c2d707 Release: Increase timeout for slow-testing cygwin build
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c2d70768aec9f02a66a42a19db21e9a1d513a03
commit 4c2d70768aec9f02a66a42a19db21e9a1d513a03
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Dec 30 15:40:07 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Dec 30 15:40:50 2011 -0500
Release: Increase timeout for slow-testing cygwin build
The parent commit only added DART_TESTING_TIMEOUT to the cache.
Also add CTEST_TEST_TIMEOUT because the logic in
CMake/Tests/CMakeLists.txt uses that variable in its "long test
timeout" computation. Now the cygwin build really does have 7200
seconds before it calls timeout death on a test.
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake
index 74d5012..78e8df0 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -8,6 +8,7 @@ set(CPACK_SOURCE_GENERATORS "CygwinSource")
set(MAKE_PROGRAM "make")
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE
+CTEST_TEST_TIMEOUT:STRING=7200
DART_TESTING_TIMEOUT:STRING=7200
")
set(CXX g++)
-----------------------------------------------------------------------
Summary of changes:
Utilities/Release/dash2win64_cygwin.cmake | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list