diff options
author | Pedro Navarro <pnavarro@netflix.com> | 2013-10-31 20:24:57 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-11-01 12:52:26 (GMT) |
commit | 1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978 (patch) | |
tree | 46bf996cf965d140caae9885cf1bf3b728bed9bd /Source/CTest | |
parent | 7a616e75b84d692e2df453e889c12d1afdb6c576 (diff) | |
download | CMake-1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978.zip CMake-1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978.tar.gz CMake-1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978.tar.bz2 |
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.
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestP4.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
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 |