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:
commit
d0369a9888
|
@ -1097,10 +1097,17 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
// gcov 4.7 can have output lines saying "No executable lines" and
|
||||||
"Unknown gcov output line: [" << line->c_str() << "]" << std::endl);
|
// "Removing 'filename.gcov'"... Don't log those as "errors."
|
||||||
cont->Error ++;
|
if(*line != "No executable lines" &&
|
||||||
//abort();
|
!cmSystemTools::StringStartsWith(line->c_str(), "Removing "))
|
||||||
|
{
|
||||||
|
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||||
|
"Unknown gcov output line: [" << line->c_str() << "]"
|
||||||
|
<< std::endl);
|
||||||
|
cont->Error ++;
|
||||||
|
//abort();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue