[Cmake-commits] CMake branch, next, updated. v2.8.1-1303-g3d1e82a

[cmake-commits at cmake.org]

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  3d1e82ab02f57323f4414ec8d9d4ecd14d5a28a3 (commit)
       via  f6909a69ece83851dd9c08a17e08b6c4fb34f308 (commit)
      from  df29e0f528254bfbba7c1c5a2e8dd779afaa5a92 (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=3d1e82ab02f57323f4414ec8d9d4ecd14d5a28a3
commit 3d1e82ab02f57323f4414ec8d9d4ecd14d5a28a3
Merge: df29e0f f6909a6
Author: David Cole <david.cole at kitware.com>
Date:   Thu Jun 3 17:49:15 2010 -0400

    Merge branch 'fix-large-output-test' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6909a69ece83851dd9c08a17e08b6c4fb34f308
commit f6909a69ece83851dd9c08a17e08b6c4fb34f308
Author: David Cole <david.cole at kitware.com>
Date:   Thu Jun 3 17:47:48 2010 -0400

    Use the long test timeout value for SubmitLargeOutput.
    
    Hopefully this will be a large enough value to get the
    large output test to pass on the still exceedingly slow
    dash19.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 330cf9f..e0fc094 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1493,6 +1493,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     #
     SET_TESTS_PROPERTIES(CTestSubmitLargeOutput PROPERTIES
       PASS_REGULAR_EXPRESSION "Errors occurred during submission")
+
+    # Give this test plenty of time to run on slower machines:
+    #
+    SET_TESTS_PROPERTIES(CTestSubmitLargeOutput PROPERTIES
+      TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
   ENDIF(CTEST_RUN_CTestSubmitLargeOutput)
 
   IF (CMAKE_RUN_LONG_TESTS AND TEST_KDE4_STABLE_BRANCH)
diff --git a/Tests/CTestSubmitLargeOutput/test.cmake.in b/Tests/CTestSubmitLargeOutput/test.cmake.in
index bc094b0..17a7c7d 100644
--- a/Tests/CTestSubmitLargeOutput/test.cmake.in
+++ b/Tests/CTestSubmitLargeOutput/test.cmake.in
@@ -16,6 +16,7 @@ CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 
 SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1000000000)
 SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000000)
+SET(CTEST_TEST_TIMEOUT @CMAKE_LONG_TEST_TIMEOUT@)
 
 CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 

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

Summary of changes:
 Tests/CMakeLists.txt                       |    5 +++++
 Tests/CTestSubmitLargeOutput/test.cmake.in |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake