Change annotated steps to support the cps based dart2js backend

tools/bots/compiler.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. 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 os
 import platform
 import re
 import shutil
 import socket
 import string
 import subprocess
 import sys
 
 import bot
 
 DARTIUM_BUILDER = r'none-dartium-(linux|mac|windows)'
 DART2JS_BUILDER = (
-    r'dart2js-(linux|mac|windows)(-(jsshell))?-(debug|release)(-(checked|host-checked))?(-(host-checked))?(-(minified))?(-(x64))?-?(\d*)-?(\d*)')
+    r'dart2js-(linux|mac|windows)(-(jsshell))?-(debug|release)(-(checked|host-checked))?(-(host-checked))?(-(minified))?(-(x64))?(-(cps))?-?(\d*)-?(\d*)')
 DART2JS_FULL_BUILDER = r'full-(linux|mac|win7|win8)(-(ie10|ie11))?(-checked)?(-minified)?-(\d+)-(\d+)'
 WEB_BUILDER = (
     r'dart2js-(ie9|ie10|ie11|ff|safari|chrome|chromeOnAndroid|safarimobilesim|opera|drt)-(win7|win8|mac10\.7|mac10\.8|mac10\.9|linux)(-(all|html))?(-(csp))?(-(\d+)-(\d+))?')
 
 IE_VERSIONS = ['ie10', 'ie11']
 
 DART2JS_FULL_CONFIGURATIONS = {
   'linux' : [
     {'runtime' : 'ff'},
     {'runtime' : 'chrome'},
@@ skipping 22 matching lines @@
   host_checked = False
   minified = False
   shard_index = None
   total_shards = None
   test_set = None
   csp = None
   arch = None
   dart2js_full = False
   batch = True
   builder_tag = None
+  cps_ir = None
 
   dart2js_pattern = re.match(DART2JS_BUILDER, builder_name)
   dart2js_full_pattern = re.match(DART2JS_FULL_BUILDER, builder_name)
   web_pattern = re.match(WEB_BUILDER, builder_name)
   dartium_pattern = re.match(DARTIUM_BUILDER, builder_name)
 
   if web_pattern:
     compiler = 'dart2js'
     runtime = web_pattern.group(1)
     system = web_pattern.group(2)
@@ skipping 40 matching lines @@
     if dart2js_pattern.group(6) == 'checked':
       checked = True
     if dart2js_pattern.group(6) == 'host-checked':
       host_checked = True
     if dart2js_pattern.group(8) == 'host-checked':
       host_checked = True
     if dart2js_pattern.group(10) == 'minified':
       minified = True
     if dart2js_pattern.group(12) == 'x64':
       arch = 'x64'
-    shard_index = dart2js_pattern.group(13)
-    total_shards = dart2js_pattern.group(14)
+    if dart2js_pattern.group(14) == 'cps':
+      cps_ir = True
+    shard_index = dart2js_pattern.group(15)
+    total_shards = dart2js_pattern.group(16)
   elif dartium_pattern:
     compiler = 'none'
     runtime = 'dartium'
     mode = 'release'
     system = dartium_pattern.group(1)
   else :
     return None
 
   # We have both win7 and win8 bots, functionality is the same.
   if system.startswith('win'):
     system = 'windows'
 
   # We have both 10.8 and 10.7 bots, functionality is the same.
   if system == 'mac10.7' or system == 'mac10.8' or system == 'mac10.9':
     builder_tag = system.replace('.', '_')
     system = 'mac'
 
   if (system == 'windows' 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.')
     return None
   return bot.BuildInfo(compiler, runtime, mode, system, checked, host_checked,
                        minified, shard_index, total_shards, is_buildbot,
                        test_set, csp, arch, dart2js_full, batch=batch,
-                       builder_tag=builder_tag)
+                       builder_tag=builder_tag, cps_ir=cps_ir)
 
 
 def NeedsXterm(compiler, runtime):
   return runtime in ['ie9', 'ie10', 'ie11', 'chrome', 'safari', 'opera',
                      'ff', 'drt', 'dartium']
 
 
 def TestStepName(name, runtime, flags):
   # Filter out flags with '=' as this breaks the /stats feature of the
   # build bot.
@@ skipping 184 matching lines @@
   test_flags = []
   if build_info.shard_index:
     test_flags = ['--shards=%s' % build_info.total_shards,
                   '--shard=%s' % build_info.shard_index]
   if build_info.checked: test_flags += ['--checked']
   if build_info.minified: test_flags += ['--minified']
   if build_info.host_checked: test_flags += ['--host-checked']
   if build_info.batch: test_flags += ['--dart2js-batch']
   if build_info.builder_tag: test_flags += ['--builder-tag=' +
                                              build_info.builder_tag]
+  if build_info.cps_ir: test_flags += ['--cps-ir']
 
   if build_info.dart2js_full:
     compiler = build_info.compiler
     assert compiler == 'dart2js'
     system = build_info.system
     arch = build_info.arch
     mode = build_info.mode
     is_buildbot = build_info.is_buildbot
 
     config = build_info.builder_tag if system == 'windows' else system
@@ skipping 36 matching lines @@
     if build_info.mode == 'debug':
       target = 'dart2js_bot_debug'
     args = [sys.executable, './tools/build.py', '--mode=' + build_info.mode,
             '--arch=' + build_info.arch, target]
     print 'Build SDK and d8: %s' % (' '.join(args))
     bot.RunProcess(args)
 
 
 if __name__ == '__main__':
   bot.RunBot(GetBuildInfo, RunCompilerTests, build_step=BuildCompiler)