Fix manual starting of test runner HTTP servers

tools/testing/dart/http_server.dart

 // Copyright (c) 2013, 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 http_server;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:uri';
@@ skipping 53 matching lines @@
         .directoryPath
         .join(new Path('../../test.dart'))
         .canonicalize()
         .toNativePath();
     var servers = new TestingServers(new Path(args['build-directory']),
                                      args['csp']);
     var port = int.parse(args['port']);
     var crossOriginPort = int.parse(args['crossOriginPort']);
     servers.startServers(args['network'],
                          port: port,
-                         crossOriginPort: crossOriginPort);
-    DebugLogger.info('Server listening on port ${servers.port}');
-    DebugLogger.info('Server listening on port ${servers.crossOriginPort}');
+                         crossOriginPort: crossOriginPort).then((_) {
+      DebugLogger.info('Server listening on port ${servers.port}');
+      DebugLogger.info('Server listening on port ${servers.crossOriginPort}');
+    });
   }
 }
 
 /**
  * Runs a set of servers that are initialized specifically for the needs of our
  * test framework, such as dealing with package-root.
  */
 class TestingServers {
   List _serverList = [];
   Path _buildDirectory = null;
   final bool useContentSecurityPolicy;
 
   TestingServers(Path buildDirectory, this.useContentSecurityPolicy) {
     _buildDirectory = TestUtils.absolutePath(buildDirectory);
   }
 
   int get port => _serverList[0].port;
   int get crossOriginPort => _serverList[1].port;
 
   /**
    * [startServers] will start two Http servers.
    * The first server listens on [port] and sets
    *   "Access-Control-Allow-Origin: *"
    * The second server listens on [crossOriginPort] and sets
    *   "Access-Control-Allow-Origin: client:port1
    *   "Access-Control-Allow-Credentials: true"
    */
   Future startServers(String host, {int port: 0, int crossOriginPort: 0}) {
-    return _startHttpServer(host, port: port).then((_) {
-      _startHttpServer(host,
-                       port: crossOriginPort,
-                       allowedPort:_serverList[0].port);
+    return _startHttpServer(host, port: port).then((server) {
+      return _startHttpServer(host,
+                              port: crossOriginPort,
+                              allowedPort:_serverList[0].port);
     });
   }
 
   String httpServerCommandline() {
     var dart = TestUtils.dartTestExecutable.toNativePath();
     var dartDir = TestUtils.dartDir();
     var script = dartDir.join(new Path("tools/testing/dart/http_server.dart"));
     var buildDirectory = _buildDirectory.toNativePath();
     var csp = useContentSecurityPolicy ? '--csp ' : '';
 
@@ skipping 212 matching lines @@
 class _Entry {
   final String name;
   final String displayName;
 
   _Entry(this.name, this.displayName);
 
   int compareTo(_Entry other) {
     return name.compareTo(other.name);
   }
 }