[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1263-gd66c8c1

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d66c8c16790ebf44d1ba339eebfa2ec25cfea287 (commit)
       via  61ace1df2616e472d056b302e4269cbf112fb020 (commit)
       via  7ecaa4047bc1517f757f01e34747a0c4fdac4ee4 (commit)
       via  140ed91dd2598f4516b3290025a909e76b2871f6 (commit)
       via  0cbe7dd1e3fa4b2254c4d318e41f8167d8f2ad4e (commit)
      from  440a17614ff31eee0709a3e74b02c02ed31dad9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d66c8c16790ebf44d1ba339eebfa2ec25cfea287
commit d66c8c16790ebf44d1ba339eebfa2ec25cfea287
Merge: 440a176 61ace1d
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 10 17:06:23 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 10 17:06:23 2012 -0500

    Merge topic 'fix-13657-more-gcov47-output' into next
    
    61ace1d CTest: Coverage handler: expect certain output lines from gcov 4.7 (#13657)
    7ecaa40 CMake Nightly Date Stamp
    140ed91 CMake Nightly Date Stamp
    0cbe7dd CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61ace1df2616e472d056b302e4269cbf112fb020
commit 61ace1df2616e472d056b302e4269cbf112fb020
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 10 17:03:57 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 10 17:03:57 2012 -0500

    CTest: Coverage handler: expect certain output lines from gcov 4.7 (#13657)
    
    And do not report them as errors.

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();
+          }
         }
 
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake               |    2 +-
 Source/CTest/cmCTestCoverageHandler.cxx |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake