diff options
| author | David Cole <david.cole@kitware.com> | 2012-12-10 22:03:57 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-12-10 22:03:57 (GMT) |
| commit | 61ace1df2616e472d056b302e4269cbf112fb020 (patch) | |
| tree | 4a9c8e9ee169e71d7f08892d5b0ce26d96da5a23 | |
| parent | 7ecaa4047bc1517f757f01e34747a0c4fdac4ee4 (diff) | |
| download | CMake-61ace1df2616e472d056b302e4269cbf112fb020.zip CMake-61ace1df2616e472d056b302e4269cbf112fb020.tar.gz CMake-61ace1df2616e472d056b302e4269cbf112fb020.tar.bz2 | |
CTest: Coverage handler: expect certain output lines from gcov 4.7 (#13657)
And do not report them as errors.
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 4d1e249..20aded2 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -1097,10 +1097,17 @@ int cmCTestCoverageHandler::HandleGCovCoverage( } else { - cmCTestLog(this->CTest, ERROR_MESSAGE, - "Unknown gcov output line: [" << line->c_str() << "]" << std::endl); - cont->Error ++; - //abort(); + // 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, + "Unknown gcov output line: [" << line->c_str() << "]" + << std::endl); + cont->Error ++; + //abort(); + } } |