Log Message
Make Apple's Windows port fall back to Lion results instead of SnowLeopard Apple's Windows port now uses Lion-era versions of CoreFoundation, ICU, etc., so in theory should match Lion's behavior.
Fixes <http://webkit.org/b/66302> Apple's Windows port matches Lion for some test results, but doesn't use Lion results Reviewed by David Kilzer. * Scripts/old-run-webkit-tests: (expectedDirectoryForTest): * Scripts/webkitpy/layout_tests/port/win.py: (WinPort.baseline_search_path): * Scripts/webkitpy/layout_tests/port/win_unittest.py: (WinPortTest.test_baseline_search_path): Replaced mac-snowleopard with mac-lion. * Scripts/webkitpy/common/config/build.py: (_should_file_trigger_build): Added an entry for the LayoutTests/platform/mac-lion directory, which all Apple Mac platforms and Apple Win platforms could potentially use results from. Removed Apple Win from being affected by mac-snowleopard changes, since it will no longer look there for results. * Scripts/webkitpy/common/config/build_unittest.py: (ShouldBuildTest.test_should_build): Tests for the above changes.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (93106 => 93107)
--- trunk/Tools/ChangeLog 2011-08-16 16:00:25 UTC (rev 93106)
+++ trunk/Tools/ChangeLog 2011-08-16 16:03:02 UTC (rev 93107)
@@ -1,3 +1,32 @@
+2011-08-16 Adam Roben <[email protected]>
+
+ Make Apple's Windows port fall back to Lion results instead of SnowLeopard
+
+ Apple's Windows port now uses Lion-era versions of CoreFoundation, ICU, etc., so in theory
+ should match Lion's behavior.
+
+ Fixes <http://webkit.org/b/66302> Apple's Windows port matches Lion for some test results,
+ but doesn't use Lion results
+
+ Reviewed by David Kilzer.
+
+ * Scripts/old-run-webkit-tests:
+ (expectedDirectoryForTest):
+ * Scripts/webkitpy/layout_tests/port/win.py:
+ (WinPort.baseline_search_path):
+ * Scripts/webkitpy/layout_tests/port/win_unittest.py:
+ (WinPortTest.test_baseline_search_path):
+ Replaced mac-snowleopard with mac-lion.
+
+ * Scripts/webkitpy/common/config/build.py:
+ (_should_file_trigger_build): Added an entry for the LayoutTests/platform/mac-lion
+ directory, which all Apple Mac platforms and Apple Win platforms could potentially use
+ results from. Removed Apple Win from being affected by mac-snowleopard changes, since it
+ will no longer look there for results.
+
+ * Scripts/webkitpy/common/config/build_unittest.py:
+ (ShouldBuildTest.test_should_build): Tests for the above changes.
+
2011-08-16 Dean Jackson <[email protected]>
Move me from contributor to reviewer.
Modified: trunk/Tools/Scripts/old-run-webkit-tests (93106 => 93107)
--- trunk/Tools/Scripts/old-run-webkit-tests 2011-08-16 16:00:25 UTC (rev 93106)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2011-08-16 16:03:02 UTC (rev 93107)
@@ -1711,7 +1711,7 @@
my @extraPlatforms = ();
if (isAppleWinWebKit()) {
push @extraPlatforms, "mac-wk2" if $platform eq "win-wk2";
- push @extraPlatforms, qw(mac-snowleopard mac);
+ push @extraPlatforms, qw(mac-lion mac);
}
push @directories, map { catdir($platformBaseDirectory, $_) } @extraPlatforms;
Modified: trunk/Tools/Scripts/webkitpy/common/config/build.py (93106 => 93107)
--- trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-16 16:00:25 UTC (rev 93106)
+++ trunk/Tools/Scripts/webkitpy/common/config/build.py 2011-08-16 16:03:02 UTC (rev 93107)
@@ -72,7 +72,8 @@
("gtk", ["gtk"]),
("mac", ["chromium-mac", "mac"]),
("mac-leopard", ["mac-leopard"]),
- ("mac-snowleopard", ["mac-leopard", "mac-snowleopard", "win"]),
+ ("mac-lion", ["mac", "win"]),
+ ("mac-snowleopard", ["mac-leopard", "mac-snowleopard"]),
("mac-wk2", ["mac-lion", "mac-snowleopard", "win"]),
("objc", ["mac"]),
("qt", ["qt"]),
Modified: trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py (93106 => 93107)
--- trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-16 16:00:25 UTC (rev 93106)
+++ trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2011-08-16 16:03:02 UTC (rev 93107)
@@ -40,7 +40,8 @@
(["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
(["LayoutTests/platform/chromium-win/fast/compact/001-expected.txt"], ["chromium-win"]),
(["LayoutTests/platform/mac-leopard/foo"], ["mac-leopard"]),
- (["LayoutTests/platform/mac-snowleopard/foo"], ["mac-leopard", "mac-snowleopard", "win"]),
+ (["LayoutTests/platform/mac-lion/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
+ (["LayoutTests/platform/mac-snowleopard/foo"], ["mac-leopard", "mac-snowleopard"]),
(["LayoutTests/platform/mac-wk2/Skipped"], ["mac-lion", "mac-snowleopard", "win"]),
(["LayoutTests/platform/mac/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard", "win"]),
(["LayoutTests/platform/win-xp/foo"], ["win"]),
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py (93106 => 93107)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-08-16 16:00:25 UTC (rev 93106)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-08-16 16:03:02 UTC (rev 93107)
@@ -94,7 +94,7 @@
fallback_names.append('mac-wk2')
# Note we do not add 'wk2' here, even though it's included in _skipped_search_paths().
# FIXME: Perhaps we should get this list from MacPort?
- fallback_names.extend(['mac-snowleopard', 'mac'])
+ fallback_names.extend(['mac-lion', 'mac'])
return map(self._webkit_baseline_path, fallback_names)
def _generate_all_test_configurations(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py (93106 => 93107)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py 2011-08-16 16:00:25 UTC (rev 93106)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py 2011-08-16 16:03:02 UTC (rev 93107)
@@ -76,12 +76,12 @@
self.assertEquals(port.baseline_search_path(), absolute_search_paths)
def test_baseline_search_path(self):
- self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-snowleopard', 'mac'], 'xp')
- self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac-snowleopard', 'mac'], 'vista')
- self._assert_search_path(['win-7sp0', 'win', 'mac-snowleopard', 'mac'], '7sp0')
- self._assert_search_path(['win', 'mac-snowleopard', 'mac'], 'bogus')
+ self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-lion', 'mac'], 'xp')
+ self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac-lion', 'mac'], 'vista')
+ self._assert_search_path(['win-7sp0', 'win', 'mac-lion', 'mac'], '7sp0')
+ self._assert_search_path(['win', 'mac-lion', 'mac'], 'bogus')
- self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac-snowleopard', 'mac'], 'xp', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac-snowleopard', 'mac'], 'vista', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac-snowleopard', 'mac'], '7sp0', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win', 'mac-wk2', 'mac-snowleopard', 'mac'], 'bogus', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac-lion', 'mac'], 'xp', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac-lion', 'mac'], 'vista', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac-lion', 'mac'], '7sp0', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win', 'mac-wk2', 'mac-lion', 'mac'], 'bogus', use_webkit2=True)
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
