Numerous cleanups to the test suite and expect scripts.

Conflicts:

	cpp/test/Glacier2/staticFiltering/run.py

1 files changed, 10 insertions, 15 deletions

diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py
index 0c45d6d34d8..50834a30234 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/IceSSL/configuration/run.py
@@ -10,21 +10,16 @@
 
 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(path[0]))
+from scripts import *
 
-sys.path.append(os.path.join(toplevel, "config"))
-import TestUtil
-TestUtil.processCmdLine()
+testdir = os.getcwd()
 
-name = os.path.join("IceSSL", "configuration")
-testdir = os.path.dirname(os.path.abspath(__file__))
-
-classpath = os.getenv("CLASSPATH", "")
-os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + os.pathsep + classpath
-TestUtil.clientServerTestWithOptions(name, "", " " + testdir)
-sys.exit(0)
+TestUtil.clientServerTest(additionalClientOptions=testdir)