Mercurial > hg > release > icedtea-web-1.4

changeset 796:c4a622149b5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Jacoco boot class loading moved from custom built to upstreamed form
author Jiri Vanek <jvanek@redhat.com>
date Fri, 17 Oct 2014 13:29:21 +0200
parents 9eadfcabb570
children 4ad4b61198f6
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 21 15:48:43 2014 +0100
+++ b/ChangeLog	Fri Oct 17 13:29:21 2014 +0200
@@ -1,3 +1,10 @@
+2014-10-17  Jiri Vanek  <jvanek@redhat.com>
+
+	Jacoco boot class loading moved from custom built to upstreamed form
+	* Makefile.am: (JACOCO_AGENT_JAVAWS_SWITCH) and (JACOCO_AGENT_PLUGIN_SWITCH)
+	moved from xboot=true to inclbootstrapclasses=true which is now supported
+	by upstream.
+
 2014-02-21  Jiri Vanek  <jvanek@redhat.com>
 
 	* acinclude.m4:	Added (IT_CHECK_XULRUNNER_API_VERSION_C11) macro
--- a/Makefile.am	Fri Feb 21 15:48:43 2014 +0100
+++ b/Makefile.am	Fri Oct 17 13:29:21 2014 +0200
@@ -72,8 +72,8 @@
 export JACOCO_BASE_EXCLUDE=org.junit.*:junit.*
 export JACOCO_ADVANCED_EXCLUDE=:*jacoco*:java.lang.*:java.reflect.*:java.util.*:sun.reflect.*
 export JACOCO_AGENT_SWITCH="$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)"
-export JACOCO_AGENT_JAVAWS_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),xboot=true,destfile=$(JACOCO_JAVAWS_RESULTS)\"
-export JACOCO_AGENT_PLUGIN_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),xboot=true,destfile=$(JACOCO_PLUGIN_RESULTS)\"
+export JACOCO_AGENT_JAVAWS_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),inclbootstrapclasses=true,destfile=$(JACOCO_JAVAWS_RESULTS)\"
+export JACOCO_AGENT_PLUGIN_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),inclbootstrapclasses=true,destfile=$(JACOCO_PLUGIN_RESULTS)\"
 export JACOCO_OPERATOR_EXEC=$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(JACOCO_OPERATOR_DIR):$(JACOCO_CLASSPATH):. org.jacoco.operator.Main
 
 # linking variables