Index: tools/testing/dart/compiler_configuration.dart |
diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart |
index f348318017c3756ac02c2279c18c7352861f2532..1568457662d1a24683225e374ab676641faa1532 100644 |
--- a/tools/testing/dart/compiler_configuration.dart |
+++ b/tools/testing/dart/compiler_configuration.dart |
@@ -304,8 +304,9 @@ class PipelineCommand { |
class ComposedCompilerConfiguration extends CompilerConfiguration { |
final List<PipelineCommand> pipelineCommands; |
+ final bool isPrecompiler; |
- ComposedCompilerConfiguration(this.pipelineCommands) |
+ ComposedCompilerConfiguration(this.pipelineCommands, {this.isPrecompiler: false}) |
: super._subclass(); |
CommandArtifact computeCompilationArtifact( |
@@ -354,7 +355,8 @@ class ComposedCompilerConfiguration extends CompilerConfiguration { |
List<String> sharedOptions, |
List<String> originalArguments, |
CommandArtifact artifact) { |
- return <String>[artifact.filename]; |
+ final String suffix = isPrecompiler ? "/out.aotsnapshot" : ""; |
+ return <String>["${artifact.filename}${suffix}"]; |
} |
static ComposedCompilerConfiguration createDartKPConfiguration( |
@@ -372,7 +374,7 @@ class ComposedCompilerConfiguration extends CompilerConfiguration { |
new PrecompilerCompilerConfiguration( |
arch: arch, useBlobs: useBlobs, isAndroid: isAndroid))); |
- return new ComposedCompilerConfiguration(nested); |
+ return new ComposedCompilerConfiguration(nested, isPrecompiler: true); |
} |
static ComposedCompilerConfiguration createDartKConfiguration( |
@@ -384,7 +386,7 @@ class ComposedCompilerConfiguration extends CompilerConfiguration { |
new DartKCompilerConfiguration(isHostChecked: isHostChecked, |
useSdk: useSdk))); |
- return new ComposedCompilerConfiguration(nested); |
+ return new ComposedCompilerConfiguration(nested, isPrecompiler: false); |
} |
} |