test rename overhaul: step 14 - vm tests

tools/test-runtime.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.
 
 // TODO(ager): Get rid of this version of test.dart when we don't have
 // to worry about the special runtime checkout anymore.
 // This file is identical to test.dart with test suites in the
 // directories samples, client, compiler, frog, and utils removed.
 
 #library("test");
 
 #import("testing/dart/test_runner.dart");
 #import("testing/dart/test_options.dart");
 #import("testing/dart/test_suite.dart");
 
 #import("../tests/co19/test_config.dart");
 #import("../runtime/tests/vm/test_config.dart");
 
 /**
  * The directories that contain test suites which follow the conventions
  * 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 [
+  'runtime/tests/vm',
   'tests/corelib',
   'tests/isolate',
   'tests/language',
   'tests/lib',
   'tests/standalone',
   'tests/utils',
 ];
 
 main() {
   var startTime = new Date.now();
@@ skipping 29 matching lines @@
   bool enqueueConfiguration(ProcessQueue queue) {
     if (!configurationIterator.hasNext()) {
       return false;
     }
 
     var conf = configurationIterator.next();
     if (selectors.containsKey('co19')) {
       queue.addTestSuite(new Co19TestSuite(conf));
     }
     if (conf['runtime'] == 'vm' && selectors.containsKey('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));
     }
 
     for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
       final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1);
       if (selectors.containsKey(name)) {
         queue.addTestSuite(
             new StandardTestSuite.forDirectory(conf, testSuiteDir));
       }
     }
 
     return true;
   }
 
   // Start process queue.
   var queue = new ProcessQueue(maxProcesses,
                                progressIndicator,
                                startTime,
                                printTiming,
                                enqueueConfiguration,
                                verbose,
                                listTests,
                                keepGeneratedTests);
 }