1 files changed, 7 insertions, 20 deletions
diff --git a/py/allTests.py b/py/allTests.py
index dd88a389cf1..fd254d32a3c 100755
--- a/py/allTests.py
+++ b/py/allTests.py
@@ -11,28 +11,14 @@
 import os, sys, re, getopt
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
+    toplevel = os.path.abspath(toplevel)
     if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
         break
 else:
     raise "can't find toplevel directory!"
 
-def isCygwin():
-
-    # The substring on sys.platform is required because some cygwin
-    # versions return variations like "cygwin_nt-4.01".
-    return sys.platform[:6] == "cygwin"
-
-def isWin32():
-
-    return sys.platform == "win32" or isCygwin()
-
-def isWin9x():
-
-    if isWin32():
-        return not (os.environ.has_key("OS") and os.environ["OS"] == "Windows_NT")
-    else:
-        return 0
+sys.path.append(os.path.join(toplevel, "config"))
+import TestUtil
 
 def runTests(args, tests, num = 0):
     #
@@ -41,20 +27,21 @@ def runTests(args, tests, num = 0):
     for i in tests:
 
         i = os.path.normpath(i)
-        dir = os.path.join(toplevel, "test", i)
+        dir = os.path.join(toplevel, TestUtil.getDefaultMapping(), "test", i)
 
         print
         if num > 0:
             print "[" + str(num) + "]",
         print "*** running tests in " + dir,
         print
+        os.chdir(dir)
 
-        if isWin9x():
+        if TestUtil.isWin9x():
             status = os.system("python " + os.path.join(dir, "run.py " + args))
         else:
             status = os.system(os.path.join(dir, "run.py " + args))
 
-        if status and not (sys.platform.startswith("aix") and status == 256):
+        if status:
             if(num > 0):
                 print "[" + str(num) + "]",
             print "test in " + dir + " failed with exit status", status,