| 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 /** | 6 /** |
| 7 * This file is the entrypoint of the dart test suite. This suite is used | 7 * This file is the entrypoint of the dart test suite. This suite is used |
| 8 * to test: | 8 * to test: |
| 9 * | 9 * |
| 10 * 1. the dart vm | 10 * 1. the dart vm |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 138 } |
| 139 | 139 |
| 140 for (String key in selectors.keys) { | 140 for (String key in selectors.keys) { |
| 141 if (key == 'co19') { | 141 if (key == 'co19') { |
| 142 testSuites.add(new Co19TestSuite(conf)); | 142 testSuites.add(new Co19TestSuite(conf)); |
| 143 } else if (conf['runtime'] == 'vm' && key == 'vm') { | 143 } else if (conf['runtime'] == 'vm' && key == 'vm') { |
| 144 // vm tests contain both cc tests (added here) and dart tests (added in | 144 // vm tests contain both cc tests (added here) and dart tests (added in |
| 145 // [TEST_SUITE_DIRECTORIES]). | 145 // [TEST_SUITE_DIRECTORIES]). |
| 146 testSuites.add(new VMTestSuite(conf)); | 146 testSuites.add(new VMTestSuite(conf)); |
| 147 } else if (conf['analyzer']) { | 147 } else if (conf['analyzer']) { |
| 148 if (key == 'dartc') { | 148 if (key == 'dartc' && conf['compiler'] == 'dartc') { |
| 149 testSuites.add(new JUnitDartcTestSuite(conf)); |
| 150 } |
| 151 // TODO(devoncarew): get these running with the new analyzer |
| 152 if (key == 'dartc' && conf['compiler'] == 'dartc') { |
| 149 testSuites.add(new SamplesDartcTestSuite(conf)); | 153 testSuites.add(new SamplesDartcTestSuite(conf)); |
| 150 testSuites.add(new JUnitDartcTestSuite(conf)); | |
| 151 } | 154 } |
| 152 if (key == 'analyze_library') { | 155 if (key == 'analyze_library') { |
| 153 testSuites.add(new AnalyzeLibraryTestSuite(conf)); | 156 testSuites.add(new AnalyzeLibraryTestSuite(conf)); |
| 154 } | 157 } |
| 155 } | 158 } |
| 156 } | 159 } |
| 157 | 160 |
| 158 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { | 161 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { |
| 159 final name = testSuiteDir.filename; | 162 final name = testSuiteDir.filename; |
| 160 if (selectors.containsKey(name)) { | 163 if (selectors.containsKey(name)) { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 // Start process queue. | 209 // Start process queue. |
| 207 new ProcessQueue(maxProcesses, | 210 new ProcessQueue(maxProcesses, |
| 208 maxBrowserProcesses, | 211 maxBrowserProcesses, |
| 209 startTime, | 212 startTime, |
| 210 testSuites, | 213 testSuites, |
| 211 eventListener, | 214 eventListener, |
| 212 allTestsFinished, | 215 allTestsFinished, |
| 213 verbose, | 216 verbose, |
| 214 listTests); | 217 listTests); |
| 215 } | 218 } |
| OLD | NEW |