Chromium Code Reviews| Index: tools/testing/dart/test_options.dart |
| =================================================================== |
| --- tools/testing/dart/test_options.dart (revision 13840) |
| +++ tools/testing/dart/test_options.dart (working copy) |
| @@ -74,7 +74,7 @@ |
| dart2js: Compile dart code to JavaScript by running dart2js. |
| (only valid with the following runtimes: d8, drt, chrome, |
| - safari, ie9, firefox, opera, none (compile only)), |
| + safari, ie9, ie10, firefox, opera, none (compile only)), |
| dartc: Perform static analysis on Dart code by running dartc. |
| (only valid with the following runtimes: none)''', |
| @@ -95,14 +95,14 @@ |
| dartium: Run Dart or JavaScript in Dartium. |
| - [ff | chrome | safari | ie9 | opera]: Run JavaScript in the specified |
| + [ff | chrome | safari | ie9 | ie10 | opera]: Run JavaScript in the specified |
| browser. |
| none: No runtime, compile only (for example, used for dartc static analysis |
| tests).''', |
| ['-r', '--runtime'], |
| ['vm', 'd8', 'jsshell', 'drt', 'dartium', 'ff', 'firefox', |
| - 'chrome', 'safari', 'ie9', 'opera', 'none'], |
| + 'chrome', 'safari', 'ie9', 'ie10', 'opera', 'none'], |
| 'vm'), |
| new _TestOptionSpecification( |
| 'arch', |
| @@ -398,7 +398,8 @@ |
| // dart2js_drt will be duplicating work. If later we don't need 'none' |
| // with dart2js, we should remove it from here. |
| validRuntimes = const ['d8', 'jsshell', 'drt', 'none', 'dartium', |
| - 'ff', 'chrome', 'safari', 'ie9', 'opera']; |
| + 'ff', 'chrome', 'safari', 'ie9', 'ie10', |
| + 'opera']; |
| break; |
| case 'dartc': |
| validRuntimes = const ['none']; |
| @@ -413,7 +414,7 @@ |
| print("Warning: combination of ${config['compiler']} and " |
| "${config['runtime']} is invalid. Skipping this combination."); |
| } |
| - if (config['runtime'] == 'ie9' && |
| + if ((config['runtime'] == 'ie9' || config['runtime'] == 'ie10') && |
| Platform.operatingSystem != 'windows') { |
| isValid = false; |
| print("Warning cannot run Internet Explorer on non-Windows operating" |
| @@ -560,7 +561,8 @@ |
| timeout *= 2; |
| } |
| if (Contains(configuration['runtime'], |
| - const ['ie9', 'ff', 'chrome', 'safari', 'opera'])) { |
| + const ['ie9', 'ie10', 'ff', 'chrome', 'safari', |
| + 'opera'])) { |
|
ricow1
2012/10/22 10:37:15
I would indent this under 'ie9'
|
| timeout *= 8; // Allow additional time for browser testing to run. |
| } |
| break; |