changeset 23593:318e66c8de0e

Merge
author erikj
date Fri, 28 Mar 2014 18:03:40 +0100
parents 35b16ae6b4f4 1b50db37efd3
children 505c3a4eb0d6
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);