Changes to run tests on Dartium content shell on Android.

tools/testing/dart/test_options.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.
 
 library test_options_parser;
 
 import "dart:io";
 import "dart:math";
 import "drt_updater.dart";
 import "test_suite.dart";
@@ skipping 68 matching lines @@
 
     d8: Run JavaScript from the command line using v8.
 
     jsshell: Run JavaScript from the command line using firefox js-shell.
 
     drt: Run Dart or JavaScript in the headless version of Chrome,
          Content shell.
 
     dartium: Run Dart or JavaScript in Dartium.
 
+    ContentShellOnAndroid: Run Dart or JavaScript in Dartium content shell
+                      on Android.
+
     [ff | chrome | safari | ie9 | ie10 | opera | chromeOnAndroid]:
         Run JavaScript in the specified browser.
 
     none: No runtime, compile only (for example, used for dartanalyzer static
           analysis tests).''',
               ['-r', '--runtime'],
               ['vm', 'd8', 'jsshell', 'drt', 'dartium', 'ff', 'firefox',
                'chrome', 'safari', 'ie9', 'ie10', 'opera', 'chromeOnAndroid',
-               'none'],
+               'ContentShellOnAndroid', 'none'],
               'vm'),
           new _TestOptionSpecification(
               'arch',
               'The architecture to run tests for',
               ['-a', '--arch'],
               ['all', 'ia32', 'x64', 'simarm', 'simmips', 'arm', 'mips'],
               'ia32'),
           new _TestOptionSpecification(
               'system',
               'The operating system to run tests on',
@@ skipping 187 matching lines @@
               'bool'
               ),
           new _TestOptionSpecification(
               'local_ip',
               'IP address the http servers should listen on.'
               'This address is also used for browsers to connect.',
               ['--local_ip'],
               [],
               '127.0.0.1'),
           new _TestOptionSpecification(
+              'test_server_port',
+              'Port for test http server.',
+              ['--test_server_port'],
+              [],
+              0,
+              'int'),
+          new _TestOptionSpecification(
+              'test_server_cross_origin_port',
+              'Port for test http server cross origin.',
+              ['--test_server_cross_origin_port'],
+              [],
+              0,
+              'int'),
+          new _TestOptionSpecification(
+              'test_driver_port',
+              'Port for http test driver server.',
+              ['--test_driver_port'],
+              [],
+              0,
+              'int'),
+          new _TestOptionSpecification(
+              'test_driver_error_port',
+              'Port for http test driver server errors.',
+              ['--test_driver_error_port'],
+              [],
+              0,
+              'int'),
+          new _TestOptionSpecification(
               'record_to_file',
               'Records all the commands that need to be executed and writes it '
               'out to a file.',
               ['--record_to_file'],
               [],
               null),
           new _TestOptionSpecification(
               'replay_from_file',
               'Records all the commands that need to be executed and writes it '
               'out to a file.',
@@ skipping 191 matching lines @@
         validRuntimes = const ['d8', 'jsshell', 'drt', 'none', 'dartium',
                                'ff', 'chrome', 'safari', 'ie9', 'ie10',
                                'opera', 'chromeOnAndroid'];
         break;
       case 'dartanalyzer':
       case 'dart2analyzer':
         validRuntimes = const ['none'];
         break;
       case 'none':
       case 'dart2dart':
-        validRuntimes = const ['vm', 'drt', 'dartium'];
+        validRuntimes = const ['vm', 'drt', 'dartium', 'ContentShellOnAndroid'];
         break;
     }
     if (!validRuntimes.contains(config['runtime'])) {
       isValid = false;
       print("Warning: combination of compiler '${config['compiler']}' and "
           "runtime '${config['runtime']}' is invalid. "
           "Skipping this combination.");
     }
     if ((config['runtime'] == 'ie9' || config['runtime'] == 'ie10') &&
         Platform.operatingSystem != 'windows') {
@@ skipping 228 matching lines @@
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
 
   List<_TestOptionSpecification> _options;
 }