Index: tests/compiler/dart2js/serialization/compilation_test.dart |
diff --git a/tests/compiler/dart2js/serialization/compilation_test.dart b/tests/compiler/dart2js/serialization/compilation_test.dart |
index 1ddde4c2b4289ad657fb38ba2c3ece99ff49dc91..595803ab6046c12a44aee17394e87c4f1e68ca5e 100644 |
--- a/tests/compiler/dart2js/serialization/compilation_test.dart |
+++ b/tests/compiler/dart2js/serialization/compilation_test.dart |
@@ -16,7 +16,8 @@ import '../output_collector.dart'; |
main(List<String> args) { |
asyncTest(() async { |
Arguments arguments = new Arguments.from(args); |
- String serializedData = await serializeDartCore(arguments: arguments); |
+ SerializedData serializedData = |
+ await serializeDartCore(arguments: arguments); |
if (arguments.filename != null) { |
Uri entryPoint = Uri.base.resolve(nativeToUriPath(arguments.filename)); |
await compile(serializedData, entryPoint, null); |
@@ -31,7 +32,7 @@ main(List<String> args) { |
}); |
} |
-Future compile(String serializedData, Uri entryPoint, Test test, |
+Future compile(SerializedData serializedData, Uri entryPoint, Test test, |
{int index, bool verbose: false}) async { |
String testDescription = |
test != null ? test.sourceFiles[entryPoint.path] : '${entryPoint}'; |
@@ -41,12 +42,11 @@ Future compile(String serializedData, Uri entryPoint, Test test, |
OutputCollector outputCollector = new OutputCollector(); |
await runCompiler( |
entryPoint: entryPoint, |
- memorySourceFiles: test != null ? test.sourceFiles : const {}, |
+ resolutionInputs: serializedData.toUris(), |
+ memorySourceFiles: serializedData.toMemorySourceFiles( |
+ test != null ? test.sourceFiles : null), |
options: [], |
- outputProvider: outputCollector, |
- beforeRun: (Compiler compiler) { |
- compiler.serialization.deserializeFromText(serializedData); |
- }); |
+ outputProvider: outputCollector); |
if (verbose) { |
print(outputCollector.getOutput('', 'js')); |
} |