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 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]).
       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);
 }