finished AMD for Java

1 files changed, 29 insertions, 1 deletions

diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py
index 1477e0f52e2..db0bfa10487 100755
--- a/java/test/Ice/exceptions/run.py
+++ b/java/test/Ice/exceptions/run.py
@@ -27,8 +27,36 @@ import TestUtil
 
 name = os.path.join("Ice", "exceptions")
 testdir = os.path.join(toplevel, "test", name)
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.getenv("CLASSPATH", "")
+nameAMD = os.path.join("Ice", "exceptionsAMD")
+testdirAMD = os.path.join(toplevel, "test", nameAMD)
 
+print "tests with regular server."
+classpath = os.getenv("CLASSPATH", "")
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath
 TestUtil.clientServerTest()
+
+print "tests with AMD server."
+server = "java -ea Server --Ice.ProgramName=Server "
+client = "java -ea Client --Ice.ProgramName=Client "
+print "starting server...",
+classpath = os.getenv("CLASSPATH", "")
+os.environ["CLASSPATH"] = os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath
+serverPipe = os.popen(server + TestUtil.serverOptions)
+TestUtil.getAdapterReady(serverPipe)
+print "ok"
+print "starting client...",
+classpath = os.getenv("CLASSPATH", "")
+os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath
+clientPipe = os.popen(client + TestUtil.clientOptions)
+print "ok"
+for output in clientPipe.xreadlines():
+    print output,
+clientStatus = clientPipe.close()
+serverStatus = serverPipe.close()
+if clientStatus or serverStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
+print "tests with collocated server."
 TestUtil.collocatedTest()
 sys.exit(0)