Update bootstraptest_increase_timeout.diff with upstream version.

My previous patch didn't work.
ci/unstable
Modestas Vainius 15 years ago
parent 05d008ccad
commit 35ca1848e4

2
debian/changelog vendored

@ -1,5 +1,7 @@
cmake (2.8.0-4) UNRELEASED; urgency=low 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 -- 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 Subject: increase time out for BootstrapTest to 2 hours
Default time out of 25 minutes (1500 seconds) is not enough on slow Default time out of 25 minutes (1500 seconds) is not enough on slow
and embedded systems (e.g. armel, s390). and embedded systems (e.g. armel, s390).
Bug: http://public.kitware.com/Bug/view.php?id=9950 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 Forwarded: not-needed
--- a/Tests/CMakeLists.txt --- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt
@@ -1372,6 +1372,7 @@ @@ -1380,7 +1380,7 @@
--build-noclean GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT)
--build-makeprogram ${CMake_SOURCE_DIR}/bootstrap IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
--build-generator "${CMAKE_TEST_GENERATOR}" SET_TESTS_PROPERTIES ( BootstrapTest
+ --test-timeout 7200 - PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
--test-command + PROPERTIES TIMEOUT 5400)
${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake) ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest") ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)

Loading…
Cancel
Save