/hg/icedtea6: Allow overwriting -samevm in check-langtools, chec...

[doko at icedtea.classpath.org]

changeset 727bee274d9e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=727bee274d9e
author: doko at ubuntu.com
date: Sat Apr 24 15:32:51 2010 +0200

	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 at ubuntu.com>

	 * Makefile.am (check-langtools, check-jdk): Allow
	overwriting -samevm with the environment variable
	ICEDTEA_JTREG_OTHERVM.


diffstat:

2 files changed, 9 insertions(+), 2 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    6 ++++--

diffs (35 lines):

diff -r a7a7eb697a8a -r 727bee274d9e ChangeLog
--- 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-23  Tomas Hurka <Tomas.Hurka at Sun
+2010-04-24  Matthias Klose  <doko at 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 at Sun.COM>
 
 	* Makefile.am: Update visualvm build support for 1.2.2.
diff -r a7a7eb697a8a -r 727bee274d9e Makefile.am
--- 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 @@ check-langtools: stamps/jtreg.stamp
 	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 @@ check-jdk: stamps/jtreg.stamp
 	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 \