| 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 18 matching lines...) Expand all Loading... |
| 29 import "testing/dart/test_options.dart"; | 29 import "testing/dart/test_options.dart"; |
| 30 import "testing/dart/test_suite.dart"; | 30 import "testing/dart/test_suite.dart"; |
| 31 import "testing/dart/test_progress.dart"; | 31 import "testing/dart/test_progress.dart"; |
| 32 import "testing/dart/http_server.dart"; | 32 import "testing/dart/http_server.dart"; |
| 33 import "testing/dart/utils.dart"; | 33 import "testing/dart/utils.dart"; |
| 34 | 34 |
| 35 import "../compiler/tests/dartc/test_config.dart"; | 35 import "../compiler/tests/dartc/test_config.dart"; |
| 36 import "../runtime/tests/vm/test_config.dart"; | 36 import "../runtime/tests/vm/test_config.dart"; |
| 37 import "../samples/tests/dartc/test_config.dart"; | 37 import "../samples/tests/dartc/test_config.dart"; |
| 38 import "../tests/co19/test_config.dart"; | 38 import "../tests/co19/test_config.dart"; |
| 39 import "../tests/lib/analyzer/test_config.dart"; |
| 39 | 40 |
| 40 /** | 41 /** |
| 41 * The directories that contain test suites which follow the conventions | 42 * The directories that contain test suites which follow the conventions |
| 42 * required by [StandardTestSuite]'s forDirectory constructor. | 43 * required by [StandardTestSuite]'s forDirectory constructor. |
| 43 * New test suites should follow this convention because it makes it much | 44 * New test suites should follow this convention because it makes it much |
| 44 * simpler to add them to test.dart. Existing test suites should be | 45 * simpler to add them to test.dart. Existing test suites should be |
| 45 * moved to here, if possible. | 46 * moved to here, if possible. |
| 46 */ | 47 */ |
| 47 final TEST_SUITE_DIRECTORIES = [ | 48 final TEST_SUITE_DIRECTORIES = [ |
| 48 new Path('pkg'), | 49 new Path('pkg'), |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 maxBrowserProcesses = 1; | 137 maxBrowserProcesses = 1; |
| 137 } | 138 } |
| 138 | 139 |
| 139 for (String key in selectors.keys) { | 140 for (String key in selectors.keys) { |
| 140 if (key == 'co19') { | 141 if (key == 'co19') { |
| 141 testSuites.add(new Co19TestSuite(conf)); | 142 testSuites.add(new Co19TestSuite(conf)); |
| 142 } else if (conf['runtime'] == 'vm' && key == 'vm') { | 143 } else if (conf['runtime'] == 'vm' && key == 'vm') { |
| 143 // 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 |
| 144 // [TEST_SUITE_DIRECTORIES]). | 145 // [TEST_SUITE_DIRECTORIES]). |
| 145 testSuites.add(new VMTestSuite(conf)); | 146 testSuites.add(new VMTestSuite(conf)); |
| 146 } else if (conf['compiler'] == 'dartc' && key == 'dartc') { | 147 } else if (conf['compiler'] == 'dartc') { |
| 147 testSuites.add(new SamplesDartcTestSuite(conf)); | 148 if (key == 'dartc') { |
| 148 testSuites.add(new JUnitDartcTestSuite(conf)); | 149 testSuites.add(new SamplesDartcTestSuite(conf)); |
| 150 testSuites.add(new JUnitDartcTestSuite(conf)); |
| 151 } |
| 152 if (key == 'analyze_library') { |
| 153 testSuites.add(new AnalyzeLibraryTestSuite(conf)); |
| 154 } |
| 149 } | 155 } |
| 150 } | 156 } |
| 151 | 157 |
| 152 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { | 158 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { |
| 153 final name = testSuiteDir.filename; | 159 final name = testSuiteDir.filename; |
| 154 if (selectors.containsKey(name)) { | 160 if (selectors.containsKey(name)) { |
| 155 testSuites.add( | 161 testSuites.add( |
| 156 new StandardTestSuite.forDirectory(conf, testSuiteDir)); | 162 new StandardTestSuite.forDirectory(conf, testSuiteDir)); |
| 157 } | 163 } |
| 158 } | 164 } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 171 new ProcessQueue(maxProcesses, | 177 new ProcessQueue(maxProcesses, |
| 172 maxBrowserProcesses, | 178 maxBrowserProcesses, |
| 173 progressIndicator, | 179 progressIndicator, |
| 174 startTime, | 180 startTime, |
| 175 printTiming, | 181 printTiming, |
| 176 testSuites, | 182 testSuites, |
| 177 allTestsFinished, | 183 allTestsFinished, |
| 178 verbose, | 184 verbose, |
| 179 listTests); | 185 listTests); |
| 180 } | 186 } |
| OLD | NEW |