Update the buildbot name patterns (for generalized sharding on web bots).

utils/compiler/buildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 """Dart frog buildbot steps

[ricow1, 2012/05/30 09:58:29]

remove frog in this comment

 
 Runs tests for the frog or dart2js compiler.

[ricow1, 2012/05/30 09:58:29]

And here

 """
 
 import platform
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 BUILDER_NAME = 'BUILDBOT_BUILDERNAME'
 
 DART_PATH = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 DART2JS_BUILDER = (
     r'dart2js-(linux|mac|windows)-(debug|release)(-([a-z]+))?-?(\d*)-?(\d*)')
-FROG_BUILDER = r'(frog)-(linux|mac|windows)-(debug|release)'
-WEB_BUILDER = r'web-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)(-(\d+))?'
+FROG_BUILDER = (

[ricow1, 2012/05/30 09:58:29]

remove this?

+    r'(frog)-(linux|mac|windows)-(debug|release)')
+WEB_BUILDER = (
+    r'web-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)-?(\d*)-?(\d*)')
 
 NO_COLOR_ENV = dict(os.environ)
 NO_COLOR_ENV['TERM'] = 'nocolor'
 
 def GetBuildInfo():
   """Returns a tuple (compiler, runtime, mode, system, option) where:
     - compiler: 'dart2js', 'frog', or None when the builder has an

[ricow1, 2012/05/30 09:58:29]

remove frog?

       incorrect name
     - runtime: 'd8', 'ie', 'ff', 'safari', 'chrome', 'opera'
     - mode: 'debug' or 'release'
     - system: 'linux', 'mac', or 'win7'
     - option: 'checked'
   """
   parser = optparse.OptionParser()
   parser.add_option('-n', '--name', dest='name', help='The name of the build'
       'bot you would like to emulate (ex: web-chrome-win7)', default=None)
   args, _ = parser.parse_args()
@@ skipping 21 matching lines @@
 
     if dart2js_pattern:
       compiler = 'dart2js'
       runtime = 'd8'
       system = dart2js_pattern.group(1)
       mode = dart2js_pattern.group(2)
       option = dart2js_pattern.group(4)
       shard_index = dart2js_pattern.group(5)
       total_shards = dart2js_pattern.group(6)
 
     elif frog_pattern:

[ricow1, 2012/05/30 09:58:29]

remove this?

       compiler = frog_pattern.group(1)
       runtime = 'd8'
       system = frog_pattern.group(2)
       mode = frog_pattern.group(3)
 
     elif web_pattern:
       compiler = 'dart2js'
       runtime = web_pattern.group(1)
+      system = web_pattern.group(2)
       mode = 'release'
-      system = web_pattern.group(2)
-
-      # TODO(kasperl): Update the names of the web builders so we can
-      # use the generic sharding mechanism.
-      if (runtime == 'ie'):
-        total_shards = 2
-        if web_pattern.group(4) == '2': shard_index = 2
-        else: shard_index = 1
+      shard_index = dart2js_pattern.group(3)
+      total_shards = dart2js_pattern.group(4)
 
   if system == 'windows':
     system = 'win7'
 
   if (system == 'win7' and platform.system() != 'Windows') or (
       system == 'mac' and platform.system() != 'Darwin') or (
       system == 'linux' and platform.system() != 'Linux'):
     print ('Error: You cannot emulate a buildbot with a platform different '
         'from your own.')
     sys.exit(1)
@@ skipping 97 matching lines @@
       # that run the browser tests to cut down on the cycle time.
       TestStep("dart2js_unit", mode, system, 'none', 'vm', ['leg'], flags)
 
     # Run the default set of test suites.
     TestStep("dart2js", mode, system, 'dart2js', runtime, [], flags)
 
     # TODO(kasperl): Consider running peg and css tests too.
     extras = ['leg_only', 'frog_native']
     TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extras, flags)
 
   elif compiler == 'frog':

[ricow1, 2012/05/30 09:58:29]

remove this?

     TestStep("frog", mode, system, compiler, runtime, [], flags)
     extras = ['frog', 'frog_native', 'peg', 'css']
     TestStep("frog_extra", mode, system, compiler, runtime, extras, flags)
 
   return 0
 
 def _DeleteFirefoxProfiles(directory):
   """Find all the firefox profiles in a particular directory and delete them."""
   for f in os.listdir(directory):
     item = os.path.join(directory, f)
@@ skipping 61 matching lines @@
   if status == 0 and compiler != 'dart2js':
     status = TestCompiler(compiler, runtime, mode, system, option,
                           test_flags + ['--checked'])
 
   if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())