kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'jacoco_out_of_source' 

1db32ffe ctest_coverage: Search for Jacoco files in the binary directory
This commit is contained in:
Brad King 2015-11-16 09:22:41 -05:00 committed by CMake Topic Stage
parent 64b3df7d1e 1db32ffe98
commit 96be53aebd
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -913,16 +913,33 @@ int cmCTestCoverageHandler::HandleJacocoCoverage(
{
cmParseJacocoCoverage cov =
cmParseJacocoCoverage(*cont, this->CTest);
cmsys::Glob g;
// Search in the source directory.
cmsys::Glob g1;
std::vector<std::string> files;
g.SetRecurse(true);
g1.SetRecurse(true);
std::string SourceDir
= this->CTest->GetCTestConfiguration("SourceDirectory");
std::string coverageFile = SourceDir+ "/*jacoco.xml";
g.FindFiles(coverageFile);
files=g.GetFiles();
g1.FindFiles(coverageFile);
files = g1.GetFiles();
// ...and in the binary directory.
cmsys::Glob g2;
std::vector<std::string> binFiles;
g2.SetRecurse(true);
std::string binaryDir
= this->CTest->GetCTestConfiguration("BuildDirectory");
std::string binCoverageFile = binaryDir+ "/*jacoco.xml";
g2.FindFiles(binCoverageFile);
binFiles = g2.GetFiles();
if (!binFiles.empty())
{
files.insert(files.end(), binFiles.begin(), binFiles.end());
}
if (!files.empty())
{
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,