Switch unit tests to configurable runner

6 files changed, 25 insertions, 11 deletions

diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py
index 76944c1..902030d 100644
--- a/src/engine/SCons/Tool/JavaCommonTests.py
+++ b/src/engine/SCons/Tool/JavaCommonTests.py
@@ -27,6 +27,9 @@ import os.path
 import sys
 import unittest
 
+import TestUnit
+
+import SCons.Scanner.IDL
 import SCons.Tool.JavaCommon
 
 
@@ -570,8 +573,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
diff --git a/src/engine/SCons/Tool/PharLapCommonTests.py b/src/engine/SCons/Tool/PharLapCommonTests.py
index d1e7f60..e67d426 100644
--- a/src/engine/SCons/Tool/PharLapCommonTests.py
+++ b/src/engine/SCons/Tool/PharLapCommonTests.py
@@ -28,6 +28,8 @@ import os.path
 import os
 import sys
 
+import TestUnit
+
 import SCons.Errors
 from SCons.Tool.PharLapCommon import *
 
@@ -58,8 +60,7 @@ class PharLapCommonTestCase(unittest.TestCase):
 
 if __name__ == "__main__":
     suite = unittest.makeSuite(PharLapCommonTestCase, 'test_')
-    if not unittest.TextTestRunner().run(suite).wasSuccessful():
-        sys.exit(1)
+    TestUnit.run(suite)
 
 # Local Variables:
 # tab-width:4
diff --git a/src/engine/SCons/Tool/ToolTests.py b/src/engine/SCons/Tool/ToolTests.py
index 9595680..3e6da5b 100644
--- a/src/engine/SCons/Tool/ToolTests.py
+++ b/src/engine/SCons/Tool/ToolTests.py
@@ -26,6 +26,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import sys
 import unittest
 
+import TestUnit
+
 import SCons.Errors
 import SCons.Tool
 
@@ -76,8 +78,7 @@ class ToolTestCase(unittest.TestCase):
 
 if __name__ == "__main__":
     suite = unittest.makeSuite(ToolTestCase, 'test_')
-    if not unittest.TextTestRunner().run(suite).wasSuccessful():
-        sys.exit(1)
+    TestUnit.run(suite)
 
 # Local Variables:
 # tab-width:4
diff --git a/src/engine/SCons/Tool/javacTests.py b/src/engine/SCons/Tool/javacTests.py
index 4631c8a..c1832a8 100644
--- a/src/engine/SCons/Tool/javacTests.py
+++ b/src/engine/SCons/Tool/javacTests.py
@@ -24,6 +24,8 @@
 import os
 import unittest
 
+import TestUnit
+
 import SCons.Tool.javac
 
 class DummyNode(object):
@@ -98,5 +100,10 @@ class pathoptTestCase(unittest.TestCase):
             '/foo',
             '')
 
+def suite():
+    suite = unittest.TestSuite()
+    suite.addTest(pathoptTestCase())
+    return suite
+
 if __name__ == "__main__":
-    unittest.main()
+    TestUnit.run(suite)
diff --git a/src/engine/SCons/Tool/msvsTests.py b/src/engine/SCons/Tool/msvsTests.py
index 3a9cac7..558f9f0 100644
--- a/src/engine/SCons/Tool/msvsTests.py
+++ b/src/engine/SCons/Tool/msvsTests.py
@@ -25,10 +25,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import sys
-import TestCmd
 import unittest
 import copy
 
+import TestCmd
+import TestUnit
+
 from SCons.Tool.msvs import *
 from SCons.Tool.MSCommon.vs import SupportedVSList
 import SCons.Util
@@ -759,7 +761,7 @@ if __name__ == "__main__":
                     del os.environ[k]
 
             suite = unittest.makeSuite(test_class, 'test_')
-            if not unittest.TextTestRunner().run(suite).wasSuccessful():
+            if not TestUnit.cli.get_runner().run(suite).wasSuccessful():
                 exit_val = 1
         finally:
             os.env = back_osenv
diff --git a/src/engine/SCons/Tool/wixTests.py b/src/engine/SCons/Tool/wixTests.py
index c815dd0..c683e98 100644
--- a/src/engine/SCons/Tool/wixTests.py
+++ b/src/engine/SCons/Tool/wixTests.py
@@ -33,6 +33,8 @@ from SCons.Tool.wix import *
 from SCons.Environment import Environment
 
 import TestCmd
+import TestUnit
+
 
 # create fake candle and light, so the tool's exists() method will succeed
 test = TestCmd.TestCmd(workdir = '')
@@ -52,8 +54,7 @@ class WixTestCase(unittest.TestCase):
 
 if __name__ == "__main__":
     suite = unittest.makeSuite(WixTestCase, 'test_')
-    if not unittest.TextTestRunner().run(suite).wasSuccessful():
-        sys.exit(1)
+    TestUnit.run(suite)
 
 # Local Variables:
 # tab-width:4