| Index: tools/bots/compiler.py
|
| ===================================================================
|
| --- tools/bots/compiler.py (revision 37933)
|
| +++ tools/bots/compiler.py (working copy)
|
| @@ -15,6 +15,7 @@
|
| import re
|
| import shutil
|
| import socket
|
| +import string
|
| import subprocess
|
| import sys
|
|
|
| @@ -23,19 +24,25 @@
|
| 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']},
|
| - {'runtime' : 'ff'},
|
| + 'windows-ie10' : [
|
| + {'runtime' : 'ie10'},
|
| + {'runtime' : 'ie10', 'additional_flags' : ['--checked']},
|
| {'runtime' : 'chrome'},
|
| ],
|
| + 'windows-ie11' : [
|
| + {'runtime' : 'ie11'},
|
| + {'runtime' : 'ie11', 'additional_flags' : ['--checked']},
|
| + {'runtime' : 'ff'},
|
| + ],
|
| }
|
|
|
|
|
| @@ -57,6 +64,7 @@
|
| 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)
|
| @@ -78,6 +86,16 @@
|
| 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):
|
| @@ -135,7 +153,8 @@
|
| 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):
|
| @@ -341,7 +360,9 @@
|
| 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,
|
|
|