| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test_configurations; | 5 library test_configurations; |
| 6 | 6 |
| 7 import "dart:async"; | 7 import "dart:async"; |
| 8 import 'dart:convert'; | 8 import 'dart:convert'; |
| 9 import 'dart:io'; | 9 import 'dart:io'; |
| 10 import "dart:math" as math; | 10 import "dart:math" as math; |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { | 192 for (final testSuiteDir in TEST_SUITE_DIRECTORIES) { |
| 193 final name = testSuiteDir.filename; | 193 final name = testSuiteDir.filename; |
| 194 if (selectors.containsKey(name)) { | 194 if (selectors.containsKey(name)) { |
| 195 testSuites | 195 testSuites |
| 196 .add(new StandardTestSuite.forDirectory(conf, testSuiteDir)); | 196 .add(new StandardTestSuite.forDirectory(conf, testSuiteDir)); |
| 197 } | 197 } |
| 198 } | 198 } |
| 199 for (String key in selectors.keys) { | 199 for (String key in selectors.keys) { |
| 200 if (key == 'co19') { | 200 if (key == 'co19') { |
| 201 testSuites.add(new Co19TestSuite(conf)); | 201 testSuites.add(new Co19TestSuite(conf)); |
| 202 } else if (conf['compiler'] == 'none' && | 202 } else if ((conf['compiler'] == 'dartk' || |
| 203 conf['compiler'] == 'none') && |
| 203 conf['runtime'] == 'vm' && | 204 conf['runtime'] == 'vm' && |
| 204 key == 'vm') { | 205 key == 'vm') { |
| 205 // vm tests contain both cc tests (added here) and dart tests (added | 206 // vm tests contain both cc tests (added here) and dart tests (added |
| 206 // in [TEST_SUITE_DIRECTORIES]). | 207 // in [TEST_SUITE_DIRECTORIES]). |
| 207 testSuites.add(new VMTestSuite(conf)); | 208 testSuites.add(new VMTestSuite(conf)); |
| 208 } else if (conf['analyzer']) { | 209 } else if (conf['analyzer']) { |
| 209 if (key == 'analyze_library') { | 210 if (key == 'analyze_library') { |
| 210 testSuites.add(new AnalyzeLibraryTestSuite(conf)); | 211 testSuites.add(new AnalyzeLibraryTestSuite(conf)); |
| 211 } | 212 } |
| 212 } | 213 } |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 maxBrowserProcesses, | 308 maxBrowserProcesses, |
| 308 startTime, | 309 startTime, |
| 309 testSuites, | 310 testSuites, |
| 310 eventListener, | 311 eventListener, |
| 311 allTestsFinished, | 312 allTestsFinished, |
| 312 verbose, | 313 verbose, |
| 313 recordingPath, | 314 recordingPath, |
| 314 recordingOutputPath, | 315 recordingOutputPath, |
| 315 adbDevicePool); | 316 adbDevicePool); |
| 316 } | 317 } |
| OLD | NEW |