/hg/icedtea-web: Added and used java arguments (now Xmx2G) for e...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Apr 11 01:23:17 PDT 2012
changeset 17f9e4e1ac6d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=17f9e4e1ac6d
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 11 10:19:17 2012 +0200
Added and used java arguments (now Xmx2G) for emma runs.
diffstat:
ChangeLog | 8 ++++++++
Makefile.am | 12 +++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
diffs (70 lines):
diff -r c115840c1974 -r 17f9e4e1ac6d ChangeLog
--- a/ChangeLog Wed Apr 11 09:51:34 2012 +0200
+++ b/ChangeLog Wed Apr 11 10:19:17 2012 +0200
@@ -1,3 +1,11 @@
+2012-04-11 Jiri Vanek <jvanek at redhat.com>
+
+ * Makefile.am: EMMA_JAVA_ARGS, new variable for adjusting emma runs.
+ Currently set to -Xmx2G.
+ (stamps/run-unit-test-code-coverage.stamp),
+ (stamps/run-reproducers-test-code-coverage.stamp),
+ (run-test-code-coverage): Use EMMA_JAVA_ARGS in theirs emma runs.
+
2012-06-04 Jiri Vanek <jvanek at redhat.com>
Thomas Meyer <thomas at m3y3r.de>
diff -r c115840c1974 -r 17f9e4e1ac6d Makefile.am
--- a/Makefile.am Wed Apr 11 09:51:34 2012 +0200
+++ b/Makefile.am Wed Apr 11 10:19:17 2012 +0200
@@ -27,6 +27,7 @@
JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
+EMMA_JAVA_ARGS=-Xmx2G
META_MANIFEST = META-INF/MANIFEST.MF
# Build directories
@@ -631,7 +632,7 @@
mv $(NETX_UNIT_TEST_DIR)/tests-output.xml $(NETX_UNIT_TEST_DIR)/tests-output.xml_noEmma ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
+ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
-Dreport.html.out.encoding=UTF-8 \
-raw \
-sp $(NETX_SRCDIR) \
@@ -696,6 +697,7 @@
cd $(JNLP_TESTS_ENGINE_DIR) ; \
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
$(BOOT_DIR)/bin/java \
+ $(EMMA_JAVA_ARGS) \
-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR) \
-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws) \
-Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) emmarun \
@@ -712,11 +714,11 @@
CommandLine $$class_names ; \
mv $(JNLP_TESTS_ENGINE_DIR)/coverage.ec $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec ; \
mv $(JNLP_TESTS_ENGINE_DIR)/coverage.es $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
- $(BOOT_DIR)/bin/java -cp $(EMMA_JAR) emma merge \
+ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
-in $(TESTS_DIR)/coverage.em \
-in $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec \
-in $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
- $(BOOT_DIR)/bin/java -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emma report \
+ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emma report \
-Dreport.html.out.encoding=UTF-8 \
-in $(JNLP_TESTS_ENGINE_DIR)/coverage.es \
-sp $(NETX_SRCDIR) \
@@ -756,10 +758,10 @@
k=$$((k+1)) ; \
done ; \
done ; \
- $(BOOT_DIR)/bin/java -cp $(EMMA_JAR) emma merge \
+ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
-in $(NETX_UNIT_TEST_DIR)/coverage.es \
-in $(JNLP_TESTS_ENGINE_DIR)/coverage.es ; \
- $(BOOT_DIR)/bin/java -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emma report \
+ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emma report \
-Dreport.html.out.encoding=UTF-8 \
-in $(TESTS_DIR)/coverage.es \
-in $(TESTS_DIR)/coverage.em \
More information about the distro-pkg-dev
mailing list