| 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 import 'dart:async'; | 5 import 'dart:async'; |
| 6 import 'dart:io'; | 6 import 'dart:io'; |
| 7 import 'dart:math' as math; | 7 import 'dart:math' as math; |
| 8 | 8 |
| 9 import 'android.dart'; | 9 import 'android.dart'; |
| 10 import 'browser_controller.dart'; | 10 import 'browser_controller.dart'; |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 var name = testSuiteDir.filename; | 172 var name = testSuiteDir.filename; |
| 173 if (configuration.selectors.containsKey(name)) { | 173 if (configuration.selectors.containsKey(name)) { |
| 174 testSuites.add( | 174 testSuites.add( |
| 175 new StandardTestSuite.forDirectory(configuration, testSuiteDir)); | 175 new StandardTestSuite.forDirectory(configuration, testSuiteDir)); |
| 176 } | 176 } |
| 177 } | 177 } |
| 178 | 178 |
| 179 for (var key in configuration.selectors.keys) { | 179 for (var key in configuration.selectors.keys) { |
| 180 if (key == 'co19') { | 180 if (key == 'co19') { |
| 181 testSuites.add(new Co19TestSuite(configuration)); | 181 testSuites.add(new Co19TestSuite(configuration)); |
| 182 } else if (configuration.compiler == Compiler.none && | 182 } else if ((configuration.compiler == Compiler.none || |
| 183 configuration.compiler == Compiler.dartk) && |
| 183 configuration.runtime == Runtime.vm && | 184 configuration.runtime == Runtime.vm && |
| 184 key == 'vm') { | 185 key == 'vm') { |
| 185 // vm tests contain both cc tests (added here) and dart tests (added | 186 // vm tests contain both cc tests (added here) and dart tests (added |
| 186 // in [TEST_SUITE_DIRECTORIES]). | 187 // in [TEST_SUITE_DIRECTORIES]). |
| 187 testSuites.add(new VMTestSuite(configuration)); | 188 testSuites.add(new VMTestSuite(configuration)); |
| 188 } else if (configuration.compiler == Compiler.dart2analyzer) { | 189 } else if (configuration.compiler == Compiler.dart2analyzer) { |
| 189 if (key == 'analyze_library') { | 190 if (key == 'analyze_library') { |
| 190 testSuites.add(new AnalyzeLibraryTestSuite(configuration)); | 191 testSuites.add(new AnalyzeLibraryTestSuite(configuration)); |
| 191 } | 192 } |
| 192 } | 193 } |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 maxBrowserProcesses, | 277 maxBrowserProcesses, |
| 277 startTime, | 278 startTime, |
| 278 testSuites, | 279 testSuites, |
| 279 eventListener, | 280 eventListener, |
| 280 allTestsFinished, | 281 allTestsFinished, |
| 281 verbose, | 282 verbose, |
| 282 recordingPath, | 283 recordingPath, |
| 283 replayPath, | 284 replayPath, |
| 284 adbDevicePool); | 285 adbDevicePool); |
| 285 } | 286 } |
| OLD | NEW |