Diff
Modified: trunk/Tools/ChangeLog (90696 => 90697)
--- trunk/Tools/ChangeLog 2011-07-10 18:39:30 UTC (rev 90696)
+++ trunk/Tools/ChangeLog 2011-07-10 18:55:22 UTC (rev 90697)
@@ -1,3 +1,15 @@
+2011-07-10 Adam Barth <[email protected]>
+
+ Clean up style in fallback path calculation
+ https://bugs.webkit.org/show_bug.cgi?id=64239
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/port/win.py:
+
2011-07-10 Balazs Kelemen <[email protected]>
[Qt][WK2] Implement the rest of WTR::PlatformWebView
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py (90696 => 90697)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-07-10 18:39:30 UTC (rev 90696)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-07-10 18:55:22 UTC (rev 90697)
@@ -41,8 +41,21 @@
SUPPORTED_ARCHITECTURES = ('x86', 'x86_64')
FALLBACK_PATHS = {
- 'x86_64': ['chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'],
- 'x86': ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'],
+ 'x86_64': [
+ 'chromium-linux',
+ 'chromium-win',
+ 'chromium',
+ 'win',
+ 'mac',
+ ],
+ 'x86': [
+ 'chromium-linux-x86',
+ 'chromium-linux',
+ 'chromium-win',
+ 'chromium',
+ 'win',
+ 'mac',
+ ],
}
def __init__(self, port_name=None, **kwargs):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (90696 => 90697)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-10 18:39:30 UTC (rev 90696)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-10 18:55:22 UTC (rev 90697)
@@ -62,9 +62,27 @@
# FIXME: Do we need mac-snowleopard here, like the base win port?
FALLBACK_PATHS = {
- 'xp': ['chromium-win-xp', 'chromium-win-vista', 'chromium-win', 'chromium', 'win', 'mac'],
- 'vista': ['chromium-win-vista', 'chromium-win', 'chromium', 'win', 'mac'],
- 'win7': ['chromium-win', 'chromium', 'win', 'mac'],
+ 'xp': [
+ 'chromium-win-xp',
+ 'chromium-win-vista',
+ 'chromium-win',
+ 'chromium',
+ 'win',
+ 'mac',
+ ],
+ 'vista': [
+ 'chromium-win-vista',
+ 'chromium-win',
+ 'chromium',
+ 'win',
+ 'mac',
+ ],
+ 'win7': [
+ 'chromium-win',
+ 'chromium',
+ 'win',
+ 'mac',
+ ],
}
def __init__(self, port_name=None, windows_version=None, **kwargs):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (90696 => 90697)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-10 18:39:30 UTC (rev 90696)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-10 18:55:22 UTC (rev 90697)
@@ -66,9 +66,18 @@
SUPPORTED_VERSIONS = ('leopard', 'snowleopard', 'future', 'wk2')
FALLBACK_PATHS = {
- 'leopard': ['mac-leopard', 'mac-snowleopard', 'mac'],
- 'snowleopard': ['mac-snowleopard', 'mac'],
- 'future': ['mac'],
+ 'leopard': [
+ 'mac-leopard',
+ 'mac-snowleopard',
+ 'mac',
+ ],
+ 'snowleopard': [
+ 'mac-snowleopard',
+ 'mac',
+ ],
+ 'future': [
+ 'mac',
+ ],
'wk2': [], # wk2 does not make sense as a version, this is only here to make the rebaseline unit tests not crash.
}
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py (90696 => 90697)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-07-10 18:39:30 UTC (rev 90696)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-07-10 18:55:22 UTC (rev 90697)
@@ -39,6 +39,14 @@
class WinPort(WebKitPort):
port_name = "win"
+ FALLBACK_PATHS = {
+ 'win7': [
+ "win",
+ "mac-snowleopard",
+ "mac",
+ ],
+ }
+
def __init__(self, **kwargs):
WebKitPort.__init__(self, **kwargs)
self._version = 'win7'
@@ -47,8 +55,7 @@
def baseline_search_path(self):
# Based on code from old-run-webkit-tests expectedDirectoryForTest()
# FIXME: This does not work for WebKit2.
- port_names = ["win", "mac-snowleopard", "mac"]
- return map(self._webkit_baseline_path, port_names)
+ return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self._version])
def _path_to_apache_config_file(self):
return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'cygwin-httpd.conf')
