From 186882959de54f4b6ed0a604976502992ea1057e Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Wed, 11 Nov 2009 16:22:27 +0000 Subject: [PATCH] 6900234: Several NIO tests should be removed from test/ProblemList.txt Reviewed-by: chegar --- jdk/test/ProblemList.txt | 22 ------------------- .../AsynchronousChannelGroup/Unbounded.java | 2 +- .../nio/channels/FileChannel/Transfer.java | 1 + jdk/test/java/nio/file/Path/CopyAndMove.java | 2 ++ jdk/test/java/nio/file/Path/Links.java | 2 ++ 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 2e57a38b131..9a366c1ba8f 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -741,9 +741,6 @@ com/sun/nio/sctp/SctpMultiChannel/Branch.java generic-all 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 @@ java/nio/channels/DatagramChannel/Connect.java generic-all # 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 @@ java/nio/channels/Selector/OpRead.java solaris-sparc # 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 @@ java/nio/channels/SocketChannel/FinishConnect.java windows-all # 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 @@ java/nio/channels/SocketChannel/VectorParams.java solaris-all # 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 --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java index 7b947d949e6..dcf0a62531d 100644 --- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java +++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java @@ -34,7 +34,7 @@ import java.io.IOException; 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 --git a/jdk/test/java/nio/channels/FileChannel/Transfer.java b/jdk/test/java/nio/channels/FileChannel/Transfer.java index 15578c3b38e..b511ae6a6d3 100644 --- a/jdk/test/java/nio/channels/FileChannel/Transfer.java +++ b/jdk/test/java/nio/channels/FileChannel/Transfer.java @@ -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 --git a/jdk/test/java/nio/file/Path/CopyAndMove.java b/jdk/test/java/nio/file/Path/CopyAndMove.java index 5894b2894f2..18abbe0de56 100644 --- a/jdk/test/java/nio/file/Path/CopyAndMove.java +++ b/jdk/test/java/nio/file/Path/CopyAndMove.java @@ -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 --git a/jdk/test/java/nio/file/Path/Links.java b/jdk/test/java/nio/file/Path/Links.java index 8ffd89fb691..aa88e37a702 100644 --- a/jdk/test/java/nio/file/Path/Links.java +++ b/jdk/test/java/nio/file/Path/Links.java @@ -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.*;