Chromium Code Reviews| Index: tools/testing/dart/runtime_configuration.dart |
| diff --git a/tools/testing/dart/runtime_configuration.dart b/tools/testing/dart/runtime_configuration.dart |
| index 8983cc5949d04f30da138b57a4c8853d740dfb85..78dd1202de91a614f75030598f8db42a7ec58022 100644 |
| --- a/tools/testing/dart/runtime_configuration.dart |
| +++ b/tools/testing/dart/runtime_configuration.dart |
| @@ -4,6 +4,8 @@ |
| library runtime_configuration; |
| +import 'dart:io' show Platform; |
| + |
| import 'compiler_configuration.dart' show CommandArtifact; |
| // TODO(ahe): Remove this import, we can precompute all the values required |
| @@ -244,16 +246,14 @@ class DartAppRuntimeConfiguration extends DartVmRuntimeConfiguration { |
| throw "dart_app cannot run files of type '$type'."; |
| } |
| - var augmentedArgs = new List(); |
| - augmentedArgs.add("--run-app-snapshot=${artifact.filename}"); |
| - if (useBlobs) { |
| - augmentedArgs.add("--use-blobs"); |
| - } |
| - augmentedArgs.addAll(arguments); |
| + var args = new List(); |
| + args.addAll(arguments); |
| + args.removeLast(); |
| + args.add("${artifact.filename}/out.jitsnapshot"); |
| return <Command>[ |
| commandBuilder.getVmCommand(suite.dartVmBinaryFileName, |
| - augmentedArgs, environmentOverrides) |
| + args, environmentOverrides) |
| ]; |
| } |
| } |
| @@ -274,16 +274,24 @@ class DartPrecompiledRuntimeConfiguration extends DartVmRuntimeConfiguration { |
| throw "dart_precompiled cannot run files of type '$type'."; |
| } |
| - var augmentedArgs = new List(); |
| - augmentedArgs.add("--run-app-snapshot=${artifact.filename}"); |
| + var args = new List(); |
| + args.addAll(arguments); |
| + args.removeLast(); |
| if (useBlobs) { |
| - augmentedArgs.add("--use-blobs"); |
| + args.add("${artifact.filename}/out.aotsnapshot"); |
| + } else { |
| + if (Platform.isLinux) { |
| + args.add("${artifact.filename}/libprecompiled.so"); |
| + } else if (Platform.isMacOS) { |
| + args.add("${artifact.filename}/libprecompiled.dylib"); |
|
siva
2016/10/12 20:37:33
if any name for the dynamic libraries work then we
|
| + } else { |
| + throw "Not implemented for ${Platform.name}"; |
| + } |
| } |
| - augmentedArgs.addAll(arguments); |
| return <Command>[ |
| commandBuilder.getVmCommand(suite.dartPrecompiledBinaryFileName, |
| - augmentedArgs, environmentOverrides) |
| + args, environmentOverrides) |
| ]; |
| } |
| } |