Changes to run tests on Dartium content shell on Android.

tools/test.dart

 #!/usr/bin/env 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.
 
 /**
  * This file is the entrypoint of the dart test suite.  This suite is used
  * to test:
  *
  *     1. the dart vm
@@ skipping 114 matching lines @@
     print(output_words.join(' '));
   }
 
   var runningBrowserTests = configurations.any((config) {
     return TestUtils.isBrowserRuntime(config['runtime']);
   });
 
   List<Future> serverFutures = [];
   var testSuites = new List<TestSuite>();
   var maxBrowserProcesses = maxProcesses;
   for (var conf in configurations) {

[kustermann, 2013/10/25 15:35:01]

Please add an assertion before this loop, that if 'test_server_port' or
'test_server_cross_origin_port' is 0 in the first configuration, then the
"configurations.length" has to be 1.

(We start two http servers per configuration. Having a fixed port means we can
have only one configuration!)

[zra, 2013/10/25 16:19:36]

Done.

     Map<String, RegExp> selectors = conf['selectors'];
     var useContentSecurityPolicy = conf['csp'];
     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)),
                                        useContentSecurityPolicy,
                                        conf['runtime']);
-      serverFutures.add(servers.startServers(conf['local_ip']));
+      serverFutures.add(servers.startServers(conf['local_ip'],
+          port: conf['test_server_port'],
+          crossOriginPort: conf['test_server_cross_origin_port']));
       conf['_servers_'] = servers;
       if (verbose) {
         serverFutures.last.then((_) {
           var commandline = servers.httpServerCommandline();
           print('Started HttpServers: $commandline');
         });
       }
     }
 
     if (conf['runtime'].startsWith('ie')) {
@@ skipping 124 matching lines @@
 void main() {
   deleteTemporaryDartDirectories().then((_) {
     var optionsParser = new TestOptionsParser();
     var configurations = optionsParser.parse(new Options().arguments);
     if (configurations != null && configurations.length > 0) {
       testConfigurations(configurations);
     }
   });
 }