[PerfTry] Make it possible to ./run_benchmark try within tools/perf

tools/perf/core/trybot_command.py

Index: tools/perf/core/trybot_command.py
diff --git a/tools/perf/core/trybot_command.py b/tools/perf/core/trybot_command.py
index c6a6fbc7b3ce6392af44a31d1d8a86a579dfa7a1..3980327e47a0de2d932d4e3f8da5695225708f66 100644
--- a/tools/perf/core/trybot_command.py
+++ b/tools/perf/core/trybot_command.py
@@ -12,9 +12,11 @@ import json
 
 from telemetry.util import command_line
 
+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',

[nednguyen, 2016/03/08 20:39:52]

Can you rename this to CHROMIUM_TRYBOT_CONFIG_PATH

+                                        'run-perf-test.cfg')
 SUCCESS, NO_CHANGES, ERROR = range(3)
 # Unsupported Perf bisect bots.
 EXCLUDED_BOTS = {
@@ -199,10 +201,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 '
@@ -230,7 +228,7 @@ class Trybot(command_line.ArgParseCommand):
     try:
       config_file = open(cfg_file_path, 'w')
     except IOError:
-      msg = 'Cannot find %s. Please run from src dir.' % cfg_file_path
+      msg = 'Cannot find %s.' % cfg_file_path
       return (ERROR, msg)
     config_file.write('config = %s' % json.dumps(
         config, sort_keys=True, indent=2, separators=(',', ': ')))
@@ -322,8 +320,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.