Mercurial > hg > release > icedtea-web-1.4

changeset 798:d27ef8e16953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unittests coverage adapted to latest jacoco
author Jiri Vanek <jvanek@redhat.com>
date Thu, 23 Oct 2014 12:22:42 +0200
parents 4ad4b61198f6
children 050347a87858
files ChangeLog Makefile.am
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 20 17:31:22 2014 +0200
+++ b/ChangeLog	Thu Oct 23 12:22:42 2014 +0200
@@ -1,3 +1,11 @@
+2014-10-21  Jiri Vanek  <jvanek@redhat.com>
+
+	Unittests coverage adapted to latest jacoco
+	* Makefile.am: (JACOCO_AGENT_SWITCH) is now using both  JACOCO_ADVANCED_EXCLUDE)
+	and inclbootstrapclasses=true too. (JACOCO_AGENT_JAVAWS_SWITCH) and
+	(JACOCO_AGENT_PLUGIN_SWITCH) are using JACOCO_AGENT_SWITCH instead of copypasting
+	values.
+
 2014-10-20  Jiri Vanek  <jvanek@redhat.com>
 
 	Added support for chromium binary (along with older chromium-browser one)
--- a/Makefile.am	Mon Oct 20 17:31:22 2014 +0200
+++ b/Makefile.am	Thu Oct 23 12:22:42 2014 +0200
@@ -71,9 +71,9 @@
 export JACOCO_AGENT_SWITCH_BODY=-javaagent:$(JACOCO_PATH)/$(JACOCO_AGENTRT)
 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),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_AGENT_SWITCH="$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),inclbootstrapclasses=true"
+export JACOCO_AGENT_JAVAWS_SWITCH=\"$(JACOCO_AGENT_SWITCH),destfile=$(JACOCO_JAVAWS_RESULTS)\"
+export JACOCO_AGENT_PLUGIN_SWITCH=\"$(JACOCO_AGENT_SWITCH),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