Title: [227629] trunk/Tools
- Revision
- 227629
- Author
- [email protected]
- Date
- 2018-01-25 14:04:10 -0800 (Thu, 25 Jan 2018)
Log Message
[webkitpy] Stop modifying path information only when running on Cygwin
https://bugs.webkit.org/show_bug.cgi?id=182136
On LayoutTestApacheHttpd, some path configuration is modified when platform
is Windows. This modification is only required for AppleWin running on Cygwin.
WinCairo uses native Windows environment, so the condition should be changed.
Patch by Basuke Suzuki <[email protected]> on 2018-01-25
Reviewed by Per Arne Vollan.
* Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
(LayoutTestApacheHttpd.__init__):
(LayoutTestApacheHttpd._get_apache_config_file_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (227628 => 227629)
--- trunk/Tools/ChangeLog 2018-01-25 21:54:21 UTC (rev 227628)
+++ trunk/Tools/ChangeLog 2018-01-25 22:04:10 UTC (rev 227629)
@@ -1,3 +1,18 @@
+2018-01-25 Basuke Suzuki <[email protected]>
+
+ [webkitpy] Stop modifying path information only when running on Cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=182136
+
+ On LayoutTestApacheHttpd, some path configuration is modified when platform
+ is Windows. This modification is only required for AppleWin running on Cygwin.
+ WinCairo uses native Windows environment, so the condition should be changed.
+
+ Reviewed by Per Arne Vollan.
+
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+ (LayoutTestApacheHttpd.__init__):
+ (LayoutTestApacheHttpd._get_apache_config_file_path):
+
2018-01-25 Eric Carlson <[email protected]>
REGRESSION(r227457): Release assert in updateLayout while destructing a media element
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (227628 => 227629)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2018-01-25 21:54:21 UTC (rev 227628)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2018-01-25 22:04:10 UTC (rev 227629)
@@ -64,7 +64,7 @@
self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
- if port_obj.host.platform.is_win():
+ if port_obj.host.platform.is_cygwin():
# Convert to MSDOS file naming:
precompiledBuildbot = re.compile('^/home/buildbot')
precompiledDrive = re.compile('^/cygdrive/[cC]')
@@ -166,7 +166,7 @@
# FIXME: Why do we need to copy the config file since we're not modifying it?
self._filesystem.write_text_file(httpd_config_copy, httpd_conf)
- if self._port_obj.host.platform.is_win():
+ if self._port_obj.host.platform.is_cygwin():
# Convert to MSDOS file naming:
precompiledDrive = re.compile('^/cygdrive/[cC]')
httpd_config_copy = precompiledDrive.sub("C:", httpd_config_copy)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
