Title: [278569] trunk/Tools
- Revision
- 278569
- Author
- hironori.fu...@sony.com
- Date
- 2021-06-07 13:05:53 -0700 (Mon, 07 Jun 2021)
Log Message
run-webkit-test should use python2 for wpt serve until the latest will be imported
https://bugs.webkit.org/show_bug.cgi?id=226703
Reviewed by Jonathan Bedard.
The current imported wpt.py doesn't support Python 3 yet. Use
Python 2 temporarily.
* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer.__init__):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278568 => 278569)
--- trunk/Tools/ChangeLog 2021-06-07 19:55:30 UTC (rev 278568)
+++ trunk/Tools/ChangeLog 2021-06-07 20:05:53 UTC (rev 278569)
@@ -1,3 +1,16 @@
+2021-06-07 Fujii Hironori <hironori.fu...@sony.com>
+
+ run-webkit-test should use python2 for wpt serve until the latest will be imported
+ https://bugs.webkit.org/show_bug.cgi?id=226703
+
+ Reviewed by Jonathan Bedard.
+
+ The current imported wpt.py doesn't support Python 3 yet. Use
+ Python 2 temporarily.
+
+ * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+ (WebPlatformTestServer.__init__):
+
2021-06-07 Wenson Hsieh <wenson_hs...@apple.com>
[Cocoa] Find-in-page should match text inside image overlays
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py (278568 => 278569)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2021-06-07 19:55:30 UTC (rev 278568)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py 2021-06-07 20:05:53 UTC (rev 278569)
@@ -23,6 +23,7 @@
import json
import logging
+import sys
import time
from webkitpy.layout_tests.servers import http_server_base
@@ -94,8 +95,13 @@
self._doc_root_path = self._filesystem.join(self._layout_root, self._doc_root)
self._config_filename = self._filesystem.join(self._doc_root_path, "config.json")
+ # FIXME https://webkit.org/b/222703
+ python_interp = sys.executable
+ if sys.version_info > (3, 0):
+ python_interp = 'python2'
+
wpt_file = self._filesystem.join(self._doc_root_path, "wpt.py")
- self._start_cmd = ["python", wpt_file, "serve", "--config", self._config_filename]
+ self._start_cmd = [python_interp, wpt_file, "serve", "--config", self._config_filename]
self._mappings = []
config = wpt_config_json(port_obj)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
