Remove frogsh.

dart/frog/presubmit.py

 #!/usr/bin/env python
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import optparse
 import os
 import stat
 import subprocess
 import sys
@@ skipping 51 matching lines @@
   quoted_arguments = ' '.join([repr(s) for s in arguments])
   sys.stderr.write('Command failed:\n%s\n' % quoted_arguments)
   if stdout:
     sys.stderr.write(stdout)
 
 
 EXECUTABLE = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
               stat.S_IRGRP | stat.S_IXGRP |
               stat.S_IROTH | stat.S_IXOTH)
 
-def SelfHost():
-  def b(s):
-    """Adds ANSI escape-code for bold-face"""
-    return "\033[1m%s\033[0m" % s
-
-  # VM Checked/CompileAll, produces checked
-  print 'Started'
-  start = time.time()
-  RunCommand('./frog/frog.py',
-             '--vm_flags=--compile_all --enable_type_checks --enable_asserts',
-             '--', '--compile_all', '--enable_type_checks',
-             '--out=frog/minfrog', 'frog/minfrog.dart')
-  elapsed = time.time() - start
-  mode = 'in checked mode + compile all'
-  print 'Compiling minfrog on Dart VM took %s seconds %s' % (
-      b('%.1f' % elapsed), b(mode))
-  os.chmod('./frog/minfrog', EXECUTABLE)
-
-  # VM Production
-  start = time.time()
-  RunCommand('./frog/frog.py', '--', '--out=frog/minfrog', 'frog/minfrog.dart')
-  elapsed = time.time() - start
-  mode = 'in production mode'
-  print 'Compiling minfrog on Dart VM took %s seconds %s' % (
-      b('%.1f' % elapsed), b(mode))
-  os.chmod('./frog/minfrog', EXECUTABLE)
-
-  # Selfhost Production
-  start = time.time()
-  # TODO(jmesserly): --warnings_as_errors disabled until corelib is moved to
-  # new factory syntax.
-  RunCommand('./frog/minfrog', '--out=frog/minfrog', # '--warnings_as_errors',
-             'frog/minfrog.dart', 'frog/tests/hello.dart', verbose=True)
-  elapsed = time.time() - start
-  size = os.path.getsize('./frog/minfrog') / 1024
-  print 'Bootstrapping minfrog took %s seconds %s' % (b('%.1f' % elapsed),
-                                              b('in production mode'))
-  print 'Generated %s minfrog is %s kB' % (b('production'), b(size))
-
-
 def main():
   dart_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
   os.chdir(dart_dir)
 
   (options, args) = BuildOptions().parse_args()
 
   RunCommand('./tools/build.py', '--mode=release', 'dart2js')
 
-  if not options.leg_only:
-    SelfHost()
-
   test_cmd = ['./tools/test.py', '--report', '--timeout=30',
               '--progress=color', '--mode=release', '--checked']
 
   if options.notest: return
 
   if args:
     if options.leg_only:
       test_cmd.extend('--compiler=dart2js', '--runtime=d8')
     else:
-      test_cmd.append('--component=frogsh,dart2js')
+      test_cmd.extend('--compiler=frog,dart2js', '--runtime=d8')
     test_cmd.extend(args)
     RunCommand(*test_cmd, verbose=True)
   else:
     if not options.leg_only:
       # Run frog.py on the corelib tests, so we get some frog.py coverage.
       cmd = test_cmd + ['--compiler=frog', '--runtime=d8', 'corelib']
       RunCommand(*cmd, verbose=True)
 
       # Run frogium client tests. This is a pretty quick test but
       # tends to uncover different issues due to the size/complexity
       # of the DOM APIs.
       cmd = test_cmd + ['--compiler=frog', '--runtime=drt', 'client']
       RunCommand(*cmd, verbose=True)
 
-      # TODO(jimhug): Consider adding co19 back when it delivers more value
-      #   than pain.
-      # Run frogsh on most of the tests.
-      cmd = test_cmd + ['--compiler=frogsh', '--runtime=d8',
-                        'language', 'corelib',
-                        'isolate', 'peg', 'frog', 'css', 'frog_native']

[sra1, 2012/04/21 17:10:27]

If frogsh is not run on these tests then frog needs to be run instead.

[ahe, 2012/04/23 13:14:09]

Done.

-      RunCommand(*cmd, verbose=True)
-
     # Run the "utils" tests which includes dartdoc. Frog/leg changes often
     # break dartdoc and this tries to catch those.
     cmd = test_cmd + ['--compiler=none', '--runtime=vm', 'utils']
     RunCommand(*cmd, verbose=True)
 
     # Run leg unit tests.
     cmd = test_cmd + ['--compiler=none', '--runtime=vm', 'leg']
     RunCommand(*cmd, verbose=True)
 
     # Leg does not implement checked mode yet.
     test_cmd.remove('--checked')
 
     cmd = test_cmd + ['--compiler=dart2js', '--runtime=d8',
                       'leg_only', 'frog_native']
     RunCommand(*cmd, verbose=True)
 
     # Run dart2js and legium on "built-in" tests.
     cmd = test_cmd + ['--compiler=dart2js', '--runtime=d8,drt']
     RunCommand(*cmd, verbose=True)
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main())
   except Error as e:
     sys.stderr.write('%s\n' % e)
     sys.exit(1)