diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-05-13 16:09:13 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-05-13 16:09:13 +0800 |
| commit | 9f8dd79fc6a1cc5ad916e78fd9625ba4c3fe69d1 (patch) | |
| tree | fae952fc02e24b0862bf0bdf738e85d79dd60dd1 /demoscript/Ice/multicast.py | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=3160 - solaris 10 & java 64 bit issu... (diff) | |
| download | ice-9f8dd79fc6a1cc5ad916e78fd9625ba4c3fe69d1.tar.bz2 ice-9f8dd79fc6a1cc5ad916e78fd9625ba4c3fe69d1.tar.xz ice-9f8dd79fc6a1cc5ad916e78fd9625ba4c3fe69d1.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3092 - skip ipv6 section of multicast test with java under windows.
Diffstat (limited to 'demoscript/Ice/multicast.py')
| -rwxr-xr-x | demoscript/Ice/multicast.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py index ce20f77852d..11391c2c3c1 100755 --- a/demoscript/Ice/multicast.py +++ b/demoscript/Ice/multicast.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python: # ********************************************************************** # # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. @@ -53,9 +53,12 @@ def run(clientCmd, serverCmd): runDemo(clientCmd, serverCmd) print "ok" - print "testing multicast discovery (IPv6)...", - sys.stdout.flush() - serverCmd += " --Ice.IPv6=1 --Discover.Endpoints='udp -h \"ff01::1:1\" -p 10000'" - clientCmd += " --Ice.IPv6=1 --Discover.Proxy='discover:udp -h \"ff01::1:1\" -p 10000'" - runDemo(clientCmd, serverCmd) + if demoscript.Util.defaultLanguage == "Java" and demoscript.Util.isCygwin(): + print "skipping testing multicast discovery (IPv6) under windows...", + else: + print "testing multicast discovery (IPv6)...", + sys.stdout.flush() + serverCmd += " --Ice.IPv6=1 --Discover.Endpoints='udp -h \"ff01::1:1\" -p 10000'" + clientCmd += " --Ice.IPv6=1 --Discover.Proxy='discover:udp -h \"ff01::1:1\" -p 10000'" + runDemo(clientCmd, serverCmd) print "ok" |