# HG changeset patch
# User doko@ubuntu.com
# Date 1236335628 -3600
# Node ID 88cbabc76b8935cdf957993c375c0c7c7d305924
# Parent  c015d541246a5de925d58b7bc7863193a4f712fe
2009-03-06  Matthias Klose  <doko@ubuntu.com>

        * Makefile.am (check-*): Pass $(ICEDTEA_JTREG_OPTIONS), unset
        by default.
(transplanted from 52cac9f018fd629e23158f859409691e02de2dfd)

diff -r c015d541246a -r 88cbabc76b89 ChangeLog
--- a/ChangeLog	Thu Mar 05 09:14:30 2009 -0500
+++ b/ChangeLog	Fri Mar 06 11:33:48 2009 +0100
@@ -1,3 +1,8 @@
+2009-03-06  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (check-*): Pass $(ICEDTEA_JTREG_OPTIONS), unset
+	by default.
+
 2009-03-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
diff -r c015d541246a -r 88cbabc76b89 Makefile.am
--- a/Makefile.am	Thu Mar 05 09:14:30 2009 -0500
+++ b/Makefile.am	Fri Mar 06 11:33:48 2009 +0100
@@ -2918,6 +2918,7 @@
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
 		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/hotspot/test \
 	    | tee test/$@.log
 
@@ -2926,6 +2927,7 @@
 	$(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_OPTIONS) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
 		`pwd`/openjdk/langtools/test \
 	    | tee test/$@.log
@@ -2935,6 +2937,7 @@
 	$(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_OPTIONS) \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
 		`pwd`/openjdk/jdk/test \
 	    | tee test/$@.log