# HG changeset patch
# User jlaskey
# Date 1363701804 10800
# Node ID 606a1946e3e257dc1b9f081b0ffaef6f0fab05fa
# Parent 3b0a0d9d51f0758815e2719aa32a012521ecab36
8009969: CodeCoverage should use template
Reviewed-by: jlaskey, sundar
Contributed-by: pavel.stepanov@oracle.com
diff -r 3b0a0d9d51f0 -r 606a1946e3e2 make/build.xml
--- a/make/build.xml Mon Mar 18 21:03:11 2013 +0530
+++ b/make/build.xml Tue Mar 19 11:03:24 2013 -0300
@@ -124,7 +124,7 @@
-
+
diff -r 3b0a0d9d51f0 -r 606a1946e3e2 make/code_coverage.xml
--- a/make/code_coverage.xml Mon Mar 18 21:03:11 2013 +0530
+++ b/make/code_coverage.xml Tue Mar 19 11:03:24 2013 -0300
@@ -36,7 +36,12 @@
+
+
+
+
+
@@ -51,25 +56,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
+
+
+
-
+
@@ -81,12 +127,12 @@
-
+
-
+
diff -r 3b0a0d9d51f0 -r 606a1946e3e2 make/project.properties
--- a/make/project.properties Mon Mar 18 21:03:11 2013 +0530
+++ b/make/project.properties Tue Mar 19 11:03:24 2013 -0300
@@ -235,10 +235,12 @@
#naming of CC results
#NB directory specified in the cc.dir will be cleaned up!!!
cc.dir=${basedir}/../Codecoverage_Nashorn
-cc.result.file.name=cc_nashorn.xml
+cc.result.file.name=CC_${jcov}_nashorn.xml
#dynamic CC parameters; please redefine in the ${user.home}/.nashorn.project.local.properties
jcov2.lib.dir=${basedir}/../jcov2/lib
jcov.jar=${jcov2.lib.dir}/jcov.jar
cc.include=jdk\.nashorn\.*
cc.exclude=jdk\.nashorn\.internal\.scripts\.*
+cc.dynamic.genereate.template=true
+cc.template=${cc.dir}/CC_template.xml
cc.dynamic.args=-javaagent:${jcov.jar}=include=${cc.include},exclude=${cc.exclude},type=all,verbose=0,file=${cc.dir}/${cc.result.file.name}