diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3021ceb6802..0aa532b984f 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -894,9 +894,6 @@ com/sun/jdi/RepStep.java 8043571 generic-
com/sun/jdi/NashornPopFrameTest.java 8225620 generic-all
-com/sun/jdi/JdwpListenTest.java 8234935 windows-all
-com/sun/jdi/JdwpAttachTest.java 8234935 windows-all
-
############################################################################
# jdk_time
diff --git a/test/jdk/com/sun/jdi/JdwpAttachTest.java b/test/jdk/com/sun/jdi/JdwpAttachTest.java
index 8d134af027c..cabb0442e9e 100644
--- a/test/jdk/com/sun/jdi/JdwpAttachTest.java
+++ b/test/jdk/com/sun/jdi/JdwpAttachTest.java
@@ -25,6 +25,7 @@ import com.sun.jdi.Bootstrap;
import com.sun.jdi.VirtualMachine;
import com.sun.jdi.connect.Connector;
import com.sun.jdi.connect.ListeningConnector;
+import jdk.test.lib.Platform;
import jdk.test.lib.apps.LingeredApp;
import java.net.Inet4Address;
@@ -33,7 +34,6 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
-import java.util.Arrays;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.LinkedList;
@@ -54,8 +54,6 @@ import java.util.concurrent.Executors;
*/
public class JdwpAttachTest {
- private static final boolean IsWindows = System.getProperty("os.name").toLowerCase().contains("windows");
-
// Set to true to perform testing of attach from wrong address (expected to fail).
// It's off by default as it caused significant test time increase\
// (tests <number_of_addresses> * <number_of_addresses> cases, each case fails by timeout).
@@ -115,7 +113,7 @@ public class JdwpAttachTest {
}
log(" Listening port: " + port);
- log(" Attaching from " + connectAddress);
+ log(" Attaching to " + connectAddress);
try {
ExecutorService executor = Executors.newSingleThreadExecutor();
executor.submit((Callable<Exception>)() -> {
@@ -155,6 +153,12 @@ public class JdwpAttachTest {
list.add(addr);
}
+ private static boolean isTeredo(Inet6Address addr) {
+ // Teredo prefix is 2001::/32 (i.e. first 4 bytes are 2001:0000)
+ byte[] bytes = addr.getAddress();
+ return bytes[0] == 0x20 && bytes[1] == 0x01 && bytes[2] == 0x00 && bytes[3] == 0x00;
+ }
+
private static List<InetAddress> getAddresses() {
List<InetAddress> result = new LinkedList<>();
try {
@@ -173,6 +177,12 @@ public class JdwpAttachTest {
// On other platforms test both symbolic and numeric scopes.
if (addr instanceof Inet6Address) {
Inet6Address addr6 = (Inet6Address)addr;
+ // Teredo clients cause intermittent errors on listen ("bind failed")
+ // and attach ("no route to host").
+ // Teredo is supposed to be a temporary measure, but some test machines have it.
+ if (isTeredo(addr6)) {
+ continue;
+ }
NetworkInterface scopeIface = addr6.getScopedInterface();
if (scopeIface != null && scopeIface.getName() != null) {
// On some test machines VPN creates link local addresses
@@ -190,7 +200,7 @@ public class JdwpAttachTest {
throw new RuntimeException("Unexpected", e);
}
- if (IsWindows) {
+ if (Platform.isWindows()) {
// don't add addresses with symbolic scope
continue;
}
diff --git a/test/jdk/com/sun/jdi/JdwpListenTest.java b/test/jdk/com/sun/jdi/JdwpListenTest.java
index 43820b00e2a..37c7132f2a0 100644
--- a/test/jdk/com/sun/jdi/JdwpListenTest.java
+++ b/test/jdk/com/sun/jdi/JdwpListenTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@ import com.sun.jdi.VirtualMachine;
import com.sun.jdi.connect.AttachingConnector;
import com.sun.jdi.connect.Connector;
import com.sun.jdi.connect.IllegalConnectorArgumentsException;
+import jdk.test.lib.Platform;
import lib.jdb.Debuggee;
import java.io.IOException;
@@ -52,8 +53,6 @@ import java.util.Map;
*/
public class JdwpListenTest {
- private static final boolean IsWindows = System.getProperty("os.name").toLowerCase().contains("windows");
-
// Set to true to allow testing of attach from wrong address (expected to fail).
// It's off by default as it causes test time increase and test interference (see JDK-8231915).
private static boolean allowNegativeTesting = false;
@@ -89,7 +88,7 @@ public class JdwpListenTest {
private static void listenTest(String listenAddress, String connectAddress, boolean expectedResult)
throws IOException {
- log("\nTest: listen at " + listenAddress + ", attaching from " + connectAddress
+ log("\nTest: listen at " + listenAddress + ", attaching to " + connectAddress
+ ", expected: " + (expectedResult ? "SUCCESS" : "FAILURE"));
if (!expectedResult && !allowNegativeTesting) {
log("SKIPPED: negative testing is disabled");
@@ -99,7 +98,7 @@ public class JdwpListenTest {
log("Starting listening debuggee at " + listenAddress);
try (Debuggee debuggee = Debuggee.launcher("HelloWorld").setAddress(listenAddress + ":0").launch()) {
log("Debuggee is listening on " + listenAddress + ":" + debuggee.getAddress());
- log("Connecting from " + connectAddress + ", expected: " + (expectedResult ? "SUCCESS" : "FAILURE"));
+ log("Connecting to " + connectAddress + ", expected: " + (expectedResult ? "SUCCESS" : "FAILURE"));
try {
VirtualMachine vm = attach(connectAddress, debuggee.getAddress());
vm.dispose();
@@ -120,6 +119,12 @@ public class JdwpListenTest {
list.add(addr);
}
+ private static boolean isTeredo(Inet6Address addr) {
+ // Teredo prefix is 2001::/32 (i.e. first 4 bytes are 2001:0000)
+ byte[] bytes = addr.getAddress();
+ return bytes[0] == 0x20 && bytes[1] == 0x01 && bytes[2] == 0x00 && bytes[3] == 0x00;
+ }
+
private static List<InetAddress> getAddresses() {
List<InetAddress> result = new LinkedList<>();
try {
@@ -138,6 +143,12 @@ public class JdwpListenTest {
// On other platforms test both symbolic and numeric scopes.
if (addr instanceof Inet6Address) {
Inet6Address addr6 = (Inet6Address)addr;
+ // Teredo clients cause intermittent errors on listen ("bind failed")
+ // and attach ("no route to host").
+ // Teredo is supposed to be a temporary measure, but some test machines have it.
+ if (isTeredo(addr6)) {
+ continue;
+ }
NetworkInterface scopeIface = addr6.getScopedInterface();
if (scopeIface != null && scopeIface.getName() != null) {
// On some test machines VPN creates link local addresses
@@ -155,7 +166,7 @@ public class JdwpListenTest {
throw new RuntimeException("Unexpected", e);
}
- if (IsWindows) {
+ if (Platform.isWindows()) {
// don't add addresses with symbolic scope
continue;
}