Chromium Code Reviews| Index: tools/perf/chrome_telemetry_build/chromium_config.py |
| diff --git a/tools/perf/chrome_telemetry_build/chromium_config.py b/tools/perf/chrome_telemetry_build/chromium_config.py |
| index a39dca9296f96f752656d81cfc99e676c39044e5..d49fc5a16b79dfbdabc3a6a467e6f28c8c510526 100644 |
| --- a/tools/perf/chrome_telemetry_build/chromium_config.py |
| +++ b/tools/perf/chrome_telemetry_build/chromium_config.py |
| @@ -16,13 +16,20 @@ def GetTelemetryDir(): |
| return os.path.join(GetChromiumSrcDir(), 'third_party', 'catapult', |
| 'telemetry') |
| +def GetDevilDir(): |
| + return os.path.join(GetChromiumSrcDir(), 'third_party', 'catapult', |
| + 'devil') |
| CLIENT_CONFIG_PATH = os.path.join( |
| os.path.dirname(os.path.abspath(__file__)), 'binary_dependencies.json') |
| +DEVIL_CONFIG_PATH = os.path.join( |
| + os.path.dirname(os.path.abspath(__file__)), 'devil_dependencies.json') |
| sys.path.insert(1, os.path.join(GetTelemetryDir())) |
| +sys.path.insert(1, os.path.join(GetDevilDir())) |
| from telemetry import project_config |
| +from devil import devil_env |
| class ChromiumConfig(project_config.ProjectConfig): |
| @@ -46,3 +53,5 @@ class ChromiumConfig(project_config.ProjectConfig): |
| super(ChromiumConfig, self).__init__( |
| top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs, |
| client_configs=client_configs, default_chrome_root=default_chrome_root) |
| + |
| + devil_env.config.Initialize(config_files=[DEVIL_CONFIG_PATH]) |
|
jbudorick
2016/12/16 18:32:57
The right way to handle this would be to call devi
aiolos (Not reviewing)
2016/12/16 18:39:22
This should instead be done in telemetry's binary
djordje.golubovic
2016/12/20 15:16:03
Thanks for your inputs.
I just need a bit of clar
jbudorick
2016/12/20 16:55:44
It seems that they're not entirely compatible, unf
djordje.golubovic
2016/12/21 17:58:55
Done.
djordje.golubovic
2016/12/21 17:58:55
Done.
|