summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2019-08-18 12:22:11 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2019-08-18 12:22:11 (GMT)
commitda26b3be8948471dd2320d1e44af9eb5dfaa0f6a (patch)
treed3e861dde3c600440154767d88a90a13af5abc01 /Source/CTest
parent06e32a089df03c158eaee7525de3ac1be25d8136 (diff)
downloadCMake-da26b3be8948471dd2320d1e44af9eb5dfaa0f6a.zip
CMake-da26b3be8948471dd2320d1e44af9eb5dfaa0f6a.tar.gz
CMake-da26b3be8948471dd2320d1e44af9eb5dfaa0f6a.tar.bz2
avoid adding multiple consecutive string literals to std::string
While at it change some single character additions to be of type char.
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx3
-rw-r--r--Source/CTest/cmCTestLaunch.cxx3
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 54fe612..2a68544 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -2223,8 +2223,7 @@ int cmCTestCoverageHandler::GetLabelId(std::string const& label)
void cmCTestCoverageHandler::LoadLabels()
{
std::string fileList = this->CTest->GetBinaryDir();
- fileList += "/CMakeFiles";
- fileList += "/TargetDirectories.txt";
+ fileList += "/CMakeFiles/TargetDirectories.txt";
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
" target directory list [" << fileList << "]\n",
this->Quiet);
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 739cc58..4708a71 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -283,8 +283,7 @@ void cmCTestLaunch::LoadLabels()
// Labels are listed in per-target files.
std::string fname = this->OptionBuildDir;
- fname += "/CMakeFiles";
- fname += "/";
+ fname += "/CMakeFiles/";
fname += this->OptionTargetName;
fname += ".dir/Labels.txt";