Reapply "Move dart2js batch decision out so that it actually takes effect on browser bots"

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.
@@ skipping 107 matching lines @@
     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'
     if dart2js_pattern.group(14) == 'batch':
       batch = True
-    # This is temporary, slowly enabling this.
-    if system == 'linux' or system.startswith('mac'):
-      batch = 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.8' or system == 'mac10.7':
     system = 'mac'
 
+  # This is temporary, slowly enabling this.
+  if system == 'linux' or system == 'mac':
+    batch = True
+
   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)
@@ skipping 243 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)