Numerous cleanups to the test suite and expect scripts.

Conflicts:

	cpp/test/Glacier2/staticFiltering/run.py

1 files changed, 11 insertions, 15 deletions

diff --git a/py/test/Ice/exceptions/run.py b/py/test/Ice/exceptions/run.py
index f5153ac8666..2de58587328 100755
--- a/py/test/Ice/exceptions/run.py
+++ b/py/test/Ice/exceptions/run.py
@@ -10,23 +10,19 @@
 
 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", "exceptions")
+sys.path.append(os.path.join(path[0]))
+from scripts import *
 
 print "tests with regular server."
-TestUtil.clientServerTest(name)
+TestUtil.clientServerTest()
 print "tests with AMD server."
-TestUtil.clientServerTestWithOptionsAndNames(name, "", "", "ServerAMD.py", "Client.py")
+TestUtil.clientServerTest(server="ServerAMD.py")
 print "tests with collocated server."
-TestUtil.collocatedTest(name)
-sys.exit(0)
+TestUtil.collocatedTest()