WebKit Bugzilla
Attachment 362466 Details for
Bug 194846
: [WinCairo] Enable wk1/wk2 suffix for platform search path.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
194846.diff (text/plain), 5.18 KB, created by
Basuke Suzuki
on 2019-02-19 18:21:11 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Basuke Suzuki
Created:
2019-02-19 18:21:11 PST
Size:
5.18 KB
patch
obsolete
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 1753c6760ad..57ca2a5d8b7 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,15 @@ >+2019-02-19 Basuke Suzuki <basuke.suzuki@sony.com> >+ >+ [WinCairo] Enable wk1/wk2 suffix for platform search path. >+ https://bugs.webkit.org/show_bug.cgi?id=194846 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Added WebKitLegacy specific TestExpectations. >+ >+ * platform/wincairo-wk1/TestExpectations: Added. >+ * platform/wincairo/TestExpectations: >+ > 2019-02-19 Ryosuke Niwa <rniwa@webkit.org> > > REGRESSION(r240909): Release assertion in FrameLoader::loadPostRequest when opening new window >diff --git a/LayoutTests/platform/wincairo-wk1/TestExpectations b/LayoutTests/platform/wincairo-wk1/TestExpectations >new file mode 100644 >index 00000000000..27070624d15 >--- /dev/null >+++ b/LayoutTests/platform/wincairo-wk1/TestExpectations >@@ -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 ] >diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations >index 5a168dfafc1..2070251b75f 100644 >--- a/LayoutTests/platform/wincairo/TestExpectations >+++ b/LayoutTests/platform/wincairo/TestExpectations >@@ -955,9 +955,6 @@ http/tests/websocket/tests/hybi/websocket-cookie-overwrite-behavior.html [ Pass > 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 ] > >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 288e9fa4d9f..b196f9d5936 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,19 @@ >+2019-02-19 Basuke Suzuki <basuke.suzuki@sony.com> >+ >+ [WinCairo] Enable wk1/wk2 suffix for platform search path. >+ https://bugs.webkit.org/show_bug.cgi?id=194846 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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-19 Zalan Bujtas <zalan@apple.com> > > [LFC][Floats] Remove redundant intersecting logic >diff --git a/Tools/Scripts/webkitpy/port/win.py b/Tools/Scripts/webkitpy/port/win.py >index e00c2a4fe40..358ffdd357f 100644 >--- a/Tools/Scripts/webkitpy/port/win.py >+++ b/Tools/Scripts/webkitpy/port/win.py >@@ -481,12 +481,31 @@ class WinCairoPort(WinPort): > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194846
: 362466