darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-30 15:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8223196: java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java fails on Solaris SPARC

Browse Source 
The test is fixed to use InetAddress.getLocalHost consistently, instead of a mix of getLocalHost/wildcard addresses.

Reviewed-by: chegar, vtewari
This commit is contained in:
Daniel Fuchs 2019-11-28 12:28:48 +00:00
parent 2077bdfa8c
commit d6f414a1f7
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java
View File

@ -1,3 +1,4 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@ -91,7 +92,7 @@ public class Launcher {
*/
public static SocketChannel launchWithSocketChannel(String className, String options[], String args[]) throws IOException {
ServerSocketChannel ssc = ServerSocketChannel.open();
ssc.socket().bind(new InetSocketAddress(0));
ssc.socket().bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
InetSocketAddress isa = new InetSocketAddress(InetAddress.getLocalHost(),
ssc.socket().getLocalPort());
SocketChannel sc1 = SocketChannel.open(isa);
@ -120,7 +121,7 @@ public class Launcher {
throws IOException
{
ServerSocketChannel ssc = ServerSocketChannel.open();
ssc.socket().bind(new InetSocketAddress(0));
ssc.socket().bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
int port = ssc.socket().getLocalPort();
launch(className, options, args, Util.getFD(ssc));
ssc.close();
@ -147,18 +148,18 @@ public class Launcher {
public static DatagramChannel launchWithDatagramChannel(String className, String options[], String args[])
throws IOException
{
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
}
DatagramChannel dc = DatagramChannel.open();
dc.socket().bind(new InetSocketAddress(0));
dc.socket().bind(new InetSocketAddress(address, 0));
int port = dc.socket().getLocalPort();
launch(className, options, args, Util.getFD(dc));
dc.close();
dc = DatagramChannel.open();
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
}
InetSocketAddress isa = new InetSocketAddress(address, port);
dc.connect(isa);

13
test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java
View File

@ -35,6 +35,7 @@
*/
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
import java.nio.channels.SelectionKey;
@ -66,6 +67,7 @@ public class StateTest {
/*
* Wait for service to connect
*/
System.err.println("Waiting for the service to connect");
ssc.configureBlocking(false);
sk = ssc.register(sel, SelectionKey.OP_ACCEPT);
long to = Utils.adjustTimeout(15*1000);
@ -89,6 +91,7 @@ public class StateTest {
/*
* Wait for service to report test result
*/
System.err.println("Waiting for the service to report test result");
sc.configureBlocking(false);
sk = sc.register(sel, SelectionKey.OP_READ);
to = Utils.adjustTimeout(5000);
@ -111,6 +114,7 @@ public class StateTest {
throw new IOException("Timed out waiting for service to report test result");
}
}
System.err.println("Cleaning up");
sk.cancel();
sc.close();
sel.close();
@ -118,6 +122,7 @@ public class StateTest {
/*
* Examine the test result
*/
System.err.println("Examine test result");
bb.flip();
byte b = bb.get();
@ -152,7 +157,8 @@ public class StateTest {
* from the service.
*/
ServerSocketChannel ssc = ServerSocketChannel.open();
ssc.socket().bind(new InetSocketAddress(0));
ssc.socket().bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
System.err.println("Listener bound to: " + ssc.socket().getLocalSocketAddress());
/*
* The port is passed to the service as an argument.
@ -164,7 +170,9 @@ public class StateTest {
/*
* Launch service with a SocketChannel (tcp nowait)
*/
System.err.println("launchWithSocketChannel");
SocketChannel sc = Launcher.launchWithSocketChannel(TEST_SERVICE, options, arg);
System.err.println("Waiting for test results");
waitForTestResult(ssc, expectFail);
sc.close();
@ -173,6 +181,7 @@ public class StateTest {
* launchWithServerSocketChannel establishes a connection to the service
* and the returned SocketChannel is connected to the service.
*/
System.err.println("launchWithServerSocketChannel");
sc = Launcher.launchWithServerSocketChannel(TEST_SERVICE, options, arg);
waitForTestResult(ssc, expectFail);
sc.close();
@ -180,10 +189,12 @@ public class StateTest {
/*
* Launch service with a DatagramChannel (udp wait)
*/
System.err.println("launchWithDatagramChannel");
DatagramChannel dc = Launcher.launchWithDatagramChannel(TEST_SERVICE, options, arg);
waitForTestResult(ssc, expectFail);
dc.close();
System.err.println("done");
if (failures > 0) {
throw new RuntimeException("Test failed - see log for details");
} else {