Mercurial > hg > release > icedtea6-1.8
changeset 2029:c30ad3953745
Allow overwriting -samevm in check-langtools, check-jdk targets.
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 | Mon, 26 Apr 2010 14:11:34 +0200 |
| parents | 8c46a40782ff |
| children | c8d38c28900e |
| 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 Apr 26 14:11:34 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-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 Apr 26 14:11:34 2010 +0200 @@ -2024,7 +2024,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 @@ -2033,7 +2034,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 \