Fix name of dart2js full bots to be shorter

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-ie10|windows-ie11)(-checked)?(-minified)?-(\d+)-(\d+)'

[Bill Hesse, 2014/07/07 13:02:41]

Grab the '-' eagerly? :  ...|win8)-((ie10|ie11)-)?(checked-)?(\d+)-...
and make sure to change "-checked" and "-minified" where they are used?

[ricow1, 2014/07/07 13:05:42]

They are not, on the contrary, we overwrite it for ie and run both checked and
unchecked

+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\.8|mac10\.7|linux)(-(all|html))?(-(csp))?(-(\d+)-(\d+))?')
 
 IE_VERSIONS = ['ie10', 'ie11']
 
 DART2JS_FULL_CONFIGURATIONS = {
   'linux' : [ ],
   'mac' : [ ],
   'windows-ie10' : [
     {'runtime' : 'ie10'},
@@ skipping 44 matching lines @@
     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
+    if system.startswith('win'):
+      ie =  dart2js_full_pattern.group(3)
+      assert ie in IE_VERSIONS
+      builder_tag = 'windows-%s' % ie
       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)
@@ skipping 35 matching lines @@
 
   # We have both 10.8 and 10.7 bots, functionality is the same.
   if system == 'mac10.8' or system == 'mac10.7':
     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 None

[Bill Hesse, 2014/07/07 13:02:41]

Stray comment marker?

[ricow1, 2014/07/07 13:05:42]

Thanks

   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)
 
 
 def NeedsXterm(compiler, runtime):
   return runtime in ['ie9', 'ie10', 'ie11', 'chrome', 'safari', 'opera',
                      'ff', 'drt', 'dartium']
 
@@ skipping 237 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)