diff options
| author | Brad King <brad.king@kitware.com> | 2009-12-18 16:01:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-12-18 16:01:24 (GMT) |
| commit | 918355632c0a0b2156f4921a317f5cff40afee04 (patch) | |
| tree | 38eafc12b1c954a9b861bbc7b4601bd4de9b34f7 /Tests | |
| parent | a4cdd73636041f032597f12a96f74cd277e6f791 (diff) | |
| download | CMake-918355632c0a0b2156f4921a317f5cff40afee04.zip CMake-918355632c0a0b2156f4921a317f5cff40afee04.tar.gz CMake-918355632c0a0b2156f4921a317f5cff40afee04.tar.bz2 | |
Test for SVNPath element in Update.xml
The commit "Submit Subversion directory path in Update.xml" added the
element <SVNPath>...</SVNPath> to Update.xml for Subversion work trees.
This commit teaches the CTest.UpdateSVN test to verify the presence of
the element.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CTestUpdateCommon.cmake | 6 | ||||
| -rw-r--r-- | Tests/CTestUpdateSVN.cmake.in | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake index 211a0fa..1f5941d 100644 --- a/Tests/CTestUpdateCommon.cmake +++ b/Tests/CTestUpdateCommon.cmake @@ -46,8 +46,9 @@ function(check_updates build) endforeach(f) if(NOT UPDATE_NOT_GLOBAL) - set(rev_elements "Revision|PriorRevision") - set(rev_regex "^\t<(${rev_elements})>[^<\n]+</(${rev_elements})>$") + set(rev_elements Revision PriorRevision ${UPDATE_GLOBAL_ELEMENTS}) + string(REPLACE ";" "|" rev_regex "${rev_elements}") + set(rev_regex "^\t<(${rev_regex})>[^<\n]+</(${rev_regex})>$") file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_REVISIONS REGEX "${rev_regex}" LIMIT_INPUT 4096 @@ -56,7 +57,6 @@ function(check_updates build) string(REGEX REPLACE "${rev_regex}" "\\1" element "${r}") set(element_${element} 1) endforeach() - string(REPLACE "|" ";" rev_elements "${rev_elements}") foreach(element ${rev_elements}) if(NOT element_${element}) list(APPEND MISSING "global <${element}> element") diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in index 57d72fd..509597b 100644 --- a/Tests/CTestUpdateSVN.cmake.in +++ b/Tests/CTestUpdateSVN.cmake.in @@ -5,6 +5,7 @@ # Test in a directory next to this script. get_filename_component(TOP "${CMAKE_CURRENT_LIST_FILE}" PATH) set(TOP "${TOP}/@CTestUpdateSVN_DIR@") +set(UPDATE_GLOBAL_ELEMENTS SVNPath) # Include code common to all update tests. include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake") |