[Cmake-commits] CMake branch, next, updated. v3.0.2-5572-g7463bf5
Brad King
brad.king at kitware.com
Fri Oct 3 14:39:29 EDT 2014
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 7463bf509034baadfd4fa1d2436c3da12c11eec0 (commit)
via 1c838addf590f8ae67e43f0eb02a6e02b46264f3 (commit)
from bf3796f41a88b99065df708f7c719fead8c0a60a (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=7463bf509034baadfd4fa1d2436c3da12c11eec0
commit 7463bf509034baadfd4fa1d2436c3da12c11eec0
Merge: bf3796f 1c838ad
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 3 14:39:29 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 3 14:39:29 2014 -0400
Merge topic 'fix-cobertura-parsing' into next
1c838add cmParseCoberturaCoverage: Initialize CurFileName to empty string
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c838addf590f8ae67e43f0eb02a6e02b46264f3
commit 1c838addf590f8ae67e43f0eb02a6e02b46264f3
Author: Jonathan Beezley <jonathan.beezley at kitware.com>
AuthorDate: Fri Oct 3 13:51:14 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 3 14:35:56 2014 -0400
cmParseCoberturaCoverage: Initialize CurFileName to empty string
When the file is not found in $CMAKE_SOURCE_DIR/<file path>,
the CurFileName pointer remained set to the previous file. This
caused the new file's coverage data to populate the into the
wrong object giving incorrect results and occasionally resulting
in a seg fault.
diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx
index 6b98056..0742be1 100644
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@@ -71,6 +71,7 @@ protected:
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Reading file: "
<< atts[tagCount+1]<< std::endl);
std::string filename = atts[tagCount+1];
+ this->CurFileName = "";
for(size_t i=0;i < FilePaths.size();i++)
{
finalpath = FilePaths[i] + "/" + filename;
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmParseCoberturaCoverage.cxx | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list