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

tools/perf/core/trybot_command.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import os
 import logging
 import re
 import subprocess
 import urllib2
 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 = {
     'win_xp_perf_bisect',  # Goma issues: crbug.com/330900
     'win_perf_bisect_builder',
     'win64_nv_tester',
     'winx64_bisect_builder',
     'linux_perf_bisect_builder',
     'mac_perf_bisect_builder',
     'android_perf_bisect_builder',
@@ skipping 164 matching lines @@
     """
     if extra_args is None:
       extra_args = []
     self._InitializeBuilderNames(options.trybot)
 
     arguments = [options.benchmark_name] + extra_args
 
     # 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 '
                       'perf trybot(s): %s.', options.trybot,
                       self._builder_names.values())
         return 1
     return 0
 
   def _UpdateConfigAndRunTryjob(self, bot_platform, cfg_file_path, arguments):
     """Updates perf config file, uploads changes and excutes perf try job.
 
     Args:
       bot_platform: Name of the platform to be generated.
       cfg_file_path: Perf config file path.
 
     Returns:
       (result, msg) where result is one of:
           SUCCESS if a tryjob was sent
           NO_CHANGES if there was nothing to try,
           ERROR if a tryjob was attempted but an error encountered
           and msg is an error message if an error was encountered, or rietveld
           url if success, otherwise throws TrybotError exception.
     """
     config = self._GetPerfConfig(bot_platform, arguments)
     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=(',', ': ')))
     config_file.close()
     # Commit the config changes locally.
     returncode, out, err = _RunProcess(
         ['git', 'commit', '-a', '-m', 'bisect config: %s' % bot_platform])
     if returncode:
       raise TrybotError('Could not commit bisect config change for %s,'
                         ' error %s' % (bot_platform, err))
@@ skipping 71 matching lines @@
     This is run once for chromium, and if it returns NO_CHANGES, once for blink.
 
     Args:
       cfg_file_path: Path to the config file for the try job.
 
     Returns:
       Returns SUCCESS if a tryjob was sent, NO_CHANGES if there was nothing to
       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.
     returncode, original_branchname, err = _RunProcess(
         ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
     if returncode:
       msg = 'Must be in a git repository to send changes to trybots.'
       if err:
         msg += '\nGit error: %s' % err
       logging.error(msg)
@@ skipping 58 matching lines @@
         return ERROR  # pylint: disable=lost-exception
       logging.info('Checked out original branch: %s', original_branchname)
       returncode, out, err = _RunProcess(
           ['git', 'branch', '-D', 'telemetry-tryjob'])
       if returncode:
         logging.error('Could not delete telemetry-tryjob branch. '
                       'Please delete it manually: %s', err)
         return ERROR  # pylint: disable=lost-exception
       logging.info('Deleted temp branch: telemetry-tryjob')
     return SUCCESS