Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 40 insertions, 0 deletions

diff --git a/cpp/test/Ice/udp/run.py b/cpp/test/Ice/udp/run.py
new file mode 100755
index 00000000000..95f47bc2952
--- /dev/null
+++ b/cpp/test/Ice/udp/run.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import os, sys
+
+path = [ ".", "..", "../..", "../../..", "../../../.." ]
+head = os.path.dirname(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
+if len(path) == 0:
+    raise "can't find toplevel directory!"
+sys.path.append(os.path.join(path[0]))
+from scripts import *
+
+server = os.path.join(os.getcwd(), "server")
+client = os.path.join(os.getcwd(), "client")
+
+num = 5
+
+serverProc = []
+for i in range(0, num):
+    print "starting server #%d..." % (i + 1),
+    serverProc.append(TestUtil.startServer(server, "%d" % (i + 1) , adapter="McastTestAdapter"))
+    print "ok"
+
+print "starting client...",
+clientProc = TestUtil.startClient(client)
+print "ok"
+
+clientProc.waitTestSuccess()
+for p in serverProc:
+    p.waitTestSuccess()