Continue removal of frog.

Review URL: https://chromiumcodereview.appspot.com//10854232

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@10996 260f80e4-7a28-3924-810f-c04153c831b5

tools/create_sdk.py

@@ -36,8 +36,8 @@
 # ........runtime/
 # ......dart2js/
 # ......isolate/
-# ........isolate_{frog, runtime}.dart
-# ........{frog, runtime}/
+# ........isolate_{dart2js, runtime}.dart
+# ........dart2js/
 # ......dom/
 # ........dom.dart
 # ......html/

tools/presubmit.sh

@@ -117,16 +117,6 @@ if [ ${DO_OPTIMIZE} == 1 ] ; then
   fi
 fi
 
-echo
-echo "=== frog tests ==="
-cd frog 
-./presubmit.py
-FROG_RESULT=$?
-if [ ${FROG_RESULT} != 0 ] ; then
-  TESTS_FAILED=1
-fi
-cd -
-
 echo
 echo "=== Client tests ==="
 echo " Chromium  (Ctrl-C to skip this set of tests)"
@@ -160,10 +150,6 @@ if [ ${DARTC_RESULT}  != 0 ] ; then
   echo "*** dartc tests failed"
 fi
 
-if [ ${FROG_RESULT}  != 0 ] ; then
-  echo "*** frog tests failed"
-fi
-
 if [ ${CLIENT_RESULT}  != 0 ] ; then
   echo "*** client tests failed"
 fi

tools/test-runtime.dart

@@ -6,7 +6,7 @@
 // TODO(ager): Get rid of this version of test.dart when we don't have
 // to worry about the special runtime checkout anymore.
 // This file is identical to test.dart with test suites in the
-// directories samples, client, compiler, frog, and utils removed.
+// directories samples, client, compiler, and utils removed.
 
 #library("test");
 

tools/testing/dart/test_options.dart

@@ -71,17 +71,14 @@ is 'dart file.dart' and you specify special command
    dart2dart: Compile Dart code to Dart code
               (only valid with the following runtimes: vm, drt)
 
-   dart2js: Compile dart code to JavaScript by running dart2js (leg).
-            (only valid with the following runtimes: same as frog)
+   dart2js: Compile dart code to JavaScript by running dart2js.
+         (only valid with the following runtimes: d8, drt, chrome,
+         safari, ie, firefox, opera, none (compile only)),
 
    dartc: Perform static analysis on Dart code by running dartc.
-          (only valid with the following runtimes: none)
-
-   frog: (DEPRECATED) Compile dart code to JavaScript by running the
-         frog compiler. (only valid with the following runtimes: d8,
-         drt, chrome, safari, ie, firefox, opera, none (compile only))''',
+          (only valid with the following runtimes: none)''',
               ['-c', '--compiler'],
-              ['none', 'dart2dart', 'frog', 'dart2js', 'dartc'],
+              ['none', 'dart2dart', 'dart2js', 'dartc'],
               'none'),
           new _TestOptionSpecification(
               'runtime',
@@ -213,12 +210,6 @@ is 'dart file.dart' and you specify special command
               [],
               false,
               'bool'),
-          new _TestOptionSpecification(
-              'frog',
-              'Path to frog script or executable',
-              ['--frog'],
-              [],
-              ''),
           new _TestOptionSpecification(
               'dart',
               'Path to dart executable',
@@ -237,12 +228,6 @@ is 'dart file.dart' and you specify special command
               ['--dartium'],
               [],
               ''),
-          new _TestOptionSpecification(
-              'froglib',
-              'Path to frog library',
-              ['--froglib'],
-              [],
-              ''),
           new _TestOptionSpecification(
               'use_sdk',
               '''Use compiler or runtime from the SDK.
@@ -392,7 +377,6 @@ Note: currently only implemented for dart2js.''',
     bool isValid = true;
     List<String> validRuntimes;
     switch (config['compiler']) {
-      case 'frog':
       case 'dart2js':
         // Note: by adding 'none' as a configuration, if the user
         // runs test.py -c dart2js -r drt,none the dart2js_none and

tools/testing/dart/test_suite.dart

@@ -699,17 +699,6 @@ class StandardTestSuite implements TestSuite {
     String executable = TestUtils.compilerPath(configuration);
     List<String> args = TestUtils.standardOptions(configuration);
     switch (compiler) {
-      case 'frog':
-        String libdir = configuration['froglib'];
-        if (libdir == '') {
-          libdir = dartDir.append('frog/lib').toNativePath();
-        }
-        args.addAll(['--libdir=$libdir',
-                     '--compile-only',
-                     '--out=$outputFile']);
-        args.addAll(vmOptions);
-        args.add(inputFile);
-        break;
       case 'dart2js':
       case 'dart2dart':
         if (compiler == 'dart2dart') args.add('--out=$outputFile');
@@ -765,7 +754,6 @@ class StandardTestSuite implements TestSuite {
       case 'none':
       case 'dart2dart':
         return 'application/dart';
-      case 'frog':
       case 'dart2js':
       case 'dartc':
         return 'text/javascript';
@@ -846,10 +834,6 @@ class StandardTestSuite implements TestSuite {
       args.add('--error_format');
       args.add('machine');
     }
-    if ((configuration['compiler'] == 'frog')
-        && (configuration['runtime'] == 'none')) {
-      args.add('--compile-only');
-    }
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
@@ -1268,8 +1252,6 @@ class TestUtils {
         } else {
           return '${prefix}dart2js$suffix';
         }
-      case 'frog':
-        return 'frog/bin/frog$suffix';
       default:
         throw "Unknown executable for: ${configuration['compiler']}";
     }
@@ -1282,8 +1264,6 @@ class TestUtils {
       case 'dart2js':
       case 'dart2dart':
         return executableName(configuration);
-      case 'frog':
-        return 'frog/bin/frog$suffix';
       default:
         throw "Unknown compiler for: ${configuration['compiler']}";
     }
@@ -1322,10 +1302,7 @@ class TestUtils {
     if (configuration['compiler'] == 'none') {
       return null;  // No separate compiler for dartium tests.
     }
-    var name = configuration['frog'];
-    if (name == '') {
-      name = '${buildDir(configuration)}/${compilerName(configuration)}';
-    }
+    var name = '${buildDir(configuration)}/${compilerName(configuration)}';
     if (!(new File(name)).existsSync() && !configuration['list']) {
       throw "Executable '$name' does not exist";
     }