Changeset 92562 in webkit
- Timestamp:
- Aug 6, 2011 3:17:24 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r92558 r92562 1 2011-08-06 Adam Barth <abarth@webkit.org> 2 3 webkit-patch optimize-baselines can't handle promotions to base results directory 4 https://bugs.webkit.org/show_bug.cgi?id=65819 5 6 Reviewed by Dimitri Glazkov. 7 8 This bug came up when testing the optimizer on some editing baselines. 9 10 * Scripts/webkitpy/common/checkout/baselineoptimizer.py: 11 * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py: 12 1 13 2011-08-06 Adam Barth <abarth@webkit.org> 2 14 -
trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py
r92493 r92562 37 37 # These edges in the hypergraph aren't visible on build.webkit.org, 38 38 # but they impose constraints on how we optimize baselines. 39 hypergraph['mac-future'] = ['LayoutTests/platform/mac-future', 'LayoutTests/platform/mac'] 40 hypergraph['qt-unknown'] = ['LayoutTests/platform/qt-unknown', 'LayoutTests/platform/qt'] 39 hypergraph['mac-future'] = ['LayoutTests/platform/mac-future', 'LayoutTests/platform/mac', 'LayoutTests'] 40 hypergraph['qt-unknown'] = ['LayoutTests/platform/qt-unknown', 'LayoutTests/platform/qt', 'LayoutTests'] 41 42 # FIXME: Should we get this constant from somewhere? 43 fallback_path = ['LayoutTests'] 41 44 42 45 for port_name in port_factory.all_port_names(): … … 45 48 search_path = port.baseline_search_path() 46 49 if search_path: 47 hypergraph[port_name] = [fs.relpath(path, webkit_base) for path in search_path] 50 hypergraph[port_name] = [fs.relpath(path, webkit_base) for path in search_path] + fallback_path 48 51 return hypergraph 49 52 -
trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
r92153 r92562 90 90 }) 91 91 92 def test_common_directory_includes_root(self): 93 # Note: The resulting directories are "wrong" in the sense that 94 # enacting this plan would change semantics. However, this test case 95 # demonstrates that we don't throw an exception in this case. :) 96 self._assertOptimization({ 97 'LayoutTests/platform/gtk': 'e8608763f6241ddacdd5c1ef1973ba27177d0846', 98 'LayoutTests/platform/qt': 'bcbd457d545986b7abf1221655d722363079ac87', 99 'LayoutTests/platform/chromium-win': '3764ac11e1f9fbadd87a90a2e40278319190a0d3', 100 'LayoutTests/platform/mac': 'e8608763f6241ddacdd5c1ef1973ba27177d0846', 101 }, { 102 'LayoutTests/platform/qt': 'bcbd457d545986b7abf1221655d722363079ac87', 103 'LayoutTests/platform/chromium-win': '3764ac11e1f9fbadd87a90a2e40278319190a0d3', 104 'LayoutTests': 'e8608763f6241ddacdd5c1ef1973ba27177d0846', 105 }) 106 107 self._assertOptimization({ 108 'LayoutTests/platform/chromium-win': '23a30302a6910f8a48b1007fa36f3e3158341834', 109 'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127', 110 'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834', 111 }, { 112 'LayoutTests/platform/chromium': '23a30302a6910f8a48b1007fa36f3e3158341834', 113 'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127', 114 }) 115 92 116 def test_complex_shadowing(self): 93 117 self._assertOptimization({
Note: See TracChangeset
for help on using the changeset viewer.