Use -j1 when testing IE and use the general sharding mechanism to shard the tests across web-ie-win…

utils/compiler/buildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Dart frog buildbot steps
 
 Runs tests for the frog or dart2js compiler.
 """
@@ skipping 34 matching lines @@
   args, _ = parser.parse_args()
 
   compiler = None
   runtime = None
   mode = None
   system = None
   builder_name = os.environ.get(BUILDER_NAME)
   option = None
   shard_index = None
   total_shards = None
-  number = None
   if not builder_name:
     # We are not running on a buildbot.
     if args.name:
       builder_name = args.name
     else:
       print 'Use -n $BUILDBOT_NAME for the bot you would like to emulate.'
       sys.exit(1)
 
   if builder_name:
     dart2js_pattern = re.match(DART2JS_BUILDER, builder_name)
@@ skipping 14 matching lines @@
       runtime = 'd8'
       system = frog_pattern.group(2)
       mode = frog_pattern.group(3)
 
     elif web_pattern:
       compiler = 'dart2js'
       runtime = web_pattern.group(1)
       mode = 'release'
       system = web_pattern.group(2)
 
-      # TODO(jmesserly): do we want to do anything different for the second IE
-      # bot? For now we're using it to track down flakiness.
-      number = web_pattern.group(4)
+      # TODO(kasperl): Update the names of the web builders so we can
+      # use the generic sharding mechanism.
+      if (runtime == 'ie'):
+        total_shards = 2
+        if web_pattern.group(4) == '2': shard_index = 2
+        else: shard_index = 1
 
   if system == 'windows':
     system = 'win7'
 
   if (system == 'win7' 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.')
     sys.exit(1)
-  return (compiler, runtime, mode, system, option, shard_index, total_shards,
-          number)
+  return (compiler, runtime, mode, system, option, shard_index, total_shards)
 
 
 def NeedsXterm(compiler, runtime):
   return runtime in ['ie', 'chrome', 'safari', 'opera', 'ff', 'drt']
 
 def TestStep(name, mode, system, compiler, runtime, targets, flags):
   print '@@@BUILD_STEP %s %s tests: %s %s@@@' % (name, compiler, runtime,
       ' '.join(flags))
   sys.stdout.flush()
   if NeedsXterm(compiler, runtime) and system == 'linux':
@@ skipping 48 matching lines @@
 
   os.chdir(DART_PATH)
 
   print '@@@BUILD_STEP build sdk@@@'
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'create_sdk']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
-def TestCompiler(compiler, runtime, mode, system, option, flags, bot_number=None):
+def TestCompiler(compiler, runtime, mode, system, option, flags):
   """ test the compiler.
    Args:
      - compiler: either 'dart2js' or 'frog'
      - runtime: either 'd8', or one of the browsers, see GetBuildInfo
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
      - option: 'checked'
      - flags: extra flags to pass to test.dart
-     - bot_number: (optional) Number of the buildbot. Used for dividing test
-       sets between bots.
   """
 
   # Make sure we are in the frog directory
   os.chdir(DART_PATH)
 
+  if system.startswith('win') and runtime == 'ie':
+    # There should not be more than one InternetExplorerDriver instance
+    # running at a time. For details, see
+    # http://code.google.com/p/selenium/wiki/InternetExplorerDriver.
+    flags = flags + ['-j1']
+
   if compiler == 'dart2js':
-    if (option == 'checked'):
-      flags.append('--host-checked')
+    if (option == 'checked'): flags = flags + ['--host-checked']
     # Leg isn't self-hosted (yet) so we run the leg unit tests on the VM.
     TestStep("dart2js_unit", mode, system, 'none', 'vm', ['leg'], ['--checked'])
 
     extra_suites = ['leg_only', 'frog_native']
     TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extra_suites,
         flags)
 
     TestStep("dart2js", mode, system, 'dart2js', runtime, [], flags)
 
   elif runtime == 'd8' and compiler in ['frog']:
@@ skipping 14 matching lines @@
       TestStep('browser', mode, system, 'frog', 'drt', tests, flags)
 
       # TODO(ngeoffray): Enable checked mode once dart2js supports type
       # variables.
       if not ('--checked' in flags):
         TestStep('browser_dart2js', mode, system, 'dart2js', 'drt', [], flags)
         TestStep('browser_dart2js_extra', mode, system, 'dart2js', 'drt',
             ['leg_only', 'frog_native'], flags)
 
     else:
-      additional_flags = []
-      if system.startswith('win') and runtime == 'ie':
-        # There should not be more than one InternetExplorerDriver instance
-        # running at a time. For details, see
-        # http://code.google.com/p/selenium/wiki/InternetExplorerDriver.
-        additional_flags += ['-j1']
-        # The IE bots are slow lately. Split up the tests they do.
-        if bot_number == '2':
-          tests = ['language']
-        else:
-          tests = ['dom', 'html', 'json', 'benchmark_smoke',
-                   'isolate', 'frog', 'css', 'frog_native', 'peg', 'corelib']
-      TestStep(runtime, mode, system, compiler, runtime, tests,
-          flags + additional_flags)
+      TestStep(runtime, mode, system, compiler, runtime, tests, flags)
 
   return 0
 
 def _DeleteFirefoxProfiles(directory):
   """Find all the firefox profiles in a particular directory and delete them."""
   for f in os.listdir(directory):
     item = os.path.join(directory, f)
     if os.path.isdir(item) and f.startswith('tmp'):
       subprocess.Popen('rm -rf %s' % item, shell=True)
 
@@ skipping 23 matching lines @@
     # password. The command won't actually work on regular machines without
     # root permissions.
     _DeleteFirefoxProfiles('/tmp')
     _DeleteFirefoxProfiles('/var/tmp')
 
 def main():
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
-  compiler, runtime, mode, system, option, shard_index, total_shards, number = (
+  compiler, runtime, mode, system, option, shard_index, total_shards = (
       GetBuildInfo())
   shard_description = ""
   if shard_index:
     shard_description = " shard %s of %s" % (shard_index, total_shards)
   print "compiler: %s, runtime: %s mode: %s, system: %s, option: %s%s" % (
       compiler, runtime, mode, system, option, shard_description)
   if compiler is None:
     return 1
 
   status = BuildSDK(mode, system)
   if status != 0:
     print '@@@STEP_FAILURE@@@'
     return status
 
   test_flags = []
   if shard_index:
     test_flags = ['--shards=%s' % total_shards, '--shard=%s' % shard_index]
 
   # First we run all the regular tests.
-  status = TestCompiler(compiler, runtime, mode, system, option,
-                        test_flags, number)
+  status = TestCompiler(compiler, runtime, mode, system, option, test_flags)
 
   # BUG(3281): We do not run checked mode tests on dart2js.
   if status == 0 and compiler != 'dart2js':
     status = TestCompiler(compiler, runtime, mode, system, option,
-                          test_flags + ['--checked'], number)
+                          test_flags + ['--checked'])
 
   if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())