Revert "Simplify tests under utils/tests to follow StandardTestSuite

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 27 matching lines @@
 #import("../runtime/tests/vm/test_config.dart");
 #import("../samples/tests/samples/test_config.dart");
 #import("../client/tests/dartc/test_config.dart");
 #import("../compiler/tests/dartc/test_config.dart");
 #import("../client/tests/client/test_config.dart");
 #import("../frog/tests/frog/test_config.dart");
 #import("../frog/tests/leg/test_config.dart");
 #import("../frog/tests/leg_only/test_config.dart");
 #import("../frog/tests/native/test_config.dart");
 #import("../frog/tests/await/test_config.dart");
+#import("../utils/tests/css/test_config.dart");
+#import("../utils/tests/import_mapper/test_config.dart");
+#import("../utils/tests/peg/test_config.dart");
 
 /**
  * The directories that contain test suites which follow the conventions
  * required by [DirectoryTestSuite]. Ideally, we'd move more suites to this
  * convention because it makes it much simpler to add them to test.dart. (You
  * basically add the directory here and you're done.)
 */
 final TEST_SUITE_DIRECTORIES = const [
-  'utils/tests/css',
-  'utils/tests/import_mapper',
-  'utils/tests/peg',
   'utils/tests/pub'
 ];
 
 main() {
   var startTime = new Date.now();
   var optionsParser = new TestOptionsParser();
   List<Map> configurations = optionsParser.parse(new Options().arguments);
   if (configurations == null || configurations.length == 0) return;
 
   // Extract global options from first configuration.
@@ skipping 63 matching lines @@
     }
     if (selectors.containsKey('frog_native')) {
       queue.addTestSuite(new FrogNativeTestSuite(conf));
     }
     if (conf['compiler'] == 'dartc' && selectors.containsKey('dartc')) {
       queue.addTestSuite(new ClientDartcTestSuite(conf));
     }
     if (conf['compiler'] == 'dartc' && selectors.containsKey('dartc')) {
       queue.addTestSuite(new JUnitDartcTestSuite(conf));
     }
+    if (selectors.containsKey('css')) {
+      queue.addTestSuite(new CssTestSuite(conf));
+    }
+    if (selectors.containsKey('import_mapper')) {
+      queue.addTestSuite(new ImportMapperTestSuite(conf));
+    }
+    if (selectors.containsKey('peg')) {
+      queue.addTestSuite(new PegTestSuite(conf));
+    }
     if (selectors.containsKey('await')) {
       queue.addTestSuite(new AwaitTestSuite(conf));
     }
     if (selectors.containsKey('client')) {
       queue.addTestSuite(new ClientTestSuite(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);
 }