diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-26 16:31:31 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-26 16:31:31 +0200 |
commit | df608fa858819f84924451b6a97559671303e8b0 (patch) | |
tree | 931f0ae1302ff7d45e41a1aa4b6dbc96be174744 /src/engine/SCons/Variables/VariablesTests.py | |
parent | 9d8eae9f5bf53a4a80e29d7a3a1d2c7d7197688a (diff) | |
parent | 78989ebb445af2c6462ae2bf05ffd588d76610e4 (diff) |
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
Diffstat (limited to 'src/engine/SCons/Variables/VariablesTests.py')
-rw-r--r-- | src/engine/SCons/Variables/VariablesTests.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py index 7dcc464..91a90f6 100644 --- a/src/engine/SCons/Variables/VariablesTests.py +++ b/src/engine/SCons/Variables/VariablesTests.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,11 +21,13 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/VariablesTests.py 2014/03/02 14:18:15 garyo" +__revision__ = "src/engine/SCons/Variables/VariablesTests.py 2014/07/05 09:42:21 garyo" import sys import unittest + import TestSCons +import TestUnit import SCons.Variables import SCons.Subst @@ -655,8 +657,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 |