Merge topic 'ctest-gtm-coverage-fileoffset-bug'

782eba3 CTest: Fix GTM coverage parsing line offset bug
This commit is contained in:
Brad King 2013-08-30 08:10:35 -04:00 committed by CMake Topic Stage
commit 452882ebeb
1 changed files with 2 additions and 2 deletions

View File

@ -98,7 +98,7 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
bool found = this->FindMumpsFile(routine, filepath); bool found = this->FindMumpsFile(routine, filepath);
if(found) if(found)
{ {
int lineoffset; int lineoffset = 0;
if(this->FindFunctionInMumpsFile(filepath, if(this->FindFunctionInMumpsFile(filepath,
function, function,
lineoffset)) lineoffset))
@ -106,9 +106,9 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
cmCTestCoverageHandlerContainer::SingleFileCoverageVector& cmCTestCoverageHandlerContainer::SingleFileCoverageVector&
coverageVector = this->Coverage.TotalCoverage[filepath]; coverageVector = this->Coverage.TotalCoverage[filepath];
coverageVector[lineoffset + linenumber] += count; coverageVector[lineoffset + linenumber] += count;
}
lastoffset = lineoffset; lastoffset = lineoffset;
} }
}
else else
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, cmCTestLog(this->CTest, ERROR_MESSAGE,