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

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

Issue 9178022: Fix test.dart to have the same behavior as test.py for --frog and --froglib. (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 | « 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
===================================================================
--- tools/testing/dart/test_suite.dart (revision 3364)
+++ tools/testing/dart/test_suite.dart (working copy)
@@ -444,7 +444,11 @@
break;
case 'frogium':
case 'webdriver':
- compilerArgs.addAll(['--libdir=$dartDir/frog/lib',
+ String libdir = configuration['froglib'];
+ if (libdir == '') {
+ libdir = '$dartDir/frog/lib';
+ }
+ compilerArgs.addAll(['--libdir=$libdir',
'--compile-only',
'--out=$compiledDartWrapperFilename']);
compilerArgs.addAll(vmOptions);
@@ -462,6 +466,7 @@
String executable = getFilename(dumpRenderTreeFilename);
List<String> args;
if (component == 'webdriver') {
+ // TODO(efortuna): These paths are not OS independent!
executable = '$dartDir/tools/testing/run_selenium.py';
args = ['--out', htmlPath, '--browser', configuration['browser']];
} else {
@@ -928,7 +933,10 @@
if (configuration['component'] == 'dartium') {
return null; // No separate compiler for dartium tests.
}
- var name = '${buildDir(configuration)}/${compilerName(configuration)}';
+ var name = configuration['frog'];
Bill Hesse 2012/01/19 16:31:28 I don't think we want --frog to override the dartc
+ if (name == '') {
+ name = '${buildDir(configuration)}/${compilerName(configuration)}';
+ }
if (!(new File(name)).existsSync()) {
throw "Executable '$name' does not exist";
}
« 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