# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1414059725 -7200
# Node ID bcd06e3c9dfd58d444a8d077655ff2d0b66c1828
# Parent  0c38ee32f2adc594d58b0980d67867670fca1487
Unittests coverage adapted to latest jacoco

diff -r 0c38ee32f2ad -r bcd06e3c9dfd ChangeLog
--- a/ChangeLog	Mon Oct 20 17:30:08 2014 +0200
+++ b/ChangeLog	Thu Oct 23 12:22:05 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)
diff -r 0c38ee32f2ad -r bcd06e3c9dfd Makefile.am
--- a/Makefile.am	Mon Oct 20 17:30:08 2014 +0200
+++ b/Makefile.am	Thu Oct 23 12:22:05 2014 +0200
@@ -68,9 +68,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