Numerous cleanups to the test suite and expect scripts.

Conflicts:

	cpp/test/Glacier2/staticFiltering/run.py

1 files changed, 14 insertions, 23 deletions

diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py
index 84cccf81362..26ccab807dc 100755
--- a/java/test/Ice/operations/run.py
+++ b/java/test/Ice/operations/run.py
@@ -10,33 +10,24 @@
 
 import os, sys
 
-for toplevel in [".", "..", "../..", "../../..", "../../../..", "../../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
-        break
-else:
+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(toplevel, "config"))
-import TestUtil
-TestUtil.processCmdLine()
-
-name = os.path.join("Ice", "operations")
-testdir = os.path.dirname(os.path.abspath(__file__))
-nameAMD = os.path.join("Ice", "operationsAMD")
-testdirAMD = testdir + "AMD" 
+sys.path.append(os.path.join(path[0]))
+from scripts import *
 
 print "tests with regular server."
-classpath = os.getenv("CLASSPATH", "")
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + classpath
-TestUtil.clientServerTest(name)
+TestUtil.clientServerTest()
 
 print "tests with AMD server."
-TestUtil.clientServerTestWithClasspath(name, \
-    os.path.join(testdirAMD, "classes") + os.pathsep + classpath,\
-    os.path.join(testdir, "classes") + os.pathsep + classpath)
+import copy
+amdenv = copy.deepcopy(os.environ)
+TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "operationsAMD", "classes"), amdenv)
+TestUtil.clientServerTest(serverenv = amdenv)
 
 print "tests with collocated server."
-TestUtil.collocatedTest(name)
-
-sys.exit(0)
+TestUtil.collocatedTest()