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

Merge topic 'fix_coverage_file_searching' 

bc29ed54 CTest: Make coverage file selection more specific.
This commit is contained in:
Brad King 2016-02-26 10:31:30 -05:00 committed by CMake Topic Stage
parent 79d4b5bec9 bc29ed542b
commit 467f83d2e5
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -983,7 +983,7 @@ int cmCTestCoverageHandler::HandleDelphiCoverage(
std::string BinDir
= this->CTest->GetBinaryDir();
std::string coverageFile = BinDir+ "/*.html";
std::string coverageFile = BinDir+ "/*(*.pas).html";
g.FindFiles(coverageFile);
@ -1017,9 +1017,25 @@ int cmCTestCoverageHandler::HandleBlanketJSCoverage(
std::string coverageFile = SourceDir+ "/*.json";
cmsys::Glob g;
std::vector<std::string> files;
std::vector<std::string> blanketFiles;
g.FindFiles(coverageFile);
files=g.GetFiles();
if (!files.empty())
// Ensure that the JSON files found are the result of the
// Blanket.js output. Check for the "node-jscoverage"
// string on the second line
std::string line;
for(unsigned int fileEntry=0;fileEntry<files.size();fileEntry++)
{
cmsys::ifstream in(files[fileEntry].c_str());
cmSystemTools::GetLineFromStream(in, line);
cmSystemTools::GetLineFromStream(in, line);
if (line.find("node-jscoverage") != line.npos)
{
blanketFiles.push_back(files[fileEntry]);
}
}
// Take all files with the node-jscoverage string and parse those
if (!blanketFiles.empty())
{
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Found BlanketJS output JSON, Performing Coverage" << std::endl,