revert prior submit

tools/testing/dart/test_suite.dart

 // 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 312 matching lines @@
       for (var dummy in optionsFromFile["vmOptions"]) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
     switch (configuration['component']) {
       case 'dartium':
       case 'chromium':
       case 'frogium':
-      case 'frogsh':
       case 'legium':
       case 'webdriver':
         enqueueBrowserTest(filename, testName, optionsFromFile,
                            expectations, isNegative);
         break;
       default:
         isNegative = isNegative ||
             (configuration['checked'] && info.isNegativeIfChecked);
 
         if (configuration['component'] == 'dartc') {
@@ skipping 234 matching lines @@
     List<String> args = TestUtils.standardOptions(configuration);
     switch (component) {
       // TODO(zundel): Remove chromium now that dartc doesn't generate code?
       case 'chromium':
         args.addAll(['--work', dir]);
         args.addAll(vmOptions);
         args.add('--ignore-unrecognized-flags');
         args.add(inputFile);
         // TODO(whesse): Add --fatal-type-errors if needed.
         break;
-      case 'frogsh':
-        args.clear();
-        args.add('--out=$outputFile');
-        args.add('--frogpad_js=' +
-          '${TestUtils.buildDir(configuration)}/frog/bin/frogpad.js');
-        args.add(inputFile);
-        break;
       case 'frogium':
       case 'legium':
       case 'webdriver':
         String libdir = configuration['froglib'];
         if (libdir == '') {
           libdir = '$dartDir/frog/lib';
         }
         args.addAll(['--libdir=$libdir',
                              '--compile-only',
                              '--out=$outputFile']);
@@ skipping 72 matching lines @@
     return TestUtils.mkdirRecursive(tempDirPath, 
       Strings.join(generatedTestPath, '/'));
   }
 
   String get scriptType() {
     switch (configuration['component']) {
       case 'dartium':
         return 'application/dart';
       case 'chromium':
       case 'frogium':
-      case 'frogsh':
       case 'legium':
       case 'webdriver':
         return 'text/javascript';
       default:
-        Expect.fail("Unexpected component '{configuration['component']}'");
+        Expect.fail('Unimplemented component scriptType');
         return null;
     }
   }
 
   String getHtmlName(String filename) {
     return filename.replaceAll('/', '_').replaceAll(':', '_')
         + configuration['component'] + '.html';
   }
 
   String get dumpRenderTreeFilename() {
@@ skipping 423 matching lines @@
       throw "Executable '$name' does not exist";
     }
     return name;
   }
 
   static String compilerPath(Map configuration) {
     if (configuration['component'] == 'dartium') {
       return null;  // No separate compiler for dartium tests.
     }
     var name = configuration['frog'];
-    if (configuration['component'] == 'frogsh') {
-      name = '${dartDir()}/tools/testing/frogpad/frogpad.py';
-    }
     if (name == '') {
       name = '${buildDir(configuration)}/${compilerName(configuration)}';
     }
     if (!(new File(name)).existsSync() && !configuration['list']) {
       throw "Executable '$name' does not exist";
     }
     return name;
   }
 
   static String outputDir(Map configuration) {
@@ skipping 79 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
 """;
     print(report);
    }
 }