test rename overhaul: step 14 - vm tests

tools/test.dart

 #!/usr/bin/env 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.
 
 /**
  * This file is the entrypoint of the dart test suite.  This suite is used
  * to test:
  *
  *     1. the dart vm
@@ skipping 29 matching lines @@
  * required by [StandardTestSuite]'s forDirectory constructor.
  * New test suites should follow this convention because it makes it much
  * simpler to add them to test.dart.  Existing test suites should be
  * moved to here, if possible.
 */
 final TEST_SUITE_DIRECTORIES = const [
   'frog/tests/frog',
   'frog/tests/frog_native',
   'frog/tests/leg',
   'frog/tests/leg_only',
+  'runtime/tests/vm',
   'samples/tests/samples',
   'tests/benchmark_smoke',
   'tests/corelib',
   'tests/dom',
   'tests/html',
   'tests/isolate',
   'tests/json',
   'tests/language',
   'tests/lib',
   'tests/standalone',
@@ skipping 37 matching lines @@
   bool enqueueConfiguration(ProcessQueue queue) {
     if (!configurationIterator.hasNext()) {
       return false;
     }
 
     var conf = configurationIterator.next();
     for (String key in selectors.getKeys()) {
       if (key == 'co19') {
         queue.addTestSuite(new Co19TestSuite(conf));
       } else if (conf['runtime'] == 'vm' && key == 'vm') {
+        // vm tests contain both cc tests (added here) and dart tests (added in
+        // [TEST_SUITE_DIRECTORIES]).
         queue.addTestSuite(new VMTestSuite(conf));
-        queue.addTestSuite(new VMDartTestSuite(conf));
       } else if (conf['compiler'] == 'dartc' && key == 'dartc') {
         queue.addTestSuite(new ClientDartcTestSuite(conf));
       } else if (conf['compiler'] == 'dartc' && key == 'dartc') {
         queue.addTestSuite(new JUnitDartcTestSuite(conf));
       } else if (key == 'await') {
         queue.addTestSuite(new AwaitTestSuite(conf));
       }
     }
 
     for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
@@ skipping 10 matching lines @@
   // Start process queue.
   var queue = new ProcessQueue(maxProcesses,
                                progressIndicator,
                                startTime,
                                printTiming,
                                enqueueConfiguration,
                                verbose,
                                listTests,
                                keepGeneratedTests);
 }