summaryrefslogtreecommitdiff
path: root/allTests.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-11-25 13:13:22 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-11-25 13:13:22 +0100
commitdcdc32af1fced49d80a8ccd93230e15d91ab45d8 (patch)
treeeb69e2555fbd54496fce8a33f4dd610e1473ff51 /allTests.py
parentC# IceSSL/configuration log expired certificate exceptions. (diff)
downloadice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.bz2
ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.xz
ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.zip
Refactored test scripts
Diffstat (limited to 'allTests.py')
-rwxr-xr-xallTests.py27
1 files changed, 3 insertions, 24 deletions
diff --git a/allTests.py b/allTests.py
index f65508ec9ac..5b0470cf439 100755
--- a/allTests.py
+++ b/allTests.py
@@ -8,30 +8,9 @@
#
# **********************************************************************
-import os, sys, imp
-
+import os, sys
sys.path.append(os.path.join(os.path.dirname(__file__), "scripts"))
-import TestUtil
-
-testGroups = []
-
-languages = [ "cpp", "java", "java-compat", "python", "ruby", "php", "js" ]
-if TestUtil.isWin32():
- languages.append("csharp")
-if TestUtil.isDarwin():
- languages.append("objective-c")
-
-for d in languages:
-
- filename = os.path.abspath(os.path.join(os.path.dirname(__file__), d, "allTests.py"))
- f = open(filename, "r")
- current_mod = imp.load_module("allTests", f, filename, (".py", "r", imp.PY_SOURCE))
- f.close()
-
- tests = []
- tests = [ (os.path.join(d, "test", os.path.normpath(x)), y) for x, y in current_mod.tests ]
- if len(tests) > 0:
- testGroups.extend(tests)
+from Util import runTests
-TestUtil.run(testGroups, root=True)
+runTests() \ No newline at end of file