Numerous cleanups to the test suite and expect scripts.

Conflicts:

	cpp/test/Glacier2/staticFiltering/run.py

1 files changed, 10 insertions, 28 deletions

diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index 6d4273abdea..06250626150 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -10,34 +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()
+client = os.path.join(os.getcwd(), "client")
 
-testdir = os.path.dirname(os.path.abspath(__file__))
-
-client = os.path.join(testdir, "client")
-clientOptions = ' ' + testdir
-
-print "starting client...",
-command = client + clientOptions
-if TestUtil.debug:
-    print "(" + command + ")",
-clientPipe = os.popen(command + " 2>&1")
-print "ok"
-
-TestUtil.printOutputFromPipe(clientPipe)
-    
-clientStatus = TestUtil.closePipe(clientPipe)
-
-if clientStatus:
-    sys.exit(1)
-
-sys.exit(0)
+TestUtil.simpleTest(client, os.getcwd())