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

Unified Diff: tools/perf/core/trybot_command.py

Issue 1780453002: [PerfTry] Make it possible to ./run_benchmark try within tools/perf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove webkit changes Created 4 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/core/trybot_command.py
diff --git a/tools/perf/core/trybot_command.py b/tools/perf/core/trybot_command.py
index 79a009b501bbb822672c66e58ad3292efcef5aa1..6d437b10c07e77532cd0610385be6d22113fd2ef 100644
--- a/tools/perf/core/trybot_command.py
+++ b/tools/perf/core/trybot_command.py
@@ -18,9 +18,11 @@ from telemetry.core import discover
from telemetry.util import command_line
from telemetry.util import matching
+from core import path_util
+
-CHROMIUM_CONFIG_FILENAME = 'tools/run-perf-test.cfg'
-BLINK_CONFIG_FILENAME = 'Tools/run-perf-test.cfg'
+CHROMIUM_CONFIG_FILENAME = os.path.join(path_util.GetChromiumSrcDir(), 'tools',
+ 'run-perf-test.cfg')
SUCCESS, NO_CHANGES, ERROR = range(3)
# Unsupported Perf bisect bots.
EXCLUDED_BOTS = {
@@ -225,10 +227,6 @@ class Trybot(command_line.ArgParseCommand):
# First check if there are chromium changes to upload.
status = self._AttemptTryjob(CHROMIUM_CONFIG_FILENAME, arguments)
if status not in [SUCCESS, ERROR]:
- # If we got here, there are no chromium changes to upload. Try blink.
- os.chdir('third_party/WebKit/')
- status = self._AttemptTryjob(BLINK_CONFIG_FILENAME, arguments)
- os.chdir('../..')
if status not in [SUCCESS, ERROR]:
logging.error('No local changes found in chromium or blink trees. '
'browser=%s argument sends local changes to the '
@@ -261,7 +259,7 @@ class Trybot(command_line.ArgParseCommand):
if config_to_write == config_file.read():
return NO_CHANGES, ''
except IOError:
- msg = 'Cannot find %s. Please run from src dir.' % cfg_file_path
+ msg = 'Cannot find %s.' % cfg_file_path
return (ERROR, msg)
with open(cfg_file_path, 'w') as config_file:
@@ -357,8 +355,6 @@ class Trybot(command_line.ArgParseCommand):
try, ERROR if a tryjob was attempted but an error encountered.
"""
source_repo = 'chromium'
- if cfg_file_path == BLINK_CONFIG_FILENAME:
- source_repo = 'blink'
# TODO(prasadv): This method is quite long, we should consider refactor
# this by extracting to helper methods.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698