Fixed bug 1650

1 files changed, 46 insertions, 0 deletions

diff --git a/java/test/Ice/servantLocator/run.py b/java/test/Ice/servantLocator/run.py
new file mode 100755
index 00000000000..3e6d59ec3a7
--- /dev/null
+++ b/java/test/Ice/servantLocator/run.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2006 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
+
+for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
+    toplevel = os.path.normpath(toplevel)
+    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
+        break
+else:
+    raise "can't find toplevel directory!"
+
+sys.path.append(os.path.join(toplevel, "config"))
+import TestUtil
+
+name = os.path.join("Ice", "servantLocator")
+nameAMD = os.path.join("Ice", "servantLocatorAMD")
+testdir = os.path.join(toplevel, "test", name)
+testdirAMD = os.path.join(toplevel, "test", nameAMD)
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.getenv("CLASSPATH", "")
+
+#
+# We need to use mixedClientServerTest so that, when using SSL, the
+# server-side SSL configuration properties are defined. This is
+# necessary because the client creates object adapters.
+#
+print "tests with regular server."
+classpath = os.getenv("CLASSPATH", "")
+TestUtil.mixedClientServerTest()
+
+print "tests with AMD server."
+TestUtil.clientServerTestWithClasspath(\
+    os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath,\
+    os.path.join(testdir, "classes") + TestUtil.sep + classpath)
+
+print "tests with collocated server."
+TestUtil.collocatedTest()
+
+sys.exit(0)