Attempt to switch telemetry to typ again.

TBR=dtu@chromium.org, phajdan.jr@chromium.org
BUG=388256

Review URL: https://codereview.chromium.org/708443003

Cr-Commit-Position: refs/heads/master@{#303141}

1 files changed, 15 insertions, 9 deletions

diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index 6497020..6b4d309 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -9,17 +9,23 @@ This script DOES NOT run benchmarks. run_benchmark does that.
 """
 
 import os
+import subprocess
 import sys
 
-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
 
-from telemetry.unittest import gtest_progress_reporter
-from telemetry.unittest 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
 
-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())
+  path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest',
+                                   'run_tests.py')
+  argv = ['--top-level-dir', perf_dir] + sys.argv[1:]
+  ret = subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)
+  print 'run_tests exiting, ret = %d' % ret
+  sys.exit(ret)