From 918355632c0a0b2156f4921a317f5cff40afee04 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 18 Dec 2009 11:01:24 -0500 Subject: [PATCH] Test for SVNPath element in Update.xml The commit "Submit Subversion directory path in Update.xml" added the element ... to Update.xml for Subversion work trees. This commit teaches the CTest.UpdateSVN test to verify the presence of the element. --- Tests/CTestUpdateCommon.cmake | 6 +++--- Tests/CTestUpdateSVN.cmake.in | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake index 211a0faef..1f5941d5b 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]+$") + set(rev_elements Revision PriorRevision ${UPDATE_GLOBAL_ELEMENTS}) + string(REPLACE ";" "|" rev_regex "${rev_elements}") + set(rev_regex "^\t<(${rev_regex})>[^<\n]+$") 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 57d72fd44..509597b0f 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")