/hg/release/icedtea6-1.8: Allow overwriting -samevm in check-lan...

[doko at icedtea.classpath.org]

changeset c30ad3953745 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=c30ad3953745
author: doko at ubuntu.com
date: Mon Apr 26 14:11:34 2010 +0200

	Allow overwriting -samevm in check-langtools, check-jdk targets.

	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 8c46a40782ff -r c30ad3953745 ChangeLog
--- a/ChangeLog	Thu Apr 22 11:16:37 2010 +0200
+++ b/ChangeLog	Mon Apr 26 14:11:34 2010 +0200
@@ -1,3 +1,8 @@ 2010-04-22  Xerxes RÃ¥nby  <xerxes at zafen
+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-22  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
diff -r 8c46a40782ff -r c30ad3953745 Makefile.am
--- a/Makefile.am	Thu Apr 22 11:16:37 2010 +0200
+++ b/Makefile.am	Mon Apr 26 14:11:34 2010 +0200
@@ -2024,7 +2024,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
@@ -2033,7 +2034,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 \