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("testing/dart/test_runner.dart"); | 13 #import("testing/dart/test_runner.dart"); |
14 #import("testing/dart/test_options.dart"); | 14 #import("testing/dart/test_options.dart"); |
15 #import("testing/dart/test_suite.dart"); | 15 #import("testing/dart/test_suite.dart"); |
16 | 16 |
17 #import("../tests/co19/test_config.dart"); | 17 #import("../tests/co19/test_config.dart"); |
18 #import("../tests/language/test_config.dart"); | |
19 #import("../tests/lib/test_config.dart"); | 18 #import("../tests/lib/test_config.dart"); |
20 #import("../tests/standalone/test_config.dart"); | 19 #import("../tests/standalone/test_config.dart"); |
21 #import("../tests/utils/test_config.dart"); | 20 #import("../tests/utils/test_config.dart"); |
22 #import("../runtime/tests/vm/test_config.dart"); | 21 #import("../runtime/tests/vm/test_config.dart"); |
23 | 22 |
24 /** | 23 /** |
25 * The directories that contain test suites which follow the conventions | 24 * The directories that contain test suites which follow the conventions |
26 * required by [StandardTestSuite]'s forDirectory constructor. | 25 * required by [StandardTestSuite]'s forDirectory constructor. |
27 * New test suites should follow this convention because it makes it much | 26 * New test suites should follow this convention because it makes it much |
28 * simpler to add them to test.dart. Existing test suites should be | 27 * simpler to add them to test.dart. Existing test suites should be |
29 * moved to here, if possible. | 28 * moved to here, if possible. |
30 */ | 29 */ |
31 final TEST_SUITE_DIRECTORIES = const [ | 30 final TEST_SUITE_DIRECTORIES = const [ |
32 'tests/corelib', | 31 'tests/corelib', |
33 'tests/isolate', | 32 'tests/isolate', |
| 33 'tests/language', |
34 ]; | 34 ]; |
35 | 35 |
36 main() { | 36 main() { |
37 var startTime = new Date.now(); | 37 var startTime = new Date.now(); |
38 var optionsParser = new TestOptionsParser(); | 38 var optionsParser = new TestOptionsParser(); |
39 List<Map> configurations = optionsParser.parse(new Options().arguments); | 39 List<Map> configurations = optionsParser.parse(new Options().arguments); |
40 if (configurations == null) return; | 40 if (configurations == null) return; |
41 | 41 |
42 // Extract global options from first configuration. | 42 // Extract global options from first configuration. |
43 var firstConf = configurations[0]; | 43 var firstConf = configurations[0]; |
(...skipping 25 matching lines...) Expand all Loading... |
69 return false; | 69 return false; |
70 } | 70 } |
71 | 71 |
72 var conf = configurationIterator.next(); | 72 var conf = configurationIterator.next(); |
73 if (selectors.containsKey('standalone')) { | 73 if (selectors.containsKey('standalone')) { |
74 queue.addTestSuite(new StandaloneTestSuite(conf)); | 74 queue.addTestSuite(new StandaloneTestSuite(conf)); |
75 } | 75 } |
76 if (selectors.containsKey('co19')) { | 76 if (selectors.containsKey('co19')) { |
77 queue.addTestSuite(new Co19TestSuite(conf)); | 77 queue.addTestSuite(new Co19TestSuite(conf)); |
78 } | 78 } |
79 if (selectors.containsKey('language')) { | |
80 queue.addTestSuite(new LanguageTestSuite(conf)); | |
81 } | |
82 if (selectors.containsKey('lib')) { | 79 if (selectors.containsKey('lib')) { |
83 queue.addTestSuite(new LibTestSuite(conf)); | 80 queue.addTestSuite(new LibTestSuite(conf)); |
84 } | 81 } |
85 if (selectors.containsKey('utils')) { | 82 if (selectors.containsKey('utils')) { |
86 queue.addTestSuite(new UtilsTestSuite(conf)); | 83 queue.addTestSuite(new UtilsTestSuite(conf)); |
87 } | 84 } |
88 if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) { | 85 if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) { |
89 queue.addTestSuite(new VMTestSuite(conf)); | 86 queue.addTestSuite(new VMTestSuite(conf)); |
90 queue.addTestSuite(new VMDartTestSuite(conf)); | 87 queue.addTestSuite(new VMDartTestSuite(conf)); |
91 } | 88 } |
(...skipping 12 matching lines...) Expand all Loading... |
104 // Start process queue. | 101 // Start process queue. |
105 var queue = new ProcessQueue(maxProcesses, | 102 var queue = new ProcessQueue(maxProcesses, |
106 progressIndicator, | 103 progressIndicator, |
107 startTime, | 104 startTime, |
108 printTiming, | 105 printTiming, |
109 enqueueConfiguration, | 106 enqueueConfiguration, |
110 verbose, | 107 verbose, |
111 listTests, | 108 listTests, |
112 keepGeneratedTests); | 109 keepGeneratedTests); |
113 } | 110 } |
OLD | NEW |