changeset 2559:7c3da1f0e17c

6961029: java/net/BindException/Test.java should not use wildcard address Reviewed-by: michaelm, alanb
author chegar
date Mon, 28 Jun 2010 20:52:37 +0100
parents a89f8c292a5b
children a9e0a6fb6057 505befdee800
files test/ProblemList.txt test/java/net/BindException/Test.java test/java/net/ipv6tests/Tests.java
diffstat 3 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/ProblemList.txt	Mon Jun 28 15:06:24 2010 +0100
+++ b/test/ProblemList.txt	Mon Jun 28 20:52:37 2010 +0100
@@ -379,9 +379,6 @@
 #   Interrupted or IO exception, maybe writing to non-unique named file?
 com/sun/net/httpserver/bugs/B6373555.java			generic-all
 
-# Fails on OpenSolaris, BindException unexpected 
-java/net/BindException/Test.java				generic-all
-
 # Fails on OpenSolaris, times out
 java/net/MulticastSocket/SetOutgoingIf.java			generic-all
 
--- a/test/java/net/BindException/Test.java	Mon Jun 28 15:06:24 2010 +0100
+++ b/test/java/net/BindException/Test.java	Mon Jun 28 20:52:37 2010 +0100
@@ -180,7 +180,7 @@
             while (addrs.hasMoreElements()) {
                 InetAddress ia = (InetAddress)addrs.nextElement();
 
-                if (ia.isLoopbackAddress()) {
+                if (ia.isLoopbackAddress() || ia.isAnyLocalAddress()) {
                     continue;
                 }
 
--- a/test/java/net/ipv6tests/Tests.java	Mon Jun 28 15:06:24 2010 +0100
+++ b/test/java/net/ipv6tests/Tests.java	Mon Jun 28 20:52:37 2010 +0100
@@ -248,7 +248,8 @@
                 }
                 while (addrs.hasMoreElements()) {
                     InetAddress addr = (InetAddress) addrs.nextElement();
-                    if (filter.isInstance (addr) && !addr.isLoopbackAddress()) {
+                    if (filter.isInstance (addr) && !addr.isLoopbackAddress()
+                            && !addr.isAnyLocalAddress()) {
                         if (Arrays.equals (addr.getAddress(), fe80_loopback)) {
                             continue;
                         }