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

Unified Diff: tools/perf/chrome_telemetry_build/chromium_config.py

Issue 2823063003: Revert of [tools/perf] Remove default values of benchmark_dirs and top_level_dir in chromium_config module (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/perf/core/path_util.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dcbc7b86576a12b001c447d1a848b3793d21f099..a39dca9296f96f752656d81cfc99e676c39044e5 100644
--- a/tools/perf/chrome_telemetry_build/chromium_config.py
+++ b/tools/perf/chrome_telemetry_build/chromium_config.py
@@ -2,15 +2,25 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import logging
import os
+import sys
-from core import path_util
+
+def GetChromiumSrcDir():
+ return os.path.abspath(
+ os.path.join(os.path.abspath(__file__), '..', '..', '..', '..'))
+
+
+def GetTelemetryDir():
+ return os.path.join(GetChromiumSrcDir(), 'third_party', 'catapult',
+ 'telemetry')
CLIENT_CONFIG_PATH = os.path.join(
os.path.dirname(os.path.abspath(__file__)), 'binary_dependencies.json')
-path_util.AddTelemetryToPath()
+sys.path.insert(1, os.path.join(GetTelemetryDir()))
from telemetry import project_config
@@ -18,11 +28,20 @@
class ChromiumConfig(project_config.ProjectConfig):
def __init__(self, top_level_dir=None, benchmark_dirs=None,
- client_configs=None, default_chrome_root=None):
+ client_configs=None,
+ default_chrome_root=GetChromiumSrcDir()):
if client_configs is None:
client_configs = [CLIENT_CONFIG_PATH]
- if default_chrome_root is None:
- default_chrome_root = path_util.GetChromiumSrcDir()
+
+ perf_dir = os.path.join(GetChromiumSrcDir(), 'tools', 'perf')
+ if not benchmark_dirs:
+ benchmark_dirs = [os.path.join(perf_dir, 'benchmarks')]
+ logging.info('No benchmark directories specified. Defaulting to %s',
+ benchmark_dirs)
+ if not top_level_dir:
+ top_level_dir = perf_dir
+ logging.info('No top level directory specified. Defaulting to %s',
+ top_level_dir)
super(ChromiumConfig, self).__init__(
top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs,
« no previous file with comments | « no previous file | tools/perf/core/path_util.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698