Remove dart2dart support from testing scripts and status files

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 1310 matching lines @@
       var fullHtmlPath =
           _getUriForBrowserTest(htmlPath_subtest, subtestName).toString();
 
       if (runtime == "drt") {
         var dartFlags = [];
         var contentShellOptions = [];
 
         contentShellOptions.add('--no-timeout');
         contentShellOptions.add('--dump-render-tree');
 
-        if (compiler == 'none' || compiler == 'dart2dart') {
+        if (compiler == 'none') {
           dartFlags.add('--ignore-unrecognized-flags');
           if (configuration["checked"]) {
             dartFlags.add('--enable_asserts');
             dartFlags.add("--enable_type_checks");
           }
           dartFlags.addAll(vmOptions);
         }
 
         commandSet.add(
             CommandBuilder.instance.getContentShellCommand(
@@ skipping 106 matching lines @@
         info,
         isNegative(info),
         fullHtmlPath);
     enqueueNewTestCase(testCase);
     return;
   }
 
   /** Helper to create a compilation command for a single input file. */
   Command _compileCommand(String inputFile, String outputFile,
       String compiler, String dir, optionsFromFile) {
-    assert (['dart2js', 'dart2dart'].contains(compiler));
+    assert (compiler == 'dart2js')
     List<String> args;
     if (compilerPath.endsWith('.dart')) {
       // Run the compiler script via the Dart VM.
       args = [compilerPath];
     } else {
       args = [];
     }
     args.addAll(TestUtils.standardOptions(configuration));
     String packageRoot =
       packageRootArgument(optionsFromFile['packageRoot']);
@@ skipping 19 matching lines @@
         ..add('--file-filter')..add('.svn');
     if (configuration['csp']) args.add('--csp');
 
     return CommandBuilder.instance.getProcessCommand(
         'polymer_deploy', dartVmBinaryFileName, args, environmentOverrides);
   }
 
   String get scriptType {
     switch (configuration['compiler']) {
       case 'none':
-      case 'dart2dart':
         return 'application/dart';
       case 'dart2js':
       case 'dartanalyzer':
       case 'dart2analyzer':
         return 'text/javascript';
       default:
         print('Non-web runtime, so no scriptType for: '
                     '${configuration["compiler"]}');
         exit(1);
         return null;
@@ skipping 76 matching lines @@
    * Special options for individual tests are currently specified in various
    * ways: with comments directly in test files, by using certain imports, or by
    * creating additional files in the test directories.
    *
    * Here is a list of options that are used by 'test.dart' today:
    *   - Flags can be passed to the vm or dartium process that runs the test by
    *   adding a comment to the test file:
    *
    *     // VMOptions=--flag1 --flag2
    *
-   *   - Flags can be passed to dart2js, dart2dart or vm by adding a comment
+   *   - Flags can be passed to dart2js or vm by adding a comment
    *   to the test file:
    *
    *     // SharedOptions=--flag1 --flag2
    *
    *   - Flags can be passed to the dart script that contains the test also
    *   using comments, as follows:
    *
    *     // DartOptions=--flag1 --flag2
    *
    *   - For tests that depend on compiling other files with dart2js (e.g.
@@ skipping 131 matching lines @@
              "hasStaticWarning" : false,
              "otherScripts": otherScripts,
              "isMultitest": isMultitest,
              "isMultiHtmlTest": isMultiHtmlTest,
              "subtestNames": subtestNames,
              "isolateStubs": isolateStubs,
              "containsDomImport": containsDomImport };
   }
 
   List<List<String>> getVmOptions(Map optionsFromFile) {
-    var COMPILERS = const ['none', 'dart2dart'];
+    var COMPILERS = const ['none'];
     var RUNTIMES = const ['none', 'vm', 'drt', 'dartium',
                           'ContentShellOnAndroid', 'DartiumOnAndroid'];
     var needsVmOptions = COMPILERS.contains(configuration['compiler']) &&
                          RUNTIMES.contains(configuration['runtime']);
     if (!needsVmOptions) return [[]];
     final vmOptions = optionsFromFile['vmOptions'];
-    if (configuration['compiler'] != 'dart2dart') return vmOptions;
-    // Temporary workaround for race in test suite: tests with different
-    // vm options are still compiled into the same output file which
-    // may lead to reads from empty files.
-    return [vmOptions[0]];
+    return vmOptions;
   }
 
   /**
    * Read options from a co19 test file.
    *
    * The reason this is different from [readOptionsFromFile] is that
    * co19 is developed based on a contract which defines certain test
    * tags. These tags may appear unused, but should not be removed
    * without consulting with the co19 team.
    *
@@ skipping 427 matching lines @@
     return result;
   }
 
   static List<String> standardOptions(Map configuration) {
     List args = ["--ignore-unrecognized-flags"];
     if (configuration["checked"]) {
       args.add('--enable_asserts');
       args.add("--enable_type_checks");
     }
     String compiler = configuration["compiler"];
-    if (compiler == "dart2js" || compiler == "dart2dart") {
+    if (compiler == "dart2js") {
       args = [];
       if (configuration["checked"]) {
         args.add('--enable-checked-mode');
       }
       // args.add("--verbose");
       if (!isBrowserRuntime(configuration['runtime'])) {
         args.add("--allow-mock-compilation");
         args.add("--categories=all");
       }
     }
-    if ((compiler == "dart2js" || compiler == "dart2dart") &&
+    if ((compiler == "dart2js") &&
         configuration["minified"]) {
       args.add("--minify");
     }
     if (compiler == "dart2js" && configuration["csp"]) {
       args.add("--csp");
     }
     if (compiler == "dart2js" && configuration["cps_ir"]) {
       args.add("--use-cps-ir");
     }
     if (compiler == "dartanalyzer" || compiler == "dart2analyzer") {
@@ skipping 169 matching lines @@
       for (var key in PATH_REPLACEMENTS.keys) {
         if (path.startsWith(key)) {
           path = path.replaceFirst(key, PATH_REPLACEMENTS[key]);
           break;
         }
       }
     }
     return path;
   }
 }