| OLD | NEW |
| 1 #!/usr/bin/env dart | 1 #!/usr/bin/env dart |
| 2 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 2 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 3 // for details. All rights reserved. Use of this source code is governed by a | 3 // for details. All rights reserved. Use of this source code is governed by a |
| 4 // BSD-style license that can be found in the LICENSE file. | 4 // BSD-style license that can be found in the LICENSE file. |
| 5 | 5 |
| 6 // TODO(ager): Get rid of this version of test.dart when we don't have | 6 // TODO(ager): Get rid of this version of test.dart when we don't have |
| 7 // to worry about the special runtime checkout anymore. | 7 // to worry about the special runtime checkout anymore. |
| 8 // This file is identical to test.dart with test suites in the | 8 // This file is identical to test.dart with test suites in the |
| 9 // directories samples, client, compiler, frog, and utils removed. | 9 // directories samples, client, compiler, frog, and utils removed. |
| 10 | 10 |
| 11 #library("test"); | 11 #library("test"); |
| 12 | 12 |
| 13 #import("dart:io"); |
| 13 #import("testing/dart/test_runner.dart"); | 14 #import("testing/dart/test_runner.dart"); |
| 14 #import("testing/dart/test_options.dart"); | 15 #import("testing/dart/test_options.dart"); |
| 15 #import("testing/dart/test_suite.dart"); | 16 #import("testing/dart/test_suite.dart"); |
| 16 | 17 |
| 17 #import("../tests/co19/test_config.dart"); | 18 #import("../tests/co19/test_config.dart"); |
| 18 #import("../runtime/tests/vm/test_config.dart"); | 19 #import("../runtime/tests/vm/test_config.dart"); |
| 19 | 20 |
| 20 /** | 21 /** |
| 21 * The directories that contain test suites which follow the conventions | 22 * The directories that contain test suites which follow the conventions |
| 22 * required by [StandardTestSuite]'s forDirectory constructor. | 23 * required by [StandardTestSuite]'s forDirectory constructor. |
| 23 * New test suites should follow this convention because it makes it much | 24 * New test suites should follow this convention because it makes it much |
| 24 * simpler to add them to test.dart. Existing test suites should be | 25 * simpler to add them to test.dart. Existing test suites should be |
| 25 * moved to here, if possible. | 26 * moved to here, if possible. |
| 26 */ | 27 */ |
| 27 final TEST_SUITE_DIRECTORIES = const [ | 28 final TEST_SUITE_DIRECTORIES = const [ |
| 28 'runtime/tests/vm', | 29 const Path('runtime/tests/vm'), |
| 29 'tests/corelib', | 30 const Path('tests/corelib'), |
| 30 'tests/isolate', | 31 const Path('tests/isolate'), |
| 31 'tests/language', | 32 const Path('tests/language'), |
| 32 'tests/lib', | 33 const Path('tests/lib'), |
| 33 'tests/standalone', | 34 const Path('tests/standalone'), |
| 34 'tests/utils', | 35 const Path('tests/utils'), |
| 35 ]; | 36 ]; |
| 36 | 37 |
| 37 main() { | 38 main() { |
| 38 var startTime = new Date.now(); | 39 var startTime = new Date.now(); |
| 39 var optionsParser = new TestOptionsParser(); | 40 var optionsParser = new TestOptionsParser(); |
| 40 List<Map> configurations = optionsParser.parse(new Options().arguments); | 41 List<Map> configurations = optionsParser.parse(new Options().arguments); |
| 41 if (configurations == null) return; | 42 if (configurations == null) return; |
| 42 | 43 |
| 43 // Extract global options from first configuration. | 44 // Extract global options from first configuration. |
| 44 var firstConf = configurations[0]; | 45 var firstConf = configurations[0]; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 74 if (selectors.containsKey('co19')) { | 75 if (selectors.containsKey('co19')) { |
| 75 queue.addTestSuite(new Co19TestSuite(conf)); | 76 queue.addTestSuite(new Co19TestSuite(conf)); |
| 76 } | 77 } |
| 77 if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) { | 78 if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) { |
| 78 // vm tests contain both cc tests (added here) and dart tests (added in | 79 // vm tests contain both cc tests (added here) and dart tests (added in |
| 79 // [TEST_SUITE_DIRECTORIES]). | 80 // [TEST_SUITE_DIRECTORIES]). |
| 80 queue.addTestSuite(new VMTestSuite(conf)); | 81 queue.addTestSuite(new VMTestSuite(conf)); |
| 81 } | 82 } |
| 82 | 83 |
| 83 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { | 84 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { |
| 84 final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1); | 85 final name = testSuiteDir.filename; |
| 85 if (selectors.containsKey(name)) { | 86 if (selectors.containsKey(name)) { |
| 86 queue.addTestSuite( | 87 queue.addTestSuite( |
| 87 new StandardTestSuite.forDirectory(conf, testSuiteDir)); | 88 new StandardTestSuite.forDirectory(conf, testSuiteDir)); |
| 88 } | 89 } |
| 89 } | 90 } |
| 90 | 91 |
| 91 return true; | 92 return true; |
| 92 } | 93 } |
| 93 | 94 |
| 94 // Start process queue. | 95 // Start process queue. |
| 95 var queue = new ProcessQueue(maxProcesses, | 96 var queue = new ProcessQueue(maxProcesses, |
| 96 progressIndicator, | 97 progressIndicator, |
| 97 startTime, | 98 startTime, |
| 98 printTiming, | 99 printTiming, |
| 99 enqueueConfiguration, | 100 enqueueConfiguration, |
| 100 verbose, | 101 verbose, |
| 101 listTests); | 102 listTests); |
| 102 } | 103 } |
| OLD | NEW |