Start two http servers for every configuration

tools/test-runtime.dart

 #!/usr/bin/env dart
 // Copyright (c) 2012, 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.
 
 // TODO(ager): Get rid of this version of test.dart when we don't have
 // to worry about the special runtime checkout anymore.
 // This file is identical to test.dart with test suites in the
 // directories samples, client, compiler, and utils removed.
 
@@ skipping 54 matching lines @@
         ['Test configurations:'] : ['Test configuration:'];
     for (Map conf in configurations) {
       List settings = ['compiler', 'runtime', 'mode', 'arch']
           .mappedBy((name) => conf[name]).toList();
       if (conf['checked']) settings.add('checked');
       output_words.add(settings.join('_'));
     }
     print(output_words.join(' '));
   }
 
+  var runningBrowserTests = configurations.any((config) {
+    return TestUtils.isBrowserRuntime(config['runtime']);
+  });
+
   var testSuites = new List<TestSuite>();
-  TestingServerRunner.setBuildDir(firstConf);
-  TestingServerRunner.setPackageRootDir(firstConf);
   for (var conf in configurations) {
+    if (!listTests && runningBrowserTests) {
+      // Start global http servers that serve the entire dart repo.
+      // The http server is available on window.location.port, and a second 
+      // server for cross-domain tests can be found by calling
+      // getCrossOriginPortNumber().
+      var servers = new TestingServers(new Path(TestUtils.buildDir(conf)));
+      servers.startServers('127.0.0.1');
+      conf['_servers_'] = servers;
+    }
+
     if (selectors.containsKey('co19')) {
       testSuites.add(new Co19TestSuite(conf));
     }
+
     if (conf['runtime'] == 'vm' && selectors.containsKey('vm')) {
       // vm tests contain both cc tests (added here) and dart tests (added in
       // [TEST_SUITE_DIRECTORIES]).
       testSuites.add(new VMTestSuite(conf));
     }
 
     for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
       final name = testSuiteDir.filename;
       if (selectors.containsKey(name)) {
         testSuites.add(new StandardTestSuite.forDirectory(conf, testSuiteDir));
       }
     }
   }
 
-  // Start global http server that serves the entire dart repo.
-  // The http server is available on localhost:9876 for any
-  // test that needs to load resources from the repo over http.
-  if (!listTests) {
-    // Only start the server if we are running browser tests.
-    var runningBrowserTests = configurations.any((config) {
-      return TestUtils.isBrowserRuntime(config['runtime']);
-    });
-    if (runningBrowserTests) startHttpServer('127.0.0.1', 9876);
+  void allTestsFinished() {
+    for (var conf in configurations) {
+      if (conf.containsKey('_servers_')) {
+        conf['_servers_'].stopServers();
+      }
+    }
+    DebugLogger.close();
   }
 
   var maxBrowserProcesses = maxProcesses;
 
   // Start process queue.
   new ProcessQueue(
       maxProcesses,
       maxBrowserProcesses,
       progressIndicator,
       startTime,
       printTiming,
       testSuites,
-      () => TestingServerRunner.terminateHttpServers(),
+      allTestsFinished,
       verbose,
       listTests);
 }