Merge
authorerikj
Fri, 28 Mar 2014 18:03:40 +0100
changeset 23593 318e66c8de0e
parent 23592 35b16ae6b4f4 (current diff)
parent 23591 1b50db37efd3 (diff)
child 23594 505c3a4eb0d6
Merge
--- a/jdk/test/java/net/NetworkInterface/Test.java	Fri Mar 28 15:00:07 2014 +0100
+++ b/jdk/test/java/net/NetworkInterface/Test.java	Fri Mar 28 18:03:40 2014 +0100
@@ -30,6 +30,7 @@
 import java.util.Enumeration;
 
 public class Test {
+    static final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
 
     public static void main(String args[]) throws Exception {
 
@@ -38,6 +39,11 @@
         while (nifs.hasMoreElements()) {
             NetworkInterface ni = (NetworkInterface)nifs.nextElement();
 
+            //JDK-8038276: Should not test on Windows with Teredo Tunneling Pseudo-Interface
+            String dName = ni.getDisplayName();
+            if (isWindows && dName != null && dName.contains("Teredo"))
+                continue;
+
             String name = ni.getName();
             System.out.println("\n" + name);