Merge topic 'ctest-p4'

1b54b1d ctest_update: Do not remove the p4 depot name

Source/CTest/cmCTestP4.cxx

@@ -144,17 +144,7 @@ private:
     if(!this->Line.empty() && this->Line[0] == '='
        && this->RegexDiff.find(this->Line))
       {
-        std::string Path = this->RegexDiff.match(1);
+        CurrentPath = this->RegexDiff.match(1);
-        // See if we need to remove the //depot prefix
-        if(Path.length() > 2 && Path[0] == '/' && Path[1] == '/')
-          {
-          size_t found = Path.find('/', 2);
-          if(found != std::string::npos)
-            {
-            Path = Path.substr(found + 1);
-            }
-          }
-        CurrentPath = Path;
         AlreadyNotified = false;
       }
     else

Tests/CTestUpdateCommon.cmake

@@ -37,10 +37,19 @@ function(check_updates build)
     REGEX "<(${types}|FullName)>"
     LIMIT_INPUT ${max_update_xml_size}
     )
+
   string(REGEX REPLACE
     "[ \t]*<(${types})>[ \t]*;[ \t]*<FullName>([^<]*)</FullName>"
     "\\1{\\2}" UPDATE_XML_ENTRIES "${UPDATE_XML_ENTRIES}")
 
+  # If specified, remove the given prefix from the files in Update.xml.
+  # Some VCS systems, like Perforce, return absolute locations
+  if(DEFINED REPOSITORY_FILE_PREFIX)
+    string(REPLACE
+      "${REPOSITORY_FILE_PREFIX}" ""
+      UPDATE_XML_ENTRIES "${UPDATE_XML_ENTRIES}")
+  endif()
+
   # Compare expected and actual entries
   set(EXTRA "${UPDATE_XML_ENTRIES}")
   list(REMOVE_ITEM EXTRA ${ARGN} ${UPDATE_EXTRA} ${UPDATE_MAYBE})

Tests/CTestUpdateP4.cmake.in

@@ -8,6 +8,7 @@ set(P4_TOP "${TOP}")
 set(TOP "${TOP}/@CTestUpdateP4_DIR@")
 
 # Include code common to all update tests.
+set(REPOSITORY_FILE_PREFIX "//ctest/")
 include("@CMAKE_CURRENT_SOURCE_DIR@/CTestUpdateCommon.cmake")
 
 #-----------------------------------------------------------------------------