Modified: trunk/Tools/ChangeLog (121590 => 121591)
--- trunk/Tools/ChangeLog 2012-06-29 21:43:31 UTC (rev 121590)
+++ trunk/Tools/ChangeLog 2012-06-29 21:53:42 UTC (rev 121591)
@@ -1,3 +1,18 @@
+2012-06-29 Ojan Vafai <[email protected]>
+
+ Fix optimize-baselines to not move baselines from win to win-7sp0
+ https://bugs.webkit.org/show_bug.cgi?id=90312
+
+ Reviewed by Dirk Pranke.
+
+ It used to consider win-7sp0 as the common directory for all the Apple
+ windows ports and incorrectly move results out of win.
+
+ * Scripts/webkitpy/common/checkout/baselineoptimizer.py:
+ * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+ (BaselineOptimizerTest.test_win_does_not_drop_to_win_7sp0):
+ (BaselineOptimizerTest.test_common_directory_includes_root):
+
2012-06-28 Ojan Vafai <[email protected]>
Fix rebaselining for Qt and Apple ports
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py (121590 => 121591)
--- trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py 2012-06-29 21:43:31 UTC (rev 121590)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py 2012-06-29 21:53:42 UTC (rev 121591)
@@ -52,6 +52,7 @@
_VIRTUAL_PORTS = {
'mac-future': ['LayoutTests/platform/mac-future', 'LayoutTests/platform/mac', 'LayoutTests'],
+ 'win-future': ['LayoutTests/platform/win-future', 'LayoutTests/platform/win', 'LayoutTests'],
'qt-unknown': ['LayoutTests/platform/qt-unknown', 'LayoutTests/platform/qt', 'LayoutTests'],
}
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py (121590 => 121591)
--- trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2012-06-29 21:43:31 UTC (rev 121590)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py 2012-06-29 21:53:42 UTC (rev 121591)
@@ -119,6 +119,21 @@
'LayoutTests/platform/qt': '462d03b9c025db1b0392d7453310dbee5f9a9e74',
})
+ def test_win_does_not_drop_to_win_7sp0(self):
+ self._assertOptimization({
+ 'LayoutTests/platform/win': '1',
+ 'LayoutTests/platform/mac': '2',
+ 'LayoutTests/platform/gtk': '3',
+ 'LayoutTests/platform/qt': '4',
+ 'LayoutTests/platform/chromium': '5',
+ }, {
+ 'LayoutTests/platform/win': '1',
+ 'LayoutTests/platform/mac': '2',
+ 'LayoutTests/platform/gtk': '3',
+ 'LayoutTests/platform/qt': '4',
+ 'LayoutTests/platform/chromium': '5',
+ })
+
def test_common_directory_includes_root(self):
# Note: The resulting directories are "wrong" in the sense that
# enacting this plan would change semantics. However, this test case
@@ -138,7 +153,7 @@
'LayoutTests/platform/chromium-win': '23a30302a6910f8a48b1007fa36f3e3158341834',
'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
- 'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
+ 'LayoutTests/platform/chromium': '1',
}, {
'LayoutTests/platform/chromium': '23a30302a6910f8a48b1007fa36f3e3158341834',
'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
