Chromium Code Reviews| Index: tools/testing/dart/test_suite.dart |
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart |
| index ea5fdf0dddc785f33f619f92ee43b0c2b13942e4..a33b17c2c5dcab1e51f41c76470ac76639d57ee5 100644 |
| --- a/tools/testing/dart/test_suite.dart |
| +++ b/tools/testing/dart/test_suite.dart |
| @@ -666,6 +666,11 @@ class StandardTestSuite implements TestSuite { |
| default: |
| Expect.fail('unimplemented compiler $compiler'); |
| } |
| + if (executable.endsWith('.dart')) { |
| + // Run the compiler script via the Dart VM. |
| + args.insertRange(0, 1, executable); |
| + executable = TestUtils.dartShellFileName(configuration); |
| + } |
| return new Command(executable, args); |
| } |
| @@ -1257,7 +1262,10 @@ class TestUtils { |
| } |
| static String dartShellFileName(Map configuration) { |
| - var name = '${buildDir(configuration)}/${executableName(configuration)}'; |
| + var name = configuration['shell']; |
| + if (name == '') { |
| + name = '${buildDir(configuration)}/${executableName(configuration)}'; |
|
Bill Hesse
2012/04/24 09:28:25
The real problem is that the buildDir is not corre
vsm
2012/04/24 16:05:57
It's a little more complicated than that. In an a
|
| + } |
| if (!(new File(name)).existsSync() && !configuration['list']) { |
| throw "Executable '$name' does not exist"; |
| } |