Make test.dart respect the requested order of test suites, and also split up IE

frog/scripts/buildbot_annotated_steps.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:
 
@@ skipping 28 matching lines @@
 
   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)
+  return (compiler, runtime, mode, system, option, shard_index, total_shards,
+          number)
 
 
 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 frog@@@'
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'dart2js']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
-def TestFrog(compiler, runtime, mode, system, option, flags):
+def TestFrog(compiler, runtime, mode, system, option, flags, bot_number=None):
   """ test frog.
    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 compiler == 'dart2js':
     if (option == 'checked'):
       flags.append('--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']:
     TestStep("frog", mode, system, compiler, runtime, [], flags)
     TestStep("frog_extra", mode, system, compiler, runtime,
         ['frog', 'frog_native', 'peg', 'css'], flags)
     TestStep("sdk", mode, system, 'none', 'vm', ['dartdoc'], flags)
 
   else:
-    tests = ['client', 'language', 'corelib', 'isolate', 'frog',
-             'frog_native', 'peg', 'css']
+    tests = ['client', 'isolate', 'frog', 'css', 'corelib', 'language'
+             'frog_native', 'peg']
 
     # TODO(efortuna): Move Mac back to DumpRenderTree when we have a more stable
     # solution for DRT. Right now DRT is flakier than regular Chrome for the
     # isolate tests, so we're switching to use Chrome in the short term.
     if runtime == 'chrome' and system == 'linux':
       TestStep('browser', mode, system, 'frog', 'drt', tests, 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 = ['corelib', 'language']
+        else:
+          tests = ['client', 'isolate', 'frog', 'css', 'frog_native', 'peg']
       TestStep(runtime, mode, system, compiler, runtime, tests,
           flags + additional_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'):
@@ skipping 25 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 = (
+  compiler, runtime, mode, system, option, shard_index, total_shards, number = (
       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 = BuildFrog(compiler, 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]
   if compiler == 'dart2js':
-    status = TestFrog(compiler, runtime, mode, system, option, test_flags)
+    status = TestFrog(compiler, runtime, mode, system, option, test_flags,
+                      number)
     if status != 0:
       print '@@@STEP_FAILURE@@@'
     return status # Return unconditionally for dart2js.
 
   if runtime == 'd8' or (system == 'linux' and runtime == 'chrome'):
-    status = TestFrog(compiler, runtime, mode, system, option, test_flags)
+    status = TestFrog(compiler, runtime, mode, system, option, test_flags,
+                      number)
     if status != 0:
       print '@@@STEP_FAILURE@@@'
       return status
 
   status = TestFrog(compiler, runtime, mode, system, option,
-                    test_flags + ['--checked'])
+                    test_flags + ['--checked'], number)
   if status != 0:
     print '@@@STEP_FAILURE@@@'
 
   if compiler == 'frog' and runtime in ['ff', 'chrome', 'safari', 'opera',
       'ie', 'drt']:
     CleanUpTemporaryFiles(system, runtime)
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())