changeset in /hg/icedtea: * patches/icedtea-samejvm-safe.patch: ...

[Mark Wielaard]

changeset b7ce0d293432 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b7ce0d293432
description:
	* patches/icedtea-samejvm-safe.patch: New patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.
		(check-jdk): Run jtreg with -samevm.
		* HACKING: Document new patch.

diffstat:

4 files changed, 23 insertions(+), 2 deletions(-)
ChangeLog                          |    7 +++++++
HACKING                            |    1 +
Makefile.am                        |    5 +++--
patches/icedtea-samejvm-safe.patch |   12 ++++++++++++

diffs (63 lines):

diff -r d1ff3aff9167 -r b7ce0d293432 ChangeLog
--- a/ChangeLog	Sun Nov 23 17:12:40 2008 +0100
+++ b/ChangeLog	Sun Nov 23 17:46:11 2008 +0100
@@ -1,3 +1,10 @@ 2008-11-23  Mark Wielaard  <mark at klomp.o
+2008-11-23  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-samejvm-safe.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	(check-jdk): Run jtreg with -samevm.
+	* HACKING: Document new patch.
+
 2008-11-23  Mark Wielaard  <mark at klomp.org>
 
 	* test/jtreg/com/sun/javatest/regtest/Main.java
diff -r d1ff3aff9167 -r b7ce0d293432 HACKING
--- a/HACKING	Sun Nov 23 17:12:40 2008 +0100
+++ b/HACKING	Sun Nov 23 17:46:11 2008 +0100
@@ -73,6 +73,7 @@ The following patches are currently appl
   #6761856, swing TextLayout.getBounds() returns shifted bounds.
 * icedtea-display-mode-changer.patch: Add extra test class.
 * icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
+* icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r d1ff3aff9167 -r b7ce0d293432 Makefile.am
--- a/Makefile.am	Sun Nov 23 17:12:40 2008 +0100
+++ b/Makefile.am	Sun Nov 23 17:46:11 2008 +0100
@@ -540,7 +540,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-cc-interp-no-fer.patch \
 	patches/icedtea-6761856-freetypescaler.patch \
 	patches/icedtea-display-mode-changer.patch \
-	patches/icedtea-testenv.patch
+	patches/icedtea-testenv.patch \
+	patches/icedtea-samejvm-safe.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -1599,7 +1600,7 @@ 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 \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test \
 	    | tee test/$@.log
 
diff -r d1ff3aff9167 -r b7ce0d293432 patches/icedtea-samejvm-safe.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-samejvm-safe.patch	Sun Nov 23 17:46:11 2008 +0100
@@ -0,0 +1,12 @@
+--- openjdk.orig/jdk/test/TEST.ROOT	2008-11-06 09:44:52.000000000 +0100
++++ openjdk/jdk/test/TEST.ROOT	2008-11-23 16:15:53.000000000 +0100
+@@ -4,3 +4,9 @@
+ 
+ # The list of keywords supported in the entire test suite
+ keys=2d dnd i18n
++
++# List if directory (prefixes) that contain test that are safe to run in
++# -samejvm mode. Only used if the test root (dir containing this file) is
++# given to jtreg and the -samejvm argument is used, ignored otherwise
++# (meaning all tests are assumed to be same jvm safe).
++samejvmsafe=com/sun/crypto com/sun/management com/sun/media com/sun/security java/beans/beancontext java/beans/PropertyChangeSupport java/beans/Statement java/beans/VetoableChangeSupport java/lang/Boolean java/lang/Byte java/lang/Double java/lang/Float java/lang/Integer java/lang/Long java/lang/Short java/lang/Math java/lang/StrictMath java/lang/String java/lang/Throwable java/lang/instrument java/math java/net/URI java/net/URLDecoder java/net/URLEncoder java/nio/Buffer java/nio/ByteOrder java/nio/MappedByteBuffer java/nio/channels/Channels java/nio/channels/DatagramChannel java/nio/channels/spi java/security/cert java/security/Provider java/text java/util/jar java/util/zip java/util/Array java/util/BitSet java/util/Collection java/util/List javax/crypto/Cipher javax/imageio javax/management/openmbean javax/naming javax/rmi javax/sound sun/net/www/protocol sun/misc sun/nio sun/rmi sun/security/pkcs11 sun/security/rsa sun/security/util sun/security/x509 sun/util