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

Unified Diff: tools/telemetry/telemetry/benchmark_runner.py

Issue 1280903003: Add dependency_manager initialization to binary_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix and refactor the unittest. 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_tests ('k') | tools/telemetry/telemetry/core/exceptions.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/benchmark_runner.py
diff --git a/tools/telemetry/telemetry/benchmark_runner.py b/tools/telemetry/telemetry/benchmark_runner.py
index eecb9458d71167fd755f8df30130ca1c303436c8..fdde6905697cdb8ecc8facac241ae4eed8555f89 100644
--- a/tools/telemetry/telemetry/benchmark_runner.py
+++ b/tools/telemetry/telemetry/benchmark_runner.py
@@ -18,6 +18,7 @@ from telemetry.core import discover
from telemetry import decorators
from telemetry.internal.browser import browser_finder
from telemetry.internal.browser import browser_options
+from telemetry.internal.util import binary_manager
from telemetry.internal.util import command_line
@@ -75,17 +76,14 @@ class ProjectConfig(object):
benchmark_dirs: A list of dirs containing benchmarks.
benchmark_aliases: A dict of name:alias string pairs to be matched against
exactly during benchmark selection.
+ client_config: A path to a ProjectDependencies json file.
"""
def __init__(self, top_level_dir, benchmark_dirs=None,
- benchmark_aliases=None):
+ benchmark_aliases=None, client_config=None):
self._top_level_dir = top_level_dir
self._benchmark_dirs = benchmark_dirs or []
self._benchmark_aliases = benchmark_aliases or dict()
-
- if benchmark_aliases:
- self._benchmark_aliases = benchmark_aliases
- else:
- self._benchmark_aliases = {}
+ self._client_config = client_config or ''
@property
def top_level_dir(self):
@@ -99,6 +97,9 @@ class ProjectConfig(object):
def benchmark_aliases(self):
return self._benchmark_aliases
+ @property
+ def client_config(self):
+ return self._client_config
class Help(command_line.OptparseCommand):
"""Display help information about a command"""
@@ -408,6 +409,8 @@ def main(environment):
else:
command = Run
+ binary_manager.InitDependencyManager(environment.client_config)
+
# Parse and run the command.
parser = command.CreateParser()
command.AddCommandLineArgs(parser, environment)
« no previous file with comments | « tools/perf/run_tests ('k') | tools/telemetry/telemetry/core/exceptions.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698