Fix bug 23303: ui_tests crash Windows 7's shell when running WorkerHttpLayout...

webkit/tools/layout_tests/layout_package/http_server.py

 #!/usr/bin/env python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A class to help start/stop the lighttpd server used by layout tests."""
 
 
 import logging
 import optparse
@@ skipping 66 matching lines @@
   if _pending_tests:
     VIRTUALCONFIG.extend(
       # Three similar mappings (one with SSL enabled) for pending http tests
       [{'port': 9000, 'docroot': _pending_tests},
        {'port': 9080, 'docroot': _pending_tests},
        {'port': 9443, 'docroot': _pending_tests, 'sslcert': _pem_file}]
     )
 
 
   def __init__(self, output_dir, background=False, port=None, root=None,
-               register_cygwin=None):
+               register_cygwin=None, run_background=None):
     """Args:
       output_dir: the absolute path to the layout test result directory
     """
     self._output_dir = output_dir
     self._process = None
     self._port = port
     self._root = root
     self._register_cygwin = register_cygwin
+    self._run_background = run_background
     if self._port:
       self._port = int(self._port)
 
   def IsRunning(self):
     return self._process != None
 
   def Start(self):
     if self.IsRunning():
       raise 'Lighttpd already running'
 
@@ skipping 68 matching lines @@
                '}\n\n') % (mapping['port'], mapping['docroot']))
     f.close()
 
     executable = path_utils.LigHTTPdExecutablePath()
     module_path = path_utils.LigHTTPdModulePath()
     start_cmd = [ executable,
                   # Newly written config file
                   '-f', path_utils.PathFromBase(self._output_dir,
                                                 'lighttpd.conf'),
                   # Where it can find its module dynamic libraries
-                  '-m', module_path,
-                  # Don't background
-                  '-D' ]
+                  '-m', module_path ]
+
+    if not self._run_background:
+      start_cmd.append(# Don't background
+                       '-D')
 
     # Copy liblightcomp.dylib to /tmp/lighttpd/lib to work around the bug that
     # mod_alias.so loads it from the hard coded path.
     if sys.platform == 'darwin':
       tmp_module_path = '/tmp/lighttpd/lib'
       if not os.path.exists(tmp_module_path):
         os.makedirs(tmp_module_path)
       lib_file = 'liblightcomp.dylib'
       shutil.copyfile(os.path.join(module_path, lib_file),
                       os.path.join(tmp_module_path, lib_file))
@@ skipping 74 matching lines @@
   # Provide some command line params for starting/stopping the http server
   # manually. Also used in ui_tests to run http layout tests in a browser.
   option_parser = optparse.OptionParser()
   option_parser.add_option('-k', '--server', help='Server action (start|stop)')
   option_parser.add_option('-p', '--port',
       help='Port to listen on (overrides layout test ports)')
   option_parser.add_option('-r', '--root',
       help='Absolute path to DocumentRoot (overrides layout test roots)')
   option_parser.add_option('--register_cygwin', action="store_true",
       dest="register_cygwin", help='Register Cygwin paths (on Win try bots)')
+  option_parser.add_option('--run_background', action="store_true",
+      dest="run_background", help='Run on background (for running as UI test)')
   options, args = option_parser.parse_args()
 
   if not options.server:
     print 'Usage: %s --server {start|stop} [--root=root_dir]'
     print ' [--port=port_number]' % sys.argv[0]
   else:
     if (options.root is None) and (options.port is not None):
       # specifying root but not port means we want httpd on default set of
       # ports that LayoutTest use, but pointing to a different source of tests.
       # Specifying port but no root does not seem meaningful.
       raise 'Specifying port requires also a root.'
     httpd = Lighttpd(tempfile.gettempdir(),
                      port=options.port,
                      root=options.root,
-                     register_cygwin=options.register_cygwin)
+                     register_cygwin=options.register_cygwin,
+                     run_background=options.run_background)
     if 'start' == options.server:
       httpd.Start()
     else:
       httpd.Stop(force=True)