[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3390-g4021498

[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  4021498fbed20940dd1b0f66bae82291ad25f8a5 (commit)
       via  f9b7108f0535dc329ca4e1eac435234f33744e34 (commit)
      from  ab0a98c2c8840df13671fbc50e395a3f5083bf8c (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=4021498fbed20940dd1b0f66bae82291ad25f8a5
commit 4021498fbed20940dd1b0f66bae82291ad25f8a5
Merge: ab0a98c f9b7108
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 16:29:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 27 16:29:17 2014 -0400

    Merge topic 'fix-coverage-py' into next
    
    f9b7108f Coverage results from coverage.py were off by one


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9b7108f0535dc329ca4e1eac435234f33744e34
commit f9b7108f0535dc329ca4e1eac435234f33744e34
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Tue May 27 15:44:46 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 16:28:12 2014 -0400

    Coverage results from coverage.py were off by one
    
    The cobertura format uses line numbers indexed by one, and CTest uses a vector (0-indexed) to store them.

diff --git a/Source/CTest/cmParsePythonCoverage.cxx b/Source/CTest/cmParsePythonCoverage.cxx
index 68a6817..817b8dc 100644
--- a/Source/CTest/cmParsePythonCoverage.cxx
+++ b/Source/CTest/cmParsePythonCoverage.cxx
@@ -79,11 +79,11 @@ protected:
           curNumber = atoi(atts[tagCount+1]);
         }
 
-        if(curHits > -1 && curNumber > -1)
+        if(curHits > -1 && curNumber > 0)
         {
           FileLinesType& curFileLines =
             this->Coverage.TotalCoverage[this->CurFileName];
-          curFileLines[curNumber] = curHits;
+          curFileLines[curNumber-1] = curHits;
           break;
         }
         ++tagCount;

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

Summary of changes:
 Source/CTest/cmParsePythonCoverage.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake