# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1243005399 -7200
# Node ID c1469020162e9790ee7d7b2d57d32c1a104af5df
# Parent  b443c3bc7e259f091a7f234722f96fed40674cc1
	* Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch
	added.
	* patches/icedtea-samejvm-safe.patch: Add packages that are
	samejvm-safe to TEST.ROOT.
	* test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont
	tests. Hangs jtreg test suite.

diff -r b443c3bc7e25 -r c1469020162e ChangeLog
--- a/ChangeLog	Fri May 22 16:55:42 2009 +0200
+++ b/ChangeLog	Fri May 22 17:16:39 2009 +0200
@@ -1,3 +1,12 @@
+2009-05-22  Mark Wielaard  <mark@klomp.org>
+
+	* Makefile.am(ICEDTEA_PATCHES): patches/icedtea-samejvm-safe.patch
+	added.
+	* patches/icedtea-samejvm-safe.patch: Add packages that are
+	samejvm-safe to TEST.ROOT.
+	* test/jtreg/excludelist.jdk.jtx: Add java/awt/FontClass/CreateFont
+	tests. Hangs jtreg test suite.
+
 2009-05-22  Mark Wielaard  <mark@klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*,
diff -r b443c3bc7e25 -r c1469020162e Makefile.am
--- a/Makefile.am	Fri May 22 16:55:42 2009 +0200
+++ b/Makefile.am	Fri May 22 17:16:39 2009 +0200
@@ -2039,6 +2039,7 @@
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
 	patches/icedtea-testenv.patch \
+	patches/icedtea-samejvm-safe.patch \
 	patches/icedtea-pr261.patch \
 	patches/icedtea-doc-headers.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
diff -r b443c3bc7e25 -r c1469020162e patches/icedtea-samejvm-safe.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-samejvm-safe.patch	Fri May 22 17:16:39 2009 +0200
@@ -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/imageio javax/management/openmbean javax/rmi javax/sound sun/net/www/protocol sun/misc sun/nio sun/security/pkcs11 sun/security/rsa sun/util
diff -r b443c3bc7e25 -r c1469020162e test/jtreg/excludelist.jdk.jtx
--- a/test/jtreg/excludelist.jdk.jtx	Fri May 22 16:55:42 2009 +0200
+++ b/test/jtreg/excludelist.jdk.jtx	Fri May 22 17:16:39 2009 +0200
@@ -192,3 +192,8 @@
 sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java
 # java.lang.IllegalAccessException: Class com.sun.javatest.regtest.MainWrapper$MainThread can not access a member of class NotBound with modifiers "public static"
 java/nio/channels/DatagramChannel/NotBound.java
+
+# Something fishy going on here...
+java/awt/FontClass/CreateFont/fileaccess/FontFile.java
+java/awt/FontClass/CreateFont/DeleteFont.sh
+java/awt/FontClass/CreateFont/bigfont.html