Title: [150612] trunk/Tools
Revision
150612
Author
[email protected]
Date
2013-05-23 13:59:48 -0700 (Thu, 23 May 2013)

Log Message

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

Patch by Brent Fulgham <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (150611 => 150612)


--- trunk/Tools/ChangeLog	2013-05-23 20:56:00 UTC (rev 150611)
+++ trunk/Tools/ChangeLog	2013-05-23 20:59:48 UTC (rev 150612)
@@ -1,3 +1,19 @@
+2013-05-23  Brent Fulgham  <[email protected]>
+
+        [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  <[email protected]>
 
         Make default bug links in buildbot clickable

Modified: trunk/Tools/Scripts/new-run-webkit-httpd (150611 => 150612)


--- trunk/Tools/Scripts/new-run-webkit-httpd	2013-05-23 20:56:00 UTC (rev 150611)
+++ trunk/Tools/Scripts/new-run-webkit-httpd	2013-05-23 20:59:48 UTC (rev 150612)
@@ -61,7 +61,7 @@
             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='chromium', options=options)
+        port_obj = host.port_factory.get(port_name='win', options=options)
         httpd = http_server.Lighttpd(port_obj,
                                      tempfile.gettempdir(),
                                      port=options.port,

Modified: trunk/Tools/Scripts/webkitpy/port/win.py (150611 => 150612)


--- trunk/Tools/Scripts/webkitpy/port/win.py	2013-05-23 20:56:00 UTC (rev 150611)
+++ trunk/Tools/Scripts/webkitpy/port/win.py	2013-05-23 20:59:48 UTC (rev 150612)
@@ -42,7 +42,7 @@
 class WinPort(ApplePort):
     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']
 
@@ -98,3 +98,16 @@
         if not match_object:
             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"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to