diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-02 19:10:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-02 19:10:12 (GMT) |
| commit | 330577ce875568bc0906ac08cd6c2a638ab503eb (patch) | |
| tree | 931976ae1b0a97e4f9ec3a6d86b857b4b3eb6c80 | |
| parent | 86bae62bd1a3369a1487887392d22be39530a2bd (diff) | |
| parent | 0375865a4e1ab337ae5ac2e8eae888444da00864 (diff) | |
| download | CMake-330577ce875568bc0906ac08cd6c2a638ab503eb.zip CMake-330577ce875568bc0906ac08cd6c2a638ab503eb.tar.gz CMake-330577ce875568bc0906ac08cd6c2a638ab503eb.tar.bz2 | |
Merge topic 'fix-updategit-test'
0375865 Fix machine-specific UpdateGIT test failures
| -rw-r--r-- | Tests/CTestUpdateCommon.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
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) |