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

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

Issue 9146049: Test.dart running browser tests on Windows! (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 8 years, 11 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 | « client/tools/buildbot_annotated_steps.py ('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
===================================================================
--- tools/testing/dart/test_suite.dart (revision 3583)
+++ tools/testing/dart/test_suite.dart (working copy)
@@ -470,14 +470,15 @@
String executable = getFilename(dumpRenderTreeFilename);
List<String> args;
if (component == 'webdriver') {
- executable = '$dartDir/tools/testing/run_selenium.py';
+ executable = 'python';
if (new Platform().operatingSystem() == 'windows') {
// For Windows, the first command, must have the Windows
// slash direction.
// TODO(efortuna): Get rid of this hack when issue 1306 is fixed.
executable = executable.replaceAll('/', '\\');
}
- args = ['--out=$htmlPath', '--browser=${configuration["browser"]}'];
+ args = ['$dartDir/tools/testing/run_selenium.py', '--out=$htmlPath',
+ '--browser=${configuration["browser"]}'];
} else {
args = ['--no-timeout'];
if (component == 'dartium') {
@@ -899,35 +900,43 @@
class TestUtils {
- static String get executableSuffix() =>
- (new Platform().operatingSystem() == 'windows') ? '.exe' : '';
+ static String executableSuffix(String component) {
+ if (new Platform().operatingSystem() == 'windows') {
+ if (component != 'frogium' && component != 'webdriver') {
+ return '.exe';
+ } else {
+ return '.bat';
+ }
+ }
+ return '';
+ }
static String executableName(Map configuration) {
- String postfix = executableSuffix;
+ String suffix = executableSuffix(configuration['component']);
switch (configuration['component']) {
case 'vm':
- return 'dart$postfix';
+ return 'dart$suffix';
case 'dartc':
- return 'compiler/bin/dartc_test$postfix';
+ return 'compiler/bin/dartc_test$suffix';
case 'frog':
case 'leg':
- return 'frog/bin/frog$postfix';
+ return 'frog/bin/frog$suffix';
case 'frogsh':
- return 'frog/bin/frogsh';
+ return 'frog/bin/frogsh$suffix';
default:
throw "Unknown executable for: ${configuration['component']}";
}
}
static String compilerName(Map configuration) {
- String postfix = executableSuffix;
+ String suffix = executableSuffix(configuration['component']);
switch (configuration['component']) {
case 'chromium':
case 'dartc':
- return 'compiler/bin/dartc$postfix';
+ return 'compiler/bin/dartc$suffix';
case 'frogium':
case 'webdriver':
- return 'frog/bin/frogsh';
+ return 'frog/bin/frogsh$suffix';
default:
throw "Unknown compiler for: ${configuration['component']}";
}
« no previous file with comments | « client/tools/buildbot_annotated_steps.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698