Update bootstraptest_increase_timeout.diff with upstream version.
My previous patch didn't work.
This commit is contained in:
parent
05d008ccad
commit
35ca1848e4
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,5 +1,7 @@
|
||||
cmake (2.8.0-4) UNRELEASED; urgency=low
|
||||
|
||||
* Update bootstraptest_increase_timeout.diff with upstream version. My previous
|
||||
patch didn't work.
|
||||
|
||||
-- Modestas Vainius <modestas@vainius.eu> Mon, 23 Nov 2009 19:44:53 +0200
|
||||
|
||||
|
@ -1,17 +1,17 @@
|
||||
From: Modestas Vainius <modestas@vainius.eu>
|
||||
Subject: increase time out for BootstrapTest to 2 hours
|
||||
Default time out of 25 minutes (1500 seconds) is not enough on slow
|
||||
and embedded systems (e.g. armel, s390).
|
||||
Bug: http://public.kitware.com/Bug/view.php?id=9950
|
||||
Origin: upstream, cvs diff -u -r 1.154 -r 1.155 Tests/CMakeLists.txt
|
||||
Forwarded: not-needed
|
||||
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -1372,6 +1372,7 @@
|
||||
--build-noclean
|
||||
--build-makeprogram ${CMake_SOURCE_DIR}/bootstrap
|
||||
--build-generator "${CMAKE_TEST_GENERATOR}"
|
||||
+ --test-timeout 7200
|
||||
--test-command
|
||||
${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
|
||||
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")
|
||||
@@ -1380,7 +1380,7 @@
|
||||
GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)
|
||||
IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
|
||||
SET_TESTS_PROPERTIES ( BootstrapTest
|
||||
- PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
|
||||
+ PROPERTIES TIMEOUT 5400)
|
||||
ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
|
||||
ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user