[Cmake-commits] CMake branch, next, updated. v2.8.8-2788-g694bafc

[Bill Hoffman]

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  694bafcfc3349ea155cb83b93c28c9771b356dbf (commit)
       via  f5c5db0753161726c6032178bb10eb41b1ddde02 (commit)
      from  95157abf2b097577d42f990cc3d19148da403465 (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=694bafcfc3349ea155cb83b93c28c9771b356dbf
commit 694bafcfc3349ea155cb83b93c28c9771b356dbf
Merge: 95157ab f5c5db0
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue May 1 17:33:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 1 17:33:55 2012 -0400

    Merge topic 'mumps_coverage' into next
    
    f5c5db0 Fix some warnings and a bug where it went past the length of a vector.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5c5db0753161726c6032178bb10eb41b1ddde02
commit f5c5db0753161726c6032178bb10eb41b1ddde02
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue May 1 17:32:23 2012 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue May 1 17:32:23 2012 -0400

    Fix some warnings and a bug where it went past the length of a vector.
    
    Fix a kwstyle warning and an unused variable warning. Also fix a case
    where it could crash because a vector was referenced passed its
    end.

diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index d2ff404..fb85810 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -7,8 +7,9 @@
 #include <cmsys/Glob.hxx>
 
 
-cmParseCacheCoverage::cmParseCacheCoverage(cmCTestCoverageHandlerContainer& cont,
-                                       cmCTest* ctest)
+cmParseCacheCoverage::cmParseCacheCoverage(
+  cmCTestCoverageHandlerContainer& cont,
+  cmCTest* ctest)
   :cmParseMumpsCoverage(cont, ctest)
 {
 }
@@ -101,7 +102,6 @@ bool cmParseCacheCoverage::ReadCMCovFile(const char* file)
     }
   std::string routine;
   std::string filepath;
-  bool foundFile = false;
   while(cmSystemTools::GetLineFromStream(in, line))
     {
     // clear out line argument vector
@@ -181,6 +181,13 @@ bool cmParseCacheCoverage::ReadCMCovFile(const char* file)
       continue; // skip setting count to avoid crash
       }
     // now add to count for linenumber
+    // for some reason the cache coverage adds extra lines to the
+    // end of the file in some cases. Since they do not exist, we will
+    // mark them as non executable
+    while(linenumber >= coverageVector.size())
+      {
+      coverageVector.push_back(-1);
+      }
     coverageVector[linenumber] += count;
     }
   return true;

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

Summary of changes:
 Source/CTest/cmParseCacheCoverage.cxx |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake