diff options
| author | David Cole <david.cole@kitware.com> | 2012-12-11 18:44:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-12-11 18:44:33 (GMT) |
| commit | d0369a9888880c1e9974edd2f6c74b870ac65163 (patch) | |
| tree | a3cc2cf7c6481e893ddc3566fae2f6e141277fce | |
| parent | bc9dcadf19d44173bcc0b6cb99eac4cf5fdae4f0 (diff) | |
| parent | 61ace1df2616e472d056b302e4269cbf112fb020 (diff) | |
| download | CMake-d0369a9888880c1e9974edd2f6c74b870ac65163.zip CMake-d0369a9888880c1e9974edd2f6c74b870ac65163.tar.gz CMake-d0369a9888880c1e9974edd2f6c74b870ac65163.tar.bz2 | |
Merge topic 'fix-13657-more-gcov47-output'
61ace1d CTest: Coverage handler: expect certain output lines from gcov 4.7 (#13657)
| -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(); + } } |