diff options
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 3 | ||||
-rw-r--r-- | Source/CTest/cmParseCacheCoverage.cxx | 12 | ||||
-rw-r--r-- | Source/CTest/cmParseGTMCoverage.cxx | 6 | ||||
-rw-r--r-- | Source/CTest/cmParseMumpsCoverage.cxx | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 593512e..bb39e0d 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -771,6 +771,9 @@ int cmCTestCoverageHandler::HandleMumpsCoverage( "/gtm_coverage.mcov"; if(cmSystemTools::FileExists(coverageFile.c_str())) { + cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, + "Parsing Cache Coverage: " << coverageFile + << std::endl); cov.ReadCoverageFile(coverageFile.c_str()); return static_cast<int>(cont->TotalCoverage.size()); } diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx index e4b0a88..137f344 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -44,11 +44,10 @@ bool cmParseCacheCoverage::LoadCoverageData(const char* d) } } } - // now remove files wht no actual coverage... - this->RemoveUnCoveredFiles(); return true; } +// not currently used, but leave it in case we want it in the future void cmParseCacheCoverage::RemoveUnCoveredFiles() { // loop over the coverage data computed and remove all files @@ -195,15 +194,6 @@ bool cmParseCacheCoverage::ReadCMCovFile(const char* file) { continue; } - // routine and filepath should be set at this point. - // see if we have visited this file before, and if not - // call InitializeMumpsFile - if( this->Coverage.TotalCoverage[filepath].size() == 0) - { - // hack, this should be done on every file, but for now - // just do it on the ones that have coverage at all - this->InitializeMumpsFile(filepath); - } // now we are ready to set the coverage from the line of data cmCTestCoverageHandlerContainer::SingleFileCoverageVector& coverageVector = this->Coverage.TotalCoverage[filepath]; diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index e1f02d6..5dfcfe5 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -103,12 +103,6 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file) function, lineoffset)) { - // hack, this should be done on every file, but for now - // just do it on the ones that have coverage at all - if( this->Coverage.TotalCoverage[filepath].size() == 0) - { - this->InitializeMumpsFile(filepath); - } cmCTestCoverageHandlerContainer::SingleFileCoverageVector& coverageVector = this->Coverage.TotalCoverage[filepath]; coverageVector[lineoffset + linenumber] += count; diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx index 7076315..37e8bd0 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -131,7 +131,7 @@ bool cmParseMumpsCoverage::LoadPackages(const char* d) this->RoutineToDirectory[name.substr(0, name.size()-2)] = *fileIt; // initialze each file, this is left out until CDash is fixed // to handle large numbers of files -// this->InitializeMumpsFile(*fileIt); + this->InitializeMumpsFile(*fileIt); } return true; } |