"Reverting 16675-16676, 71-73"

tools/test.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.
 
 /**
  * This file is the entrypoint of the dart test suite.  This suite is used
  * to test:
  *
  *     1. the dart vm
@@ skipping 63 matching lines @@
 
   // Extract global options from first configuration.
   var firstConf = configurations[0];
   Map<String, RegExp> selectors = firstConf['selectors'];
   var maxProcesses = firstConf['tasks'];
   var progressIndicator = firstConf['progress'];
   BuildbotProgressIndicator.stepName = firstConf['step_name'];
   var verbose = firstConf['verbose'];
   var printTiming = firstConf['time'];
   var listTests = firstConf['list'];
-
+  
   if (!firstConf['append_flaky_log'])  {
     var file = new File(TestUtils.flakyFileName());
     if (file.existsSync()) {
       file.deleteSync();
     }
   }
 
   // Print the configurations being run by this execution of
   // test.dart. However, don't do it if the silent progress indicator
   // is used. This is only needed because of the junit tests.
   if (progressIndicator != 'silent') {
     List output_words = configurations.length > 1 ?
         ['Test configurations:'] : ['Test configuration:'];
     for (Map conf in configurations) {
       List settings =
           ['compiler', 'runtime', 'mode', 'arch'].map((name) => conf[name]);
       if (conf['checked']) settings.add('checked');
       output_words.add(Strings.join(settings, '_'));
     }
     print(Strings.join(output_words, ' '));
   }
 
-  // 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().
-  List serverList = [];
-  if (!listTests) {
-    // Only start the server if we are running browser tests.
-    var runningBrowserTests = configurations.some((config) {
-      return TestUtils.isBrowserRuntime(config['runtime']);
-    });
-    if (runningBrowserTests) {
-      serverList.add(startHttpServer('127.0.0.1'));
-      // We start two servers so that we can test cross-domain tests.
-      serverList.add(startHttpServer('127.0.0.1', serverList[0].port));
-    }
-  }
-
   var configurationIterator = configurations.iterator();
   void enqueueConfiguration(ProcessQueue queue) {
     if (!configurationIterator.hasNext) return;
 
     var conf = configurationIterator.next();
     for (String key in selectors.keys) {
       if (key == 'co19') {
         queue.addTestSuite(new Co19TestSuite(conf));
       } else if (conf['runtime'] == 'vm' && key == 'vm') {
         // vm tests contain both cc tests (added here) and dart tests (added in
         // [TEST_SUITE_DIRECTORIES]).
         queue.addTestSuite(new VMTestSuite(conf));
       } else if (conf['compiler'] == 'dartc' && key == 'dartc') {
         queue.addTestSuite(new SamplesDartcTestSuite(conf));
         queue.addTestSuite(new JUnitDartcTestSuite(conf));
       }
     }
 
     for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
       final name = testSuiteDir.filename;
       if (selectors.containsKey(name)) {
         queue.addTestSuite(
-            new StandardTestSuite.forDirectory(conf, testSuiteDir, serverList));
+            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.some((config) {
+      return TestUtils.isBrowserRuntime(config['runtime']);
+    });
+    if (runningBrowserTests) startHttpServer('127.0.0.1', 9876);
+  }
+
   // Start process queue.
   new ProcessQueue(maxProcesses,
                    progressIndicator,
                    startTime,
                    printTiming,
                    enqueueConfiguration,
-                   () => terminateHttpServers(serverList),
+                   () => terminateHttpServer(),
                    verbose,
                    listTests);
 }