Modified: trunk/Tools/ChangeLog (221714 => 221715)
--- trunk/Tools/ChangeLog 2017-09-07 03:42:39 UTC (rev 221714)
+++ trunk/Tools/ChangeLog 2017-09-07 04:02:16 UTC (rev 221715)
@@ -1,3 +1,12 @@
+2017-09-06 Joseph Pecoraro <[email protected]>
+
+ Remove new-run-webkit-httpd as it appears to be old
+ https://bugs.webkit.org/show_bug.cgi?id=176493
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/new-run-webkit-httpd: Removed.
+
2017-09-06 Alex Christensen <[email protected]>
Add WKUIDelegatePrivate equivalent of WKPageUIClient's pageDidScroll
Deleted: trunk/Tools/Scripts/new-run-webkit-httpd (221714 => 221715)
--- trunk/Tools/Scripts/new-run-webkit-httpd 2017-09-07 03:42:39 UTC (rev 221714)
+++ trunk/Tools/Scripts/new-run-webkit-httpd 2017-09-07 04:02:16 UTC (rev 221715)
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-# Copyright (C) 2010 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""A utility script for starting and stopping the HTTP server with the
- same configuration as used in the layout tests."""
-
-#
-# FIXME: currently this code only works with the Chromium ports and LigHTTPd.
-# It should be made to work on all ports.
-#
-# This script is also used by Chromium's ui_tests to run http layout tests
-# in a browser.
-#
-import optparse
-import os
-import sys
-import tempfile
-
-import webkitpy.common.version_check
-
-from webkitpy.common.host import Host
-from webkitpy.layout_tests.servers import http_server
-
-
-def run(options):
- 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.'
- host = Host()
- # FIXME: Make this work with other ports as well.
- port_obj = host.port_factory.get(port_name='win', options=options)
- httpd = http_server.Lighttpd(port_obj,
- tempfile.gettempdir(),
- port=options.port,
- root=options.root,
- run_background=options.run_background,
- layout_tests_dir=options.layout_tests_dir)
- if options.server == 'start':
- httpd.start()
- else:
- httpd.stop()
-
-
-def main():
- 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=""
- dest="register_cygwin", help='Register Cygwin paths (on Win try bots)')
- option_parser.add_option('--run_background', action=""
- dest="run_background",
- help='Run on background (for running as UI test)')
- option_parser.add_option('--layout_tests_dir',
- dest="layout_tests_dir",
- help='Absolute path to LayoutTests root')
- options, args = option_parser.parse_args()
-
- run(options)
-
-
-if '__main__' == __name__:
- main()
