104687 2012-12-11 10:55:24 -0800 check-webkit-style complaining about TestExpectations lines a patch didn't modify 2012-12-11 13:43:02 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke aroben eric esprehn halton.huo hamaji levin ojan zan oldest_to_newest 788600 0 dpranke 2012-12-11 10:55:24 -0800 See bug 104462 for context ... check-webkit-style seems to be complaining about errors in TestExpectation lines unrelated to the patch. This is causing the style bot to fail and will block patches in the commit queue. I also saw the error locally when I landed the patch by hand. 788683 1 178853 dpranke 2012-12-11 12:44:56 -0800 Created attachment 178853 Patch 788731 2 178853 ojan 2012-12-11 13:29:36 -0800 Comment on attachment 178853 Patch In theory we could fix this properly by having both lines involved in a duplicate expectation get a lint error? Then we wouldn't lose any coverage here. We'd still want line filtering on for that though, right? So this patch is correct either way, but a FIXME would be nice. It's going to be a pain to keep the lint-webkitpy step green. 788734 3 dpranke 2012-12-11 13:33:11 -0800 (In reply to comment #2) > (From update of attachment 178853 [details]) > In theory we could fix this properly by having both lines involved in a duplicate expectation get a lint error? Then we wouldn't lose any coverage here. > Perhaps. A complication would be that you wouldn't want to print both lines to stderr in the lint-test-files case, but we can probably do something. > We'd still want line filtering on for that though, right? So this patch is correct either way, but a FIXME would be nice. It's going to be a pain to keep the lint-webkitpy step green. I think I'll file a bug for the enhancement instead. 788744 4 dpranke 2012-12-11 13:42:45 -0800 filed https://bugs.webkit.org/show_bug.cgi?id=104712 ; ended up adding a FIXME as well :). 788745 5 dpranke 2012-12-11 13:43:02 -0800 Committed r137355: <http://trac.webkit.org/changeset/137355> 178853 2012-12-11 12:44:56 -0800 2012-12-11 13:29:36 -0800 Patch bug-104687-20121211124218.patch text/plain 3922 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MzM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzRkY2EwMGM2YzkzYjVjZWMxNzI2Yjk5OGJjODljZGYz YTA1MzEzMC4uZjlmODk0ZTcxOWRlZjE3YzczNGVhZDY4YjgxYTBiMDQ3MzYwYmZkYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0 IEBACisyMDEyLTEyLTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSBjb21wbGFpbmluZyBhYm91dCBUZXN0RXhwZWN0YXRp b25zIGxpbmVzIGEgcGF0Y2ggZGlkbid0IG1vZGlmeQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0Njg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2F5IGJhY2sgaW4gYnVnIDYwNDY2IC8gcjg2MTY1LCB3 ZSBjaGFuZ2VkIHRoZSBzdHlsZSBjaGVja2VyCisgICAgICAgIGZvciBUZXN0RXhwZWN0YXRpb25z IHRvIGVuc3VyZSB0aGF0IHRoZSBlbnRpcmUgZmlsZSBsaW50ZWQsIG5vdAorICAgICAgICBqdXN0 IHRoZSBsaW5lcyBtb2RpZmllZCBieSBhIHBhdGNoLCBpbiBvcmRlciB0byBlbnN1cmUgdGhhdCBh CisgICAgICAgIG5ldyBsaW5lIGRpZG4ndCBjYXVzZSBlcnJvcnMgZWxzZXdoZXJlIGluIHRoZSBm aWxlIChlLmcuLCBieQorICAgICAgICBpbnRyb2R1Y2luZyBkdXBsaWNhdGUgbGluZXMpLiBBdCB0 aGUgdGltZSwgZXJyb3JzIGluIHRoZQorICAgICAgICBleHBlY3RhdGlvbnMgZmlsZXMgd2VyZSBm YXRhbCBhbmQgd2UgZGlkbid0IGhhdmUgYSBzZXBhcmF0ZSBzdGVwCisgICAgICAgIG9uIHRoZSBi b3RzIHRoYXQgd291bGQgbGludCB0aGUgZmlsZXMgdG8gZW5zdXJlIHRoaW5ncyB3ZXJlIHN0aWxs CisgICAgICAgIG9rYXksIHNvIHRoaXMgd2FzIHByb2JhYmx5IHRoZSByaWdodCB0aGluZyB0byBk bywgYnV0IGl0IGNvdWxkCisgICAgICAgIGNhdXNlIHNvbWUgcGF0Y2hlcyB0byBmYWlsIHRoZSBz dHlsZSBjaGVjayBldmVuIHRob3VnaCB0aGUgcGF0Y2hlcworICAgICAgICB0aGVtc2VsdmVzIHdl cmUgZmluZS4KKworICAgICAgICBIb3dldmVyLCBub3cgZXJyb3JzIGFyZW4ndCBhbHdheXMgZmF0 YWwsIGFuZCB3ZSBoYXZlIGEgc2VwYXJhdGUgYnVpbGQKKyAgICAgICAgc3RlcCB0byBsaW50IHRo ZSBmaWxlcy4gU28sIHdlIHNob3VsZCBwcm9iYWJseSBub3QgcHVuaXNoIHRoZQorICAgICAgICBw YXRjaGVzIGFuZCB0aGUgc3R5bGUgY2hlY2tlciBzaG91bGQgZmlsdGVyIG91dCAidW5yZWxhdGVk IiBlcnJvcnMuCisKKyAgICAgICAgSW4gdGhlb3J5IHdlIHNob3VsZCBiZSBjb21wYXJpbmcgdGhl IG91dHB1dCBwcmUtIGFuZCBwb3N0LXBhdGNoCisgICAgICAgIHRvIGZpbHRlciBvdXQgcHJlLWV4 aXN0aW5nIGVycm9ycywgYnV0IEkgZG9uJ3QgdGhpbmsgdGhlIHN0eWxlCisgICAgICAgIGNoZWNr ZXIgaGFzIHRoYXQgYWJpbGl0eS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25z Q2hlY2tlci5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RFeHBlY3Rh dGlvbnNUZXN0Q2FzZS5hc3NlcnRfbGluZXNfbGludCk6CisKIDIwMTItMTItMTEgIE1hcnRpbiBS b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFNwdXJpb3Vz IHN0ZGVyciBvdXRwdXQgZnJvbSB0aGUgZXZlbnQgc2VuZGVyCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQpp bmRleCA1MWI5N2JlYzU5MGVlNGMxNDJlZjgzZGZiNjhlZmQxYzdjNzBhZDUwLi42N2YzODQxNmRi NWMzZWI2N2I5MzhhZDdmYzdjMjJjZjk5ODhhN2E1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAg LTYyLDcgKzYyLDYgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIob2JqZWN0KToKICAg ICBkZWYgX19pbml0X18oc2VsZiwgZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IsIGhvc3Q9 Tm9uZSk6CiAgICAgICAgIHNlbGYuX2ZpbGVfcGF0aCA9IGZpbGVfcGF0aAogICAgICAgICBzZWxm Ll9oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKLSAgICAgICAgc2VsZi5f aGFuZGxlX3N0eWxlX2Vycm9yLnR1cm5fb2ZmX2xpbmVfZmlsdGVyaW5nKCkKICAgICAgICAgc2Vs Zi5fdGFiX2NoZWNrZXIgPSBUYWJDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9y KQogCiAgICAgICAgICMgRklYTUU6IGhvc3Qgc2hvdWxkIGJlIGEgcmVxdWlyZWQgcGFyYW1ldGVy LCBub3QgYW4gb3B0aW9uYWwgb25lLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3Qu cHkKaW5kZXggODlmMjgwZDlhMzJjYTI2NTAxYWFiZTYwYWE3YzRmOThjMTZhYWY4MC4uZDQ1ODcw ZDRmNWNlMThhZmFjZmUxNTcxNjQ2NjI4NzM5MDIxNWNiOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0 YXRpb25zX3VuaXR0ZXN0LnB5CkBAIC0xMDcsNyArMTA3LDExIEBAIGNsYXNzIFRlc3RFeHBlY3Rh dGlvbnNUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGV4cGVjdGVkX291dHB1dCwgc2VsZi5fZXJyb3JfY29sbGVjdG9yLmdldF9lcnJvcnMo KSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0Tm90RXF1YWxzKCcnLCBz ZWxmLl9lcnJvcl9jb2xsZWN0b3IuZ2V0X2Vycm9ycygpKQotICAgICAgICBzZWxmLmFzc2VydFRy dWUoc2VsZi5fZXJyb3JfY29sbGVjdG9yLnR1cm5lZF9vZmZfZmlsdGVyaW5nKQorCisgICAgICAg ICMgTm90ZSB0aGF0IGEgcGF0Y2ggbWlnaHQgY2hhbmdlIGEgbGluZSB0aGF0IGludHJvZHVjZXMg ZXJyb3JzIGVsc2V3aGVyZSwgYnV0IHdlCisgICAgICAgICMgZG9uJ3Qgd2FudCB0byBsaW50IHRo ZSB3aG9sZSBmaWxlIChpdCBjYW4gdW5mYWlybHkgcHVuaXNoIHBhdGNoZXMgZm9yIHByZS1leGlz dGluZyBlcnJvcnMpLgorICAgICAgICAjIFdlIHJlbHkgb24gYSBzZXBhcmF0ZSBsaW50LXdlYmtp dHB5IHN0ZXAgb24gdGhlIGJvdHMgdG8ga2VlcCB0aGUgd2hvbGUgZmlsZSBva2F5LgorICAgICAg ICBzZWxmLmFzc2VydEZhbHNlKHNlbGYuX2Vycm9yX2NvbGxlY3Rvci50dXJuZWRfb2ZmX2ZpbHRl cmluZykKIAogICAgIGRlZiB0ZXN0X3ZhbGlkX2V4cGVjdGF0aW9ucyhzZWxmKToKICAgICAgICAg c2VsZi5hc3NlcnRfbGluZXNfbGludChbImNyYnVnLmNvbS8xMjM0IFsgTWFjIF0gcGFzc2VzL3Rl eHQuaHRtbCBbIFBhc3MgRmFpbHVyZSBdIl0sIHNob3VsZF9wYXNzPVRydWUpCg==