reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-01 07:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ctest_coverage: Search for Jacoco files in the binary directory

Browse Source 
Search for Jacoco coverage files in both the source directory
and the binary directory.
This commit is contained in:
Zack Galbreath 2015-10-29 16:08:10 -04:00 committed by Brad King
parent 4f9a02db41
commit 1db32ffe98
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,