Changeset 55602 in webkit

Timestamp:

Mar 5, 2010 4:38:23 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-03-05 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Eric Siedel.

Split the command-line invocation of the Chromium/python LigHTTPd
server implementation out into its own top level script to make it
a more "public" interface and to resolve some awkward layering
issues. This script will be called directly by other test scripts in
the Chromium tree.

At some point this script should be made to work with Apache-based
implementations and on other ports. I have filed
​https://bugs.webkit.org/show_bug.cgi?id=35820 for this.

Also fix a bug in port/factory where options.chromium could be
dereferenced even if it wasn't set, raising an exception.

​https://bugs.webkit.org/show_bug.cgi?id=35812

• Scripts/webkitpy/layout_tests/port/factory.py:
• Scripts/webkitpy/layout_tests/port/http_server.py:
• Scripts/new-run-webkit-httpd: Added

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/new-run-webkit-httpd (added)
• Scripts/webkitpy/layout_tests/port/factory.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/http_server.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-05  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Siedel.
+
+        Split the command-line invocation of the Chromium/python LigHTTPd
+        server implementation out into its own top level script to make it
+        a more "public" interface and to resolve some awkward layering
+        issues. This script will be called directly by other test scripts in
+        the Chromium tree.
+
+        At some point this script should be made to work with Apache-based
+        implementations and on other ports. I have filed
+        https://bugs.webkit.org/show_bug.cgi?id=35820 for this.
+
+        Also fix a bug in port/factory where options.chromium could be
+        dereferenced even if it wasn't set, raising an exception.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35812
+
+        * Scripts/webkitpy/layout_tests/port/factory.py:
+        * Scripts/webkitpy/layout_tests/port/http_server.py:
+        * Scripts/new-run-webkit-httpd: Added
+
 2010-03-02  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py

@@ -45 +45 @@
             port_to_use = 'chromium-linux'
         elif sys.platform == 'darwin':
-            if options.chromium:
+            if options and hasattr(options, 'chromium') and options.chromium:
                 port_to_use = 'chromium-mac'
             else:

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py

@@ -235 +235 @@
             self._process.wait()
             self._process = None
-
-if '__main__' == __name__:
-    # 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]'
-               ' [--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.'
-        port_obj = factory.get()
-        httpd = Lighttpd(port_obj,
-                         tempfile.gettempdir(),
-                         port=options.port,
-                         root=options.root,
-                         register_cygwin=options.register_cygwin,
-                         run_background=options.run_background)
-        if 'start' == options.server:
-            httpd.start()
-        else:
-            httpd.stop(force=True)