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

Merge topic 'fix-13657-more-gcov47-output' 

61ace1d CTest: Coverage handler: expect certain output lines from gcov 4.7 (#13657)
This commit is contained in:
David Cole 2012-12-11 13:44:33 -05:00 committed by CMake Topic Stage
parent bc9dcadf19 61ace1df26
commit d0369a9888
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -1097,11 +1097,18 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
} }
else else
{ {
// gcov 4.7 can have output lines saying "No executable lines" and
// "Removing 'filename.gcov'"... Don't log those as "errors."
if(*line != "No executable lines" &&
!cmSystemTools::StringStartsWith(line->c_str(), "Removing "))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, cmCTestLog(this->CTest, ERROR_MESSAGE,
"Unknown gcov output line: [" << line->c_str() << "]" << std::endl); "Unknown gcov output line: [" << line->c_str() << "]"
<< std::endl);
cont->Error ++; cont->Error ++;
//abort(); //abort();
} }
}
// If the last line of gcov output gave us a valid value for gcovFile, // If the last line of gcov output gave us a valid value for gcovFile,