| OLD | NEW |
| 1 #!/usr/bin/env dart | 1 #!/usr/bin/env dart |
| 2 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 2 // Copyright (c) 2013, 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 18 matching lines...) Expand all Loading... |
| 29 import "dart:math" as math; | 29 import "dart:math" as math; |
| 30 import "testing/dart/browser_controller.dart"; | 30 import "testing/dart/browser_controller.dart"; |
| 31 import "testing/dart/http_server.dart"; | 31 import "testing/dart/http_server.dart"; |
| 32 import "testing/dart/record_and_replay.dart"; | 32 import "testing/dart/record_and_replay.dart"; |
| 33 import "testing/dart/test_options.dart"; | 33 import "testing/dart/test_options.dart"; |
| 34 import "testing/dart/test_progress.dart"; | 34 import "testing/dart/test_progress.dart"; |
| 35 import "testing/dart/test_runner.dart"; | 35 import "testing/dart/test_runner.dart"; |
| 36 import "testing/dart/test_suite.dart"; | 36 import "testing/dart/test_suite.dart"; |
| 37 import "testing/dart/utils.dart"; | 37 import "testing/dart/utils.dart"; |
| 38 | 38 |
| 39 import "../compiler/tests/dartc/test_config.dart"; | |
| 40 import "../runtime/tests/vm/test_config.dart"; | 39 import "../runtime/tests/vm/test_config.dart"; |
| 41 import "../samples/tests/dartc/test_config.dart"; | 40 import "../samples/tests/dartc/test_config.dart"; |
| 42 import "../tests/co19/test_config.dart"; | 41 import "../tests/co19/test_config.dart"; |
| 43 import "../tests/lib/analyzer/test_config.dart"; | 42 import "../tests/lib/analyzer/test_config.dart"; |
| 44 | 43 |
| 45 /** | 44 /** |
| 46 * The directories that contain test suites which follow the conventions | 45 * The directories that contain test suites which follow the conventions |
| 47 * required by [StandardTestSuite]'s forDirectory constructor. | 46 * required by [StandardTestSuite]'s forDirectory constructor. |
| 48 * New test suites should follow this convention because it makes it much | 47 * New test suites should follow this convention because it makes it much |
| 49 * simpler to add them to test.dart. Existing test suites should be | 48 * simpler to add them to test.dart. Existing test suites should be |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 } | 174 } |
| 176 | 175 |
| 177 for (String key in selectors.keys) { | 176 for (String key in selectors.keys) { |
| 178 if (key == 'co19') { | 177 if (key == 'co19') { |
| 179 testSuites.add(new Co19TestSuite(conf)); | 178 testSuites.add(new Co19TestSuite(conf)); |
| 180 } else if (conf['runtime'] == 'vm' && key == 'vm') { | 179 } else if (conf['runtime'] == 'vm' && key == 'vm') { |
| 181 // vm tests contain both cc tests (added here) and dart tests (added | 180 // vm tests contain both cc tests (added here) and dart tests (added |
| 182 // in [TEST_SUITE_DIRECTORIES]). | 181 // in [TEST_SUITE_DIRECTORIES]). |
| 183 testSuites.add(new VMTestSuite(conf)); | 182 testSuites.add(new VMTestSuite(conf)); |
| 184 } else if (conf['analyzer']) { | 183 } else if (conf['analyzer']) { |
| 185 if (key == 'dartc' && conf['compiler'] == 'dartc') { | |
| 186 testSuites.add(new JUnitDartcTestSuite(conf)); | |
| 187 } | |
| 188 // TODO(devoncarew): get these running with the new analyzer | |
| 189 if (key == 'dartc' && conf['compiler'] == 'dartc') { | |
| 190 testSuites.add(new SamplesDartcTestSuite(conf)); | |
| 191 } | |
| 192 if (key == 'analyze_library') { | 184 if (key == 'analyze_library') { |
| 193 testSuites.add(new AnalyzeLibraryTestSuite(conf)); | 185 testSuites.add(new AnalyzeLibraryTestSuite(conf)); |
| 194 } | 186 } |
| 195 if (key == 'analyze_tests') { | 187 if (key == 'analyze_tests') { |
| 196 testSuites.add(new AnalyzeTestsTestSuite(conf)); | 188 testSuites.add(new AnalyzeTestsTestSuite(conf)); |
| 197 } | 189 } |
| 198 } | 190 } |
| 199 } | 191 } |
| 200 | 192 |
| 201 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { | 193 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 void main() { | 304 void main() { |
| 313 deleteTemporaryDartDirectories().then((_) { | 305 deleteTemporaryDartDirectories().then((_) { |
| 314 var optionsParser = new TestOptionsParser(); | 306 var optionsParser = new TestOptionsParser(); |
| 315 var configurations = optionsParser.parse(new Options().arguments); | 307 var configurations = optionsParser.parse(new Options().arguments); |
| 316 if (configurations != null && configurations.length > 0) { | 308 if (configurations != null && configurations.length > 0) { |
| 317 testConfigurations(configurations); | 309 testConfigurations(configurations); |
| 318 } | 310 } |
| 319 }); | 311 }); |
| 320 } | 312 } |
| 321 | 313 |
| OLD | NEW |