From 9527a31a2d71a50380582187fc75da4c15118439 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 9 Apr 2015 11:47:57 +0000 Subject: [PATCH] LUCENE-5439: add jacoco coverage git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1672298 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 7 +++ lucene/CHANGES.txt | 2 + lucene/analysis/build.xml | 4 ++ lucene/build.xml | 33 ++++++++++++++ lucene/common-build.xml | 66 ++++++++++++++++++++++++++- lucene/tools/junit4/solr-tests.policy | 1 + lucene/tools/junit4/tests.policy | 3 ++ solr/build.xml | 40 +++++++++++++++- solr/common-build.xml | 1 + 9 files changed, 155 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 5d7935e4409..802d670f448 100644 --- a/build.xml +++ b/build.xml @@ -61,6 +61,13 @@ + + + + + + + diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 9491ee8d835..c225b31bc13 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -82,6 +82,8 @@ Other * LUCENE-6413: Test runner should report the number of suites completed/ remaining. (Dawid Weiss) +* LUCENE-5439: Add 'ant jacoco' build target. (Robert Muir) + ======================= Lucene 5.1.0 ======================= New Features diff --git a/lucene/analysis/build.xml b/lucene/analysis/build.xml index 0abd60ae6b6..0c3084105bb 100644 --- a/lucene/analysis/build.xml +++ b/lucene/analysis/build.xml @@ -154,4 +154,8 @@ + + + + diff --git a/lucene/build.xml b/lucene/build.xml index c1e0971fdab..cc7662d7162 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -18,6 +18,7 @@ --> @@ -464,6 +465,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lucene/common-build.xml b/lucene/common-build.xml index a11c2c6f7aa..56da964dce0 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -20,6 +20,7 @@ This file is designed for importing into a main build file, and not intended @@ -267,6 +268,8 @@ + + @@ -851,6 +854,9 @@ + + + @@ -878,6 +884,15 @@ + + + + + + + @@ -948,7 +963,7 @@ dynamicAssignmentRatio="${tests.dynamicAssignmentRatio}" shuffleOnSlave="true" - leaveTemporary="${tests.leaveTemporary}" + leaveTemporary="${junit4.leaveTemporary}" seed="${tests.seed}" heartbeat="${tests.heartbeat}" @@ -964,6 +979,7 @@ + @@ -1345,6 +1361,54 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lucene/tools/junit4/solr-tests.policy b/lucene/tools/junit4/solr-tests.policy index c5968999b35..66a6b1c986c 100644 --- a/lucene/tools/junit4/solr-tests.policy +++ b/lucene/tools/junit4/solr-tests.policy @@ -29,6 +29,7 @@ grant { permission java.io.FilePermission "${junit4.childvm.cwd}", "read,execute"; permission java.io.FilePermission "${junit4.childvm.cwd}${/}temp", "read,execute,write,delete"; permission java.io.FilePermission "${junit4.childvm.cwd}${/}temp${/}-", "read,execute,write,delete"; + permission java.io.FilePermission "${junit4.childvm.cwd}${/}jacoco.db", "write"; permission java.io.FilePermission "${junit4.tempDir}${/}*", "read,execute,write,delete"; permission java.io.FilePermission "${clover.db.dir}${/}-", "read,execute,write,delete"; diff --git a/lucene/tools/junit4/tests.policy b/lucene/tools/junit4/tests.policy index 1462e1c326d..8594c400654 100644 --- a/lucene/tools/junit4/tests.policy +++ b/lucene/tools/junit4/tests.policy @@ -35,6 +35,7 @@ grant { // write only to sandbox permission java.io.FilePermission "${junit4.childvm.cwd}${/}temp", "read,write,delete"; permission java.io.FilePermission "${junit4.childvm.cwd}${/}temp${/}-", "read,write,delete"; + permission java.io.FilePermission "${junit4.childvm.cwd}${/}jacoco.db", "write"; permission java.io.FilePermission "${junit4.tempDir}${/}*", "read,write,delete"; permission java.io.FilePermission "${clover.db.dir}${/}-", "read,write,delete"; @@ -72,6 +73,8 @@ grant { permission java.lang.RuntimePermission "getClassLoader"; // needed to test unmap hack on platforms that support it permission java.lang.RuntimePermission "accessClassInPackage.sun.misc"; + // needed by jacoco to dump coverage + permission java.lang.RuntimePermission "shutdownHooks"; // read access to all system properties: permission java.util.PropertyPermission "*", "read"; diff --git a/solr/build.xml b/solr/build.xml index d077946b3c1..581e5946003 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -15,7 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + Solr @@ -130,6 +133,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/solr/common-build.xml b/solr/common-build.xml index 9d0735fc62f..66697adbfd3 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -33,6 +33,7 @@ +