Update Compile Step to Build Swarm Targets if Needed

scripts/master/factory/swarm_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.
 
 This is based on commands.py and adds swarm-specific commands."""
 
 from buildbot.process.properties import WithProperties
 from buildbot.steps import shell
 from twisted.python import log
 
 import config
 from master.factory import commands
 from master.log_parser import gtest_command
 
 
 def TestStepFilterSwarm(bStep):
   """Examines the 'testfilter' property of a build and determines if this
   build has swarm steps and thus if the test should run.
   It also adds a property, swarm_tests, which contains all the tests which will
   run under swarm."""
-  bStep.setProperty('swarm_tests', '')
   test_filters = bStep.build.getProperties().getProperty('testfilter')
   test_filters = test_filters or commands.DEFAULT_TESTS
 
-  swarm_tests = ''
-  for test_filter in test_filters:
-    if '_swarm:' in test_filter:
-      swarm_tests += test_filter.split('_swarm:')[0] + ' '
-    elif test_filter.endswith('_swarm'):
-      swarm_tests += test_filter[:-len('_swarm')] + ' '
-
-  bStep.setProperty('swarm_tests', swarm_tests.strip())
+  swarm_tests = commands.GetSwarmTestsFromTestFilter(test_filters)
+  # TODO(csharp): Keep swarm_tests as a list.
+  bStep.setProperty('swarm_tests', ' '.join(swarm_tests))
 
   return bool(swarm_tests)
 
 
 def TestStepHasSwarmProperties(bStep):
   """Returns true if the step has the required swarm properties set."""
   properties = bStep.build.getProperties()
 
   try:
     properties.getProperty('testfilter')
@@ skipping 102 matching lines @@
 
     command = [self._python, script_path, '--drive', drive,
                '--network_path', network_path]
 
     self._factory.addStep(
         shell.ShellCommand,
         name='setup_windows_network_storage',
         description='setup_windows_network_storage',
         descriptionDone='setup_windows_network_storage',
         command=command)