Mercurial > hg > release > icedtea6-1.9

changeset 2071:727bee274d9e

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 doko@ubuntu.com
date Sat, 24 Apr 2010 15:32:51 +0200
parents a7a7eb697a8a
children b86fa01ca5ca fc6cf0c52f7a
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Apr 23 11:08:23 2010 +0200
+++ b/ChangeLog	Sat Apr 24 15:32:51 2010 +0200
@@ -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-23  Tomas Hurka <Tomas.Hurka@Sun.COM>
 
 	* Makefile.am: Update visualvm build support for 1.2.2.
--- a/Makefile.am	Fri Apr 23 11:08:23 2010 +0200
+++ b/Makefile.am	Sat Apr 24 15:32:51 2010 +0200
@@ -1981,7 +1981,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) \
 		`pwd`/openjdk/langtools/test \
 	    | tee test/$@.log
@@ -1990,7 +1991,8 @@
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
 	$(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 \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/jdk/test \