Renaming dom.py's http_server command and adding variant for Dartium.

tools/dom/dom.py

 #!/usr/bin/python
 
 # 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.
 
 # A script which makes it easy to execute common DOM-related tasks
 
 import os
 import subprocess
@@ skipping 78 matching lines @@
   call(args)
   return out_file
 
 def gen():
   os.chdir(os.path.join('tools', 'dom', 'scripts'))
   result = call([os.path.join(os.getcwd(), 'dartdomgenerator.py'),
       '--rebuild', '--parallel', '--systems=htmldart2js,htmldartium'])
   os.chdir(os.path.join('..', '..', '..'))
   return result
 
-def http_server():
-  print('Browse tests at '
-      '\033[94mhttp://localhost:5400/root_build/generated_tests/\033[0m')
-  return call([
-    utils.DartBinary(),
-    os.path.join('tools', 'testing', 'dart', 'http_server.dart'),
-    '--port=5400',
-    '--crossOriginPort=5401',
-    '--network=0.0.0.0',
-    '--build-directory=%s' % os.path.join('out', 'ReleaseIA32')
-  ])
-
 def size_check():
   ''' Displays the dart2js size of swarm. '''
   dart_file = os.path.join('samples', 'swarm', 'swarm.dart')
   out_file = compile_dart2js(dart_file, False)
 
   return call([
     'du',
     '-kh',
     '--apparent-size',
     out_file,
@@ skipping 23 matching lines @@
     '-v',
   ]
   if argv:
     cmd.append(argv.pop(0))
   else:
     print(
         'Test commands should be followed by tests to run. Defaulting to html')
     cmd.append('html')
   return call(cmd)
 
+def test_server():
+  start_test_server(5400, os.path.join('out', 'ReleaseIA32'))
+
+def test_server_dartium():
+  start_test_server(5500, os.path.join('..', 'out', 'Release'))
+
+def start_test_server(port, build_directory):
+  print('Browse tests at '
+      '\033[94mhttp://localhost:%d/root_build/generated_tests/\033[0m' % port)
+  return call([
+    utils.DartBinary(),
+    os.path.join('tools', 'testing', 'dart', 'http_server.dart'),
+    '--port=%d' % port,
+    '--crossOriginPort=%d' % (port + 1),
+    '--network=0.0.0.0',
+    '--build-directory=%s' % build_directory
+  ])
+
+
 def call(args):
   print ' '.join(args)
   pipe = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   output, error = pipe.communicate()
   if output:
     print output
   if error:
     print error
   return pipe.returncode
 
 commands = {
   'analyze': [analyze, 'Run the dart analyzer'],
   'build': [build, 'Build dart in release mode'],
   'dart2js': [dart2js, 'Run dart2js on the .dart file specified'],
   'docs': [docs, 'Generates docs.json'],
   'gen': [gen, 'Re-generate DOM generated files (run go.sh)'],
   'size_check': [size_check, 'Check the size of dart2js compiled Swarm'],
   'test_docs': [test_docs, 'Tests docs.dart'],
   'test_chrome': [test_chrome, 'Run tests in checked mode in Chrome.\n'
       '\t\tOptionally provide name of test to run.'],
   # TODO(antonm): fix option name.
   'test_drt': [test_drt, 'Run tests in checked mode in content shell.\n'
       '\t\tOptionally provide name of test to run.'],
   'test_ff': [test_ff, 'Run tests in checked mode in Firefox.\n'
       '\t\tOptionally provide name of test to run.'],
-  'http_server': [http_server, 'Starts the testing server for manually '
+  'test_server': [test_server, 'Starts the testing server for manually '
       'running browser tests.'],
+  'test_server_dartium': [test_server_dartium, 'Starts the testing server for '
+      'manually running browser tests from a dartium enlistment.'],
 }
 
 def main():
   success = True
   argv.pop(0)
 
   if not argv:
     help()
     success = False
 
   while (argv):
     # Make sure that we're always rooted in the dart root folder.
     os.chdir(dart_dir)
     command = argv.pop(0)
 
     if not command in commands:
       help();
       success = False
       break
     returncode = commands[command][0]()
     success = success and not bool(returncode)
 
   sys.exit(not success)
 
 if __name__ == '__main__':
   main()