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

Merge topic 'expand_cobertura_search'

Browse Source 
32268810 CTest: Expand directories for Cobertura search
This commit is contained in:
Brad King 2015-11-23 13:47:25 -05:00 committed by CMake Topic Stage
commit ed08d1d489
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -820,11 +820,26 @@ int cmCTestCoverageHandler::HandleCoberturaCoverage(
{ {
cmParseCoberturaCoverage cov(*cont, this->CTest); cmParseCoberturaCoverage cov(*cont, this->CTest);
// Assume the coverage.xml is in the source directory // Assume the coverage.xml is in the binary directory
std::string coverageXMLFile = this->CTest->GetBinaryDir() + "/coverage.xml"; // check for the COBERTURADIR environment variable,
// if it doesn't exist or is empty, assume the
// binary directory is used.
std::string coverageXMLFile;
const char* covDir = cmSystemTools::GetEnv("COBERTURADIR");
if(covDir && strlen(covDir) != 0)
{
coverageXMLFile = std::string(covDir);
}
else
{
coverageXMLFile = this->CTest->GetBinaryDir();
}
// build the find file string with the directory from above
coverageXMLFile += "/coverage.xml";
if(cmSystemTools::FileExists(coverageXMLFile.c_str())) if(cmSystemTools::FileExists(coverageXMLFile.c_str()))
{ {
// If file exists, parse it
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Parsing Cobertura XML file: " << coverageXMLFile "Parsing Cobertura XML file: " << coverageXMLFile
<< std::endl, this->Quiet); << std::endl, this->Quiet);
@ -833,7 +848,7 @@ int cmCTestCoverageHandler::HandleCoberturaCoverage(
else else
{ {
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Cannot find Cobertura XML file: " << coverageXMLFile " Cannot find Cobertura XML file: " << coverageXMLFile
<< std::endl, this->Quiet); << std::endl, this->Quiet);
} }
return static_cast<int>(cont->TotalCoverage.size()); return static_cast<int>(cont->TotalCoverage.size());

1
Tests/CMakeLists.txt
View File

@ -2544,6 +2544,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
set_tests_properties(CTestCoberturaCoverage PROPERTIES set_tests_properties(CTestCoberturaCoverage PROPERTIES
PASS_REGULAR_EXPRESSION PASS_REGULAR_EXPRESSION
"Process file.*CoverageTest.java.*Total LOC:.*18.*Percentage Coverage: 72.22.*" "Process file.*CoverageTest.java.*Total LOC:.*18.*Percentage Coverage: 72.22.*"
ENVIRONMENT COBERTURADIR=${CMake_BINARY_DIR}/Testing/CoberturaCoverage
ENVIRONMENT COVFILE=) ENVIRONMENT COVFILE=)