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

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

Issue 25876002: test.py: Propagate the global --dartium option to the browser controller (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 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/dart/utils.dart » ('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 64a495f359a14c1743243c8e67f9af61a0b46114..ac6e72aabc454d035676c3b7969472c7fafb048a 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -909,8 +909,8 @@ class StandardTestSuite extends TestSuite {
crossOriginPort = configuration['_servers_'].crossOriginPort;
}
- var local_ip = configuration['local_ip'];
- var url= 'http://$local_ip:$serverPort$pathComponent'
+ var localIp = configuration['local_ip'];
+ var url= 'http://$localIp:$serverPort$pathComponent'
'?crossOriginPort=$crossOriginPort';
if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
url= '${url}&group=${subtestNames[subtestIndex]}';
@@ -1135,7 +1135,8 @@ class StandardTestSuite extends TestSuite {
'--timeout=${configuration['timeout']}',
'--out=$fullHtmlPath'];
if (runtime == 'dartium') {
- args.add('--executable=$dartiumFilename');
+ var dartiumLocation = Locations.getDartiumLocation(configuration);
+ args.add('--executable=$dartiumLocation');
}
if (subtestIndex != 0) {
args.add('--force-refresh');
@@ -1308,17 +1309,6 @@ class StandardTestSuite extends TestSuite {
return dartDir.append('client/tests/drt/content_shell').toNativePath();
}
- String get dartiumFilename {
- if (configuration['dartium'] != '') {
- return configuration['dartium'];
- }
- if (Platform.operatingSystem == 'macos') {
- return dartDir.append('client/tests/dartium/Chromium.app/Contents/'
- 'MacOS/Chromium').toNativePath();
- }
- return dartDir.append('client/tests/dartium/chrome').toNativePath();
- }
-
List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) {
List args = TestUtils.standardOptions(configuration);
« no previous file with comments | « tools/testing/dart/test_runner.dart ('k') | tools/testing/dart/utils.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698