[Cmake-commits] CMake branch, next, updated. v2.8.7-2480-ge6c7ef0

[Rolf Eike Beer]

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  e6c7ef0bdc9a55b84de56ab9e35f7daf1e3b2a23 (commit)
       via  176132a82bd1343796ea24e1a00a8961f891f025 (commit)
      from  8236bb990d1b08cd7933fd13d2e3c08519750742 (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=e6c7ef0bdc9a55b84de56ab9e35f7daf1e3b2a23
commit e6c7ef0bdc9a55b84de56ab9e35f7daf1e3b2a23
Merge: 8236bb9 176132a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 6 13:34:46 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 6 13:34:46 2012 -0500

    Merge topic 'ctest-no-coverage-for-empty-lines' into next
    
    176132a Revert "CTest: do not add coverage for empty lines"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=176132a82bd1343796ea24e1a00a8961f891f025
commit 176132a82bd1343796ea24e1a00a8961f891f025
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 6 19:33:39 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 6 19:33:39 2012 +0100

    Revert "CTest: do not add coverage for empty lines"
    
    This reverts commit 3ea6be30819e78ddf3d97378a519dc50836049a3.
    
    Although it's an improvement, David doesn't like it.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 130eb6a..0b1c9fe 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -591,24 +591,14 @@ int cmCTestCoverageHandler::ProcessHandler()
       continue;
       }
     int untested = 0;
-    int lineNr = 0;
     std::string line;
     cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "Actually performing coverage for: " << i->c_str() << std::endl);
     while (cmSystemTools::GetLineFromStream(ifs, line))
       {
-      covLogFile << "\t\t<Line Number=\"" << lineNr << "\" Count=\"";
-      lineNr ++;
-      if ( line.empty() )
-        {
-        covLogFile << "-1\">";
-        }
-      else
-        {
-        covLogFile << "0\">" << cmXMLSafe(line);
-        untested ++;
-        }
-      covLogFile << "</Line>" << std::endl;
+      covLogFile << "\t\t<Line Number=\"" << untested << "\" Count=\"0\">"
+        << cmXMLSafe(line) << "</Line>" << std::endl;
+      untested ++;
       }
     covLogFile << "\t\t</Report>\n\t</File>" << std::endl;
 

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

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


hooks/post-receive
-- 
CMake