--- a/nashorn/make/project.properties	Fri Feb 22 08:57:22 2013 +0100
+++ b/nashorn/make/project.properties	Fri Feb 22 11:27:40 2013 +0100
@@ -208,9 +208,9 @@
 
 #  -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
 # add '-Dtest.js.outofprocess' to run each test in a new sub-process
-run.test.jvmargs=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8 
+run.test.jvmargs.main=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8
 #-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
-run.test.jvmargs.octane=-Xms${run.test.xms} ${run.test.jvmargs}
+run.test.jvmargs.octane.main=-Xms${run.test.xms} ${run.test.jvmargs}
 
 run.test.jvmsecurityargs=-Xverify:all -Djava.security.properties=${basedir}/make/java.security.override -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
 
@@ -224,3 +224,21 @@
 
 #timeout for performance tests in minutes
 octaneperf-sys-prop.timeout.value=10
+
+################
+# codecoverage #
+################
+	#enable/disable code coverage; please redifine in the ${user.home}/.nashorn.project.local.properties
+make.code.coverage=false
+	#type of codecoverage; one of static or dynamic. Now only dynamic is supported
+jcov=dynamic
+	#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
+	#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.args=-javaagent:${jcov.jar}=include=${cc.include},exclude=${cc.exclude},type=all,verbose=0,file=${cc.dir}/${cc.result.file.name}