[Cmake-commits] CMake branch, next, updated. v3.2.1-999-ge0c3dda

[Joe Snyder]

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  e0c3ddaa028b3fefa03e38e407b91b2679839fe8 (commit)
       via  c771f9d945444f6cfe41195e26653f368aff7f42 (commit)
      from  6a6face475ced78e5fa599eceecf7f59974bf6bb (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=e0c3ddaa028b3fefa03e38e407b91b2679839fe8
commit e0c3ddaa028b3fefa03e38e407b91b2679839fe8
Merge: 6a6face c771f9d
Author:     Joe Snyder <joe.snyder at kitware.com>
AuthorDate: Wed Mar 11 09:31:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 11 09:31:20 2015 -0400

    Merge topic 'fix_jacoco_coverage_process' into next
    
    c771f9d9 CTest: Fix Jacoco Coverage


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c771f9d945444f6cfe41195e26653f368aff7f42
commit c771f9d945444f6cfe41195e26653f368aff7f42
Author:     Joseph Snyder <joe.snyder at kitware.com>
AuthorDate: Fri Mar 6 11:18:19 2015 -0500
Commit:     Joseph Snyder <joe.snyder at kitware.com>
CommitDate: Fri Mar 6 11:18:19 2015 -0500

    CTest: Fix Jacoco Coverage
    
    Rename the example jacoco.xml file to be jacoco.xml.in to stop CMake
    from apptempting to calculate Jacoco Coverage when running over itself.
    
    Enclose a push of -1 to the coverage vector to only happen if there is a
    fin to calculate for. This prevents a crash if the target file doesn't
    exist.

diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index ec4cfad..31ad9fe 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -78,7 +78,10 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
           std::string line;
           FileLinesType& curFileLines =
             this->Coverage.TotalCoverage[this->CurFileName];
-          curFileLines.push_back(-1);
+          if(fin)
+            {
+            curFileLines.push_back(-1);
+            }
           while(cmSystemTools::GetLineFromStream(fin, line))
           {
             curFileLines.push_back(-1);
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 08765de..703c548 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2409,6 +2409,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
      "${CMake_BINARY_DIR}/Testing/JacocoCoverage/DartConfiguration.tcl")
   file(COPY "${CMake_SOURCE_DIR}/Tests/JacocoCoverage/Coverage"
     DESTINATION "${CMake_BINARY_DIR}/Testing/JacocoCoverage")
+  configure_file("${CMake_BINARY_DIR}/Testing/JacocoCoverage/Coverage/target/site/jacoco.xml.in"
+    "${CMake_BINARY_DIR}/Testing/JacocoCoverage/Coverage/target/site/jacoco.xml")
   add_test(NAME CTestJacocoCoverage
     COMMAND cmake -E chdir
     ${CMake_BINARY_DIR}/Testing/JacocoCoverage
diff --git a/Tests/JacocoCoverage/Coverage/target/site/jacoco.xml b/Tests/JacocoCoverage/Coverage/target/site/jacoco.xml.in
similarity index 100%
rename from Tests/JacocoCoverage/Coverage/target/site/jacoco.xml
rename to Tests/JacocoCoverage/Coverage/target/site/jacoco.xml.in

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

Summary of changes:
 Source/CTest/cmParseJacocoCoverage.cxx                            |    5 ++++-
 Tests/CMakeLists.txt                                              |    2 ++
 .../Coverage/target/site/{jacoco.xml => jacoco.xml.in}            |    0
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename Tests/JacocoCoverage/Coverage/target/site/{jacoco.xml => jacoco.xml.in} (100%)


hooks/post-receive
-- 
CMake