diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-30 14:53:39 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-30 14:53:39 (GMT) |
| commit | 29b5018f78b8fe161b76b19125eec2a164c58098 (patch) | |
| tree | 711940a9fd90bb13ba470dc05e29ab81ff3c2126 /src/engine/SCons/Node/FSTests.py | |
| parent | 1166292efdcece6306f8545fd6fb3ce44521b77d (diff) | |
| parent | 32a609a88ee6d8682840dc9b2ffd31988f91a12a (diff) | |
| download | SCons-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/Node/FSTests.py')
| -rw-r--r-- | src/engine/SCons/Node/FSTests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index a60b8a4..c4dc2ce 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -31,10 +31,12 @@ import os.path import sys import time import unittest -from TestCmd import TestCmd import shutil import stat +from TestCmd import TestCmd +import TestUnit + import SCons.Errors import SCons.Node.FS import SCons.Util @@ -3755,8 +3757,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 |