Chromium Code Reviews| 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"; |
| } |