Change annotated steps to support the cps based dart2js backend

tools/bots/compiler.py

Index: tools/bots/compiler.py
diff --git a/tools/bots/compiler.py b/tools/bots/compiler.py
index 9e47f597721f88e77e3df7593e52c502419f4e33..a784a03ca7cf27c6848ad828d095c548c26e625e 100644
--- a/tools/bots/compiler.py
+++ b/tools/bots/compiler.py
@@ -23,7 +23,7 @@ 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+))?')
@@ -66,6 +66,7 @@ def GetBuildInfo(builder_name, is_buildbot):
   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)
@@ -126,8 +127,10 @@ def GetBuildInfo(builder_name, is_buildbot):
       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'
@@ -154,7 +157,7 @@ def GetBuildInfo(builder_name, is_buildbot):
   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):
@@ -359,6 +362,7 @@ def RunCompilerTests(build_info):
   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