Index: tools/telemetry/run_tests |
diff --git a/tools/telemetry/run_tests b/tools/telemetry/run_tests |
index 96a083565c613c9e99ab4f00bac9bc292412484f..e2bb33ce9da23212c1dac83a4661ef914f2dc053 100755 |
--- a/tools/telemetry/run_tests |
+++ b/tools/telemetry/run_tests |
@@ -5,14 +5,20 @@ |
import os |
import sys |
- |
-from telemetry.unittest import gtest_progress_reporter |
-from telemetry.unittest import run_tests |
+import subprocess |
if __name__ == '__main__': |
- 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()) |
+ telemetry_dir = os.path.dirname(os.path.realpath(__file__)) |
+ |
+ 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', |
+ 'run_tests.py') |
+ argv = ['--top-level-dir', telemetry_dir] + sys.argv[1:] |
+ sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, |
+ env=env)) |