--- a/jdk/test/ProblemList.txt Tue Jun 22 19:18:06 2010 -0700
+++ b/jdk/test/ProblemList.txt Wed Jun 23 20:19:29 2010 +0100
@@ -507,25 +507,46 @@
############################################################################
+# jdk_io
+
+# 6962637
+java/io/File/MaxPathLength.java windows-all
+
+############################################################################
+
# jdk_nio
-# Suspect many of these tests auffer from using fixed ports, no concrete
-# evidence.
+# 6944810
+java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java windows-all
+
+# 6963118
+java/nio/channels/Selector/Wakeup.java windows-all
-# Occasionally Failing with java.lang.AssertionError on Windows X64
-# at sun.nio.ch.PendingIoCache.clearPendingIoMap(PendingIoCache.java:144)
-#java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java windows-all
+# The asynchronous I/O implementation on Windows requires Windows XP or newer.
+# We can remove the following once all Windows 2000 machines have been
+# decommissioned.
+java/nio/channels/AsynchronousChannelGroup/Basic.java windows-5.0
+java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java windows-5.0
+java/nio/channels/AsynchronousChannelGroup/Identity.java windows-5.0
+java/nio/channels/AsynchronousChannelGroup/Restart.java windows-5.0
+java/nio/channels/AsynchronousChannelGroup/Unbounded.java windows-5.0
+java/nio/channels/AsynchronousDatagramChannel/Basic.java windows-5.0
+java/nio/channels/AsynchronousFileChannel/Lock.java windows-5.0
+java/nio/channels/AsynchronousServerSocketChannel/Basic.java windows-5.0
+java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java windows-5.0
+java/nio/channels/AsynchronousSocketChannel/Basic.java windows-5.0
+java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java windows-5.0
+java/nio/channels/AsynchronousSocketChannel/Leaky.java windows-5.0
+java/nio/channels/AsynchronousSocketChannel/StressLoopback.java windows-5.0
+java/nio/channels/Channels/Basic2.java windows-5.0
-# Some kind of sleep/wake problem on Windows X64
-java/nio/channels/Selector/Wakeup.java windows-all
+# 6959891
+com/sun/nio/sctp/SctpChannel/SocketOptionTests.java
# Fails with -ea -esa, Assertion error, but only on Solaris 10 machines?
com/sun/nio/sctp/SctpChannel/Send.java generic-all
com/sun/nio/sctp/SctpChannel/Shutdown.java generic-all
-# Fails on Windows 2000, times out
-java/nio/channels/FileChannel/Transfer.java generic-all
-
# Fails on OpenSolaris, IllegalStateException: Cannot add or remove addresses
# from a channel that is bound to the wildcard address
com/sun/nio/sctp/SctpChannel/Bind.java generic-all
@@ -533,12 +554,6 @@
# Failed on OpenSolaris, java.lang.AssertionError: Unknown event type
com/sun/nio/sctp/SctpChannel/Receive.java generic-all
-# Runtime exception on windows X64, samevm mode
-java/nio/channels/Selector/WakeupNow.java generic-all
-
-# Occasional errors, solarix x86, address already in use, othervm mode
-java/nio/channels/Selector/SelectorTest.java generic-all
-
# Solaris 11 gave assert error and "connection refused", samevm issues?
com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java generic-all
@@ -549,43 +564,6 @@
com/sun/nio/sctp/SctpMultiChannel/Send.java generic-all
com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java generic-all
-# Linux 64bit failures. too many files open
-java/nio/channels/Selector/HelperSlowToDie.java generic-all
-
-# Gets java.lang.ExceptionInInitializerError on Windows 2000 (need XP or newer)
-java/nio/channels/AsynchronousChannelGroup/Basic.java windows-5.0
-java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java windows-5.0
-java/nio/channels/AsynchronousChannelGroup/Identity.java windows-5.0
-java/nio/channels/AsynchronousChannelGroup/Restart.java windows-5.0
-java/nio/channels/AsynchronousChannelGroup/Unbounded.java windows-5.0
-java/nio/channels/AsynchronousDatagramChannel/Basic.java windows-5.0
-java/nio/channels/AsynchronousFileChannel/Lock.java windows-5.0
-java/nio/channels/AsynchronousServerSocketChannel/Basic.java windows-5.0
-java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java windows-5.0
-java/nio/channels/AsynchronousSocketChannel/Basic.java windows-5.0
-java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java windows-5.0
-java/nio/channels/AsynchronousSocketChannel/Leaky.java windows-5.0
-java/nio/channels/AsynchronousSocketChannel/StressLoopback.java windows-5.0
-java/nio/channels/Channels/Basic2.java windows-5.0
-
-# Failed loopback connection? On windows 32bit?
-# Considered a stress test, can consume all resources.
-java/nio/channels/Selector/LotsOfChannels.java generic-all
-
-# Windows i586 client, crashed hotspot? Unpredictable
-# Considered a stress test, can consume all resources.
-java/nio/channels/Selector/RegAfterPreClose.java generic-all
-
-# Solaris i586, cannot assign address, samevm issues
-java/nio/channels/Selector/SelectorLimit.java generic-all
-
-# Socket timeout windows X64
-java/nio/channels/ServerSocketChannel/AdaptServerSocket.java windows-all
-
-# Timeouts etc. on Window
-java/nio/channels/SocketChannel/ConnectState.java windows-all
-java/nio/channels/SocketChannel/FinishConnect.java windows-all
-
############################################################################
# jdk_rmi