| Index: tools/testing/dart/compiler_configuration.dart
|
| diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
|
| index f0f8bc71c13b6bd3284ad13b9bf73a98e507bab4..b777fb7761ea07123118a9add9a49a0f1103f56e 100644
|
| --- a/tools/testing/dart/compiler_configuration.dart
|
| +++ b/tools/testing/dart/compiler_configuration.dart
|
| @@ -79,10 +79,9 @@ abstract class CompilerConfiguration {
|
| useFastStartup: useFastStartup,
|
| extraDart2jsOptions:
|
| TestUtils.getExtraOptions(configuration, 'dart2js_options'));
|
| - case 'dart2appjit':
|
| - case 'dart2app':
|
| + case 'app_jit':
|
| return new Dart2AppSnapshotCompilerConfiguration(
|
| - isDebug: isDebug, isChecked: isChecked, useBlobs: useBlobs);
|
| + isDebug: isDebug, isChecked: isChecked);
|
| case 'precompiler':
|
| return new PrecompilerCompilerConfiguration(
|
| isDebug: isDebug,
|
| @@ -701,9 +700,8 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
|
| }
|
|
|
| class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
|
| - final bool useBlobs;
|
| - Dart2AppSnapshotCompilerConfiguration({bool isDebug, bool isChecked, bool useBlobs})
|
| - : super._subclass(isDebug: isDebug, isChecked: isChecked), this.useBlobs = useBlobs;
|
| + Dart2AppSnapshotCompilerConfiguration({bool isDebug, bool isChecked})
|
| + : super._subclass(isDebug: isDebug, isChecked: isChecked);
|
|
|
| int computeTimeoutMultiplier() {
|
| int multiplier = 2;
|
| @@ -718,10 +716,11 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
|
| CommandBuilder commandBuilder,
|
| List arguments,
|
| Map<String, String> environmentOverrides) {
|
| + var snapshot = "$tempDir/out.jitsnapshot";
|
| return new CommandArtifact(<Command>[
|
| this.computeCompilationCommand(tempDir, buildDir,
|
| CommandBuilder.instance, arguments, environmentOverrides)
|
| - ], tempDir, 'application/dart-snapshot');
|
| + ], snapshot, 'application/dart-snapshot');
|
| }
|
|
|
| CompilationCommand computeCompilationCommand(
|
| @@ -732,15 +731,13 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
|
| Map<String, String> environmentOverrides) {
|
| var exec = "$buildDir/dart";
|
| var args = new List();
|
| - args.add("--snapshot=$tempDir/out.jitsnapshot");
|
| + var snapshot = "$tempDir/out.jitsnapshot";
|
| + args.add("--snapshot=$snapshot");
|
| args.add("--snapshot-kind=app-jit");
|
| - if (useBlobs) {
|
| - args.add("--use-blobs");
|
| - }
|
| args.addAll(arguments);
|
|
|
| return commandBuilder.getCompilationCommand(
|
| - 'dart2snapshot',
|
| + 'app_jit',
|
| tempDir,
|
| !useSdk,
|
| bootstrapDependencies(buildDir),
|
| @@ -775,10 +772,16 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
|
| args.add('--enable_asserts');
|
| args.add('--enable_type_checks');
|
| }
|
| - return args
|
| + args
|
| ..addAll(vmOptions)
|
| ..addAll(sharedOptions)
|
| ..addAll(originalArguments);
|
| + for (var i = 0; i < args.length; i++) {
|
| + if (args[i].endsWith(".dart")) {
|
| + args[i] = artifact.filename;
|
| + }
|
| + }
|
| + return args;
|
| }
|
| }
|
|
|
|
|