Chromium Code Reviews| Index: tools/test.dart |
| diff --git a/tools/test.dart b/tools/test.dart |
| index 8d46d8cfd6b440deb95f95054332368de7c80048..637d33145036bc36e093909c875304a99d529a2b 100755 |
| --- a/tools/test.dart |
| +++ b/tools/test.dart |
| @@ -27,6 +27,7 @@ |
| #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("../tests/corelib/test_config.dart"); |
| @@ -48,6 +49,16 @@ |
| #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/pub' |
| +]; |
| + |
| main() { |
| var startTime = new Date.now(); |
| var optionsParser = new TestOptionsParser(); |
| @@ -71,7 +82,7 @@ main() { |
| StringBuffer sb = new StringBuffer('Test configuration'); |
| sb.add(configurations.length > 1 ? 's:' : ':'); |
| for (Map conf in configurations) { |
| - sb.add(' ${conf["compiler"]}_${conf["runtime"]}_${conf["mode"]}_' + |
| + sb.add(' ${conf["compiler"]}_${conf["runtime"]}_${conf["mode"]}_' + |
| '${conf["arch"]}'); |
| if (conf['checked']) sb.add('_checked'); |
| } |
| @@ -144,6 +155,13 @@ main() { |
| 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 DirectoryTestSuite(conf, testSuiteDir)); |
|
Bill Hesse
2012/03/28 23:37:30
I would rather call this StandardTestSuite, and ei
Bob Nystrom
2012/03/29 00:10:17
Great idea. Done.
|
| + } |
| + } |
| + |
| return true; |
| } |