diff options
| author | Rolf Eike Beer <eb@emlix.com> | 2017-09-19 10:22:50 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2017-09-19 15:41:41 (GMT) |
| commit | 062776e75b4b0340b178d03bd15ef263d5cf8db1 (patch) | |
| tree | 2febd12a999ae0a131c07d7494c2c6b0d11701c7 | |
| parent | 4547d9a83030f8ae7e636cef16a261c65e6feb40 (diff) | |
| download | CMake-062776e75b4b0340b178d03bd15ef263d5cf8db1.zip CMake-062776e75b4b0340b178d03bd15ef263d5cf8db1.tar.gz CMake-062776e75b4b0340b178d03bd15ef263d5cf8db1.tar.bz2 | |
CTest: pass std::string to cmCTestCoverageHandler::ShouldIDoCoverage()
Avoid needless conversion back and forth.
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 17 | ||||
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.h | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 2d5350d..9a58433 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -185,9 +185,9 @@ void cmCTestCoverageHandler::EndCoverageLogXML(cmXMLWriter& xml) this->CTest->EndXML(xml); } -bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file, - const char* srcDir, - const char* binDir) +bool cmCTestCoverageHandler::ShouldIDoCoverage(std::string const& file, + std::string const& srcDir, + std::string const& binDir) { if (this->IsFilteredOut(file)) { return false; @@ -435,8 +435,8 @@ int cmCTestCoverageHandler::ProcessHandler() } const std::string fullFileName = file.first; - bool shouldIDoCoverage = this->ShouldIDoCoverage( - fullFileName.c_str(), sourceDir.c_str(), binaryDir.c_str()); + bool shouldIDoCoverage = + this->ShouldIDoCoverage(fullFileName, sourceDir, binaryDir); if (!shouldIDoCoverage) { cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, ".NoDartCoverage found, so skip coverage check for: " @@ -2016,8 +2016,8 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary( file += sourceFile; } file = cmSystemTools::CollapseFullPath(file); - bool shouldIDoCoverage = this->ShouldIDoCoverage( - file.c_str(), cont->SourceDir.c_str(), cont->BinaryDir.c_str()); + bool shouldIDoCoverage = + this->ShouldIDoCoverage(file, cont->SourceDir, cont->BinaryDir); if (!shouldIDoCoverage) { cmCTestOptionalLog( this->CTest, HANDLER_VERBOSE_OUTPUT, @@ -2318,8 +2318,7 @@ std::set<std::string> cmCTestCoverageHandler::FindUncoveredFiles( gl.FindFiles(glob); std::vector<std::string> files = gl.GetFiles(); for (std::string const& f : files) { - if (this->ShouldIDoCoverage(f.c_str(), cont->SourceDir.c_str(), - cont->BinaryDir.c_str())) { + if (this->ShouldIDoCoverage(f, cont->SourceDir, cont->BinaryDir)) { extraMatches.insert(this->CTest->GetShortPathToFile(f.c_str())); } } diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 99ac5df..6492fe9 100644 --- a/Source/CTest/cmCTestCoverageHandler.h +++ b/Source/CTest/cmCTestCoverageHandler.h @@ -57,8 +57,8 @@ public: void SetLabelFilter(std::set<std::string> const& labels); private: - bool ShouldIDoCoverage(const char* file, const char* srcDir, - const char* binDir); + bool ShouldIDoCoverage(std::string const& file, std::string const& srcDir, + std::string const& binDir); void CleanCoverageLogFiles(std::ostream& log); bool StartCoverageLogFile(cmGeneratedFileStream& ostr, int logFileCount); void EndCoverageLogFile(cmGeneratedFileStream& ostr, int logFileCount); |