Remove frogsh.

dart/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 compiler (running on the vm or the self-hosting version)
+Runs tests for the frog or 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|frogsh)-(linux|mac|windows)-(debug|release)'
+FROG_BUILDER = r'(frog)-(linux|mac|windows)-(debug|release)'
 WEB_BUILDER = r'web-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)(-(\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', 'frogsh', or None when the builder has an
+    - compiler: 'dart2js', 'frog', or None when the builder has an
       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 51 matching lines @@
   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)
 
 
 def NeedsXterm(compiler, runtime):
-  return compiler == 'frogsh' or runtime in ['ie', 'chrome', 'safari', 'opera',
-      'ff', 'drt']
+  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':
     cmd = ['xvfb-run', '-a']
   else:
     cmd = []
 
@@ skipping 19 matching lines @@
   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.
    Args:
-     - compiler: either 'dart2js', 'frog', 'frogsh' (frog self-hosted)
+     - 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, 'dart2js']
   print 'running %s' % (' '.join(args))
   return subprocess.call(args, env=NO_COLOR_ENV)
 
 
 def TestFrog(compiler, runtime, mode, system, option, flags):
   """ test frog.
    Args:
-     - compiler: either 'dart2js', 'frog', or 'frogsh' (frog self-hosted)
+     - 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
   """
 
   # 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', 'frogsh']:
+  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']
 
     # TODO(efortuna): Move Mac back to DumpRenderTree when we have a more stable
@@ skipping 91 matching lines @@
     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())