Simplify TestCompiler and avoid running dart2js_unit in too

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 174 matching lines @@
   # 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 = 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'])
+    if option == 'checked': flags = flags + ['--host-checked']
 
-    extra_suites = ['leg_only', 'frog_native']
-    TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extra_suites,
-        flags)
+    if runtime == 'd8':
+      # The dart2js compiler isn't self-hosted (yet) so we run its
+      # unit tests on the VM. We avoid doing this on the builders
+      # that run the browser tests to cut down on the cycle time.
+      TestStep("dart2js_unit", mode, system, 'none', 'vm', ['leg'], flags)
 
+    # Run the default set of test suites.
     TestStep("dart2js", mode, system, 'dart2js', runtime, [], flags)
 
-  elif runtime == 'd8' and compiler in ['frog']:
+    # TODO(kasperl): Consider running peg and css tests too.
+    extras = ['leg_only', 'frog_native']
+    TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extras, flags)
+
+  elif compiler == '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 = ['dom', 'html', 'json', 'benchmark_smoke',
-             '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)
-
-      # 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:
-      TestStep(runtime, mode, system, compiler, runtime, tests, flags)
+    extras = ['frog', 'frog_native', 'peg', 'css']
+    TestStep("frog_extra", mode, system, compiler, runtime, extras, 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 56 matching lines @@
   if status == 0 and compiler != 'dart2js':
     status = TestCompiler(compiler, runtime, mode, system, option,
                           test_flags + ['--checked'])
 
   if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())