Refactoring auto-bisect bot

tools/auto_bisect/builder.py

 # Copyright 2014 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.
 
 """Classes and functions for building Chrome.
 
 This includes functions for running commands to build, as well as
 specific rules about which targets to build.
 """
 
@@ skipping 46 matching lines @@
       raise RuntimeError('Failed to set platform environment.')
 
   @staticmethod
   def FromOpts(opts):
     """Constructs and returns a Builder object.
 
     Args:
       opts: Options parsed from the command-line.
     """
     builder = None
-    if opts.target_platform == 'cros':
-      builder = CrosBuilder(opts)
-    elif opts.target_platform == 'android':
+    if opts.target_platform == 'android':
       builder = AndroidBuilder(opts)
     elif opts.target_platform == 'android-chrome':
       builder = AndroidChromeBuilder(opts)
     else:
       builder = DesktopBuilder(opts)
     return builder
 
   def Build(self, depot, opts):
     """Runs a command to build Chrome."""
     raise NotImplementedError()
@@ skipping 106 matching lines @@
     super(AndroidChromeBuilder, self).__init__(opts)
 
   # TODO(qyearsley): Make this a class method and verify that it works with
   # a unit test.
   # pylint: disable=R0201
   def _GetTargets(self):
     """Returns a list of build targets."""
     return AndroidBuilder._GetTargets(self) + ['chrome_apk']
 
 
-class CrosBuilder(Builder):
-  """CrosBuilder is used to build and image ChromeOS/Chromium.
-
-  WARNING(qyearsley, 2014-08-15): This hasn't been tested recently.
-  """
-
-  def __init__(self, opts):
-    super(CrosBuilder, self).__init__(opts)
-
-  @staticmethod
-  def ImageToTarget(opts):
-    """Installs latest image to target specified by opts.cros_remote_ip.
-
-    Args:
-      opts: Program options containing cros_board and cros_remote_ip.
-
-    Returns:
-      True if successful.
-    """
-    try:
-      # Keys will most likely be set to 0640 after wiping the chroot.
-      os.chmod(bisect_utils.CROS_SCRIPT_KEY_PATH, 0600)
-      os.chmod(bisect_utils.CROS_TEST_KEY_PATH, 0600)
-      cmd = [bisect_utils.CROS_SDK_PATH, '--', './bin/cros_image_to_target.py',
-             '--remote=%s' % opts.cros_remote_ip,
-             '--board=%s' % opts.cros_board, '--test', '--verbose']
-
-      return_code = bisect_utils.RunProcess(cmd)
-      return not return_code
-    except OSError:
-      return False
-
-  @staticmethod
-  def BuildPackages(opts, depot):
-    """Builds packages for cros.
-
-    Args:
-      opts: Program options containing cros_board.
-      depot: The depot being bisected.
-
-    Returns:
-      True if successful.
-    """
-    cmd = [bisect_utils.CROS_SDK_PATH]
-
-    if depot != 'cros':
-      path_to_chrome = os.path.join(os.getcwd(), '..')
-      cmd += ['--chrome_root=%s' % path_to_chrome]
-
-    cmd += ['--']
-
-    if depot != 'cros':
-      cmd += ['CHROME_ORIGIN=LOCAL_SOURCE']
-
-    cmd += ['BUILDTYPE=%s' % opts.target_build_type, './build_packages',
-        '--board=%s' % opts.cros_board]
-    return_code = bisect_utils.RunProcess(cmd)
-
-    return not return_code
-
-  @staticmethod
-  def BuildImage(opts, depot):
-    """Builds test image for cros.
-
-    Args:
-      opts: Program options containing cros_board.
-      depot: The depot being bisected.
-
-    Returns:
-      True if successful.
-    """
-    cmd = [bisect_utils.CROS_SDK_PATH]
-
-    if depot != 'cros':
-      path_to_chrome = os.path.join(os.getcwd(), '..')
-      cmd += ['--chrome_root=%s' % path_to_chrome]
-
-    cmd += ['--']
-
-    if depot != 'cros':
-      cmd += ['CHROME_ORIGIN=LOCAL_SOURCE']
-
-    cmd += ['BUILDTYPE=%s' % opts.target_build_type, '--', './build_image',
-        '--board=%s' % opts.cros_board, 'test']
-
-    return_code = bisect_utils.RunProcess(cmd)
-
-    return not return_code
-
-  def Build(self, depot, opts):
-    """Builds targets using options passed into the script.
-
-    Args:
-        depot: Current depot being bisected.
-        opts: The options parsed from the command line.
-
-    Returns:
-        True if build was successful.
-    """
-    if self.BuildPackages(opts, depot):
-      if self.BuildImage(opts, depot):
-        return self.ImageToTarget(opts)
-    return False
-
-
 def SetBuildSystemDefault(build_system, use_goma, goma_dir):
   """Sets up any environment variables needed to build with the specified build
   system.
 
   Args:
     build_system: A string specifying build system. Currently only 'ninja' or
         'make' are supported.
   """
   if build_system == 'ninja':
     gyp_var = os.getenv('GYP_GENERATORS', default='')
@@ skipping 26 matching lines @@
 
   Args:
     opts: The options parsed from the command line through parse_args().
 
   Returns:
     True if successful.
   """
   if 'android' in opts.target_platform:
     CopyAndSaveOriginalEnvironmentVars()
     return SetupAndroidBuildEnvironment(opts)
-  elif opts.target_platform == 'cros':
-    return bisect_utils.SetupCrosRepo()
   return True
 
 
 def BuildWithMake(threads, targets, build_type='Release'):
   """Runs a make command with the given targets.
 
   Args:
     threads: The number of threads to use. None means unspecified/unlimited.
     targets: List of make targets.
     build_type: Release or Debug.
@@ skipping 34 matching lines @@
 def CopyAndSaveOriginalEnvironmentVars():
   """Makes a copy of the current environment variables.
 
   Before making a copy of the environment variables and setting a global
   variable, this function unsets a certain set of environment variables.
   """
   # TODO: Waiting on crbug.com/255689, will remove this after.
   vars_to_remove = [
       'CHROME_SRC',
       'CHROMIUM_GYP_FILE',
-      'GYP_CROSSCOMPILE',
       'GYP_DEFINES',
       'GYP_GENERATORS',
       'GYP_GENERATOR_FLAGS',
       'OBJCOPY',
   ]
   for key in os.environ:
     if 'ANDROID' in key:
       vars_to_remove.append(key)
   for key in vars_to_remove:
     if os.environ.has_key(key):
@@ skipping 36 matching lines @@
   # (See http://crrev.com/170273005). So, we set this variable explicitly here
   # in order to build Chrome on Android.
   if 'GYP_DEFINES' not in os.environ:
     os.environ['GYP_DEFINES'] = 'OS=android'
   else:
     os.environ['GYP_DEFINES'] += ' OS=android'
 
   if opts.use_goma:
     os.environ['GYP_DEFINES'] += ' use_goma=1'
   return not proc.returncode