Update Compile Step to Build Swarm Targets if Needed

scripts/master/factory/commands.py

 # Copyright (c) 2012 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.
 
 """Set of utilities to add commands to a buildbot factory (BuildFactory).
 
 All the utility functions to add steps to a build factory here are not
 project-specific. See the other *_commands.py for project-specific commands.
 """
 
@@ skipping 94 matching lines @@
     shell.ShellCommand.commandComplete(self, cmd)
 
     re_hash_mapping = re.compile(r'^([a-z_]+) ([0-9a-f]{40})$')
     matches = (
         re_hash_mapping.match(l.strip()) for l in self.stdio_log.readlines())
     swarm_hashes = dict(x.groups() for x in matches if x)
 
     self.setProperty('swarm_hashes', swarm_hashes)
 
 
+def GetSwarmTestsFromTestFilter(test_filters):
+  """Returns a list of all the tests in the list that should be run with
+  swarm."""
+  swarm_tests = []
+  for test_filter in test_filters:
+    if '_swarm:' in test_filter:
+      swarm_tests.append(test_filter.split('_swarm:')[0])

[M-A Ruel, 2012/11/01 19:06:46]

swarm_tests.append(test_filter.split('_swarm:', 1)[0])

[csharp, 2012/11/01 19:30:09]

Done.

+    elif test_filter.endswith('_swarm'):
+      swarm_tests.append(test_filter[:-len('_swarm')])
+
+  return swarm_tests
+
+
+class CompileWithRequiredSwarmTargets(shell.Compile):
+  def start(self):
+    try:
+      test_filters = self.getProperty('testfilter')
+    except KeyError:
+      test_filters = []
+
+    command = self.command
+    swarm_tests = GetSwarmTestsFromTestFilter(test_filters)
+    for swarm_test in swarm_tests:

[M-A Ruel, 2012/11/01 19:06:46]

command.extend(i + '_run' for i in swarm_tests)

[csharp, 2012/11/01 19:30:09]

Done.

+      command.append(swarm_test + '_run')
+
+    self.setCommand(command)
+    return shell.Compile.start(self)
+
+
 class FactoryCommands(object):
   # Base URL for performance test results.
   PERF_BASE_URL = config.Master.perf_base_url
   PERF_REPORT_URL_SUFFIX = config.Master.perf_report_url_suffix
 
   # Directory in which to save perf output data files.
   PERF_OUTPUT_DIR = config.Master.perf_output_dir
 
   # Use this to prevent steps which cannot be run on the same
   # slave from being done together (in the case where slaves are
@@ skipping 782 matching lines @@
       description: for the waterfall
       descriptionDone: for the waterfall
       timeout: if no output is received in this many seconds, the compile step
           will be killed
       mode: if given, this will be passed as the --mode option to the compile
           command
       options: list of additional options to pass to the compile command
       halfOnFailure: should stop the build if compile fails
     """
     self._factory.addStep(
-        shell.Compile,
+        CompileWithRequiredSwarmTargets,
         name='compile',
         timeout=timeout,
         description=description,
         descriptionDone=descriptionDone,
         command=self.GetBuildCommand(clobber, solution, mode, options),
         haltOnFailure=haltOnFailure,
         env=env)
 
   def _PerfStepMappings(self, show_results, perf_id, test_name):
     """Looks up test IDs in PERF_TEST_MAPPINGS and returns test info."""
@@ skipping 148 matching lines @@
 
   def commandComplete(self, cmd):
     out = cmd.logs['stdio'].getText()
     build_properties = re.findall('BUILD_PROPERTY ([^=]*)=(.*)', out)
     for propname, value in build_properties:
       # findall can return strings containing CR characters, remove with strip.
       self.build.setProperty(propname, value.strip(), 'Step')
 
   def getText(self, cmd, results):
     return self.describe(True) + self.messages