diff options
| author | Jose <jose@zeroc.com> | 2013-09-19 18:56:22 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-09-19 18:56:22 +0200 |
| commit | fa5d30a3f1dc9a10a4df74bc993f4d776e198b79 (patch) | |
| tree | fad27ca88c380b7e206577ca5e4d47202c9b107a /demoscript/Ice | |
| parent | Remove unused method getRelease (diff) | |
| download | ice-fa5d30a3f1dc9a10a4df74bc993f4d776e198b79.tar.bz2 ice-fa5d30a3f1dc9a10a4df74bc993f4d776e198b79.tar.xz ice-fa5d30a3f1dc9a10a4df74bc993f4d776e198b79.zip | |
Disable IPv6 multicast demo when running in Windows with Java 1.6
Diffstat (limited to 'demoscript/Ice')
| -rw-r--r-- | demoscript/Ice/multicast.py | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py index f07c2e932d2..ca870fe82b1 100644 --- a/demoscript/Ice/multicast.py +++ b/demoscript/Ice/multicast.py @@ -64,19 +64,24 @@ def run(clientCmd, serverCmd): runDemo(clientCmd, serverCmd) print("ok") - sys.stdout.write("testing multicast discovery (IPv6)... ") - sys.stdout.flush() - # - # On OS X, using the interface-local address doesn't work, the client fails with - # a "Host not reachable" error, instead we use a link-local address with on loopback. + # No IPv6 support in Windows with Java 1.6.x # - if Util.isDarwin(): - endpoint = 'udp -h \\"ff02::1:1\\" -p 10000 --interface \\"lo0\\"' - else: - endpoint = 'udp -h \\"ff01::1:1\\" -p 10000' - serverCmd += ' --Ice.IPv6=1 --Discover.Endpoints="%s"' % (endpoint) - clientCmd += ' --Ice.IPv6=1 --Discover.Proxy="discover:%s"' % (endpoint) - - runDemo(clientCmd, serverCmd) - print("ok") + if not Util.isWin32() or not Util.getJavaVersion().startswith("1.6"): + + sys.stdout.write("testing multicast discovery (IPv6)... ") + sys.stdout.flush() + + # + # On OS X, using the interface-local address doesn't work, the client fails with + # a "Host not reachable" error, instead we use a link-local address with on loopback. + # + if Util.isDarwin(): + endpoint = 'udp -h \\"ff02::1:1\\" -p 10000 --interface \\"lo0\\"' + else: + endpoint = 'udp -h \\"ff01::1:1\\" -p 10000' + serverCmd += ' --Ice.IPv6=1 --Discover.Endpoints="%s"' % (endpoint) + clientCmd += ' --Ice.IPv6=1 --Discover.Proxy="discover:%s"' % (endpoint) + + runDemo(clientCmd, serverCmd) + print("ok") |