Start two http servers for every configuration

tools/test-runtime.dart

Index: tools/test-runtime.dart
diff --git a/tools/test-runtime.dart b/tools/test-runtime.dart
index 32e4e074eeaffff9263c39e3381f51960326d07b..b76ec68e4d29d46bfa729f4206285bd48d8883fd 100755
--- a/tools/test-runtime.dart
+++ b/tools/test-runtime.dart
@@ -73,12 +73,21 @@ main() {
   }
 
   var testSuites = new List<TestSuite>();

[Emily Fortuna, 2013/02/22 17:45:30]

the value of runningBrowserTests is no longer defined in this file (in test.dart
you define it on line 112. probably should be added somewhere in this file as
well? 

[kustermann, 2013/02/22 18:16:38]

Thanks for catching that.

-  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', 9876);

[Emily Fortuna, 2013/02/22 17:45:30]

we can get rid of the 9876 argument, since we can start on whatever port is
available now.

[kustermann, 2013/02/22 18:16:38]

Well, I didn't know why this magic number was here, so I kept it. But I can
remove it.

[Emily Fortuna, 2013/02/22 18:42:51]

The magic number was there from when Mads originally added the test server, he
had "special" ports that it would always use. Not sure why we have this logic in
this file anyway, seeing as it's only running for the VM in which case having a
server isn't necessary....

+      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]).
@@ -93,15 +102,13 @@ main() {
     }
   }
 
-  // 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;
@@ -114,7 +121,7 @@ main() {
       startTime,
       printTiming,
       testSuites,
-      () => TestingServerRunner.terminateHttpServers(),
+      allTestsFinished,
       verbose,
       listTests);
 }