Update the script that we run on the buildbot to test dart2js rather than frog across the different…

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 44 matching lines @@
   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)
     frog_pattern = re.match(FROG_BUILDER, builder_name)
     web_pattern = re.match(WEB_BUILDER, builder_name)
 
     if dart2js_pattern:
       compiler = 'dart2js'
       runtime = 'd8'
       system = dart2js_pattern.group(1)
       mode = dart2js_pattern.group(2)
       option = dart2js_pattern.group(4)
       shard_index = dart2js_pattern.group(5)
       total_shards = dart2js_pattern.group(6)
 
     elif frog_pattern:
       compiler = frog_pattern.group(1)
       runtime = 'd8'
       system = frog_pattern.group(2)
       mode = frog_pattern.group(3)
 
     elif web_pattern:
-      compiler = 'frog'
+      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)
 
   if system == 'windows':
     system = 'win7'
@@ skipping 40 matching lines @@
     cmd.extend(flags)
   cmd.extend(targets)
 
   print 'running %s' % (' '.join(cmd))
   exit_code = subprocess.call(cmd, env=NO_COLOR_ENV)
   if exit_code != 0:
     print '@@@STEP_FAILURE@@@'
   return exit_code
 
 
-def BuildFrog(compiler, mode, system):
-  """ build frog.
+def BuildCompiler(compiler, mode, system):
+  """ build the compiler.
    Args:
      - compiler: either 'dart2js' or 'frog'
      - mode: either 'debug' or 'release'
      - system: either 'linux', 'mac', or 'win7'
   """
   # TODO(efortuna): Currently we always clobber Windows builds. The VM
   # team thinks there's a problem with dependency tracking on Windows that
   # is leading to occasional build failures. Remove when this gyp issue has
   # been ironed out.
   if system == 'win7':
     for build in ['Release_', 'Debug_']:
       for arch in ['ia32', 'x64']:
         outdir = build + arch
         shutil.rmtree(outdir, ignore_errors=True)
         shutil.rmtree('frog/%s' % outdir, ignore_errors=True)
         shutil.rmtree('runtime/%s' % outdir, ignore_errors=True)
 
   os.chdir(DART_PATH)
 
   print '@@@BUILD_STEP build frog@@@'
 
   args = [sys.executable, './tools/build.py', '--mode=' + mode, 'create_sdk']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
-def TestFrog(compiler, runtime, mode, system, option, flags, bot_number=None):
-  """ test frog.
+def TestCompiler(compiler, runtime, mode, system, option, flags, bot_number=None):
+  """ 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.
   """
@@ skipping 98 matching lines @@
   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)
+  status = BuildCompiler(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,
-                      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,
-                      number)
-    if status != 0:
-      print '@@@STEP_FAILURE@@@'
-      return status
+  # First we run all the regular tests.
+  status = TestCompiler(compiler, runtime, mode, system, option,
+                        test_flags, number)
 
-  status = TestFrog(compiler, runtime, mode, system, option,
-                    test_flags + ['--checked'], number)
-  if status != 0:
-    print '@@@STEP_FAILURE@@@'
+  # 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)
 
-  if compiler == 'frog' and runtime in ['ff', 'chrome', 'safari', 'opera',
-      'ie', 'drt']:
-    CleanUpTemporaryFiles(system, runtime)
+  if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
+  if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
-
 if __name__ == '__main__':
   sys.exit(main())