Chromium Code Reviews| 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..5619a6db4cbefc28d33c4cb32b0d2c30cce45ec1 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,15 @@ 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. |
| + dependency_config: A path to a ProjectDependencies json file. |
| + TODO(aiolos): Add link to description/example of a ProjectDependency file. |
|
eakuefner
2015/08/10 17:07:03
Can you move the todo out of the docstring itself?
aiolos (Not reviewing)
2015/08/10 20:37:26
Done.
|
| """ |
| def __init__(self, top_level_dir, benchmark_dirs=None, |
| - benchmark_aliases=None): |
| + benchmark_aliases=None, dependency_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._dependency_config = dependency_config |
| @property |
| def top_level_dir(self): |
| @@ -99,6 +98,9 @@ class ProjectConfig(object): |
| def benchmark_aliases(self): |
| return self._benchmark_aliases |
| + @property |
| + def dependency_config(self): |
| + return self._dependency_config |
| class Help(command_line.OptparseCommand): |
| """Display help information about a command""" |
| @@ -408,6 +410,8 @@ def main(environment): |
| else: |
| command = Run |
| + binary_manager.InitDependencyManager(environment.dependency_config) |
| + |
| # Parse and run the command. |
| parser = command.CreateParser() |
| command.AddCommandLineArgs(parser, environment) |