Add flutter_engine runtime to the test script so we can run standard dart tests from the test suite…

tools/testing/dart/test_options.dart

 // Copyright (c) 2013, 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";
 import "path.dart";
@@ skipping 46 matching lines @@
    */
   TestOptionsParser() {
     _options = [
       new _TestOptionSpecification('mode', 'Mode in which to run the tests',
           ['-m', '--mode'], ['all', 'debug', 'release', 'product'], '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)
+         (only valid with the following runtimes: vm, flutter_engine, drt)
 
    dart2js: Compile dart code to JavaScript by running dart2js.
          (only valid with the following runtimes: d8, drt, chrome,
          safari, ie9, ie10, ie11, firefox, opera, chromeOnAndroid,
          none (compile only)),
 
    dart2analyzer: Perform static analysis on Dart code by running the analyzer
           (only valid with the following runtimes: none)
 
    dart2app:
@@ skipping 14 matching lines @@
             'dartk',
             'dartkp'
           ],
           'none'),
       // TODO(antonm): fix the option drt.
       new _TestOptionSpecification(
           'runtime',
           '''Where the tests should be run.
     vm: Run Dart code on the standalone dart vm.
 
+    flutter_engine: Run Dart code on the flutter engine.
+
     dart_precompiled: Run a precompiled snapshot on a variant of the standalone
                       dart vm lacking a JIT.
 
     d8: Run JavaScript from the command line using v8.
 
     jsshell: Run JavaScript from the command line using firefox js-shell.
 
     drt: Run Dart or JavaScript in the headless version of Chrome,
          Content shell.
 
@@ skipping 10 matching lines @@
     self_check: Pass each test or its compiled output to every file under
         `pkg` whose name ends with `_self_check.dart`.
         Each test is given to the self_check tester as a filename on stdin using
         the batch-mode protocol.
 
     none: No runtime, compile only (for example, used for dart2analyzer static
           analysis tests).''',
           ['-r', '--runtime'],
           [
             'vm',
+            'flutter_engine',
             'dart_precompiled',
             'd8',
             'jsshell',
             'drt',
             'dartium',
             'ff',
             'firefox',
             'chrome',
             'safari',
             'ie9',
@@ skipping 158 matching lines @@
           ['--report-in-json'],
           [],
           false,
           type: 'bool'),
       new _TestOptionSpecification('time',
           'Print timing information after running tests', ['--time'], [], false,
           type: 'bool'),
       new _TestOptionSpecification(
           'dart', 'Path to dart executable', ['--dart'], [], ''),
       new _TestOptionSpecification(
+          'engine', 'Path to flutter engine executable', ['--engine'], [], ''),
+      new _TestOptionSpecification(
           'drt', // TODO(antonm): fix the option name.
           'Path to content shell executable',
           ['--drt'],
           [],
           ''),
       new _TestOptionSpecification('dartium',
           'Path to Dartium Chrome executable', ['--dartium'], [], ''),
       new _TestOptionSpecification('firefox',
           'Path to firefox browser executable', ['--firefox'], [], ''),
       new _TestOptionSpecification(
@@ skipping 299 matching lines @@
   }
 
   // For printing out reproducing command lines, we don't want to add these
   // options.
   Set<String> _blacklistedOptions = new Set<String>.from([
     'append_logs',
     'build_directory',
     'chrome',
     'copy_coredumps',
     'dart',
+    'engine',
     'dartium',
     'drt',
     'exclude_suite',
     'failure-summary',
     'firefox',
     'local_ip',
     'progress',
     'report',
     'safari',
     'shard',
@@ skipping 74 matching lines @@
       case 'dartk':
         validRuntimes = const ['vm', 'self_check', 'none'];
         break;
       case 'precompiler':
       case 'dartkp':
         validRuntimes = const ['dart_precompiled'];
         break;
       case 'none':
         validRuntimes = const [
           'vm',
+          'flutter_engine',
           'drt',
           'dartium',
           'ContentShellOnAndroid',
           'DartiumOnAndroid'
         ];
         break;
     }
     if (!validRuntimes.contains(config['runtime'])) {
       isValid = false;
       print("Warning: combination of compiler '${config['compiler']}' and "
           "runtime '${config['runtime']}' is invalid. "
           "Skipping this combination.");
     }
     if (config['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['use_repository_packages'] && config['use_public_packages']) {
       isValid = false;
       print("Cannot have both --use-repository-packages and "
           "--use-public-packages");
     }
+    if ((config['runtime'] == 'flutter_engine') && (config['engine'] == '')) {
+      isValid = false;
+      print("-rflutter_engine requires the flutter engine executable to "

[Bill Hesse, 2017/01/05 17:48:33]

This code seems contradictory to the code in test_suite which provides a default
value for engine.

[siva, 2017/01/05 20:38:45]

Good point, I have taken out the default setting as it is hard for us to auto
compute a default location for the flutter engine binary which is in a different
repo

+          "be specified using --engine=");
+    }
+    if ((config['runtime'] == 'flutter_engine') && (config['arch'] != 'x64')) {
+      isValid = false;
+      print("-rflutter_engine is applicable only for --arch=x64");
+    }
 
     return isValid;
   }
 
   /**
    * Recursively expand a configuration with multiple values per key
    * into a list of configurations with exactly one value per key.
    */
   List<Map> _expandConfigurations(Map configuration) {
     // Expand the pseudo-values such as 'all'.
@@ skipping 239 matching lines @@
       if (option.keys.contains(name)) {
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
   List<_TestOptionSpecification> _options;
 }