Kernel: fix -c dartkp -r dart_precompiled testing configuration.

Pass full snapshot path to the dart_precompiled_runtime executable.

BUG=
R=kustermann@google.com

Review URL: https://codereview.chromium.org/2517243004 .
This commit is contained in:
Vyacheslav Egorov 2016-11-22 19:34:58 +01:00
parent 4fea218f77
commit 2cb8640ac1

View file

@ -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);
}
}