96136 2012-09-07 12:00:05 -0700 Regression: check-webkit-style no longer checks TestExpectations for syntax errors 2012-09-07 15:23:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony abarth dpranke levin ojan rniwa webkit.review.bot oldest_to_newest 714818 0 tony 2012-09-07 12:00:05 -0700 Regression: check-webkit-style no longer checks TestExpectations for syntax errors 714821 1 162838 tony 2012-09-07 12:02:39 -0700 Created attachment 162838 Patch 714822 2 tony 2012-09-07 12:03:21 -0700 Dirk, what was the overrides param for? Should I put the FIXME back? 714829 3 162838 ojan 2012-09-07 12:09:36 -0700 Comment on attachment 162838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162838&action=review > Tools/Scripts/webkitpy/style/checkers/test_expectations.py:-80 > - # FIXME: we should pass in the filenames here if possible, and ensure > - # that this works with with cascading expectations files and remove the overrides param. As discussed in person, I think with cascading expectations we want to lint each file in isolation and so doing nothing special is correct. I'll r+ for now to get the linter running again. Dirk can clarify if I'm wrong when he returns from vacation. 714832 4 162838 tony 2012-09-07 12:13:04 -0700 Comment on attachment 162838 Patch Removing the overrides check should just make this check more permissive, which is still better than not running it at all. If we need to do something with overrides, we can do that in a follow up. 714893 5 162838 webkit.review.bot 2012-09-07 13:11:38 -0700 Comment on attachment 162838 Patch Clearing flags on attachment: 162838 Committed r127910: <http://trac.webkit.org/changeset/127910> 714894 6 webkit.review.bot 2012-09-07 13:11:41 -0700 All reviewed patches have been landed. Closing bug. 714914 7 dpranke 2012-09-07 13:39:03 -0700 I seem to recall the overrides check in the style checker was something of a kludge; as you could see, all we did was cat the two strings together. The TestExpectationsParser class is only set up to parse one file at a time and so has no concept of the cascade. As such, using this approach misses out on some cross-file semantic warnings, but it's probably good enough for now. If we wanted we could get fancier and pass in a full OrderedDict of the cascades, but I don't think there's a real need for it. LGTM. 715043 8 ojan 2012-09-07 15:23:27 -0700 This misses when tests are duplicated between TestExpectations and Skipped files. "run-webkit-tests --lint-test-files" warns for those cases. It's not a big deal. Hopefully we just won't have Skipped files soon. 162838 2012-09-07 12:02:39 -0700 2012-09-07 13:11:37 -0700 Patch bug-96136-20120907120218.patch text/plain 4978 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3ODk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTMzOWU5MzhkOGRkNzU3MzFlNzJlN2FlMTBkYTllZDg4 ZDg5ODZiNS4uNWZlNjQ0NjM1YzA3MTY4ZmFjYjM0NTYyYWJjMzVhYzdjMDMxODliNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEyLTA5LTA3ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmVncmVzc2lvbjogY2hlY2std2Via2l0LXN0eWxlIG5vIGxvbmdlciBjaGVja3MgVGVzdEV4 cGVjdGF0aW9ucyBmb3Igc3ludGF4IGVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYxMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIHdlIHJlbmFtZWQgdGhlIGZpbGUgdG8gVGVzdEV4cGVj dGF0aW9ucywgaXQgd2FzIG5vIGxvbmdlciBjb25zaWRlcmVkIGEgdGV4dCBmaWxlIHNvCisgICAg ICAgIGl0IHdhcyBubyBsb25nZXIgYmVpbmcgY2hlY2tlZC4gU2luY2UgdGhlbiwgdGVzdF9leHBl Y3RhdGlvbnNfb3ZlcnJpZGVzKCkgaGFzIGJlZW4gcmVtb3ZlZAorICAgICAgICBmcm9tIHRoZSBw b3J0IG9iamVjdCwgc28gSSd2ZSByZW1vdmVkIHRoYXQgZnJvbSB0aGUgY2hlY2suIEknbSBub3Qg c3VyZSB3aGF0IGl0IHdhcworICAgICAgICBzdXBwb3NlZCB0byBkby4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRj aGVyLl9maWxlX3R5cGUpOiBNYXJrIFRlc3RFeHBlY3RhdGlvbnMgYXMgYSB0ZXh0IGZpbGUuCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9u cy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyLmNoZWNrX3Rlc3RfZXhwZWN0 YXRpb25zKTogUmVtb3ZlIG92ZXJyaWRlcyBwYXJhbS4KKyAgICAgICAgKFRlc3RFeHBlY3RhdGlv bnNDaGVja2VyLmNoZWNrKTogUmVtb3ZlIG92ZXJyaWRlcyBwYXJhbS4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5 OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uc1Rlc3RDYXNlLmFzc2VydF9saW5lc19saW50KTog UmVtb3ZlIG92ZXJyaWRlcyBwYXJhbS4KKwogMjAxMi0wOS0wNyAgUGV0ZXIgQmV2ZXJsb28gIDxw ZXRlckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWN0dWFsbHkgdHJpZ2dlciB0aGUgQW5kcm9p ZCBUZXN0ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl ci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQppbmRleCBlZDA4 NjBjYzBjYmJkNWQxZjk5Zjc3NWUyMGUxNGYyY2Q3ODhkMTcxLi41YjExYWY0ODNmZjE1OGMxZGYw NzhjOTQ0NzEyYWYwN2M4ODM1YzkzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyLnB5CkBAIC01NzIsNyArNTcyLDcgQEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNoZXIob2JqZWN0 KToKICAgICAgICAgZWxpZiBmaWxlX2V4dGVuc2lvbiA9PSBfUE5HX0ZJTEVfRVhURU5TSU9OOgog ICAgICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLlBORwogICAgICAgICBlbGlmICgobm90IGZpbGVf ZXh0ZW5zaW9uIGFuZCBvcy5wYXRoLmpvaW4oIlRvb2xzIiwgIlNjcmlwdHMiKSBpbiBmaWxlX3Bh dGgpIG9yCi0gICAgICAgICAgICAgIGZpbGVfZXh0ZW5zaW9uIGluIF9URVhUX0ZJTEVfRVhURU5T SU9OUyk6CisgICAgICAgICAgICAgIGZpbGVfZXh0ZW5zaW9uIGluIF9URVhUX0ZJTEVfRVhURU5T SU9OUyBvciBvcy5wYXRoLmJhc2VuYW1lKGZpbGVfcGF0aCkgPT0gJ1Rlc3RFeHBlY3RhdGlvbnMn KToKICAgICAgICAgICAgIHJldHVybiBGaWxlVHlwZS5URVhUCiAgICAgICAgIGVsc2U6CiAgICAg ICAgICAgICByZXR1cm4gRmlsZVR5cGUuTk9ORQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggYzk1 YzQxMjBmNjM0YjBmODU0MDIzYWRmYjE4OTYzOTM2YjA0OTk3Zi4uM2I4MTEzMmMzOTUyNzQ3YTM5 ZjA0M2Q1YmIxNzQzNTY4YzkyYjlhMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC03NSwxMyAr NzUsOSBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zQ2hlY2tlcihvYmplY3QpOgogICAgIGRlZiBf aGFuZGxlX2Vycm9yX21lc3NhZ2Uoc2VsZiwgbGluZW5vLCBtZXNzYWdlLCBjb25maWRlbmNlKToK ICAgICAgICAgcGFzcwogCi0gICAgZGVmIGNoZWNrX3Rlc3RfZXhwZWN0YXRpb25zKHNlbGYsIGV4 cGVjdGF0aW9uc19zdHIsIHRlc3RzPU5vbmUsIG92ZXJyaWRlcz1Ob25lKToKLSAgICAgICAgIyBG SVhNRTogd2Ugc2hvdWxkIHBhc3MgaW4gdGhlIGZpbGVuYW1lcyBoZXJlIGlmIHBvc3NpYmxlLCBh bmQgZW5zdXJlCi0gICAgICAgICMgdGhhdCB0aGlzIHdvcmtzIHdpdGggd2l0aCBjYXNjYWRpbmcg ZXhwZWN0YXRpb25zIGZpbGVzIGFuZCByZW1vdmUgdGhlIG92ZXJyaWRlcyBwYXJhbS4KKyAgICBk ZWYgY2hlY2tfdGVzdF9leHBlY3RhdGlvbnMoc2VsZiwgZXhwZWN0YXRpb25zX3N0ciwgdGVzdHM9 Tm9uZSk6CiAgICAgICAgIHBhcnNlciA9IFRlc3RFeHBlY3RhdGlvblBhcnNlcihzZWxmLl9wb3J0 X29iaiwgdGVzdHMsIEZhbHNlKQogICAgICAgICBleHBlY3RhdGlvbnMgPSBwYXJzZXIucGFyc2Uo J2V4cGVjdGF0aW9ucycsIGV4cGVjdGF0aW9uc19zdHIpCi0gICAgICAgIGlmIG92ZXJyaWRlczoK LSAgICAgICAgICAgIGV4cGVjdGF0aW9ucyArPSBwYXJzZXIucGFyc2UoJ292ZXJyaWRlcycsIG92 ZXJyaWRlcykKIAogICAgICAgICBsZXZlbCA9IDUKICAgICAgICAgZm9yIGV4cGVjdGF0aW9uX2xp bmUgaW4gZXhwZWN0YXRpb25zOgpAQCAtOTIsMTIgKzg4LDkgQEAgY2xhc3MgVGVzdEV4cGVjdGF0 aW9uc0NoZWNrZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fdGFiX2NoZWNrZXIuY2hlY2sobGlu ZXMpCiAKICAgICBkZWYgY2hlY2soc2VsZiwgbGluZXMpOgotICAgICAgICBvdmVycmlkZXMgPSBz ZWxmLl9wb3J0X29iai50ZXN0X2V4cGVjdGF0aW9uc19vdmVycmlkZXMoKQogICAgICAgICBleHBl Y3RhdGlvbnMgPSAnXG4nLmpvaW4obGluZXMpCiAgICAgICAgIGlmIHNlbGYuX3BvcnRfb2JqOgot ICAgICAgICAgICAgc2VsZi5jaGVja190ZXN0X2V4cGVjdGF0aW9ucyhleHBlY3RhdGlvbnNfc3Ry PWV4cGVjdGF0aW9ucywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGVzdHM9Tm9uZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3Zl cnJpZGVzPW92ZXJyaWRlcykKKyAgICAgICAgICAgIHNlbGYuY2hlY2tfdGVzdF9leHBlY3RhdGlv bnMoZXhwZWN0YXRpb25zX3N0cj1leHBlY3RhdGlvbnMsIHRlc3RzPU5vbmUpCiAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IoMSwgJ3Rlc3QvZXhwZWN0 YXRpb25zJywgNSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnTm8gcG9y dCB1c2VzIHBhdGggJXMgZm9yIHRlc3RfZXhwZWN0YXRpb25zJyAlIHNlbGYuX2ZpbGVfcGF0aCkK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9l eHBlY3RhdGlvbnNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CmluZGV4IDhjYzkxYjFhYzc1ZDc5 MWU2MmI0MzZjZWVjNmE1MzM3NjQyYzgyOTkuLjhiNTNlNmRmYTkzYzQ0MjYyMDRiMjdmMzk1YzUx NzQ5YjE2Njc3YzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQpAQCAt OTMsOCArOTMsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zVGVzdENhc2UodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICAjIE5vdyB1c2UgYSB0ZXN0IHBvcnQgc28gd2UgY2FuIGNoZWNrIHRo ZSBsaW5lcy4KICAgICAgICAgY2hlY2tlci5fcG9ydF9vYmogPSBob3N0LnBvcnRfZmFjdG9yeS5n ZXQoJ3Rlc3QtbWFjLWxlb3BhcmQnKQogICAgICAgICBjaGVja2VyLmNoZWNrX3Rlc3RfZXhwZWN0 YXRpb25zKGV4cGVjdGF0aW9uc19zdHI9J1xuJy5qb2luKGxpbmVzKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0cz1bc2VsZi5fdGVzdF9maWxlXSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdmVycmlkZXM9Tm9uZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0cz1bc2VsZi5fdGVzdF9maWxl XSkKICAgICAgICAgY2hlY2tlci5jaGVja190YWJzKGxpbmVzKQogICAgICAgICBpZiBzaG91bGRf cGFzczoKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIHNlbGYuX2Vycm9yX2NvbGxl Y3Rvci5nZXRfZXJyb3JzKCkpCg==