Index: tools/perf/run_tests |
diff --git a/tools/perf/run_tests b/tools/perf/run_tests |
index ee8355293cad04ae6dbadf1fb04a63fd3ca7503d..0f1f2dd1ee2fbbf868100620d62376c276dac2d5 100755 |
--- a/tools/perf/run_tests |
+++ b/tools/perf/run_tests |
@@ -9,21 +9,17 @@ |
""" |
import os |
-import subprocess |
import sys |
+ |
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) |
+ |
+from telemetry.unittest_util import gtest_progress_reporter |
+from telemetry.unittest_util import run_tests |
if __name__ == '__main__': |
- perf_dir = os.path.dirname(os.path.realpath(__file__)) |
- telemetry_dir = os.path.realpath(os.path.join(perf_dir, '..', 'telemetry')) |
- |
- env = os.environ.copy() |
- if 'PYTHONPATH' in env: |
- env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + telemetry_dir |
- else: |
- env['PYTHONPATH'] = telemetry_dir |
- |
- path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util', |
- 'run_tests.py') |
- argv = ['--top-level-dir', perf_dir] + sys.argv[1:] |
- sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) |
+ base_dir = os.path.dirname(os.path.realpath(__file__)) |
+ progress_reporters = [ |
+ gtest_progress_reporter.GTestProgressReporter(sys.stdout)] |
+ run_tests.config = run_tests.Config(base_dir, [base_dir], progress_reporters) |
+ sys.exit(run_tests.RunTestsCommand.main()) |