| Index: master/skia_master_scripts/canary_factory.py
|
| diff --git a/master/skia_master_scripts/canary_factory.py b/master/skia_master_scripts/canary_factory.py
|
| deleted file mode 100644
|
| index df37906e078408290e000121e886db60089fe9c2..0000000000000000000000000000000000000000
|
| --- a/master/skia_master_scripts/canary_factory.py
|
| +++ /dev/null
|
| @@ -1,77 +0,0 @@
|
| -# Copyright (c) 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.
|
| -
|
| -
|
| -""" Subclass of factory.SkiaFactory which builds some project other than Skia,
|
| -using the latest revision of Skia. """
|
| -
|
| -import builder_name_schema
|
| -import factory
|
| -import os
|
| -
|
| -
|
| -class CanaryFactory(factory.SkiaFactory):
|
| - """ BuildFactory for a project which uses Skia; updates the project to a
|
| - known good revision, updates Skia to the latest revision, and verifies that
|
| - the project builds.
|
| - """
|
| - def __init__(self, path_to_skia, flavor, **kwargs):
|
| - """ Instantiates a CanaryFactory for a given project.
|
| -
|
| - path_to_skia: list of strings; indicates the path from the root of the
|
| - project to the project's copy of Skia.
|
| - """
|
| - flavor = '%s_canary' % flavor
|
| - factory.SkiaFactory.__init__(self, flavor=flavor, **kwargs)
|
| - self._path_to_skia = self.TargetPath.join(*path_to_skia)
|
| -
|
| - def Update(self):
|
| - self.AddFlavoredSlaveScript(
|
| - script=self.TargetPath.join('..', '..', '..', '..', '..', 'slave',
|
| - 'skia_slave_scripts',
|
| - '%s_update.py' % self._flavor),
|
| - args=['--gyp_defines',
|
| - ' '.join('%s=%s' % (k, v) for k, v in self._gyp_defines.items())],
|
| - description='Update',
|
| - timeout=None,
|
| - halt_on_failure=True,
|
| - is_rebaseline_step=True,
|
| - get_props_from_stdout={'got_revision':
|
| - 'Skia updated to (\w+)',
|
| - 'chrome_revision':
|
| - 'Chrome updated to (\w+)'},
|
| - workdir='build')
|
| -
|
| - # pylint: disable=W0221
|
| - def ApplyPatch(self):
|
| - # Note that, since Chrome only checks out the src, include, and gyp dirs,
|
| - # any patch containing changes outside of those directories will fail to
|
| - # apply.
|
| - workdir = self.TargetPath.join(self._workdir, self._path_to_skia)
|
| - path_to_script = [os.pardir for _ in workdir.split(self.TargetPath.sep)]
|
| - path_to_script.extend([os.pardir, os.pardir, os.pardir, os.pardir,
|
| - 'slave', 'skia_slave_scripts', 'apply_patch.py'])
|
| - path_str = self.TargetPath.join(*path_to_script)
|
| - factory.SkiaFactory.ApplyPatch(self,
|
| - alternate_script=path_str,
|
| - alternate_workdir=workdir)
|
| -
|
| - def CCUnitTests(self):
|
| - self.AddFlavoredSlaveScript(script='cc_unittests.py',
|
| - description='cc_unittests')
|
| -
|
| - def Build(self, role=builder_name_schema.BUILDER_ROLE_CANARY, **kwargs):
|
| - """Build and return the complete BuildFactory.
|
| -
|
| - role: string; type of builder.
|
| - """
|
| - if role != builder_name_schema.BUILDER_ROLE_CANARY:
|
| - raise Exception('Canary builders must have role "%s"' %
|
| - builder_name_schema.BUILDER_ROLE_CANARY)
|
| -
|
| - self.UpdateSteps()
|
| - self.Compile(clobber=False, retry_without_werr_on_failure=True)
|
| - self.CCUnitTests()
|
| - self.Validate()
|
| - return self
|
|
|