[Cmake-commits] [cmake-commits] king committed CTestUpdateCommon.cmake 1.7 1.8 CTestUpdateSVN.cmake.in 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv16640/Tests

Modified Files:
	CTestUpdateCommon.cmake CTestUpdateSVN.cmake.in 
Log Message:
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.


Index: CTestUpdateSVN.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateSVN.cmake.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CTestUpdateSVN.cmake.in	8 Apr 2009 13:22:08 -0000	1.5
--- CTestUpdateSVN.cmake.in	18 Dec 2009 16:01:24 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  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.

Index: CTestUpdateCommon.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCommon.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CTestUpdateCommon.cmake	18 Dec 2009 13:13:51 -0000	1.7
--- CTestUpdateCommon.cmake	18 Dec 2009 16:01:23 -0000	1.8
***************
*** 47,52 ****
  
    if(NOT UPDATE_NOT_GLOBAL)
!     set(rev_elements "Revision|PriorRevision")
!     set(rev_regex "^\t<(${rev_elements})>[^<\n]+</(${rev_elements})>$")
      file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_REVISIONS
        REGEX "${rev_regex}"
--- 47,53 ----
  
    if(NOT UPDATE_NOT_GLOBAL)
!     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}"
***************
*** 57,61 ****
        set(element_${element} 1)
      endforeach()
-     string(REPLACE "|" ";" rev_elements "${rev_elements}")
      foreach(element ${rev_elements})
        if(NOT element_${element})
--- 58,61 ----