diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-26 14:50:18 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-26 14:50:18 +0200 |
| commit | 2dd83ba68e037d7d16e06d667eb71d4f5159e90d (patch) | |
| tree | bc1a6c3bd31f8b1201d759137f4ea696532837da /java/test/Ice/udp/Server.java | |
| parent | Win32 IceBox/admin test failure (diff) | |
| download | ice-2dd83ba68e037d7d16e06d667eb71d4f5159e90d.tar.bz2 ice-2dd83ba68e037d7d16e06d667eb71d4f5159e90d.tar.xz ice-2dd83ba68e037d7d16e06d667eb71d4f5159e90d.zip | |
Fixed UDP IPv6 test failures on OS X
Diffstat (limited to 'java/test/Ice/udp/Server.java')
| -rw-r--r-- | java/test/Ice/udp/Server.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java index 55c515cf267..e0980df9739 100644 --- a/java/test/Ice/udp/Server.java +++ b/java/test/Ice/udp/Server.java @@ -52,16 +52,23 @@ public class Server extends test.Util.Application initData.properties.setProperty("Ice.UDP.RcvSize", "16384"); initData.properties.setProperty("Ice.UDP.SndSize", "16384"); - String host; + String endpoint; if(initData.properties.getProperty("Ice.IPv6").equals("1")) { - host = "\"ff01::1:1\""; + if(System.getProperty("os.name").contains("OS X")) + { + endpoint = "udp -h \"ff02::1:1\" -p 12020 --interface \"lo0\""; + } + else + { + endpoint = "udp -h \"ff01::1:1\" -p 12020"; + } } else { - host = "239.255.1.1"; + endpoint = "udp -h 239.255.1.1 -p 12020"; } - initData.properties.setProperty("McastTestAdapter.Endpoints", "udp -h " + host + " -p 12020"); + initData.properties.setProperty("McastTestAdapter.Endpoints", endpoint); return initData; } |