Support multiple resolution inputs from command line.

tests/compiler/dart2js/serialization/helper.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.serialization_helper;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:compiler/src/commandline_options.dart';
@@ skipping 63 matching lines @@
     int first = start ?? 0;
     int last = end ?? tests.length - 1;
     for (int index = first; index <= last; index++) {
       Test test = TESTS[index];
       await f(index, test);
     }
   }
 }
 
 
-Future<String> serializeDartCore(
+Future<SerializedData> serializeDartCore(
     {Arguments arguments: const Arguments()}) async {
+  Uri uri = Uri.parse('memory:${arguments.serializedDataFileName}');
   print('------------------------------------------------------------------');
   print('serialize dart:core');
   print('------------------------------------------------------------------');
-  String serializedData;
+  SerializedData serializedData;
   if (arguments.loadSerializedData) {
     File file = new File(arguments.serializedDataFileName);
     if (file.existsSync()) {
       print('Loading data from $file');
-      serializedData = file.readAsStringSync();
+      serializedData = new SerializedData(uri, file.readAsStringSync());
     }
   }
   if (serializedData == null) {
     Compiler compiler = compilerFor(
         options: [Flags.analyzeAll]);
     compiler.serialization.supportSerialization = true;
     await compiler.run(Uris.dart_core);
     BufferedEventSink sink = new BufferedEventSink();
     compiler.serialization.serializeToSink(
         sink, compiler.libraryLoader.libraries);
-    serializedData = sink.text;
+    serializedData = new SerializedData(uri, sink.text);
     if (arguments.saveSerializedData) {
       File file = new File(arguments.serializedDataFileName);
       print('Saving data to $file');
-      file.writeAsStringSync(serializedData);
+      file.writeAsStringSync(serializedData.data);
     }
   }
   return serializedData;
 }
+
+class SerializedData {
+  final Uri uri;
+  final String data;
+
+  SerializedData(this.uri, this.data);
+
+  Map<String, String> toMemorySourceFiles([Map<String, String> input]) {
+    Map<String, String> sourceFiles = <String, String>{};
+    if (input != null) {
+      sourceFiles.addAll(input);
+    }
+    expandMemorySourceFiles(sourceFiles);
+    return sourceFiles;
+  }
+
+  void expandMemorySourceFiles(Map<String, String> sourceFiles) {

[Siggi Cherem (dart-lang), 2016/05/24 18:08:15]

are these expand methods used anywhere else? if not, consider inlining them.

[Johnni Winther, 2016/05/25 07:54:46]

They are used in library_test.

+    if (uri.scheme == 'memory') {
+      sourceFiles[uri.path] = data;
+    }
+  }
+
+  List<Uri> toUris([List<Uri> input]) {
+    List<Uri> uris = <Uri>[];
+    if (input != null) {
+      uris.addAll(input);
+    }
+    expandUris(uris);
+    return uris;
+  }
+
+  void expandUris(List<Uri> uris) {
+    uris.add(uri);
+  }
+}