From 118a8cf98aed43ee972d01538937014b0b2f4894 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Tue, 23 Jun 2015 09:46:22 -0700 Subject: [PATCH] 8129510: java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java should exclude testing the Teredo tunneling interface on Windows Suppress testing the Teredo tunneling interface on Windows. Reviewed-by: chegar --- .../serialize/Inet6AddressSerializationTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java index a969986ae8c..b189aa4a147 100644 --- a/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java +++ b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java @@ -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 @@ public class Inet6AddressSerializationTest { 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 @@ public class Inet6AddressSerializationTest { for (Enumeration 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 iadrs = netIF.getInetAddresses(); iadrs .hasMoreElements();) { InetAddress iadr = iadrs.nextElement();