Chromium Code Reviews| Index: tools/testing/dart/compiler_configuration.dart |
| diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart |
| index abe30edf891a2f69a6b255c832b1807be4fff949..e132bd5b5256bb2ea66d1c9d5fcff8dc73bb0409 100644 |
| --- a/tools/testing/dart/compiler_configuration.dart |
| +++ b/tools/testing/dart/compiler_configuration.dart |
| @@ -16,7 +16,11 @@ import 'test_runner.dart' show |
| CompilationCommand; |
| import 'test_suite.dart' show |
| - TestInformation; |
| + TestInformation, |
| + TestUtils; |
| + |
| +import 'utils.dart' show |
| + Path; |
| /// Grouping of a command with its expected result. |
| class CommandArtifact { |
| @@ -124,6 +128,7 @@ abstract class CompilerConfiguration { |
| List<String> computeRuntimeArguments( |
| RuntimeConfiguration runtimeConfiguration, |
| + String buildDir, |
| TestInformation info, |
| List<String> vmOptions, |
| List<String> sharedOptions, |
| @@ -148,6 +153,7 @@ class NoneCompilerConfiguration extends CompilerConfiguration { |
| List<String> computeRuntimeArguments( |
| RuntimeConfiguration runtimeConfiguration, |
| + String buildDir, |
| TestInformation info, |
| List<String> vmOptions, |
| List<String> sharedOptions, |
| @@ -176,7 +182,7 @@ class Dart2xCompilerConfiguration extends CompilerConfiguration { |
| isHostChecked: isHostChecked, useSdk: useSdk); |
| String computeCompilerPath(String buildDir) { |
| - var prefix = 'sdk/bin/'; |
| + var prefix = 'sdk/bin'; |
|
Bill Hesse
2014/03/05 15:04:41
This was causing a double /.
|
| String suffix = executableScriptSuffix; |
| if (isHostChecked) { |
| // The script dart2js_developer is not included in the |
| @@ -262,6 +268,21 @@ class Dart2jsCompilerConfiguration extends Dart2xCompilerConfiguration { |
| isCsp ? cspOutput : normalOutput, |
| 'application/javascript'); |
| } |
| + |
| + List<String> computeRuntimeArguments( |
| + RuntimeConfiguration runtimeConfiguration, |
| + String buildDir, |
| + TestInformation info, |
| + List<String> vmOptions, |
| + List<String> sharedOptions, |
| + List<String> originalArguments, |
| + CommandArtifact artifact) { |
| + Path sdk = useSdk ? new Path(buildDir).append('dart-sdk/'): |
| + TestUtils.dartDir().append('sdk/'); |
| + Path preambleDir = sdk.append('lib/_internal/lib/preambles/'); |
| + return runtimeConfiguration.dart2jsPreambles(preambleDir) |
| + ..add(artifact.filename); |
| + } |
| } |
| /// Configuration for dart2dart compiler. |
| @@ -298,6 +319,7 @@ class Dart2dartCompilerConfiguration extends Dart2xCompilerConfiguration { |
| List<String> computeRuntimeArguments( |
| RuntimeConfiguration runtimeConfiguration, |
| + String buildDir, |
| TestInformation info, |
| List<String> vmOptions, |
| List<String> sharedOptions, |
| @@ -352,6 +374,7 @@ class AnalyzerCompilerConfiguration extends CompilerConfiguration { |
| List<String> computeRuntimeArguments( |
| RuntimeConfiguration runtimeConfiguration, |
| + String buildDir, |
| TestInformation info, |
| List<String> vmOptions, |
| List<String> sharedOptions, |