summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-02 14:54:42 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-11-02 14:54:42 (GMT)
commitf61bbf1b90f940f64f4b1e7b5040c734461ba058 (patch)
tree631022f1647a6e6fe70e468a7f23b075a83c3570 /Source/CTest
parent443d41404740568b384c77339ad624f9147c09b3 (diff)
parent1b54b1d5b7a48e8e804b32a56fc79b34ba1f0978 (diff)
downloadCMake-f61bbf1b90f940f64f4b1e7b5040c734461ba058.zip
CMake-f61bbf1b90f940f64f4b1e7b5040c734461ba058.tar.gz
CMake-f61bbf1b90f940f64f4b1e7b5040c734461ba058.tar.bz2
Merge topic 'ctest-p4'
1b54b1d ctest_update: Do not remove the p4 depot name
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestP4.cxx12
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