# HG changeset patch
# User alanb
# Date 1257956547 0
# Node ID d9720475ab15392e8b580908bd1cc4fe07e7030e
# Parent  9b594a48d0f4a6b0fb8c3bfcc712af43c9ce17ba
6900234: Several NIO tests should be removed from test/ProblemList.txt
Reviewed-by: chegar

diff -r 9b594a48d0f4 -r d9720475ab15 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Wed Nov 11 14:38:01 2009 +0000
+++ b/jdk/test/ProblemList.txt	Wed Nov 11 16:22:27 2009 +0000
@@ -741,9 +741,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 (not good for windows 2000 either)
-java/nio/channels/AsynchronousChannelGroup/Unbounded.java	generic-all
-
 # Linux 64bit failures. too many files open
 java/nio/channels/Selector/HelperSlowToDie.java			generic-all
 
@@ -771,9 +768,6 @@
 # Solaris i586 timeouts
 java/nio/channels/DatagramChannel/EmptyBuffer.java	 	solaris-all
 
-# Gets java.lang.ExceptionInInitializerError on windows:  (Windows 2000 only?)
-java/nio/channels/FileChannel/Transfer.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
@@ -785,19 +779,12 @@
 #   Considered a stress test, can consume all resources.
 java/nio/channels/Selector/RegAfterPreClose.java	 	generic-all
 
-# Gets java.net.BindException alot (static port number?)
-java/nio/channels/Selector/SelectAfterRead.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
 
-# Solaris i586, cannot assign address, samevm issues
-java/nio/channels/SocketChannel/CloseAfterConnect.java	 	generic-all
-java/nio/channels/SocketChannel/CloseRegisteredChannel.java 	generic-all
-
 # Timeouts etc. on Window
 java/nio/channels/SocketChannel/ConnectState.java	 	windows-all
 java/nio/channels/SocketChannel/FinishConnect.java	 	windows-all
@@ -805,11 +792,6 @@
 # Need to be marked othervm, or changed to be samevm safe
 java/nio/channels/SocketChannel/OpenLeak.java			generic-all
 
-# Solaris i586 java.net.BindExceptions
-java/nio/channels/SocketChannel/Shutdown.java		 	solaris-all
-java/nio/channels/SocketChannel/SocketOptionTests.java	 	solaris-all
-java/nio/channels/SocketChannel/Stream.java		 	solaris-all
-
 # Gets java.net.BindException alot (static port number?)
 java/nio/channels/SocketChannel/VectorIO.java		 	generic-all
 
@@ -819,10 +801,6 @@
 # Linux i586 address already in use, samevm issues
 java/nio/channels/SocketChannel/Write.java		 	generic-all
 
-# Fails in samevm, jtreg security manager does not grant FilePermission readlink action
-java/nio/file/Path/CopyAndMove.java			 	generic-all
-java/nio/file/Path/Links.java					generic-all
-
 # Fails on all platforms due to overlap of JDK jar file contents:
 sun/nio/cs/Test4200310.sh				 	generic-all
 
diff -r 9b594a48d0f4 -r d9720475ab15 jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java	Wed Nov 11 14:38:01 2009 +0000
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java	Wed Nov 11 16:22:27 2009 +0000
@@ -34,7 +34,7 @@
 
 public class Unbounded {
     // number of concurrent completion handlers
-    static final int CONCURRENCY_COUNT = 512;
+    static final int CONCURRENCY_COUNT = 256;
 
     public static void main(String[] args) throws Exception {
         // all accepted connections are added to a queue
diff -r 9b594a48d0f4 -r d9720475ab15 jdk/test/java/nio/channels/FileChannel/Transfer.java
--- a/jdk/test/java/nio/channels/FileChannel/Transfer.java	Wed Nov 11 14:38:01 2009 +0000
+++ b/jdk/test/java/nio/channels/FileChannel/Transfer.java	Wed Nov 11 16:22:27 2009 +0000
@@ -25,6 +25,7 @@
  * @bug 4434723 4482726 4559072 4638365 4795550 5081340 5103988 6253145
  * @summary Test FileChannel.transferFrom and transferTo
  * @library ..
+ * @run main/timeout=180 Transfer
  */
 
 import java.io.*;
diff -r 9b594a48d0f4 -r d9720475ab15 jdk/test/java/nio/file/Path/CopyAndMove.java
--- a/jdk/test/java/nio/file/Path/CopyAndMove.java	Wed Nov 11 14:38:01 2009 +0000
+++ b/jdk/test/java/nio/file/Path/CopyAndMove.java	Wed Nov 11 16:22:27 2009 +0000
@@ -25,6 +25,8 @@
  * @bug 4313887 6838333
  * @summary Unit test for java.nio.file.Path copyTo/moveTo methods
  * @library ..
+ * @build CopyAndMove
+ * @run main/othervm CopyAndMove
  */
 
 import java.nio.ByteBuffer;
diff -r 9b594a48d0f4 -r d9720475ab15 jdk/test/java/nio/file/Path/Links.java
--- a/jdk/test/java/nio/file/Path/Links.java	Wed Nov 11 14:38:01 2009 +0000
+++ b/jdk/test/java/nio/file/Path/Links.java	Wed Nov 11 16:22:27 2009 +0000
@@ -26,6 +26,8 @@
  * @summary Unit test for java.nio.file.Path createSymbolicLink,
  *     readSymbolicLink, and createLink methods
  * @library ..
+ * @build Links
+ * @run main/othervm Links
  */
 
 import java.nio.file.*;