Remove frog support from the annotated steps for dart2js and in browser testing.

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
+"""Dart2js buildbot steps
 
-Runs tests for the frog or dart2js compiler.
+Runs tests for the  dart2js compiler.
 """
 
 import platform
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 BUILDER_NAME = 'BUILDBOT_BUILDERNAME'
 
 DART_PATH = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 DART2JS_BUILDER = (
     r'dart2js-(linux|mac|windows)-(debug|release)(-([a-z]+))?-?(\d*)-?(\d*)')
-FROG_BUILDER = (
-    r'(frog)-(linux|mac|windows)-(debug|release)')
 WEB_BUILDER = (
     r'web-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)-?(\d*)-?(\d*)')
 
 NO_COLOR_ENV = dict(os.environ)
 NO_COLOR_ENV['TERM'] = 'nocolor'
 
 def GetBuildInfo():
   """Returns a tuple (compiler, runtime, mode, system, option) where:
-    - compiler: 'dart2js', 'frog', or None when the builder has an
+    - compiler: 'dart2js' or None when the builder has an

[kasperl, 2012/08/14 07:05:44]

Does the "- compiler" comment fit on one line now?

[ricow1, 2012/08/14 07:41:14]

Yes

       incorrect name
     - runtime: 'd8', 'ie', 'ff', 'safari', 'chrome', 'opera'
     - mode: 'debug' or 'release'
     - system: 'linux', 'mac', or 'win7'
     - option: 'checked'
   """
   parser = optparse.OptionParser()
   parser.add_option('-n', '--name', dest='name', help='The name of the build'
       'bot you would like to emulate (ex: web-chrome-win7)', default=None)
   args, _ = parser.parse_args()
@@ skipping 11 matching lines @@
     # We are not running on a buildbot.
     is_buildbot = False
     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 = 'dart2js'
       runtime = web_pattern.group(1)
       system = web_pattern.group(2)
       mode = 'release'
       shard_index = web_pattern.group(3)
       total_shards = web_pattern.group(4)
 
   if system == 'windows':
     system = 'win7'
@@ skipping 55 matching lines @@
   """
   # 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)
 
   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, is_buildbot):

[kasperl, 2012/08/14 07:05:44]

Could we get rid of the compiler parameter?

[ricow1, 2012/08/14 07:41:14]

done

   """ test the compiler.
    Args:
-     - compiler: either 'dart2js' or 'frog'
+     - compiler: 'dart2js'
      - 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
      - is_buildbot: true if we are running on a real buildbot instead of
        emulating one.
   """
 
-  # Make sure we are in the frog directory
+  # Make sure we are in the dart directory
   os.chdir(DART_PATH)
 
   if system.startswith('win') and runtime == 'ie':
     # We don't do proper sharding on the IE bots, since the runtime is
     # long for both. We have a "fast bot" and a "slow bot" that run specific
     # tests instead.
     for i in flags:
       if i.startswith('--shard='):
         bot_num = i.split('=')[1]
     # There should not be more than one InternetExplorerDriver instance
@@ skipping 64 matching lines @@
         TestStep("dart2js", mode, system, 'dart2js', runtime, ['html'], flags)
       else:
         TestStep("dart2js", mode, system, 'dart2js', runtime, ['dartc',
             'samples', 'standalone', 'corelib', 'co19', 'language', 'isolate',
             'vm', 'json', 'benchmark_smoke', 'dartdoc', 'utils', 'pub', 'lib'],
             flags)
         extras = ['dart2js_extra', 'dart2js_native']
         TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extras,
             flags)
 
-  elif compiler == 'frog':
-    TestStep("frog", mode, system, compiler, runtime, [], flags)
-    extras = ['frog', 'dart2js_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)
 
 def CleanUpTemporaryFiles(system, browser):
@@ skipping 58 matching lines @@
   if status == 0 and option != 'checked' and runtime == 'd8':
     status = TestCompiler(compiler, runtime, mode, system, option,
                           test_flags + ['--checked'], is_buildbot)
 
   if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())