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

CTest: Rename coverage implementation for "Python" to "Cobertura" 

The coverage.py tool writes out an XML that conforms to the Cobertura
Coverage tool standard.  Rename the cmParsePythonCoverage files to
instead be cmParseCoberturaCoverage.
This commit is contained in:
Joseph Snyder 2014-06-03 18:30:46 +00:00
parent 0ee116b7eb
commit a2822d3089
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -519,7 +519,7 @@ set(CTEST_SRCS cmCTest.cxx
CTest/cmParseCacheCoverage.cxx CTest/cmParseCacheCoverage.cxx
CTest/cmParseGTMCoverage.cxx CTest/cmParseGTMCoverage.cxx
CTest/cmParsePHPCoverage.cxx CTest/cmParsePHPCoverage.cxx
CTest/cmParsePythonCoverage.cxx CTest/cmParseCoberturaCoverage.cxx
CTest/cmCTestEmptyBinaryDirectoryCommand.cxx CTest/cmCTestEmptyBinaryDirectoryCommand.cxx
CTest/cmCTestGenericHandler.cxx CTest/cmCTestGenericHandler.cxx
CTest/cmCTestHandlerCommand.cxx CTest/cmCTestHandlerCommand.cxx

12
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -11,7 +11,7 @@
============================================================================*/ ============================================================================*/
#include "cmCTestCoverageHandler.h" #include "cmCTestCoverageHandler.h"
#include "cmParsePHPCoverage.h" #include "cmParsePHPCoverage.h"
#include "cmParsePythonCoverage.h" #include "cmParseCoberturaCoverage.h"
#include "cmParseGTMCoverage.h" #include "cmParseGTMCoverage.h"
#include "cmParseCacheCoverage.h" #include "cmParseCacheCoverage.h"
#include "cmCTest.h" #include "cmCTest.h"
@ -401,7 +401,7 @@ int cmCTestCoverageHandler::ProcessHandler()
{ {
return error; return error;
} }
file_count += this->HandlePythonCoverage(&cont); file_count += this->HandleCoberturaCoverage(&cont);
error = cont.Error; error = cont.Error;
if ( file_count < 0 ) if ( file_count < 0 )
{ {
@ -779,10 +779,10 @@ int cmCTestCoverageHandler::HandlePHPCoverage(
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int cmCTestCoverageHandler::HandlePythonCoverage( int cmCTestCoverageHandler::HandleCoberturaCoverage(
cmCTestCoverageHandlerContainer* cont) cmCTestCoverageHandlerContainer* cont)
{ {
cmParsePythonCoverage 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 source directory
std::string coverageXMLFile = this->CTest->GetBinaryDir() + "/coverage.xml"; std::string coverageXMLFile = this->CTest->GetBinaryDir() + "/coverage.xml";
@ -790,14 +790,14 @@ int cmCTestCoverageHandler::HandlePythonCoverage(
if(cmSystemTools::FileExists(coverageXMLFile.c_str())) if(cmSystemTools::FileExists(coverageXMLFile.c_str()))
{ {
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Parsing coverage.py XML file: " << coverageXMLFile "Parsing Cobertura XML file: " << coverageXMLFile
<< std::endl); << std::endl);
cov.ReadCoverageXML(coverageXMLFile.c_str()); cov.ReadCoverageXML(coverageXMLFile.c_str());
} }
else else
{ {
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"Cannot find coverage.py XML file: " << coverageXMLFile "Cannot find Cobertura XML file: " << coverageXMLFile
<< std::endl); << std::endl);
} }
return static_cast<int>(cont->TotalCoverage.size()); return static_cast<int>(cont->TotalCoverage.size());

2
Source/CTest/cmCTestCoverageHandler.h
View File

@ -76,7 +76,7 @@ private:
int HandlePHPCoverage(cmCTestCoverageHandlerContainer* cont); int HandlePHPCoverage(cmCTestCoverageHandlerContainer* cont);
//! Handle coverage for Python with coverage.py //! Handle coverage for Python with coverage.py
int HandlePythonCoverage(cmCTestCoverageHandlerContainer* cont); int HandleCoberturaCoverage(cmCTestCoverageHandlerContainer* cont);
//! Handle coverage for mumps //! Handle coverage for mumps
int HandleMumpsCoverage(cmCTestCoverageHandlerContainer* cont); int HandleMumpsCoverage(cmCTestCoverageHandlerContainer* cont);

10
Source/CTest/cmParsePythonCoverage.cxx → Source/CTest/cmParseCoberturaCoverage.cxx
View File

@ -1,12 +1,12 @@
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmXMLParser.h" #include "cmXMLParser.h"
#include "cmParsePythonCoverage.h" #include "cmParseCoberturaCoverage.h"
#include <cmsys/Directory.hxx> #include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx> #include <cmsys/FStream.hxx>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
class cmParsePythonCoverage::XMLParser: public cmXMLParser class cmParseCoberturaCoverage::XMLParser: public cmXMLParser
{ {
public: public:
XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont) XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont)
@ -104,16 +104,16 @@ private:
}; };
cmParsePythonCoverage::cmParsePythonCoverage( cmParseCoberturaCoverage::cmParseCoberturaCoverage(
cmCTestCoverageHandlerContainer& cont, cmCTestCoverageHandlerContainer& cont,
cmCTest* ctest) cmCTest* ctest)
:Coverage(cont), CTest(ctest) :Coverage(cont), CTest(ctest)
{ {
} }
bool cmParsePythonCoverage::ReadCoverageXML(const char* xmlFile) bool cmParseCoberturaCoverage::ReadCoverageXML(const char* xmlFile)
{ {
cmParsePythonCoverage::XMLParser parser(this->CTest, this->Coverage); cmParseCoberturaCoverage::XMLParser parser(this->CTest, this->Coverage);
parser.ParseFile(xmlFile); parser.ParseFile(xmlFile);
return true; return true;
} }

8
Source/CTest/cmParsePythonCoverage.h → Source/CTest/cmParseCoberturaCoverage.h
View File

@ -10,8 +10,8 @@
See the License for more information. See the License for more information.
============================================================================*/ ============================================================================*/
#ifndef cmParsePythonCoverage_h #ifndef cmParseCoberturaCoverage_h
#define cmParsePythonCoverage_h #define cmParseCoberturaCoverage_h
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h" #include "cmCTestCoverageHandler.h"
@ -25,13 +25,13 @@
* Java-based Cobertura coverage application. This helper class parses * Java-based Cobertura coverage application. This helper class parses
* that XML file to fill the coverage-handler container. * that XML file to fill the coverage-handler container.
*/ */
class cmParsePythonCoverage class cmParseCoberturaCoverage
{ {
public: public:
//! Create the coverage parser by passing in the coverage handler //! Create the coverage parser by passing in the coverage handler
//! container and the cmCTest object //! container and the cmCTest object
cmParsePythonCoverage(cmCTestCoverageHandlerContainer& cont, cmParseCoberturaCoverage(cmCTestCoverageHandlerContainer& cont,
cmCTest* ctest); cmCTest* ctest);
//! Read the XML produced by running `coverage xml` //! Read the XML produced by running `coverage xml`