- Add getters for the current packageRoot or packageMap.

pkg/analysis_server/test/integration/integration_tests.dart

Index: pkg/analysis_server/test/integration/integration_tests.dart
diff --git a/pkg/analysis_server/test/integration/integration_tests.dart b/pkg/analysis_server/test/integration/integration_tests.dart
index 08fb56d02234d4b67b2697f29549d6e479f0dad9..9c91bffb212f970f8cb710c4968a3115cb17b022 100644
--- a/pkg/analysis_server/test/integration/integration_tests.dart
+++ b/pkg/analysis_server/test/integration/integration_tests.dart
@@ -598,7 +598,7 @@ class Server {
       int diagnosticPort,
       bool profileServer: false,
       bool newTaskModel: false,
-      bool useAnalysisHighlight2: false}) {
+      bool useAnalysisHighlight2: false}) async {
     if (_process != null) {
       throw new Exception('Process already started');
     }
@@ -615,8 +615,9 @@ class Server {
       arguments.add('--observe');
       arguments.add('--pause-isolates-on-exit');
     }
-    if (Platform.packageRoot.isNotEmpty) {
-      arguments.add('--package-root=${Platform.packageRoot}');
+    Uri packageRoot = await Platform.packageRoot;
+    if (packageRoot != null) {
+      arguments.add('--package-root=${packageRoot.toFilePath()}');
     }

[Lasse Reichstein Nielsen, 2015/09/22 09:48:25]

Add a TODO to support --packages as well.

     arguments.add('--checked');
     arguments.add(serverPath);
@@ -630,15 +631,16 @@ class Server {
     if (newTaskModel) {
       arguments.add('--${analysisServer.Driver.ENABLE_NEW_TASK_MODEL}');
     }
-    return Process.start(dartBinary, arguments).then((Process process) {
-      _process = process;
-      process.exitCode.then((int code) {
-        _recordStdio('TERMINATED WITH EXIT CODE $code');
-        if (code != 0) {
-          _badDataFromServer();
-        }
-      });
+    _process = await Process.start(dartBinary, arguments);
+    _process.exitCode.then((int code) {

[Lasse Reichstein Nielsen, 2015/09/22 09:48:25]

Tricky. They should consider documenting that this is not waiting for the .then
call here.

+      _recordStdio('TERMINATED WITH EXIT CODE $code');
+      if (code != 0) {
+        _badDataFromServer();
+      }
     });
+    // Complete this function with no value, but signalling that the server
+    // process has started.
+    return null;
   }
 
   /**