Added AMI and AMD tests for exception slicing. Removed a few redundant

    semicolons from the source.

1 files changed, 24 insertions, 0 deletions

diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py
index 94ace071e25..ed558bf0436 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/Ice/slicing/exceptions/run.py
@@ -27,7 +27,31 @@ import TestUtil
 
 name = os.path.join("Ice", "slicing", "exceptions")
 testdir = os.path.join(toplevel, "test", name)
+nameAMD = os.path.join("Ice", "slicing", "exceptionsAMD")
+testdirAMD = os.path.join(toplevel, "test", nameAMD)
 
+print "tests with regular server."
 TestUtil.clientServerTestWithClasspath(os.path.join(testdir, "sclasses"), os.path.join(testdir, "cclasses"))
 
+print "tests with AMD server."
+server = "java -ea Server --Ice.ProgramName=Server "
+client = "java -ea Client --Ice.ProgramName=Client "
+print "starting server...",
+cp = os.getenv("CLASSPATH", "")
+os.environ["CLASSPATH"] = os.path.join(testdirAMD, "classes") + TestUtil.sep + cp
+serverPipe = os.popen(server + TestUtil.serverOptions)
+TestUtil.getAdapterReady(serverPipe)
+print "ok"
+print "starting client...",
+os.environ["CLASSPATH"] = cp
+os.environ["CLASSPATH"] = os.path.join(testdir, "cclasses") + TestUtil.sep + cp
+clientPipe = os.popen(client + TestUtil.clientOptions)
+print "ok"
+TestUtil.printOutputFromPipe(clientPipe)
+clientStatus = clientPipe.close()
+serverStatus = serverPipe.close()
+if clientStatus or serverStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
 sys.exit(0)