Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / trace-viewer / run_tests

diff --git a/src/third_party/trace-viewer/run_tests b/src/third_party/trace-viewer/run_tests
index 23f4cc6..cde45a9 100755 (executable)
--- a/src/third_party/trace-viewer/run_tests
+++ b/src/third_party/trace-viewer/run_tests
@@ -1,34 +1,12 @@
 #!/usr/bin/env python
-import unittest
+import build # Brings in tvcm bindings.
 import sys
-import os
 
-import build # Brings in tvcm bindings.
 import tvcm
-
-__all__ = []
-
-def Main():
-  class AllTestLoader(unittest.TestLoader):
-    def addTestsInDirToSuite(self, suite, start_dir, top_dir):
-      subsuite = self.discover(start_dir,
-                            "*unittest.py",
-                            top_dir)
-      suite.addTest(subsuite)
-
-    def loadTestsFromModule(self, module, use_load_tests=True):
-      if module.__file__ == __file__:
-        suite = unittest.TestSuite()
-        self.addTestsInDirToSuite(suite,
-                                  os.path.join(os.path.dirname(__file__), "build"),
-                                  os.path.dirname(__file__))
-        tvcm_top_dir = os.path.join(os.path.dirname(__file__), "third_party", "tvcm")
-        self.addTestsInDirToSuite(suite,
-                                  os.path.join(tvcm_top_dir, "tvcm"),
-                                  tvcm_top_dir)
-        return suite
-      return super(AllTestLoader, self).loadTestsFromModule(module, use_load_tests)
-  return unittest.main(testLoader=AllTestLoader())
+from tvcm import test_runner
 
 if __name__ == '__main__':
-  sys.exit(Main())
+  runner = test_runner.TestRunner()
+  runner.AddModule(build)
+  runner.AddModule(tvcm)
+  sys.exit(runner.Main())