[WinCairo] Fall back to AppleWin results in layout tests.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Oct 2015 19:13:56 +0000 (19:13 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Oct 2015 19:13:56 +0000 (19:13 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150672

Reviewed by Alex Christensen.

* Scripts/webkitpy/port/win.py:
(WinCairoPort):
(WinCairoPort.default_baseline_search_path):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/port/win.py

index bf786c2..afba09a 100644 (file)
@@ -1,3 +1,14 @@
+2015-10-29  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Fall back to AppleWin results in layout tests.
+        https://bugs.webkit.org/show_bug.cgi?id=150672
+
+        Reviewed by Alex Christensen.
+
+        * Scripts/webkitpy/port/win.py:
+        (WinCairoPort):
+        (WinCairoPort.default_baseline_search_path):
+
 2015-10-28  Keith Rollin  <krollin@apple.com>
 
         Do not sanitize user input for input[type=url]
index 80453a4..9239a6e 100644 (file)
@@ -354,3 +354,10 @@ class WinCairoPort(WinPort):
     port_name = "wincairo"
 
     VERSION_FALLBACK_ORDER = ["wincairo-xp", "wincairo-vista", "wincairo-7sp0", "wincairo-win10", "wincairo"]
+
+    def default_baseline_search_path(self):
+        name = self._name.replace('-wk2', '')
+        fallback_names = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(name):-1] + [self.port_name]
+        fallback_names.append('win')
+        fallback_names.append('mac')
+        return map(self._webkit_baseline_path, fallback_names)