Revert "Revert "With this change 'tools/test.py -cdartk vm' will run vm tests with Dart Frontend pa…

tools/testing/dart/test_configurations.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_configurations;
 
 import "dart:async";
 import 'dart:convert';
 import 'dart:io';
 import "dart:math" as math;
@@ skipping 181 matching lines @@
       for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
         final name = testSuiteDir.filename;
         if (selectors.containsKey(name)) {
           testSuites
               .add(new StandardTestSuite.forDirectory(conf, testSuiteDir));
         }
       }
       for (String key in selectors.keys) {
         if (key == 'co19') {
           testSuites.add(new Co19TestSuite(conf));
-        } else if (conf['compiler'] == 'none' &&
+        } else if ((conf['compiler'] == 'dartk' ||
+                conf['compiler'] == 'none') &&
             conf['runtime'] == 'vm' &&
             key == 'vm') {
           // vm tests contain both cc tests (added here) and dart tests (added
           // in [TEST_SUITE_DIRECTORIES]).
           testSuites.add(new VMTestSuite(conf));
         } else if (conf['analyzer']) {
           if (key == 'analyze_library') {
             testSuites.add(new AnalyzeLibraryTestSuite(conf));
           }
         }
@@ skipping 94 matching lines @@
       maxBrowserProcesses,
       startTime,
       testSuites,
       eventListener,
       allTestsFinished,
       verbose,
       recordingPath,
       recordingOutputPath,
       adbDevicePool);
 }