dart2dart compiler support.

tools/testing/dart/test_options.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.
 
 #library("test_options_parser");
 
 #import("dart:io");
 #import("drt_updater.dart");
 #import("test_suite.dart");
 
@@ skipping 16 matching lines @@
                            this.defaultValue,
                            [type = 'string']) : this.type = type;
   String name;
   String description;
   List<String> keys;
   List<String> values;
   var defaultValue;
   String type;
 }
 
-
 /**
  * Parser of test options.
  */
 class TestOptionsParser {
   String specialCommandHelp =
 """
 Special command support. Wraps the command line in
 a special command. The special command should contain
 an '@' character which will be replaced by the normal
 command.
@@ skipping 14 matching lines @@
               ['-m', '--mode'],
               ['all', 'debug', 'release'],
               'debug'),
           new _TestOptionSpecification(
               'compiler',
               '''Specify any compilation step (if needed).
 
    none: Do not compile the Dart code (run native Dart code on the VM).
          (only valid with the following runtimes: vm, drt)
 
+   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)
 
    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))''',
               ['-c', '--compiler'],
-              ['none', 'frog', 'dart2js', 'dartc'],
+              ['none', 'dart2dart', 'frog', 'dart2js', 'dartc'],
               'none'),
           new _TestOptionSpecification(
               'runtime',
               '''Where the tests should be run.
     vm: Run Dart code on the standalone dart vm.
 
     d8: Run JavaScript from the command line using v8.
 
     drt: Run Dart or JavaScript in the headless version of Chrome,
          DumpRenderTree.
@@ skipping 288 matching lines @@
     List<Map> result = expandedConfigs.filter(_isValidConfig);
     return result.isEmpty() ? null : result;
   }
 
   /**
    * Determine if a particular configuration has a valid combination of compiler
    * and runtime elements.
    */
   bool _isValidConfig(Map config) {
     bool isValid = true;
-      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
-          // dart2js_drt will be duplicating work. If later we don't need 'none'
-          // with dart2js, we should remove it from here.
-          isValid = (const ['d8', 'drt', 'dartium', 'ff',
-                            'chrome', 'safari', 'ie', 'opera',
-                            'none']).indexOf(config['runtime']) >= 0;
-          break;
-        case 'dartc':
-          isValid = config['runtime'] == 'none';
-          break;
-        case 'none':
-          isValid = (const ['vm', 'drt',
-                            'dartium']).indexOf(config['runtime']) >= 0;
-      }
-    if (!isValid) {
+    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
+        // dart2js_drt will be duplicating work. If later we don't need 'none'
+        // with dart2js, we should remove it from here.
+        validRuntimes = const ['d8', 'drt', 'none', 'dartium',
+                               'ff', 'chrome', 'safari', 'ie', 'opera'];
+        break;
+      case 'dartc':
+        validRuntimes = const ['none'];
+        break;
+      case 'none':
+      case 'dart2dart':
+        validRuntimes = const ['vm', 'drt', 'dartium'];
+        break;
+    }
+    if (!Contains(config['runtime'], validRuntimes)) {
+      isValid = false;
       print("Warning: combination of ${config['compiler']} and "
           "${config['runtime']} is invalid. Skipping this combination.");
     }
     if (config['runtime'] == 'ie' &&
         Platform.operatingSystem != 'windows') {
       isValid = false;
       print("Warning cannot run Internet Explorer on non-Windows operating"
           " system.");
     }
     if (config['shard'] < 1 || config['shard'] > config['shards']) {
       isValid = false;
       print("Error: shard index is ${config['shard']} out of "
             "${config['shards']} shards");
     }
-    if (config['runtime'] == 'dartium' && config['compiler'] == 'none' &&
+    if (config['runtime'] == 'dartium' &&
+        Contains(config['compiler'], const ['none', 'dart2dart']) &&
         config['checked']) {
       // TODO(vsm): Set the DART_FLAGS environment appropriately when
       // invoking Selenium to support checked mode.  It's not clear
       // the current selenium API supports this.
       isValid = false;
       print("Warning: checked mode is not yet supported for dartium tests.");
     }
     return isValid;
   }
 
@@ skipping 107 matching lines @@
           timeout *= 4;
           break;
         case 'dart2js':
         case 'frog':
           if (configuration['mode'] == 'debug') {
             timeout *= 8;
           }
           if (configuration['host_checked']) {
             timeout *= 16;
           }
-          if ((const ['ie', 'ff', 'chrome', 'safari',
-            'opera']).indexOf(configuration['runtime']) >= 0) {
+          if (Contains(configuration['runtime'],
+                       const ['ie', 'ff', 'chrome', 'safari', 'opera'])) {
             timeout *= 4; // Allow additional time for browser testing to run.
           }
           break;
         default:
           if (configuration['mode'] == 'debug') {
             timeout *= 2;
           }
-          if ((const ['drt', 'dartium']).indexOf(configuration['runtime'])
-              >= 0) {
+          if (Contains(configuration['runtime'], const ['drt', 'dartium'])) {
             timeout *= 4; // Allow additional time for browser testing to run.
           }
           break;
       }
       configuration['timeout'] = timeout;
     }
 
     return [configuration];
   }
 
@@ skipping 65 matching lines @@
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
 
   List<_TestOptionSpecification> _options;
 }