BUG: Fix coverage label reports for Bullseye
This teaches CTest to report Labels elements in the Coverage.xml file for Bullseye coverage results.
This commit is contained in:
parent
c4596605df
commit
3078fef81c
@ -1540,6 +1540,8 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
|
|||||||
total_untested += (totalFunctions - functionsCalled);
|
total_untested += (totalFunctions - functionsCalled);
|
||||||
|
|
||||||
std::string fileName = cmSystemTools::GetFilenameName(file.c_str());
|
std::string fileName = cmSystemTools::GetFilenameName(file.c_str());
|
||||||
|
std::string shortFileName =
|
||||||
|
this->CTest->GetShortPathToFile(file.c_str());
|
||||||
|
|
||||||
float cper = percentBranch + percentFunction;
|
float cper = percentBranch + percentFunction;
|
||||||
if(totalBranches > 0)
|
if(totalBranches > 0)
|
||||||
@ -1564,8 +1566,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
|
|||||||
tmpLog << "percentCoverage: " << percent_coverage << "\n";
|
tmpLog << "percentCoverage: " << percent_coverage << "\n";
|
||||||
tmpLog << "coverage metric: " << cmet << "\n";
|
tmpLog << "coverage metric: " << cmet << "\n";
|
||||||
covSumFile << "\t<File Name=\"" << cmXMLSafe(sourceFile)
|
covSumFile << "\t<File Name=\"" << cmXMLSafe(sourceFile)
|
||||||
<< "\" FullPath=\"" << cmXMLSafe(
|
<< "\" FullPath=\"" << cmXMLSafe(shortFileName)
|
||||||
this->CTest->GetShortPathToFile(file.c_str()))
|
|
||||||
<< "\" Covered=\"" << (cmet>0?"true":"false") << "\">\n"
|
<< "\" Covered=\"" << (cmet>0?"true":"false") << "\">\n"
|
||||||
<< "\t\t<BranchesTested>"
|
<< "\t\t<BranchesTested>"
|
||||||
<< branchCovered
|
<< branchCovered
|
||||||
@ -1593,8 +1594,9 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
|
|||||||
<< "\t\t<CoverageMetric>";
|
<< "\t\t<CoverageMetric>";
|
||||||
covSumFile.setf(std::ios::fixed, std::ios::floatfield);
|
covSumFile.setf(std::ios::fixed, std::ios::floatfield);
|
||||||
covSumFile.precision(2);
|
covSumFile.precision(2);
|
||||||
covSumFile << (cmet) << "</CoverageMetric>\n"
|
covSumFile << (cmet) << "</CoverageMetric>\n";
|
||||||
<< "\t</File>" << std::endl;
|
this->WriteXMLLabels(covSumFile, shortFileName);
|
||||||
|
covSumFile << "\t</File>" << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::string end_time = this->CTest->CurrentTime();
|
std::string end_time = this->CTest->CurrentTime();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user