Move bisect-perf-regression.py into auto_bisect directory.

tools/run-bisect-manual-test.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Run Manual Test Bisect Tool
 
 An example usage:
 tools/run-bisect-manual-test.py -g 201281 -b 201290
 
 On Linux platform, follow the instructions in this document
 https://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment
 to setup the sandbox manually before running the script. Otherwise the script
 fails to launch Chrome and exits with an error.
 
 This script serves a similar function to bisect-builds.py, except it uses
-the bisect-perf-regression.py. This means that that it can actually check out
-and build revisions of Chromium that are not available in cloud storage.
+the bisect_perf_regression.py. This means that that it can obtain builds of
+Chromium for revisions where builds aren't available in cloud storage.
 """
 
 import os
 import subprocess
 import sys
 
 CROS_BOARD_ENV = 'BISECT_CROS_BOARD'
 CROS_IP_ENV = 'BISECT_CROS_IP'
-_DIR_TOOLS_ROOT = os.path.abspath(os.path.dirname(__file__))
+_TOOLS_DIR = os.path.abspath(os.path.dirname(__file__))
+_BISECT_SCRIPT_PATH = os.path.join(
+    _TOOLS_DIR, 'auto_bisect', 'bisect_perf_regression.py')
 
-sys.path.append(os.path.join(_DIR_TOOLS_ROOT, 'telemetry'))
+sys.path.append(os.path.join(_TOOLS_DIR, 'telemetry'))
 from telemetry.core import browser_options
 
 
 def _RunBisectionScript(options):
-  """Attempts to execute src/tools/bisect-perf-regression.py.
+  """Attempts to execute the bisect script (bisect_perf_regression.py).
 
   Args:
     options: The configuration options to pass to the bisect script.
 
   Returns:
-    The exit code of bisect-perf-regression.py: 0 on success, otherwise 1.
+    An exit code; 0 for success, 1 for failure.
   """
   test_command = ('python %s --browser=%s --chrome-root=.' %
-                  (os.path.join(_DIR_TOOLS_ROOT, 'bisect-manual-test.py'),
+                  (os.path.join(_TOOLS_DIR, 'bisect-manual-test.py'),
                    options.browser_type))
 
-  cmd = ['python', os.path.join(_DIR_TOOLS_ROOT, 'bisect-perf-regression.py'),
+  cmd = ['python', _BISECT_SCRIPT_PATH,
          '-c', test_command,
          '-g', options.good_revision,
          '-b', options.bad_revision,
          '-m', 'manual_test/manual_test',
          '-r', '1',
          '--working_directory', options.working_directory,
          '--build_preference', 'ninja',
          '--use_goma',
          '--no_custom_deps']
 
@@ skipping 18 matching lines @@
     cmd.extend(['--target_build_type', options.browser_type.title()])
 
   if options.target_build_type:
     cmd.extend(['--target_build_type', options.target_build_type])
 
   cmd = [str(c) for c in cmd]
 
   return_code = subprocess.call(cmd)
 
   if return_code:
-    print ('Error: bisect-perf-regression.py returned with error %d' %
-           return_code)
+    print 'Error: bisect_perf_regression.py had exit code %d.' % return_code
     print
 
   return return_code
 
 
 def main():
   """Does a bisect based on the command-line arguments passed in.
 
   The user will be prompted to classify each revision as good or bad.
   """
@@ skipping 45 matching lines @@
       print 'SUID sandbox has not been setup.'\
             ' See https://code.google.com/p/chromium/wiki/'\
             'LinuxSUIDSandboxDevelopment for more information.'
       return 1
 
   return _RunBisectionScript(options)
 
 
 if __name__ == '__main__':
   sys.exit(main())