Title: [241979] trunk
- Revision
- 241979
- Author
- [email protected]
- Date
- 2019-02-22 20:05:55 -0800 (Fri, 22 Feb 2019)
Log Message
[WinCairo] Enable wk1/wk2 suffix for platform search path.
https://bugs.webkit.org/show_bug.cgi?id=194846
Reviewed by Don Olmstead.
Tools:
Added _search_paths() and _port_specific_expectations_files() for
WinCairoPort.
* Scripts/webkitpy/port/win.py:
(WinCairoPort.default_baseline_search_path):
(WinCairoPort):
(WinCairoPort._port_specific_expectations_files):
(WinCairoPort._search_paths):
LayoutTests:
Added WebKitLegacy specific TestExpectations.
* platform/wincairo-wk1/TestExpectations: Added.
* platform/wincairo/TestExpectations:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (241978 => 241979)
--- trunk/LayoutTests/ChangeLog 2019-02-23 02:38:02 UTC (rev 241978)
+++ trunk/LayoutTests/ChangeLog 2019-02-23 04:05:55 UTC (rev 241979)
@@ -1,3 +1,15 @@
+2019-02-22 Basuke Suzuki <[email protected]>
+
+ [WinCairo] Enable wk1/wk2 suffix for platform search path.
+ https://bugs.webkit.org/show_bug.cgi?id=194846
+
+ Reviewed by Don Olmstead.
+
+ Added WebKitLegacy specific TestExpectations.
+
+ * platform/wincairo-wk1/TestExpectations: Added.
+ * platform/wincairo/TestExpectations:
+
2019-02-22 Dean Jackson <[email protected]>
Rotation animations sometimes use the wrong origin (affects apple.com)
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (241978 => 241979)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2019-02-23 02:38:02 UTC (rev 241978)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2019-02-23 04:05:55 UTC (rev 241979)
@@ -955,9 +955,6 @@
http/tests/websocket/tests/hybi/workers/close.html [ Pass Failure ]
http/tests/websocket/tests/hybi/workers/worker-reload.html [ Timeout Pass ]
-# There is not NetworkProcess in WK1, so it can't crash.
-http/tests/websocket/tests/hybi/network-process-crash-error.html [ Skip ]
-
http/tests/workers/service [ Skip ]
http/tests/workers/worker-redirect.html [ Failure ]
Added: trunk/LayoutTests/platform/wincairo-wk1/TestExpectations (0 => 241979)
--- trunk/LayoutTests/platform/wincairo-wk1/TestExpectations (rev 0)
+++ trunk/LayoutTests/platform/wincairo-wk1/TestExpectations 2019-02-23 04:05:55 UTC (rev 241979)
@@ -0,0 +1,16 @@
+# This file should contain entries for expectations that are specific
+# to the Apple Mac port running WebKit1 (DumpRenderTree)
+
+#//////////////////////////////////////////////////////////////////////////////////////////
+# Platform-specific tests. Skipped globally, then re-enabled here.
+#//////////////////////////////////////////////////////////////////////////////////////////
+
+
+#//////////////////////////////////////////////////////////////////////////////////////////
+# End platform-specific directories.
+#//////////////////////////////////////////////////////////////////////////////////////////
+
+# Failures on WebKit Legacy
+
+# There is not NetworkProcess in WK1, so it can't crash.
+http/tests/websocket/tests/hybi/network-process-crash-error.html [ Skip ]
Modified: trunk/Tools/ChangeLog (241978 => 241979)
--- trunk/Tools/ChangeLog 2019-02-23 02:38:02 UTC (rev 241978)
+++ trunk/Tools/ChangeLog 2019-02-23 04:05:55 UTC (rev 241979)
@@ -1,3 +1,19 @@
+2019-02-22 Basuke Suzuki <[email protected]>
+
+ [WinCairo] Enable wk1/wk2 suffix for platform search path.
+ https://bugs.webkit.org/show_bug.cgi?id=194846
+
+ Reviewed by Don Olmstead.
+
+ Added _search_paths() and _port_specific_expectations_files() for
+ WinCairoPort.
+
+ * Scripts/webkitpy/port/win.py:
+ (WinCairoPort.default_baseline_search_path):
+ (WinCairoPort):
+ (WinCairoPort._port_specific_expectations_files):
+ (WinCairoPort._search_paths):
+
2019-02-22 Tim Horton <[email protected]>
ProcessSwap.PageOverlayLayerPersistence fails on iOS and in debug builds
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (241978 => 241979)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2019-02-23 02:38:02 UTC (rev 241978)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2019-02-23 04:05:55 UTC (rev 241979)
@@ -481,12 +481,31 @@
DEFAULT_ARCHITECTURE = 'x86_64'
def default_baseline_search_path(self, **kwargs):
+ return map(self._webkit_baseline_path, self._search_paths())
+
+ def _port_specific_expectations_files(self, **kwargs):
+ return map(lambda x: self._filesystem.join(self._webkit_baseline_path(x), 'TestExpectations'), reversed(self._search_paths()))
+
+ def _search_paths(self):
+ paths = []
version_name_map = VersionNameMap.map(self.host.platform)
if self._os_version < self.VERSION_MIN or self._os_version > self.VERSION_MAX:
- fallback_versions = [self._os_version]
+ versions = [self._os_version]
else:
sorted_versions = sorted(version_name_map.mapping_for_platform(platform=self.port_name).values())
- fallback_versions = sorted_versions[sorted_versions.index(self._os_version):]
- fallback_names = ['wincairo-' + version_name_map.to_name(version, platform=self.port_name).lower().replace(' ', '') for version in fallback_versions]
- fallback_names.append('wincairo')
- return map(self._webkit_baseline_path, fallback_names)
+ versions = sorted_versions[sorted_versions.index(self._os_version):]
+
+ normalize = lambda version: version.lower().replace(' ', '')
+ to_name = lambda version: version_name_map.to_name(version, platform=self.port_name)
+
+ wk_version = 'wk2' if self.get_option('webkit_test_runner') else 'wk1'
+
+ for version in versions:
+ name = self.port_name + '-' + normalize(to_name(version))
+ paths.append(name + '-' + wk_version)
+ paths.append(name)
+
+ paths.append(self.port_name + '-' + wk_version)
+ paths.append(self.port_name)
+
+ return paths
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
