diff options
| -rw-r--r-- | cs/test/Ice/udp/AllTests.cs | 20 | ||||
| -rw-r--r-- | java/test/Freeze/fileLock/db/.gitignore | 0 | ||||
| -rw-r--r-- | java/test/Ice/udp/AllTests.java | 20 |
3 files changed, 22 insertions, 18 deletions
diff --git a/cs/test/Ice/udp/AllTests.cs b/cs/test/Ice/udp/AllTests.cs index 8eb41eb9581..2af4c9cd215 100644 --- a/cs/test/Ice/udp/AllTests.cs +++ b/cs/test/Ice/udp/AllTests.cs @@ -196,12 +196,18 @@ public class AllTests } test(ret); - if(IceInternal.AssemblyUtil.platform_ != IceInternal.AssemblyUtil.Platform.Windows) + // + // Neither Windows nor Snow Leopard support sending replies back + // on the multicast UDP connection. For Windows, see + // UdpTransceiver constructor for the details. + // + if(IceInternal.AssemblyUtil.platform_ == IceInternal.AssemblyUtil.Platform.Windows || + IceInternal.AssemblyUtil.osx_) + { + Console.Out.WriteLine("ok"); + } + else { - // - // Windows doesn't support sending replies back on the multicast UDP connection, - // see UdpTransceiver constructor for the details. - // nRetry = 5; while(nRetry-- > 0) { @@ -225,10 +231,6 @@ public class AllTests Console.Out.WriteLine("ok"); } } - else - { - Console.Out.WriteLine("ok"); - } return objMcast; } } diff --git a/java/test/Freeze/fileLock/db/.gitignore b/java/test/Freeze/fileLock/db/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 --- a/java/test/Freeze/fileLock/db/.gitignore +++ /dev/null diff --git a/java/test/Ice/udp/AllTests.java b/java/test/Ice/udp/AllTests.java index 22550b6f370..bbecf95ae1d 100644 --- a/java/test/Ice/udp/AllTests.java +++ b/java/test/Ice/udp/AllTests.java @@ -198,12 +198,18 @@ public class AllTests reply = (PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram(); } test(ret); - if(!System.getProperty("os.name").startsWith("Windows")) + + // + // Neither Windows nor Snow Leopard support sending replies back + // on the multicast UDP connection. For Windows, see + // UdpTransceiver constructor for the details. + // + if(System.getProperty("os.name").startsWith("Windows") || System.getProperty("os.name").startsWith("Mac OS X")) + { + System.out.println("ok"); + } + else { - // - // Windows doesn't support sending replies back on the multicast UDP connection, - // see UdpTransceiver constructor for the details. - // nRetry = 5; while(nRetry-- > 0) { @@ -227,10 +233,6 @@ public class AllTests System.out.println("ok"); } } - else - { - System.out.println("ok"); - } return objMcast; } |