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

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

Issue 10034002: Selenium / Dartium cleanup (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove string+ 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_options.dart ('k') | no next file » | 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 14669902daa209f3198e09d28cd37c9f9f2901cb..e5d1e733ca3d550bcdc25e56e4e57c9b0bb9861c 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -616,6 +616,9 @@ class StandardTestSuite implements TestSuite {
'--browser=$runtime',
'--timeout=${configuration["timeout"] - 2}',
'--out=$htmlPath'];
+ if (runtime == 'dartium') {
+ args.add('--executable=$dartiumFilename');
+ }
} else {
args = [
'$dartDir/tools/testing/drt-trampoline.py',
@@ -775,12 +778,23 @@ class StandardTestSuite implements TestSuite {
return configuration['drt'];
}
if (new Platform().operatingSystem() == 'macos') {
- return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/' +
+ return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/'
'MacOS/DumpRenderTree';
}
return '$dartDir/client/tests/drt/DumpRenderTree';
}
+ String get dartiumFilename() {
+ if (configuration['dartium'] != '') {
+ return configuration['dartium'];
+ }
+ if (new Platform().operatingSystem() == 'macos') {
+ return '$dartDir/client/tests/dartium/Chromium.app/Contents/'
+ 'MacOS/Chromium';
+ }
+ return '$dartDir/client/tests/dartium/chrome';
+ }
+
void testGeneratorStarted() {
++activeTestGenerators;
}
« no previous file with comments | « tools/testing/dart/test_options.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698