Prepare compiler annotated steps for running on ie11 and ie10 on the full windows builders.

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))?(-(batch))?-?(\d*)-?(\d*)')
-DART2JS_FULL_BUILDER = r'dart2js-full-(linux|mac|windows)(-checked)?(-minified)?-(\d+)-(\d+)'
+DART2JS_FULL_BUILDER = r'dart2js-full-(linux|mac|windows-ie10|windows-ie11)(-checked)?(-minified)?-(\d+)-(\d+)'
 WEB_BUILDER = (
     r'dart2js-(ie9|ie10|ie11|ff|safari|chrome|chromeOnAndroid|safarimobilesim|opera|drt)-(win7|win8|mac10\.8|mac10\.7|linux)(-(all|html))?(-(csp))?(-(\d+)-(\d+))?')
 
+IE_VERSIONS = ['ie10', 'ie11']
+
 DART2JS_FULL_CONFIGURATIONS = {
   'linux' : [ ],
   'mac' : [ ],
-  'windows' : [
-    {'runtime' : 'ie9'},
-    {'runtime' : 'ie9', 'additional_flags' : ['--checked']},
+  'windows-ie10' : [
+    {'runtime' : 'ie10'},
+    {'runtime' : 'ie10', 'additional_flags' : ['--checked']},
+    {'runtime' : 'chrome'},
+  ],
+  'windows-ie11' : [
+    {'runtime' : 'ie11'},
+    {'runtime' : 'ie11', 'additional_flags' : ['--checked']},
     {'runtime' : 'ff'},
-    {'runtime' : 'chrome'},
   ],
 }
 
 
 def GetBuildInfo(builder_name, is_buildbot):
   """Returns a BuildInfo object for the current buildbot based on the
      name of the builder.
   """
   compiler = None
   runtime = None
   mode = None
   system = None
   checked = False
   host_checked = False
   minified = False
   shard_index = None
   total_shards = None
   test_set = None
   csp = None
   arch = None
   dart2js_full = False
   batch = False
+  builder_tag = 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)
     mode = 'release'
     test_set = web_pattern.group(4)
     if web_pattern.group(6) == 'csp':
       csp = True
     shard_index = web_pattern.group(8)
     total_shards = web_pattern.group(9)
   elif dart2js_full_pattern:
     mode = 'release'
     compiler = 'dart2js'
     dart2js_full = True
     system = dart2js_full_pattern.group(1)
+    # windows-ie10 or windows-ie11 means a windows machine with that respective
+    # version of ie installed. There is no difference in how we handle testing.
+    # We use the builder tag to pass along this information.
+    if system.startswith('windows'):
+      system_and_ie = string.split(system, '-')
+      assert len(system_and_ie) == 2
+      assert system_and_ie[0] == 'windows'
+      assert system_and_ie[1] in IE_VERSIONS
+      builder_tag = system
+      system = 'windows'
     if dart2js_full_pattern.group(2):
       checked = True
     if dart2js_full_pattern.group(3):
       minified = True
     shard_index = dart2js_full_pattern.group(4)
     total_shards = dart2js_full_pattern.group(5)
   elif dart2js_pattern:
     compiler = 'dart2js'
     system = dart2js_pattern.group(1)
     runtime = 'd8'
@@ skipping 37 matching lines @@
     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)
+                       test_set, csp, arch, dart2js_full, batch=batch,
+                       builder_tag=builder_tag)
 
 
 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 185 matching lines @@
   if build_info.host_checked: test_flags += ['--host-checked']
   if build_info.batch: test_flags += ['--dart2js-batch']
 
   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
-    for configuration in DART2JS_FULL_CONFIGURATIONS[system]:
+
+    config = build_info.builder_tag if system == 'windows' else system
+    for configuration in DART2JS_FULL_CONFIGURATIONS[config]:
       additional_flags = configuration.get('additional_flags', [])
       TestCompiler(configuration['runtime'], mode, system,
                    test_flags + additional_flags, is_buildbot, arch,
                    compiler=compiler, dart2js_full=True)
   else:
     if build_info.csp: test_flags += ['--csp']
 
     if build_info.runtime == 'chromeOnAndroid':
       test_flags.append('--local_ip=%s' % GetLocalIPAddress())
       # test.py expects the android tools directories to be in PATH
@@ skipping 25 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)