Chromium Code Reviews| 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 /** | 5 /** |
| 6 * Classes and methods for enumerating and preparing tests. | 6 * Classes and methods for enumerating and preparing tests. |
| 7 * | 7 * |
| 8 * This library includes: | 8 * This library includes: |
| 9 * | 9 * |
| 10 * - Creating tests by listing all the Dart files in certain directories, | 10 * - Creating tests by listing all the Dart files in certain directories, |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 176 var suffix = getExecutableSuffix(configuration['compiler']); | 176 var suffix = getExecutableSuffix(configuration['compiler']); |
| 177 switch (configuration['compiler']) { | 177 switch (configuration['compiler']) { |
| 178 case 'none': | 178 case 'none': |
| 179 if (useSdk) { | 179 if (useSdk) { |
| 180 return '$buildDir/dart-sdk/bin/dart$suffix'; | 180 return '$buildDir/dart-sdk/bin/dart$suffix'; |
| 181 } | 181 } |
| 182 return '$buildDir/dart$suffix'; | 182 return '$buildDir/dart$suffix'; |
| 183 case 'dartc': | 183 case 'dartc': |
| 184 return '$buildDir/analyzer/bin/dart_analyzer$suffix'; | 184 return '$buildDir/analyzer/bin/dart_analyzer$suffix'; |
| 185 case 'new_analyzer': | 185 case 'new_analyzer': |
| 186 var prefix = 'sdk/bin/'; | 186 var prefix = 'sdk/bin'; |
| 187 return '$prefix/analyzer$suffix'; | 187 return '$prefix/analyzer$suffix'; |
| 188 default: | 188 default: |
| 189 throw "Unknown executable for: ${configuration['compiler']}"; | 189 throw "Unknown executable for: ${configuration['compiler']}"; |
| 190 } | 190 } |
| 191 } | 191 } |
| 192 | 192 |
| 193 /** | 193 /** |
| 194 * The file name of the d8 executable. | 194 * The file name of the d8 executable. |
| 195 */ | 195 */ |
| 196 String get d8FileName { | 196 String get d8FileName { |
| (...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1223 | 1223 |
| 1224 List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) { | 1224 List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) { |
| 1225 List args = TestUtils.standardOptions(configuration); | 1225 List args = TestUtils.standardOptions(configuration); |
| 1226 | 1226 |
| 1227 String packageRoot = packageRootArgument(optionsFromFile['packageRoot']); | 1227 String packageRoot = packageRootArgument(optionsFromFile['packageRoot']); |
| 1228 if (packageRoot != null) { | 1228 if (packageRoot != null) { |
| 1229 args.add(packageRoot); | 1229 args.add(packageRoot); |
| 1230 } | 1230 } |
| 1231 args.addAll(additionalOptions(filePath)); | 1231 args.addAll(additionalOptions(filePath)); |
| 1232 if (configuration['analyzer']) { | 1232 if (configuration['analyzer']) { |
| 1233 args.add('--error_format'); | 1233 args.add('--machine'); |
|
ricow1
2013/03/13 07:06:05
This will remove the --error_format from dartc - i
devoncarew
2013/03/13 17:04:50
I actually added support for --machine to both dar
| |
| 1234 args.add('machine'); | |
| 1235 } | 1234 } |
| 1236 | 1235 |
| 1237 bool isMultitest = optionsFromFile["isMultitest"]; | 1236 bool isMultitest = optionsFromFile["isMultitest"]; |
| 1238 List<String> dartOptions = optionsFromFile["dartOptions"]; | 1237 List<String> dartOptions = optionsFromFile["dartOptions"]; |
| 1239 List<List<String>> vmOptionsList = getVmOptions(optionsFromFile); | 1238 List<List<String>> vmOptionsList = getVmOptions(optionsFromFile); |
| 1240 Expect.isTrue(!isMultitest || dartOptions == null); | 1239 Expect.isTrue(!isMultitest || dartOptions == null); |
| 1241 if (dartOptions == null) { | 1240 if (dartOptions == null) { |
| 1242 args.add(filePath.toNativePath()); | 1241 args.add(filePath.toNativePath()); |
| 1243 } else { | 1242 } else { |
| 1244 var executable_name = dartOptions[0]; | 1243 var executable_name = dartOptions[0]; |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1961 * $pass tests are expected to pass | 1960 * $pass tests are expected to pass |
| 1962 * $failOk tests are expected to fail that we won't fix | 1961 * $failOk tests are expected to fail that we won't fix |
| 1963 * $fail tests are expected to fail that we should fix | 1962 * $fail tests are expected to fail that we should fix |
| 1964 * $crash tests are expected to crash that we should fix | 1963 * $crash tests are expected to crash that we should fix |
| 1965 * $timeout tests are allowed to timeout | 1964 * $timeout tests are allowed to timeout |
| 1966 * $compileErrorSkip tests are skipped on browsers due to compile-time error | 1965 * $compileErrorSkip tests are skipped on browsers due to compile-time error |
| 1967 """; | 1966 """; |
| 1968 print(report); | 1967 print(report); |
| 1969 } | 1968 } |
| 1970 } | 1969 } |
| OLD | NEW |