summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-03-30 14:53:39 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2014-03-30 14:53:39 (GMT)
commit29b5018f78b8fe161b76b19125eec2a164c58098 (patch)
tree711940a9fd90bb13ba470dc05e29ab81ff3c2126 /src/engine/SCons/Script
parent1166292efdcece6306f8545fd6fb3ce44521b77d (diff)
parent32a609a88ee6d8682840dc9b2ffd31988f91a12a (diff)
downloadSCons-29b5018f78b8fe161b76b19125eec2a164c58098.zip
SCons-29b5018f78b8fe161b76b19125eec2a164c58098.tar.gz
SCons-29b5018f78b8fe161b76b19125eec2a164c58098.tar.bz2
Merged in techtonik/scons (pull request #124)
New configurable test runner for unittests
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/MainTests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/MainTests.py b/src/engine/SCons/Script/MainTests.py
index c44c426..fd6aaf4 100644
--- a/src/engine/SCons/Script/MainTests.py
+++ b/src/engine/SCons/Script/MainTests.py
@@ -24,6 +24,9 @@
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import unittest
+
+import TestUnit
+
import SCons.Errors
import SCons.Script.Main
@@ -43,8 +46,7 @@ if __name__ == "__main__":
for tclass in tclasses:
names = unittest.getTestCaseNames(tclass, 'test_')
suite.addTests(list(map(tclass, names)))
- if not unittest.TextTestRunner().run(suite).wasSuccessful():
- sys.exit(1)
+ TestUnit.run(suite)
# Local Variables:
# tab-width:4