[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4050-ga7477f4

[Brad King]

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  a7477f49a53eb7864d4ff5e7f48ab7180ce50763 (commit)
       via  782eba3a0c74009e24708d28fd520b1ba919d326 (commit)
      from  584f87591503212f0fb7432a5a71992f069b766c (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=a7477f49a53eb7864d4ff5e7f48ab7180ce50763
commit a7477f49a53eb7864d4ff5e7f48ab7180ce50763
Merge: 584f875 782eba3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 29 10:49:02 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 29 10:49:02 2013 -0400

    Merge topic 'ctest-gtm-coverage-fileoffset-bug' into next
    
    782eba3 CTest: Fix GTM coverage parsing line offset bug


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=782eba3a0c74009e24708d28fd520b1ba919d326
commit 782eba3a0c74009e24708d28fd520b1ba919d326
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Aug 22 15:20:30 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 29 10:43:40 2013 -0400

    CTest: Fix GTM coverage parsing line offset bug
    
    In cmParseGTMCoverage::ReadMCovFile, initialize the lineoffset variable.
    Also set lastoffset only if the function is found (thanks to Bill
    Hoffman).

diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx
index 5dfcfe5..6b4adb4 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -98,7 +98,7 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
     bool found = this->FindMumpsFile(routine, filepath);
     if(found)
       {
-      int lineoffset;
+      int lineoffset = 0;
       if(this->FindFunctionInMumpsFile(filepath,
                                        function,
                                        lineoffset))
@@ -106,8 +106,8 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
         cmCTestCoverageHandlerContainer::SingleFileCoverageVector&
           coverageVector = this->Coverage.TotalCoverage[filepath];
         coverageVector[lineoffset + linenumber] += count;
+        lastoffset = lineoffset;
         }
-      lastoffset = lineoffset;
       }
     else
       {

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

Summary of changes:


hooks/post-receive
-- 
CMake