Merge tag 'upstream/2.3.2'

Upstream version 2.3.2

1 files changed, 9 insertions, 5 deletions

diff --git a/src/engine/SCons/JobTests.py b/src/engine/SCons/JobTests.py
index 5c7e707..9b4a6c1 100644
--- a/src/engine/SCons/JobTests.py
+++ b/src/engine/SCons/JobTests.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
@@ -20,15 +20,19 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/engine/SCons/JobTests.py  2014/03/02 14:18:15 garyo"
+__revision__ = "src/engine/SCons/JobTests.py  2014/07/05 09:42:21 garyo"
 
 import unittest
 import random
 import math
-import SCons.Job
 import sys
 import time
 
+import TestUnit
+
+import SCons.Job
+
+
 # a large number
 num_sines = 10000
 
@@ -521,8 +525,8 @@ def suite():
     return suite
 
 if __name__ == "__main__":
-    runner = unittest.TextTestRunner()
-    result = runner.run(suite())
+    runner = TestUnit.cli.get_runner()
+    result = runner().run(suite())
     if (len(result.failures) == 0
         and len(result.errors) == 1
         and isinstance(result.errors[0][0], SerialTestCase)