# HG changeset patch
# User amurillo
# Date 1435094459 25200
# Node ID ae0369eaf0dcbab330869a01f3923f49bdb3a537
# Parent  d4e947de304589380a79d62d09e3df8ee5e541f2# Parent  b495f68ca12cc7b368ec55aa5e81c63e472cef07
Merge

diff -r d4e947de3045 -r ae0369eaf0dc jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java
--- a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java	Tue Jun 23 08:59:06 2015 -0700
+++ b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java	Tue Jun 23 14:20:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -49,6 +49,8 @@
 
     static boolean failed;
 
+    static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+
     public static final int LOOPBACK_SCOPE_ID = 0;
 
     public static final byte[] IN6ADDR_ANY_INIT = { (byte) 0x00, (byte) 0x00,
@@ -175,6 +177,13 @@
         for (Enumeration<NetworkInterface> e = NetworkInterface
                 .getNetworkInterfaces(); e.hasMoreElements();) {
             NetworkInterface netIF = e.nextElement();
+            // Skip (Windows)Teredo Tunneling Pseudo-Interface
+            if (isWindows) {
+                String dName = netIF.getDisplayName();
+                if (dName != null && dName.contains("Teredo")) {
+                    continue;
+                }
+            }
             for (Enumeration<InetAddress> iadrs = netIF.getInetAddresses(); iadrs
                     .hasMoreElements();) {
                 InetAddress iadr = iadrs.nextElement();