Changeset 150612 in webkit

Timestamp:

May 23, 2013 1:59:48 PM (11 years ago)

Author:

Brent Fulgham

Message:

[Windows] Update new-run-webkit-tests for Windows port.
​https://bugs.webkit.org/show_bug.cgi?id=38756

Patch by Brent Fulgham <​bfulgham@webkit.org> on 2013-05-23
Reviewed by Ryosuke Niwa.

• Scripts/new-run-webkit-httpd:

(run): Switch from 'chromium' to 'win'

• Scripts/webkitpy/port/win.py:

(WinPort): Add support methods for lighttpd server.
(WinPort._uses_apache):
(WinPort._path_to_lighttpd):
(WinPort._path_to_lighttpd_modules):
(WinPort._path_to_lighttpd_php):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/new-run-webkit-httpd (modified) (1 diff)
• Scripts/webkitpy/port/win.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-23  Brent Fulgham  <bfulgham@webkit.org>
+
+        [Windows] Update new-run-webkit-tests for Windows port.
+        https://bugs.webkit.org/show_bug.cgi?id=38756
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/new-run-webkit-httpd:
+        (run): Switch from 'chromium' to 'win'
+        * Scripts/webkitpy/port/win.py:
+        (WinPort): Add support methods for lighttpd server.
+        (WinPort._uses_apache):
+        (WinPort._path_to_lighttpd):
+        (WinPort._path_to_lighttpd_modules):
+        (WinPort._path_to_lighttpd_php):
+
 2013-05-23  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Tools/Scripts/new-run-webkit-httpd

@@ -62 +62 @@
         host = Host()
         # FIXME: Make this work with other ports as well.
-        port_obj = host.port_factory.get(port_name='chromium', options=options)
+        port_obj = host.port_factory.get(port_name='win', options=options)
         httpd = http_server.Lighttpd(port_obj,
                                      tempfile.gettempdir(),

trunk/Tools/Scripts/webkitpy/port/win.py

@@ -43 +43 @@
     port_name = "win"
 
-    VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win-win7"]
+    VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
 
     ARCHITECTURES = ['x86']
@@ -99 +99 @@
             return None
         return match_object.group('features_string').split(' ')
+
+    # Note: These are based on the stock Cygwin locations for these files.
+    def _uses_apache(self):
+        return False
+
+    def _path_to_lighttpd(self):
+        return "/usr/sbin/lighttpd"
+
+    def _path_to_lighttpd_modules(self):
+        return "/usr/lib/lighttpd"
+
+    def _path_to_lighttpd_php(self):
+        return "/usr/bin/php-cgi"