Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: tools/perf/run_tests

Issue 1296563002: Revert of Add dependency_manager initialization to binary_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/perf/run_benchmark ('k') | tools/telemetry/telemetry/benchmark_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/run_tests
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index 752216269facb97c59c30b13470fafdfa045c779..52cb2ad4d3138903e7a61dbfbc0efe8b959fbe64 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -12,20 +12,18 @@
import subprocess
import sys
-from core import project_config as project_config_module
if __name__ == '__main__':
- project_config = project_config_module.config
+ 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'] = os.path.join(env['PYTHONPATH'],
- project_config.telemetry_dir)
+ env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + telemetry_dir
else:
- env['PYTHONPATH'] = project_config.telemetry_dir
+ env['PYTHONPATH'] = telemetry_dir
- path_to_run_tests = os.path.join(
- project_config.telemetry_dir, 'telemetry', 'testing', 'run_tests.py')
- argv = ['--top-level-dir', project_config.top_level_dir,
- '--client-config', project_config.client_config] + sys.argv[1:]
+ path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'testing',
+ '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))
« no previous file with comments | « tools/perf/run_benchmark ('k') | tools/telemetry/telemetry/benchmark_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698