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 6e445fce2dc0c882f9b8a584e5b870c063311544 (commit) via 0375865a4e1ab337ae5ac2e8eae888444da00864 (commit) from a355760ad2c3f8ba4a0d606dd9e6093ca6aab665 (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=6e445fce2dc0c882f9b8a584e5b870c063311544 commit 6e445fce2dc0c882f9b8a584e5b870c063311544 Merge: a355760 0375865 Author: David Cole <david.c...@kitware.com> AuthorDate: Fri Jul 29 10:32:12 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jul 29 10:32:12 2011 -0400 Merge topic 'fix-updategit-test' into next 0375865 Fix machine-specific UpdateGIT test failures http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0375865a4e1ab337ae5ac2e8eae888444da00864 commit 0375865a4e1ab337ae5ac2e8eae888444da00864 Author: David Cole <david.c...@kitware.com> AuthorDate: Fri Jul 29 10:24:06 2011 -0400 Commit: David Cole <david.c...@kitware.com> CommitDate: Fri Jul 29 10:24:06 2011 -0400 Fix machine-specific UpdateGIT test failures Generated Update.xml file is larger than the previously hard-coded limit of 4096. Introduce variable max_update_xml_size and bump it up to 16k for reliable test runs. diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake index a52cb14..335d09e 100644 --- a/Tests/CTestUpdateCommon.cmake +++ b/Tests/CTestUpdateCommon.cmake @@ -29,11 +29,13 @@ function(check_updates build) endif(NOT UPDATE_XML_FILE) message(" found ${UPDATE_XML_FILE}") + set(max_update_xml_size 16384) + # Read entries from the Update.xml file set(types "Updated|Modified|Conflicting") file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_ENTRIES REGEX "<(${types}|FullName)>" - LIMIT_INPUT 4096 + LIMIT_INPUT ${max_update_xml_size} ) string(REGEX REPLACE "[ \t]*<(${types})>[ \t]*;[ \t]*<FullName>([^<]*)</FullName>" @@ -51,7 +53,7 @@ function(check_updates build) set(rev_regex "^\t<(${rev_regex})>[^<\n]+</(${rev_regex})>$") file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_REVISIONS REGEX "${rev_regex}" - LIMIT_INPUT 4096 + LIMIT_INPUT ${max_update_xml_size} ) foreach(r IN LISTS UPDATE_XML_REVISIONS) string(REGEX REPLACE "${rev_regex}" "\\1" element "${r}") @@ -94,7 +96,7 @@ function(check_updates build) file(GLOB UPDATE_LOG_FILE ${TOP}/${build}/Testing/Temporary/LastUpdate*.log) if(UPDATE_LOG_FILE) - file(READ ${UPDATE_LOG_FILE} UPDATE_LOG LIMIT 4096) + file(READ ${UPDATE_LOG_FILE} UPDATE_LOG LIMIT ${max_update_xml_size}) string(REGEX REPLACE "\n" "\n " UPDATE_LOG "${UPDATE_LOG}") set(MSG "${MSG}Update log:\n ${UPDATE_LOG}") else(UPDATE_LOG_FILE) ----------------------------------------------------------------------- Summary of changes: Tests/CTestUpdateCommon.cmake | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits