From 495eb8c604d6988a1f7fbb0fcdc2c55e8411ab23 Mon Sep 17 00:00:00 2001 From: "ojan@chromium.org" Date: Fri, 29 Jun 2012 21:53:42 +0000 Subject: [PATCH] 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): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121591 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 15 +++++++++++++++ .../webkitpy/common/checkout/baselineoptimizer.py | 1 + .../common/checkout/baselineoptimizer_unittest.py | 17 ++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 31f7f9a..37a1b55 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,18 @@ +2012-06-29 Ojan Vafai + + 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 Fix rebaselining for Qt and Apple ports diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py index 8ae0bb9..d244045 100644 --- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py +++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py @@ -52,6 +52,7 @@ def _baseline_search_hypergraph(host): _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'], } diff --git a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py index 414cc06..318f42e 100644 --- a/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py +++ b/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py @@ -119,6 +119,21 @@ class BaselineOptimizerTest(unittest.TestCase): '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 @@ class BaselineOptimizerTest(unittest.TestCase): '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', -- 2.7.4