[Cmake-commits] CMake branch, next, updated. v2.8.12-4732-g32dc4e1

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  32dc4e149a9b0eb4b7551e47b74e0f8928601eb2 (commit)
       via  1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978 (commit)
      from  f24ef61cddba064cf2ed448294b1f78f2c4362b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32dc4e149a9b0eb4b7551e47b74e0f8928601eb2
commit 32dc4e149a9b0eb4b7551e47b74e0f8928601eb2
Merge: f24ef61 1b54b1d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 1 09:16:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 1 09:16:08 2013 -0400

    Merge topic 'ctest-p4' into next
    
    1b54b1d ctest_update: Do not remove the p4 depot name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978
commit 1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978
Author:     Pedro Navarro <pnavarro at netflix.com>
AuthorDate: Thu Oct 31 13:24:57 2013 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 1 08:52:26 2013 -0400

    ctest_update: Do not remove the p4 depot name
    
    Instead of removing the depot name, which causes problems when looking
    at the file change list in CDash, make the Update test remove a given
    prefix from the files retrieved from Update.xml.

diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index a504157..0058721 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/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);
-        // 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;
+        CurrentPath = this->RegexDiff.match(1);
         AlreadyNotified = false;
       }
     else
diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake
index ae8fda2..db4e08d 100644
--- a/Tests/CTestUpdateCommon.cmake
+++ b/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})
diff --git a/Tests/CTestUpdateP4.cmake.in b/Tests/CTestUpdateP4.cmake.in
index f23bd11..f0420c4 100644
--- a/Tests/CTestUpdateP4.cmake.in
+++ b/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")
 
 #-----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestP4.cxx    |   12 +-----------
 Tests/CTestUpdateCommon.cmake |    9 +++++++++
 Tests/CTestUpdateP4.cmake.in  |    1 +
 3 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake