Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: tools/testing/dart/test_suite.dart

Issue 9960050: Add runtime=dartium webdriver support to test.dart (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comment Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/testing/dart/test_runner.dart ('k') | tools/testing/run_selenium.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 132ff1b85dad0f22741e126f955fec42be9ffaff..14669902daa209f3198e09d28cd37c9f9f2901cb 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -275,10 +275,12 @@ class StandardTestSuite implements TestSuite {
void forEachTest(Function onTest, Map testCache, String globalTempDir(),
[Function onDone = null]) {
- // If DumpRenderTree is required, and not yet updated, wait for update.
- if (configuration['runtime'] == 'drt' && !DumpRenderTreeUpdater.updated) {
- Expect.isTrue(DumpRenderTreeUpdater.isActive);
- DumpRenderTreeUpdater.onUpdated.add(() {
+ // If DumpRenderTree/Dartium is required, and not yet updated,
+ // wait for update.
+ var updater = runtimeUpdater(configuration['runtime']);
+ if (updater !== null && !updater.updated) {
+ Expect.isTrue(updater.isActive);
+ updater.onUpdated.add(() {
forEachTest(onTest, testCache, globalTempDir, onDone);
});
return;
@@ -558,7 +560,7 @@ class StandardTestSuite implements TestSuite {
}
htmlPath = '${tempDir.path}/../$htmlFilename';
}
- final String scriptPath = (compiler == 'none' && runtime == 'drt') ?
+ final String scriptPath = (compiler == 'none') ?
dartWrapperFilename : compiledDartWrapperFilename;
// Create the HTML file for the test.
RandomAccessFile htmlTest = new File(htmlPath).openSync(FileMode.WRITE);
@@ -609,7 +611,7 @@ class StandardTestSuite implements TestSuite {
// Construct the command that executes the browser test
List<String> args;
if (runtime == 'ie' || runtime == 'ff' || runtime == 'chrome' ||
- runtime == 'safari' || runtime == 'opera') {
+ runtime == 'safari' || runtime == 'opera' || runtime == 'dartium') {
args = ['$dartDir/tools/testing/run_selenium.py',
'--browser=$runtime',
'--timeout=${configuration["timeout"] - 2}',
@@ -1312,6 +1314,7 @@ class TestUtils {
static bool isBrowserRuntime(String runtime) =>
const <String>['drt',
+ 'dartium',
'ie',
'safari',
'opera',
« no previous file with comments | « tools/testing/dart/test_runner.dart ('k') | tools/testing/run_selenium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698