80717 2012-03-09 12:17:15 -0800 webkit-patch optimize-baselines sometimes creates a mac-future result 2012-03-12 20:14:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan abarth abarth dpranke webkit.review.bot zimmermann oldest_to_newest 575068 0 ojan 2012-03-09 12:17:15 -0800 1. Sync to r110230. 2. webkit-patch rebaseline-test "Webkit Mac10.7" "svg/batik/masking/maskRegions.svg" 3. webkit-patch optimize-baselines "svg/batik/masking/maskRegions.svg" After step 2, LayoutTests/platform/chromium-mac/svg/batik/masking/maskRegions-expected.png is added as a new file. After step 3, git status shows me: # new file: LayoutTests/platform/chromium-mac/svg/batik/masking/maskRegions-expected.png # renamed: LayoutTests/platform/mac/svg/batik/masking/maskRegions-expected.png -> LayoutTests/platform/mac-future/svg/batik/masking/maskRegions-expected.png Obviously, you could skip step 2 and manually add the chromium-mac expected png file. 575069 1 ojan 2012-03-09 12:18:19 -0800 Related: bug 73927 and bug 72748. 576726 2 ojan 2012-03-12 16:51:03 -0700 Here's a BaselineOptimizer unittest that hits the error case in comment 1: def test_no_add_mac_future(self): self._assertOptimization({ 'LayoutTests/platform/mac': '29a1715a6470d5dd9486a142f609708de84cdac8', 'LayoutTests/platform/win': '453e67177a75b2e79905154ece0efba6e5bfb65d', 'LayoutTests/platform/mac-snowleopard': 'c43eaeb358f49d5e835236ae23b7e49d7f2b089f', 'LayoutTests/platform/chromium-mac': 'a9ba153c700a94ae1b206d8e4a75a621a89b4554', }, { 'LayoutTests/platform/mac': '29a1715a6470d5dd9486a142f609708de84cdac8', 'LayoutTests/platform/win': '453e67177a75b2e79905154ece0efba6e5bfb65d', 'LayoutTests/platform/mac-snowleopard': 'c43eaeb358f49d5e835236ae23b7e49d7f2b089f', 'LayoutTests/platform/chromium-mac': 'a9ba153c700a94ae1b206d8e4a75a621a89b4554', }) 576741 3 131457 ojan 2012-03-12 17:01:00 -0700 Created attachment 131457 Patch 576744 4 ojan 2012-03-12 17:01:27 -0700 I'm not sure this is the best fix, but it does fix at least this one case without breaking existing tests. 576754 5 131457 dpranke 2012-03-12 17:05:45 -0700 Comment on attachment 131457 Patch I'm inclined to r- this because I don't think we should have any code anywhere that is referencing directories that shouldn't actually exist. I realize you didn't create this problem, but I think this is just masking the fact that there's an underlying bug, not fixing the underlying bug. On the other hand, I could be open to landing this as a workaround for now (since you're presumably blocked on this) and filing another bug to reference this chunk of code to fix it properly. Adam, WDYT? 576766 6 131457 abarth 2012-03-12 17:17:17 -0700 Comment on attachment 131457 Patch This is a fine workaround. Another thing you can do is to reject the new_results_by_directory in optimize() if it contains any virtual directories. That essentially means that the optimization algorithm failed, which happens sometimes. 576871 7 ojan 2012-03-12 18:36:56 -0700 (In reply to comment #6) > (From update of attachment 131457 [details]) > This is a fine workaround. Another thing you can do is to reject the new_results_by_directory in optimize() if it contains any virtual directories. That essentially means that the optimization algorithm failed, which happens sometimes. I tried that first. I think this is better because there are cases where we will successfully optimize. 576881 8 abarth 2012-03-12 18:44:36 -0700 Oh, I meant we could do both. This patch is fine as-is though. 576959 9 131457 webkit.review.bot 2012-03-12 20:14:38 -0700 Comment on attachment 131457 Patch Clearing flags on attachment: 131457 Committed r110533: <http://trac.webkit.org/changeset/110533> 576960 10 webkit.review.bot 2012-03-12 20:14:43 -0700 All reviewed patches have been landed. Closing bug. 131457 2012-03-12 17:01:00 -0700 2012-03-12 20:14:38 -0700 Patch bug-80717-20120312170059.patch text/plain 4887 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMjMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjdjODY4YTEwZTUzMjJmMzZiMTBlY2MyZmY0YjJmOGI3 MjkyYjYxYy4uYmQ1YTE5ODJiN2MxMjNkZDYzNTIzYTI0OTg4ZmE2MGY4YjY2NTU5YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTAzLTEyICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgd2Via2l0LXBhdGNoIG9wdGltaXplLWJhc2VsaW5lcyBzb21ldGltZXMgY3JlYXRlcyBhIG1h Yy1mdXR1cmUgcmVzdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04MDcxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYmFzZWxpbmVvcHRpbWl6 ZXIucHk6CisgICAgICAgIChfYmFzZWxpbmVfc2VhcmNoX2h5cGVyZ3JhcGgpOgorICAgICAgICAo QmFzZWxpbmVPcHRpbWl6ZXIuX2ZpbmRfb3B0aW1hbF9yZXN1bHRfcGxhY2VtZW50KToKKyAgICAg ICAgKEJhc2VsaW5lT3B0aW1pemVyLl9maWx0ZXJfdmlydHVhbF9wb3J0cyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYmFzZWxpbmVvcHRpbWl6ZXJfdW5pdHRl c3QucHk6CisgICAgICAgIChCYXNlbGluZU9wdGltaXplclRlc3QudGVzdF9ub19hZGRfbWFjX2Z1 dHVyZSk6CisKIDIwMTItMDMtMDggIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDQ2MwpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYmFzZWxpbmVv cHRpbWl6ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNl bGluZW9wdGltaXplci5weQppbmRleCA0ZTRkYzZjNDkxYTFjOThkNWI2OTQ4NmNkMTNmOWJlYjMz ZGJlYTNhLi5iMzA1YzE5YjgxZGY3MjZjY2M2ZGNjZGJhNDQ5Y2IyZmQ2N2Y0NzdlIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNlbGluZW9wdGlt aXplci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNl bGluZW9wdGltaXplci5weQpAQCAtMzUsOCArMzUsNyBAQCBkZWYgX2Jhc2VsaW5lX3NlYXJjaF9o eXBlcmdyYXBoKGhvc3QpOgogCiAgICAgIyBUaGVzZSBlZGdlcyBpbiB0aGUgaHlwZXJncmFwaCBh cmVuJ3QgdmlzaWJsZSBvbiBidWlsZC53ZWJraXQub3JnLAogICAgICMgYnV0IHRoZXkgaW1wb3Nl IGNvbnN0cmFpbnRzIG9uIGhvdyB3ZSBvcHRpbWl6ZSBiYXNlbGluZXMuCi0gICAgaHlwZXJncmFw aFsnbWFjLWZ1dHVyZSddID0gWydMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtZnV0dXJlJywgJ0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYycsICdMYXlvdXRUZXN0cyddCi0gICAgaHlwZXJncmFwaFsn cXQtdW5rbm93biddID0gWydMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC11bmtub3duJywgJ0xheW91 dFRlc3RzL3BsYXRmb3JtL3F0JywgJ0xheW91dFRlc3RzJ10KKyAgICBoeXBlcmdyYXBoLnVwZGF0 ZShfVklSVFVBTF9QT1JUUykKIAogICAgICMgRklYTUU6IFNob3VsZCB3ZSBnZXQgdGhpcyBjb25z dGFudCBmcm9tIHNvbWV3aGVyZT8KICAgICBmYWxsYmFja19wYXRoID0gWydMYXlvdXRUZXN0cydd CkBAIC01MSw2ICs1MCwxMiBAQCBkZWYgX2Jhc2VsaW5lX3NlYXJjaF9oeXBlcmdyYXBoKGhvc3Qp OgogICAgIHJldHVybiBoeXBlcmdyYXBoCiAKIAorX1ZJUlRVQUxfUE9SVFMgPSB7CisgICAgJ21h Yy1mdXR1cmUnOiBbJ0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1mdXR1cmUnLCAnTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjJywgJ0xheW91dFRlc3RzJ10sCisgICAgJ3F0LXVua25vd24nOiBbJ0xh eW91dFRlc3RzL3BsYXRmb3JtL3F0LXVua25vd24nLCAnTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQn LCAnTGF5b3V0VGVzdHMnXSwKK30KKworCiAjIEZJWE1FOiBTaG91bGQgdGhpcyBmdW5jdGlvbiBi ZSBzb21ld2hlcmUgbW9yZSBnZW5lcmFsPwogZGVmIF9pbnZlcnRfZGljdGlvbmFyeShkaWN0aW9u YXJ5KToKICAgICBpbnZlcnRlZF9kaWN0aW9uYXJ5ID0ge30KQEAgLTEzMCw4ICsxMzUsMTggQEAg Y2xhc3MgQmFzZWxpbmVPcHRpbWl6ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICBicmVhayAg IyBGcm93bnMuIFdlIGRvIG5vdCBhcHBlYXIgdG8gYmUgY29udmVyZ2luZy4KICAgICAgICAgICAg IHVuc2F0aXNmaWVkX3BvcnRfbmFtZXNfYnlfcmVzdWx0ID0gbmV3X3Vuc2F0aXNmaWVkX3BvcnRf bmFtZXNfYnlfcmVzdWx0CiAKKyAgICAgICAgc2VsZi5fZmlsdGVyX3ZpcnR1YWxfcG9ydHMobmV3 X3Jlc3VsdHNfYnlfZGlyZWN0b3J5KQogICAgICAgICByZXR1cm4gcmVzdWx0c19ieV9kaXJlY3Rv cnksIG5ld19yZXN1bHRzX2J5X2RpcmVjdG9yeQogCisgICAgZGVmIF9maWx0ZXJfdmlydHVhbF9w b3J0cyhzZWxmLCBuZXdfcmVzdWx0c19ieV9kaXJlY3RvcnkpOgorICAgICAgICBmb3IgcG9ydCBp biBfVklSVFVBTF9QT1JUUzoKKyAgICAgICAgICAgIHZpcnR1YWxfZGlyZWN0b3J5ID0gX1ZJUlRV QUxfUE9SVFNbcG9ydF1bMF0KKyAgICAgICAgICAgIGlmIHZpcnR1YWxfZGlyZWN0b3J5IGluIG5l d19yZXN1bHRzX2J5X2RpcmVjdG9yeToKKyAgICAgICAgICAgICAgICByZWFsX2RpcmVjdG9yeSA9 IF9WSVJUVUFMX1BPUlRTW3BvcnRdWzFdCisgICAgICAgICAgICAgICAgaWYgcmVhbF9kaXJlY3Rv cnkgbm90IGluIG5ld19yZXN1bHRzX2J5X2RpcmVjdG9yeToKKyAgICAgICAgICAgICAgICAgICAg bmV3X3Jlc3VsdHNfYnlfZGlyZWN0b3J5W3JlYWxfZGlyZWN0b3J5XSA9IG5ld19yZXN1bHRzX2J5 X2RpcmVjdG9yeVt2aXJ0dWFsX2RpcmVjdG9yeV0KKyAgICAgICAgICAgICAgICBkZWwgbmV3X3Jl c3VsdHNfYnlfZGlyZWN0b3J5W3ZpcnR1YWxfZGlyZWN0b3J5XQorCiAgICAgZGVmIF9tb3ZlX2Jh c2VsaW5lcyhzZWxmLCBiYXNlbGluZV9uYW1lLCByZXN1bHRzX2J5X2RpcmVjdG9yeSwgbmV3X3Jl c3VsdHNfYnlfZGlyZWN0b3J5KToKICAgICAgICAgZGF0YV9mb3JfcmVzdWx0ID0ge30KICAgICAg ICAgZm9yIGRpcmVjdG9yeSwgcmVzdWx0IGluIHJlc3VsdHNfYnlfZGlyZWN0b3J5Lml0ZW1zKCk6 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNl bGluZW9wdGltaXplcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyX3VuaXR0ZXN0LnB5CmluZGV4IDdhZGFjMTI1MmFi ZDA2MjUzMTZiNjFlZTQyOTJkYWM5OWQ2YzQ3ZWMuLjNmMjRhNjQ5ZmE0MzhmZDZiNDI4Y2YyOTQy NTg2MDU4OTU3MjljNDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyX3VuaXR0ZXN0LnB5 CkBAIC03NSw2ICs3NSwxOSBAQCBjbGFzcyBCYXNlbGluZU9wdGltaXplclRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICAgICAgJ0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLXdp bic6ICc0NjJkMDNiOWMwMjVkYjFiMDM5MmQ3NDUzMzEwZGJlZTVmOWE5ZTc0JywKICAgICAgICAg fSkKIAorICAgIGRlZiB0ZXN0X25vX2FkZF9tYWNfZnV0dXJlKHNlbGYpOgorICAgICAgICBzZWxm Ll9hc3NlcnRPcHRpbWl6YXRpb24oeworICAgICAgICAgICAgJ0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYyc6ICcyOWExNzE1YTY0NzBkNWRkOTQ4NmExNDJmNjA5NzA4ZGU4NGNkYWM4JywKKyAgICAg ICAgICAgICdMYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4nOiAnNDUzZTY3MTc3YTc1YjJlNzk5MDUx NTRlY2UwZWZiYTZlNWJmYjY1ZCcsCisgICAgICAgICAgICAnTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXNub3dsZW9wYXJkJzogJ2M0M2VhZWIzNThmNDlkNWU4MzUyMzZhZTIzYjdlNDlkN2YyYjA4 OWYnLAorICAgICAgICAgICAgJ0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYyc6ICdh OWJhMTUzYzcwMGE5NGFlMWIyMDZkOGU0YTc1YTYyMWE4OWI0NTU0JywKKyAgICAgICAgfSwgewor ICAgICAgICAgICAgJ0xheW91dFRlc3RzL3BsYXRmb3JtL21hYyc6ICcyOWExNzE1YTY0NzBkNWRk OTQ4NmExNDJmNjA5NzA4ZGU4NGNkYWM4JywKKyAgICAgICAgICAgICdMYXlvdXRUZXN0cy9wbGF0 Zm9ybS93aW4nOiAnNDUzZTY3MTc3YTc1YjJlNzk5MDUxNTRlY2UwZWZiYTZlNWJmYjY1ZCcsCisg ICAgICAgICAgICAnTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkJzogJ2M0M2Vh ZWIzNThmNDlkNWU4MzUyMzZhZTIzYjdlNDlkN2YyYjA4OWYnLAorICAgICAgICAgICAgJ0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYyc6ICdhOWJhMTUzYzcwMGE5NGFlMWIyMDZkOGU0 YTc1YTYyMWE4OWI0NTU0JywKKyAgICAgICAgfSkKKwogICAgIGRlZiB0ZXN0X2Nocm9taXVtX2Nv dmVyc19tYWNfd2luX2xpbnV4KHNlbGYpOgogICAgICAgICBzZWxmLl9hc3NlcnRPcHRpbWl6YXRp b24oewogICAgICAgICAgICAgJ0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtLW1hYyc6ICc0 NjJkMDNiOWMwMjVkYjFiMDM5MmQ3NDUzMzEwZGJlZTVmOWE5ZTc0JywK