Update buildbot.py to support jsshell builders.

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.
 
 """Dart2js buildbot steps
 
 Runs tests for the  dart2js compiler.
 """
 
 import platform
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 BUILDER_NAME = 'BUILDBOT_BUILDERNAME'
 BUILDER_CLOBBER = 'BUILDBOT_CLOBBER'
 
 
 DART_PATH = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 DART2JS_BUILDER = (
-    r'dart2js-(linux|mac|windows)-(debug|release)(-(checked|host-checked))?(-(host-checked))?-?(\d*)-?(\d*)')
+    r'dart2js-(linux|mac|windows)(-(jsshell))?-(debug|release)(-(checked|host-checked))?(-(host-checked))?-?(\d*)-?(\d*)')
 WEB_BUILDER = (
     r'dart2js-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)(-(all|html))?')
 
 NO_COLOR_ENV = dict(os.environ)
 NO_COLOR_ENV['TERM'] = 'nocolor'
 
 class BuildInfo(object):
   """ Encapsulation of build information.
     - compiler: 'dart2js' or None when the builder has an incorrect name
     - runtime: 'd8', 'ie', 'ff', 'safari', 'chrome', 'opera'
@@ skipping 67 matching lines @@
     web_pattern = re.match(WEB_BUILDER, builder_name)
 
     if web_pattern:
       compiler = 'dart2js'
       runtime = web_pattern.group(1)
       system = web_pattern.group(2)
       mode = 'release'
       test_set = web_pattern.group(4)
     elif dart2js_pattern:
       compiler = 'dart2js'
+      system = dart2js_pattern.group(1)
       runtime = 'd8'
-      system = dart2js_pattern.group(1)
-      mode = dart2js_pattern.group(2)
+      if dart2js_pattern.group(3) == 'jsshell':

[ricow1, 2012/10/05 12:29:36]

I can change this, but that requires us to change the names of the existing
builders (i.e., explicitly requiring the runtime from the name, so
dart2js-linux-release-1-5 would be dart2js-linux-d8-release-1-5)
Let me know what you think
(I am not to happy about this naming pattern matching, it is getting more or
less unreadable for people who don't know this, I suggest that we refactor this
when we have a more stable set of builders, that way we have the full picture)

+        runtime = 'jsshell'
+      mode = dart2js_pattern.group(4)
       # The valid naming parts for checked and host-checked are:
       # Empty: checked=False, host_checked=False
       # -checked: checked=True, host_checked=False
       # -host-checked: checked=False, host_checked=True
       # -checked-host-checked: checked=True, host_checked=True
-      if dart2js_pattern.group(4) == 'checked':
+      if dart2js_pattern.group(6) == 'checked':
         checked = True
-      if dart2js_pattern.group(4) == 'host-checked':
-        host_checked = True
       if dart2js_pattern.group(6) == 'host-checked':
         host_checked = True
-      shard_index = dart2js_pattern.group(7)
-      total_shards = dart2js_pattern.group(8)
+      if dart2js_pattern.group(8) == 'host-checked':
+        host_checked = True
+      shard_index = dart2js_pattern.group(9)
+      total_shards = dart2js_pattern.group(10)
 
   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 58 matching lines @@
   os.chdir(DART_PATH)
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'create_sdk']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
 def TestCompiler(runtime, mode, system, flags, is_buildbot, test_set):
   """ test the compiler.
    Args:
-     - runtime: either 'd8', or one of the browsers, see GetBuildInfo
+     - runtime: either 'd8', 'jsshell', or one of the browsers, see GetBuildInfo
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
      - flags: extra flags to pass to test.dart
      - is_buildbot: true if we are running on a real buildbot instead of
        emulating one.
      - test_set: Specification of a non standard test set, default None
   """
 
   # Make sure we are in the dart directory
   os.chdir(DART_PATH)
@@ skipping 181 matching lines @@
                           build_info.is_buildbot,
                           build_info.test_set)
 
   if build_info.runtime != 'd8': CleanUpTemporaryFiles(build_info.system,
                                                        build_info.runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())