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 2a78767e5e25fea144b70a4c611faaf160452da0 (commit)
via 9fd04f874c0a046736436b53b9a049a29b536165 (commit)
from 5902f23edabbf41b8bed31c2e9927d2c7c33c2ef (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=2a78767e5e25fea144b70a4c611faaf160452da0
commit 2a78767e5e25fea144b70a4c611faaf160452da0
Merge: 5902f23 9fd04f8
Author: Joe Snyder <joe.snyder at kitware.com>
AuthorDate: Wed Jul 30 11:26:29 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 11:26:29 2014 -0400
Merge topic 'update_jacoco_search_paths' into next
9fd04f87 CTEST: Update Jacoco Coverage search paths
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fd04f874c0a046736436b53b9a049a29b536165
commit 9fd04f874c0a046736436b53b9a049a29b536165
Author: Joseph Snyder <joe.snyder at kitware.com>
AuthorDate: Wed Jul 30 10:26:56 2014 -0400
Commit: Joseph Snyder <joe.snyder at kitware.com>
CommitDate: Wed Jul 30 11:22:55 2014 -0400
CTEST: Update Jacoco Coverage search paths
Add a new additional entry to the FilePaths array when a
"package" tag has been found. This path should consist of the package
information found appended to the projects source directory.
This change will allow code held in a /src/main/java/* directory off of the
projects source directory to be found, unlike now which assumes a subdirectory
contains the code.
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index 4723dd3..f270adb 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -42,6 +42,9 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
"/" + this->ModuleName + "/src/main/java/" +
this->PackageName;
this->FilePaths.push_back(FilePath);
+ FilePath = this->Coverage.SourceDir +
+ "/src/main/java/" + this->PackageName;
+ this->FilePaths.push_back(FilePath);
}
else if(name == "sourcefile")
{
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmParseJacocoCoverage.cxx | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake