| Index: tools/telemetry/telemetry/benchmark_runner.py
|
| diff --git a/tools/telemetry/telemetry/benchmark_runner.py b/tools/telemetry/telemetry/benchmark_runner.py
|
| index fdde6905697cdb8ecc8facac241ae4eed8555f89..eecb9458d71167fd755f8df30130ca1c303436c8 100644
|
| --- a/tools/telemetry/telemetry/benchmark_runner.py
|
| +++ b/tools/telemetry/telemetry/benchmark_runner.py
|
| @@ -18,7 +18,6 @@
|
| 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
|
|
|
|
|
| @@ -76,14 +75,17 @@
|
| 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, client_config=None):
|
| + benchmark_aliases=None):
|
| self._top_level_dir = top_level_dir
|
| self._benchmark_dirs = benchmark_dirs or []
|
| self._benchmark_aliases = benchmark_aliases or dict()
|
| - self._client_config = client_config or ''
|
| +
|
| + if benchmark_aliases:
|
| + self._benchmark_aliases = benchmark_aliases
|
| + else:
|
| + self._benchmark_aliases = {}
|
|
|
| @property
|
| def top_level_dir(self):
|
| @@ -97,9 +99,6 @@
|
| 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"""
|
| @@ -409,8 +408,6 @@
|
| else:
|
| command = Run
|
|
|
| - binary_manager.InitDependencyManager(environment.client_config)
|
| -
|
| # Parse and run the command.
|
| parser = command.CreateParser()
|
| command.AddCommandLineArgs(parser, environment)
|
|
|