Remove runtime 'dart_app' as it became identical to 'vm'.

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 70 matching lines @@
    dartk: Compile the Dart source into Kernel before running test.
 
    dartkp: Compiler the Dart source into Kernel and then Kernel into AOT
    snapshot before running the test.''',
           ['-c', '--compiler'],
           [
             'none',
             'precompiler',
             'dart2js',
             'dart2analyzer',
-            'dart2app',
-            'dart2appjit',
+            'app_jit',
+            'dart2app',  // TODO(rmacnak): Remove after updating bots.
+            'dart2appjit',  // TODO(rmacnak): Remove after updating bots.
             '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.
 
     dart_precompiled: Run a precompiled snapshot on a variant of the standalone
                       dart vm lacking a JIT.
 
-    dart_app: Run a full app snapshot, with or without cached unoptimized code.
-
     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.
 
     dartium: Run Dart or JavaScript in Dartium.
 
     ContentShellOnAndroid: Run Dart or JavaScript in Dartium content shell
                       on Android.
 
     DartiumOnAndroid: Run Dart or Javascript in Dartium on Android.
 
     [ff | chrome | safari | ie9 | ie10 | ie11 | opera | chromeOnAndroid]:
         Run JavaScript in the specified browser.
 
     none: No runtime, compile only (for example, used for dart2analyzer static
           analysis tests).''',
           ['-r', '--runtime'],
           [
             'vm',
             'dart_precompiled',
-            'dart_app',
+            'dart_app',  // TODO(rmacnak): Remove after updating bots.
             'd8',
             'jsshell',
             'drt',
             'dartium',
             'ff',
             'firefox',
             'chrome',
             'safari',
             'ie9',
             'ie10',
@@ skipping 547 matching lines @@
           'ie10',
           'ie11',
           'opera',
           'chromeOnAndroid',
           'safarimobilesim'
         ];
         break;
       case 'dart2analyzer':
         validRuntimes = const ['none'];
         break;
-      case 'dart2app':
-      case 'dart2appjit':
-        validRuntimes = const ['dart_app'];
-        break;
-      case 'precompiler':
-        validRuntimes = const ['dart_precompiled'];
-        break;
+      case 'app_jit':
       case 'dartk':
         validRuntimes = const ['vm'];
         break;
+      case 'precompiler':
       case 'dartkp':
         validRuntimes = const ['dart_precompiled'];
         break;
       case 'none':
         validRuntimes = const [
           'vm',
           'drt',
           'dartium',
           'ContentShellOnAndroid',
           'DartiumOnAndroid'
@@ skipping 24 matching lines @@
     }
 
     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) {
+    // TODO(rmacnak): Remove after updating bots.
+    if (configuration['runtime'] == 'dart_app') {
+      configuration['runtime'] = 'vm';
+    }
+    if (configuration['compiler'] == 'dart2app' ||
+        configuration['compiler'] == 'dart2appjit') {
+      configuration['compiler'] = 'app_jit';
+    }
+
     // Expand the pseudo-values such as 'all'.
     if (configuration['arch'] == 'all') {
       configuration['arch'] = 'ia32,x64,simarm,simarm64,simmips,simdbc64';
     }
     if (configuration['mode'] == 'all') {
       configuration['mode'] = 'debug,release,product';
     }
 
     if (configuration['report_in_json']) {
       configuration['list'] = true;
@@ skipping 230 matching lines @@
       if (option.keys.contains(name)) {
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
   List<_TestOptionSpecification> _options;
 }