1 files changed, 13 insertions, 5 deletions
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index d443b07ca9e..27dbf60dc08 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -11,10 +11,7 @@
 import sys, demoscript, signal
 import demoscript.pexpect as pexpect
 
-def run(clientCmd, serverCmd):
-    print "testing multicast discovery...",
-    sys.stdout.flush()
-
+def runDemo(clientCmd, serverCmd):
     server = demoscript.Util.spawn(serverCmd + ' --Ice.PrintAdapterReady')
     server.expect('Discover ready')
     server.expect('Hello ready')
@@ -33,5 +30,16 @@ def run(clientCmd, serverCmd):
 
     server.kill(signal.SIGINT)
     server.waitTestSuccess()
-    
+
+def run(clientCmd, serverCmd):
+    print "testing multicast discovery (Ipv4)...",
+    sys.stdout.flush()
+    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)
     print "ok"