Title: [225440] trunk/Tools
- Revision
- 225440
- Author
- dewei_...@apple.com
- Date
- 2017-12-01 17:56:40 -0800 (Fri, 01 Dec 2017)
Log Message
Hardcoded python path is not compatible with virtual environment.
https://bugs.webkit.org/show_bug.cgi?id=180300
Reviewed by Stephanie Lewis.
Hardcoding '/usr/bin/python' does not work with python virtual environment.
Use 'python' instead.
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver.serve):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (225439 => 225440)
--- trunk/Tools/ChangeLog 2017-12-02 01:56:20 UTC (rev 225439)
+++ trunk/Tools/ChangeLog 2017-12-02 01:56:40 UTC (rev 225440)
@@ -1,3 +1,16 @@
+2017-12-01 Dewei Zhu <dewei_...@apple.com>
+
+ Hardcoded python path is not compatible with virtual environment.
+ https://bugs.webkit.org/show_bug.cgi?id=180300
+
+ Reviewed by Stephanie Lewis.
+
+ Hardcoding '/usr/bin/python' does not work with python virtual environment.
+ Use 'python' instead.
+
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ (SimpleHTTPServerDriver.serve):
+
2017-12-01 Aakash Jain <aakash_j...@apple.com>
[build.webkit.org] Move python code to load config from master.cfg in separate file
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (225439 => 225440)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2017-12-02 01:56:20 UTC (rev 225439)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2017-12-02 01:56:40 UTC (rev 225440)
@@ -30,7 +30,7 @@
def serve(self, web_root):
_log.info('Launching an http server')
http_server_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "http_server/twisted_http_server.py")
- self._server_process = subprocess.Popen(["/usr/bin/python", http_server_path, web_root], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self._server_process = subprocess.Popen(["python", http_server_path, web_root], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
max_attempt = 5
interval = 0.5
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
