Index: tools/testing/dart/test_suite.dart |
=================================================================== |
--- tools/testing/dart/test_suite.dart (revision 13713) |
+++ tools/testing/dart/test_suite.dart (working copy) |
@@ -150,7 +150,8 @@ |
[new Command(runnerPath, args)], |
configuration, |
completeHandler, |
- expectations)); |
+ expectations, |
+ usesWebDriver: TestUtils.usesWebDriver)); |
} |
} |
@@ -452,7 +453,8 @@ |
completeHandler, |
expectations, |
isNegative: isNegative, |
- info: info)); |
+ info: info, |
+ usesWebDriver: TestUtils.usesWebDriver)); |
} |
} |
@@ -695,8 +697,7 @@ |
// Construct the command that executes the browser test |
List<String> args; |
- if (runtime == 'ie' || runtime == 'ff' || runtime == 'chrome' || |
- runtime == 'safari' || runtime == 'opera' || runtime == 'dartium') { |
+ if (TestUtils.usesWebDriver(runtime)) { |
args = [dartDir.append('tools/testing/run_selenium.py').toNativePath(), |
'--browser=$runtime', |
'--timeout=${configuration["timeout"] - 2}', |
@@ -1202,7 +1203,8 @@ |
[new Command('java', args)], |
updatedConfiguration, |
completeHandler, |
- new Set<String>.from([PASS]))); |
+ new Set<String>.from([PASS]), |
+ usesWebDriver: TestUtils.usesWebDriver)); |
doDone(); |
} |
@@ -1408,16 +1410,17 @@ |
return '$jsshellDir/$executable'; |
} |
- static bool isBrowserRuntime(String runtime) => Contains( |
- runtime, |
- const <String>['drt', |
- 'dartium', |
- 'ie', |
- 'safari', |
- 'opera', |
- 'chrome', |
- 'ff']); |
+ static bool usesWebDriver(String runtime) => Contains( |
+ runtime, const <String>['dartium', |
+ 'ie9', |
+ 'safari', |
+ 'opera', |
+ 'chrome', |
+ 'ff']); |
+ static bool isBrowserRuntime(String runtime) => |
+ runtime == 'drt' || TestUtils.usesWebDriver(runtime); |
+ |
static bool isJsCommandLineRuntime(String runtime) => |
Contains(runtime, const <String>['d8', 'jsshell']); |