Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 | 9 |
| 10 def GetChromiumSrcDir(): | 10 def GetChromiumSrcDir(): |
| 11 return os.path.abspath( | 11 return os.path.abspath( |
| 12 os.path.join(os.path.abspath(__file__), '..', '..', '..', '..')) | 12 os.path.join(os.path.abspath(__file__), '..', '..', '..', '..')) |
| 13 | 13 |
| 14 | 14 |
| 15 def GetTelemetryDir(): | 15 def GetTelemetryDir(): |
| 16 return os.path.join(GetChromiumSrcDir(), 'third_party', 'catapult', | 16 return os.path.join(GetChromiumSrcDir(), 'third_party', 'catapult', |
| 17 'telemetry') | 17 'telemetry') |
| 18 | 18 |
| 19 def GetDevilDir(): | |
| 20 return os.path.join(GetChromiumSrcDir(), 'third_party', 'catapult', | |
| 21 'devil') | |
| 19 | 22 |
| 20 CLIENT_CONFIG_PATH = os.path.join( | 23 CLIENT_CONFIG_PATH = os.path.join( |
| 21 os.path.dirname(os.path.abspath(__file__)), 'binary_dependencies.json') | 24 os.path.dirname(os.path.abspath(__file__)), 'binary_dependencies.json') |
| 25 DEVIL_CONFIG_PATH = os.path.join( | |
| 26 os.path.dirname(os.path.abspath(__file__)), 'devil_dependencies.json') | |
| 22 | 27 |
| 23 sys.path.insert(1, os.path.join(GetTelemetryDir())) | 28 sys.path.insert(1, os.path.join(GetTelemetryDir())) |
| 29 sys.path.insert(1, os.path.join(GetDevilDir())) | |
| 24 | 30 |
| 25 from telemetry import project_config | 31 from telemetry import project_config |
| 32 from devil import devil_env | |
| 26 | 33 |
| 27 | 34 |
| 28 class ChromiumConfig(project_config.ProjectConfig): | 35 class ChromiumConfig(project_config.ProjectConfig): |
| 29 | 36 |
| 30 def __init__(self, top_level_dir=None, benchmark_dirs=None, | 37 def __init__(self, top_level_dir=None, benchmark_dirs=None, |
| 31 client_configs=None, | 38 client_configs=None, |
| 32 default_chrome_root=GetChromiumSrcDir()): | 39 default_chrome_root=GetChromiumSrcDir()): |
| 33 if client_configs is None: | 40 if client_configs is None: |
| 34 client_configs = [CLIENT_CONFIG_PATH] | 41 client_configs = [CLIENT_CONFIG_PATH] |
| 35 | 42 |
| 36 perf_dir = os.path.join(GetChromiumSrcDir(), 'tools', 'perf') | 43 perf_dir = os.path.join(GetChromiumSrcDir(), 'tools', 'perf') |
| 37 if not benchmark_dirs: | 44 if not benchmark_dirs: |
| 38 benchmark_dirs = [os.path.join(perf_dir, 'benchmarks')] | 45 benchmark_dirs = [os.path.join(perf_dir, 'benchmarks')] |
| 39 logging.info('No benchmark directories specified. Defaulting to %s', | 46 logging.info('No benchmark directories specified. Defaulting to %s', |
| 40 benchmark_dirs) | 47 benchmark_dirs) |
| 41 if not top_level_dir: | 48 if not top_level_dir: |
| 42 top_level_dir = perf_dir | 49 top_level_dir = perf_dir |
| 43 logging.info('No top level directory specified. Defaulting to %s', | 50 logging.info('No top level directory specified. Defaulting to %s', |
| 44 top_level_dir) | 51 top_level_dir) |
| 45 | 52 |
| 46 super(ChromiumConfig, self).__init__( | 53 super(ChromiumConfig, self).__init__( |
| 47 top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs, | 54 top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs, |
| 48 client_configs=client_configs, default_chrome_root=default_chrome_root) | 55 client_configs=client_configs, default_chrome_root=default_chrome_root) |
| 56 | |
| 57 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.
| |
| OLD | NEW |