Mercurial > hg > release > icedtea7-2.1

changeset 2237:a7281252ac74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow overwriting -samevm in check-langtools, check-jdk targets. Running the testsuite in -samevm mode currently lets the harness crash when using shark or cacao as the harness VM. This provides a way to overwrite the default -samevm mode. 2010-04-24 Matthias Klose <doko@ubuntu.com> * Makefile.am (check-langtools, check-jdk): Allow overwriting -samevm with the environment variable ICEDTEA_JTREG_OTHERVM.
author Matthias Klose <doko@ubuntu.com>
date Mon, 07 Jun 2010 17:28:39 +0100
parents 33f2cabc6bca
children 1eaa1ce55902
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 22 11:16:37 2010 +0200
+++ b/ChangeLog	Mon Jun 07 17:28:39 2010 +0100
@@ -1,3 +1,8 @@
+2010-04-24  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (check-langtools, check-jdk): Allow overwriting -samevm
+	with the environment variable ICEDTEA_JTREG_OTHERVM.
+
 2010-04-22  Xerxes Rånby  <xerxes@zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
--- a/Makefile.am	Thu Apr 22 11:16:37 2010 +0200
+++ b/Makefile.am	Mon Jun 07 17:28:39 2010 +0100
@@ -2546,7 +2546,8 @@
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
-		-s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
 		`pwd`/openjdk/langtools/test \
@@ -2559,7 +2560,8 @@
 endif
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
-		-s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
 		`pwd`/openjdk/jdk/test \