Title: [290599] trunk/Tools
- Revision
- 290599
- Author
- [email protected]
- Date
- 2022-02-28 09:37:02 -0800 (Mon, 28 Feb 2022)
Log Message
Enable python3 for lighttpd
https://bugs.webkit.org/show_bug.cgi?id=236938
Patch by Pascal Abresch <[email protected]> on 2022-02-28
Reviewed by Darin Adler.
This is needed for the Haiku port to use the python3 tests.
This patch also removes the PHP support since all PHP tests have been removed and there are
currently no plans to include new ones in the future.
* Scripts/webkitpy/layout_tests/servers/http_server.py:
(Lighttpd._prepare_config):
* Scripts/webkitpy/layout_tests/servers/lighttpd.conf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (290598 => 290599)
--- trunk/Tools/ChangeLog 2022-02-28 17:10:30 UTC (rev 290598)
+++ trunk/Tools/ChangeLog 2022-02-28 17:37:02 UTC (rev 290599)
@@ -1,3 +1,17 @@
+2022-02-28 Pascal Abresch <[email protected]>
+
+ Enable python3 for lighttpd
+ https://bugs.webkit.org/show_bug.cgi?id=236938
+
+ Reviewed by Darin Adler.
+
+ This is needed for the Haiku port to use the python3 tests.
+ This patch also removes the PHP support since all PHP tests have been removed and there are
+ currently no plans to include new ones in the future.
+ * Scripts/webkitpy/layout_tests/servers/http_server.py:
+ (Lighttpd._prepare_config):
+ * Scripts/webkitpy/layout_tests/servers/lighttpd.conf:
+
2022-02-22 Jonathan Bedard <[email protected]>
[run-webkit-tests] Use Python 3 (Part 3)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py (290598 => 290599)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2022-02-28 17:10:30 UTC (rev 290598)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2022-02-28 17:37:02 UTC (rev 290599)
@@ -108,11 +108,10 @@
# Write out our cgi handlers. Run perl through env so that it
# processes the #! line and runs perl with the proper command
# line arguments. Emulate apache's mod_asis with a cat cgi handler.
- f.write(('cgi.assign = ( ".cgi" => "/usr/bin/env",\n'
+ f.write('cgi.assign = ( ".cgi" => "/usr/bin/env",\n'
' ".pl" => "/usr/bin/env",\n'
' ".asis" => "/bin/cat",\n'
- ' ".php" => "%s" )\n\n') %
- self._port_obj._path_to_lighttpd_php())
+ ' ".py" => "/bin/python3" )\n\n')
# Setup log files
f.write(('server.errorlog = "%s"\n'
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/lighttpd.conf (290598 => 290599)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/lighttpd.conf 2022-02-28 17:10:30 UTC (rev 290598)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/lighttpd.conf 2022-02-28 17:37:02 UTC (rev 290599)
@@ -37,8 +37,9 @@
##
# which extensions should not be handle via static-file transfer
#
-# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
-static-file.exclude-extensions = ( ".php", ".pl", ".cgi" )
+# .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
+# .py is needed for python based layout tests
+static-file.exclude-extensions = ( ".py", ".pl", ".cgi" )
server.bind = "localhost"
server.port = 8001
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (290598 => 290599)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2022-02-28 17:10:30 UTC (rev 290598)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2022-02-28 17:37:02 UTC (rev 290599)
@@ -1277,12 +1277,6 @@
This is needed only by ports that use the http_server.py module."""
raise NotImplementedError('Port._path_to_lighttpd_modules')
- def _path_to_lighttpd_php(self):
- """Returns the path to the LigHTTPd PHP executable.
-
- This is needed only by ports that use the http_server.py module."""
- raise NotImplementedError('Port._path_to_lighttpd_php')
-
def _webkit_baseline_path(self, platform):
"""Return the full path to the top of the baseline tree for a
given platform."""
Modified: trunk/Tools/Scripts/webkitpy/port/test.py (290598 => 290599)
--- trunk/Tools/Scripts/webkitpy/port/test.py 2022-02-28 17:10:30 UTC (rev 290598)
+++ trunk/Tools/Scripts/webkitpy/port/test.py 2022-02-28 17:37:02 UTC (rev 290599)
@@ -489,9 +489,6 @@
def _path_to_lighttpd_modules(self):
return "/usr/lib/lighttpd"
- def _path_to_lighttpd_php(self):
- return "/usr/bin/php-cgi"
-
def _path_to_apache(self):
return "/usr/sbin/httpd"
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (290598 => 290599)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2022-02-28 17:10:30 UTC (rev 290598)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2022-02-28 17:37:02 UTC (rev 290599)
@@ -198,9 +198,6 @@
def _path_to_lighttpd_modules(self):
return "/usr/lib/lighttpd"
- def _path_to_lighttpd_php(self):
- return "/usr/bin/php-cgi"
-
def _path_to_default_image_diff(self):
return self._build_path('ImageDiff.exe')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
