summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorJoseph Snyder <joe.snyder@kitware.com>2014-07-30 14:26:56 (GMT)
committerJoseph Snyder <joe.snyder@kitware.com>2014-07-30 15:22:55 (GMT)
commit9fd04f874c0a046736436b53b9a049a29b536165 (patch)
treeb571c3e9787587ad91b3ddc0f8ef132771c3264e /Source/CTest
parent8d1306cd1b2ab7af0360387bfbdd9beff29b480c (diff)
downloadCMake-9fd04f874c0a046736436b53b9a049a29b536165.zip
CMake-9fd04f874c0a046736436b53b9a049a29b536165.tar.gz
CMake-9fd04f874c0a046736436b53b9a049a29b536165.tar.bz2
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.
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmParseJacocoCoverage.cxx3
1 files changed, 3 insertions, 0 deletions
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")
{