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

Side by Side Diff: tools/perf/chrome_telemetry_build/chromium_config.py

Issue 1579743002: [Telemetry] Update telemetry_unittests to use tools/perf/run_telemetry_tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Marc's comments Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « testing/buildbot/gn_isolate_map.pyl ('k') | tools/perf/core/path_util.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 CHROMIUM_SRC_DIR = os.path.join(
10 os.path.dirname(__file__), os.path.pardir, os.path.pardir, os.path.pardir)
11 9
12 sys.path.append(os.path.join(CHROMIUM_SRC_DIR, 'tools', 'telemetry')) 10 def GetChromiumSrcDir():
11 return os.path.abspath(
12 os.path.join(os.path.abspath(__file__), '..', '..', '..', '..'))
13 13
14 from telemetry import project_config 14
15 def GetTelemetryDir():
16 return os.path.join(GetChromiumSrcDir(), 'tools', 'telemetry')
15 17
16 18
17 CLIENT_CONFIG_PATH = os.path.join( 19 CLIENT_CONFIG_PATH = os.path.join(
18 os.path.dirname(os.path.abspath(__file__)), 'binary_dependencies.json') 20 os.path.dirname(os.path.abspath(__file__)), 'binary_dependencies.json')
19 21
22 sys.path.insert(1, os.path.join(GetTelemetryDir()))
23
24 from telemetry import project_config
25
20 26
21 class ChromiumConfig(project_config.ProjectConfig): 27 class ChromiumConfig(project_config.ProjectConfig):
22 def __init__(self, top_level_dir=None, benchmark_dirs=None, 28 def __init__(self, top_level_dir=None, benchmark_dirs=None,
23 client_config=CLIENT_CONFIG_PATH, 29 client_config=CLIENT_CONFIG_PATH,
24 default_chrome_root=CHROMIUM_SRC_DIR): 30 default_chrome_root=GetChromiumSrcDir()):
25 31
26 perf_dir = os.path.join(CHROMIUM_SRC_DIR, 'tools', 'perf') 32 perf_dir = os.path.join(GetChromiumSrcDir(), 'tools', 'perf')
27 if not benchmark_dirs: 33 if not benchmark_dirs:
28 benchmark_dirs = [os.path.join(perf_dir, 'benchmarks')] 34 benchmark_dirs = [os.path.join(perf_dir, 'benchmarks')]
29 logging.info('No benchmark directories specified. Defaulting to %s', 35 logging.info('No benchmark directories specified. Defaulting to %s',
30 benchmark_dirs) 36 benchmark_dirs)
31 if not top_level_dir: 37 if not top_level_dir:
32 top_level_dir = perf_dir 38 top_level_dir = perf_dir
33 logging.info('No top level directory specified. Defaulting to %s', 39 logging.info('No top level directory specified. Defaulting to %s',
34 top_level_dir) 40 top_level_dir)
35 41
36 super(ChromiumConfig, self).__init__( 42 super(ChromiumConfig, self).__init__(
37 top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs, 43 top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs,
38 client_config=client_config, default_chrome_root=default_chrome_root) 44 client_config=client_config, default_chrome_root=default_chrome_root)
OLDNEW
« no previous file with comments | « testing/buildbot/gn_isolate_map.pyl ('k') | tools/perf/core/path_util.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698