125049 2013-12-01 16:35:47 -0800 Add JavaScript style checker and teach checker.py about .js files 2013-12-02 14:50:31 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 125045 1 burg webkit-unassigned commit-queue glenn graouts joepeck rniwa timothy oldest_to_newest 955192 0 burg 2013-12-01 16:35:47 -0800 We should check WebInspectorUI for trivial style problems using check-webkit-style. The first step is to create a JavaScript checker module and associate it with the .js file extension. As this is intended to check the inspector sources, we should defer on checking layout tests, perf tests, and other things written in JavaScript. 955206 1 218130 burg 2013-12-01 18:26:04 -0800 Created attachment 218130 patch 955532 2 218130 joepeck 2013-12-02 13:04:49 -0800 Comment on attachment 218130 patch View in context: https://bugs.webkit.org/attachment.cgi?id=218130&action=review > Tools/Scripts/webkitpy/style/checker_unittest.py:484 > + # Check checker attributes on a typical input. > + file_base = "foo" > + file_extension = "css" > + file_path = file_base + "." + file_extension > + self.assert_checker_text(file_path) > + checker = self.dispatch(file_path) > + self.assertEqual(checker.handle_style_error, > + self.mock_handle_style_error) > + There is no mention in the ChangeLog of handling .css files as text. It also seems weird to put this test in "test_js_paths" and not a "test_css_paths". Looks fine though. 955576 3 218130 commit-queue 2013-12-02 14:20:13 -0800 Comment on attachment 218130 patch Rejecting attachment 218130 from commit-queue. burg@cs.washington.edu does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 955580 4 burg 2013-12-02 14:21:15 -0800 Oops, I don't understand how attachment flags work. Can you set cq+? Also, (In reply to comment #2) > There is no mention in the ChangeLog of handling .css files as text. It also seems weird to put this test in "test_js_paths" and not a "test_css_paths". Looks fine though. This is copied from existing style checkers as a negative test case. IMO, all of the checker constructor unit tests should be deleted since they are pretty useless. But then, I'd get lost deleting a lot of unit tests for lack of purpose. 955602 5 218130 commit-queue 2013-12-02 14:50:29 -0800 Comment on attachment 218130 patch Clearing flags on attachment: 218130 Committed r159969: <http://trac.webkit.org/changeset/159969> 955603 6 commit-queue 2013-12-02 14:50:31 -0800 All reviewed patches have been landed. Closing bug. 218130 2013-12-01 18:26:04 -0800 2013-12-02 14:50:29 -0800 patch bug-125049-20131201182602.patch text/plain 13543 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjZlN2Q0NzQ1NDIyMTFmNmQxZThjNzNlZTRlZmRkZTgx M2UzZjNiMC4uMTA2MTMwMWRjMjNhZjlmNjQzMDU4ZWU1ODEzMzZlM2VhMjI1ZDVlOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQx IEBACisyMDEzLTEyLTAxICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4K KworICAgICAgICBBZGQgSmF2YVNjcmlwdCBzdHlsZSBjaGVja2VyIGFuZCB0ZWFjaCBjaGVja2Vy LnB5IGFib3V0IC5qcyBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI1MDQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGEgSmF2YVNjcmlwdCBmaWxlIHR5cGUsIGV4dGVuc2lvbiwgYW5kIGNo ZWNrZXIgKEpTQ2hlY2tlcikuCisgICAgICAgIFVzZSBUZXh0Q2hlY2tlciBmb3IgSmF2YVNjcmlw dCB0ZXN0cywgbGlicmFyaWVzLCB3ZWJzaXRlIHJlc291cmNlcywKKyAgICAgICAgZXRjLiBhbmQg dXNlIEpTQ2hlY2tlciBmb3IgZmlsZXMgd2l0aGluIFdlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UuCisKKyAgICAgICAgQW1lbmRlZCB0ZXN0cyBmb3IgVGV4dENoZWNrZXIgdG8gcmVmbGVjdCB0 aGUgcnVsZSBhYm92ZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl ci5weToKKyAgICAgICAgKF9hbGxfY2F0ZWdvcmllcyk6IEFkZCBjYXRlZ29yaWVzIGRlZmluZWQg YnkgSlNDaGVja2VyLgorICAgICAgICAoRmlsZVR5cGUpOiBBZGQgZmlsZSB0eXBlIGZvciBKUyBh bmQgcmUtbnVtYmVyIHRoZSBlbnVtLgorICAgICAgICAoQ2hlY2tlckRpc3BhdGNoZXIuX2ZpbGVf dHlwZSk6IERldGVjdCAuanMgZmlsZXMgYXMgSmF2YVNjcmlwdC4KKyAgICAgICAgKENoZWNrZXJE aXNwYXRjaGVyLl9jcmVhdGVfY2hlY2tlcik6CisgICAgICAgIENyZWF0ZSBhIEpTQ2hlY2tlciBv ciBUZXh0Q2hlY2tlciBkZXBlbmRpbmcgb24gdGhlIGZpbGUncyBwYXRoLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoQ2hl Y2tlckRpc3BhdGNoZXJEaXNwYXRjaFRlc3QuYXNzZXJ0X2NoZWNrZXJfanMpOiBBZGRlZC4KKyAg ICAgICAgKENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0Y2hUZXN0LnRlc3RfanNfcGF0aHMpOiBBZGRl ZC4KKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0Y2hUZXN0LnRlc3RfdGV4dF9wYXRo cyk6IEFkZCBuZXcgdGVzdCBwYXRocworICAgICAgICB0aGF0IGVuZCBpbiAuanMgYnV0IHNob3Vs ZCBiZSBjaGVja2VkIHdpdGggVGV4dENoZWNrZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9qcy5weTogQWRkZWQuCisgICAgICAgIChKU0NoZWNrZXIpOgorICAg ICAgICAoSlNDaGVja2VyLl9faW5pdF9fKToKKyAgICAgICAgKEpTQ2hlY2tlci5jaGVjayk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qc191bml0dGVzdC5weTog QWRkZWQuCisgICAgICAgIChKU1Rlc3RDYXNlKToKKyAgICAgICAgKEpTVGVzdENhc2UuYXNzZXJ0 Tm9FcnJvcik6CisgICAgICAgIChKU1Rlc3RDYXNlLmFzc2VydE5vRXJyb3IuZXJyb3JfZm9yX3Rl c3QpOgorICAgICAgICAoSlNUZXN0Q2FzZS5hc3NlcnRFcnJvcik6CisgICAgICAgIChKU1Rlc3RD YXNlLmFzc2VydEVycm9yLmVycm9yX2Zvcl90ZXN0KToKKyAgICAgICAgKEpTVGVzdENhc2UudGVz dF9ub19lcnJvcik6CisgICAgICAgIChKU1Rlc3RDYXNlLnRlc3RfZXJyb3IpOgorCiAyMDEzLTEy LTAxICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gUmVt b3ZlIHRoZSBNaW5pQnJvd3NlciBpbmplY3RlZCBidW5kbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weQppbmRleCA4OTIwNTdhNzBjYzdkOGRmMTBlNTQ4ZTU1MDVjZjJiMzE2 NTcwNmQyLi4zYzM5NTc0OGY5NGM3NDExNTYxZDBhN2YyY2IzOTE3MTIwZmY1MWEwIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CkBAIC00MSw2ICs0MSw3IEBAIGZyb20g Y2hlY2tlcnMuY29tbW9uIGltcG9ydCBDYXJyaWFnZVJldHVybkNoZWNrZXIKIGZyb20gY2hlY2tl cnMuY2hhbmdlbG9nIGltcG9ydCBDaGFuZ2VMb2dDaGVja2VyCiBmcm9tIGNoZWNrZXJzLmNwcCBp bXBvcnQgQ3BwQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5jbWFrZSBpbXBvcnQgQ01ha2VDaGVja2Vy Citmcm9tIGNoZWNrZXJzLmpzIGltcG9ydCBKU0NoZWNrZXIKIGZyb20gY2hlY2tlcnMuanNvbmNo ZWNrZXIgaW1wb3J0IEpTT05DaGVja2VyCiBmcm9tIGNoZWNrZXJzLnBuZyBpbXBvcnQgUE5HQ2hl Y2tlcgogZnJvbSBjaGVja2Vycy5weXRob24gaW1wb3J0IFB5dGhvbkNoZWNrZXIKQEAgLTI2Myw2 ICsyNjQsOCBAQCBfQ1BQX0ZJTEVfRVhURU5TSU9OUyA9IFsKICAgICAnaCcsCiAgICAgXQogCitf SlNfRklMRV9FWFRFTlNJT04gPSAnanMnCisKIF9KU09OX0ZJTEVfRVhURU5TSU9OID0gJ2pzb24n CiAKIF9QWVRIT05fRklMRV9FWFRFTlNJT04gPSAncHknCkBAIC0yNzksNyArMjgyLDYgQEAgX1RF WFRfRklMRV9FWFRFTlNJT05TID0gWwogICAgICdodG1sJywKICAgICAnaWRsJywKICAgICAnaW4n LAotICAgICdqcycsCiAgICAgJ21tJywKICAgICAncGhwJywKICAgICAncGwnLApAQCAtMzUwLDYg KzM1Miw3IEBAIGRlZiBfYWxsX2NhdGVnb3JpZXMoKToKICAgICAiIiJSZXR1cm4gdGhlIHNldCBv ZiBhbGwgY2F0ZWdvcmllcyB1c2VkIGJ5IGNoZWNrLXdlYmtpdC1zdHlsZS4iIiIKICAgICAjIFRh a2UgdGhlIHVuaW9uIGFjcm9zcyBhbGwgY2hlY2tlcnMuCiAgICAgY2F0ZWdvcmllcyA9IENvbW1v bkNhdGVnb3JpZXMudW5pb24oQ3BwQ2hlY2tlci5jYXRlZ29yaWVzKQorICAgIGNhdGVnb3JpZXMg PSBjYXRlZ29yaWVzLnVuaW9uKEpTQ2hlY2tlci5jYXRlZ29yaWVzKQogICAgIGNhdGVnb3JpZXMg PSBjYXRlZ29yaWVzLnVuaW9uKEpTT05DaGVja2VyLmNhdGVnb3JpZXMpCiAgICAgY2F0ZWdvcmll cyA9IGNhdGVnb3JpZXMudW5pb24oVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIuY2F0ZWdvcmllcykK ICAgICBjYXRlZ29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihDaGFuZ2VMb2dDaGVja2VyLmNhdGVn b3JpZXMpCkBAIC00OTQsMTUgKzQ5NywxNSBAQCBjbGFzcyBGaWxlVHlwZToKICAgICAjIEFscGhh YmV0aXplIHJlbWFpbmluZyB0eXBlcwogICAgIENIQU5HRUxPRyA9IDEKICAgICBDUFAgPSAyCi0g ICAgSlNPTiA9IDMKLSAgICBQTkcgPSA0Ci0gICAgUFlUSE9OID0gNQotICAgIFRFWFQgPSA2Ci0g ICAgV0FUQ0hMSVNUID0gNwotICAgIFhNTCA9IDgKLSAgICBYQ09ERVBST0ogPSA5Ci0gICAgQ01B S0UgPSAxMAotCisgICAgSlMgPSAzCisgICAgSlNPTiA9IDQKKyAgICBQTkcgPSA1CisgICAgUFlU SE9OID0gNgorICAgIFRFWFQgPSA3CisgICAgV0FUQ0hMSVNUID0gOAorICAgIFhNTCA9IDkKKyAg ICBYQ09ERVBST0ogPSAxMAorICAgIENNQUtFID0gMTEKIAogY2xhc3MgQ2hlY2tlckRpc3BhdGNo ZXIob2JqZWN0KToKIApAQCAtNTY2LDYgKzU2OSw4IEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVy KG9iamVjdCk6CiAgICAgICAgICAgICAjIHJlYWRpbmcgZnJvbSBzdGRpbiwgY3BwX3N0eWxlIHRl c3RzIHNob3VsZCBub3QgcmVseSBvbgogICAgICAgICAgICAgIyB0aGUgZXh0ZW5zaW9uLgogICAg ICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLkNQUAorICAgICAgICBlbGlmIGZpbGVfZXh0ZW5zaW9u ID09IF9KU19GSUxFX0VYVEVOU0lPTjoKKyAgICAgICAgICAgIHJldHVybiBGaWxlVHlwZS5KUwog ICAgICAgICBlbGlmIGZpbGVfZXh0ZW5zaW9uID09IF9KU09OX0ZJTEVfRVhURU5TSU9OOgogICAg ICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLkpTT04KICAgICAgICAgZWxpZiBmaWxlX2V4dGVuc2lv biA9PSBfUFlUSE9OX0ZJTEVfRVhURU5TSU9OOgpAQCAtNjAyLDYgKzYwNywxMiBAQCBjbGFzcyBD aGVja2VyRGlzcGF0Y2hlcihvYmplY3QpOgogICAgICAgICAgICAgZmlsZV9leHRlbnNpb24gPSBz ZWxmLl9maWxlX2V4dGVuc2lvbihmaWxlX3BhdGgpCiAgICAgICAgICAgICBjaGVja2VyID0gQ3Bw Q2hlY2tlcihmaWxlX3BhdGgsIGZpbGVfZXh0ZW5zaW9uLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaGFuZGxlX3N0eWxlX2Vycm9yLCBtaW5fY29uZmlkZW5jZSkKKyAgICAgICAg ZWxpZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuSlM6CisgICAgICAgICAgICAjIERvIG5vdCBhdHRl bXB0IHRvIGNoZWNrIG5vbi1JbnNwZWN0b3Igb3IgM3JkLXBhcnR5IEphdmFTY3JpcHQgZmlsZXMg YXMgSlMuCisgICAgICAgICAgICBpZiBvcy5wYXRoLmpvaW4oJ1dlYkluc3BlY3RvclVJJywgJ1Vz ZXJJbnRlcmZhY2UnKSBpbiBmaWxlX3BhdGggYW5kIChub3QgJ0V4dGVybmFsJyBpbiBmaWxlX3Bh dGgpOgorICAgICAgICAgICAgICAgIGNoZWNrZXIgPSBKU0NoZWNrZXIoZmlsZV9wYXRoLCBoYW5k bGVfc3R5bGVfZXJyb3IpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGNoZWNr ZXIgPSBUZXh0Q2hlY2tlcihmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAg ZWxpZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuSlNPTjoKICAgICAgICAgICAgIGNoZWNrZXIgPSBK U09OQ2hlY2tlcihmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAgZWxpZiBm aWxlX3R5cGUgPT0gRmlsZVR5cGUuUFlUSE9OOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CmluZGV4IGRjZjY5ZTU2NjNiMDE3YzM3MDJmNzky ZTRlY2YyN2RhYTJhNzkxMTIuLmMwMzc1YWU0NzlmNTMyMDU3M2ViZGZmM2QwMjhjMjkwYTc5NmY1 NTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0 dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRl c3QucHkKQEAgLTUyLDYgKzUyLDcgQEAgZnJvbSBjaGVja2VyIGltcG9ydCBTdHlsZVByb2Nlc3Nv cgogZnJvbSBjaGVja2VyIGltcG9ydCBTdHlsZVByb2Nlc3NvckNvbmZpZ3VyYXRpb24KIGZyb20g Y2hlY2tlcnMuY2hhbmdlbG9nIGltcG9ydCBDaGFuZ2VMb2dDaGVja2VyCiBmcm9tIGNoZWNrZXJz LmNwcCBpbXBvcnQgQ3BwQ2hlY2tlcgorZnJvbSBjaGVja2Vycy5qcyBpbXBvcnQgSlNDaGVja2Vy CiBmcm9tIGNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ2hlY2tlcgogZnJvbSBjaGVj a2Vycy5weXRob24gaW1wb3J0IFB5dGhvbkNoZWNrZXIKIGZyb20gY2hlY2tlcnMudGV4dCBpbXBv cnQgVGV4dENoZWNrZXIKQEAgLTM5Myw2ICszOTQsMTAgQEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNo ZXJEaXNwYXRjaFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAiIiJBc3NlcnQgdGhh dCB0aGUgZGlzcGF0Y2hlZCBjaGVja2VyIGlzIGEgQ3BwQ2hlY2tlci4iIiIKICAgICAgICAgc2Vs Zi5hc3NlcnRfY2hlY2tlcihmaWxlX3BhdGgsIENwcENoZWNrZXIpCiAKKyAgICBkZWYgYXNzZXJ0 X2NoZWNrZXJfanMoc2VsZiwgZmlsZV9wYXRoKToKKyAgICAgICAgIiIiQXNzZXJ0IHRoYXQgdGhl IGRpc3BhdGNoZWQgY2hlY2tlciBpcyBhIEpTQ2hlY2tlci4iIiIKKyAgICAgICAgc2VsZi5hc3Nl cnRfY2hlY2tlcihmaWxlX3BhdGgsIEpTQ2hlY2tlcikKKwogICAgIGRlZiBhc3NlcnRfY2hlY2tl cl9qc29uKHNlbGYsIGZpbGVfcGF0aCk6CiAgICAgICAgICIiIkFzc2VydCB0aGF0IHRoZSBkaXNw YXRjaGVkIGNoZWNrZXIgaXMgYSBKU09OQ2hlY2tlci4iIiIKICAgICAgICAgc2VsZi5hc3NlcnRf Y2hlY2tlcihmaWxlX3BhdGgsIEpTT05DaGVja2VyKQpAQCAtNDU5LDYgKzQ2NCwyNCBAQCBjbGFz cyBDaGVja2VyRGlzcGF0Y2hlckRpc3BhdGNoVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2hlY2tlci5maWxlX2V4dGVuc2lvbiwgZmlsZV9leHRlbnNp b24pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2hlY2tlci5maWxlX3BhdGgsIGZpbGVfcGF0 aCkKIAorICAgIGRlZiB0ZXN0X2pzX3BhdGhzKHNlbGYpOgorICAgICAgICAiIiJUZXN0IHBhdGhz IHRoYXQgc2hvdWxkIGJlIGNoZWNrZWQgYXMgSmF2YVNjcmlwdC4iIiIKKyAgICAgICAgcGF0aHMg PSBbCisgICAgICAgICAgICJTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9kdW1t eS5qcyIsCisgICAgICAgIF0KKworICAgICAgICBmb3IgcGF0aCBpbiBwYXRoczoKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0X2NoZWNrZXJfanMocGF0aCkKKworICAgICAgICAjIENoZWNrIGNoZWNr ZXIgYXR0cmlidXRlcyBvbiBhIHR5cGljYWwgaW5wdXQuCisgICAgICAgIGZpbGVfYmFzZSA9ICJm b28iCisgICAgICAgIGZpbGVfZXh0ZW5zaW9uID0gImNzcyIKKyAgICAgICAgZmlsZV9wYXRoID0g ZmlsZV9iYXNlICsgIi4iICsgZmlsZV9leHRlbnNpb24KKyAgICAgICAgc2VsZi5hc3NlcnRfY2hl Y2tlcl90ZXh0KGZpbGVfcGF0aCkKKyAgICAgICAgY2hlY2tlciA9IHNlbGYuZGlzcGF0Y2goZmls ZV9wYXRoKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNoZWNrZXIuaGFuZGxlX3N0eWxlX2Vy cm9yLAorICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLm1vY2tfaGFuZGxlX3N0eWxlX2Vy cm9yKQorCiAgICAgZGVmIHRlc3RfanNvbl9wYXRocyhzZWxmKToKICAgICAgICAgIiIiVGVzdCBw YXRocyB0aGF0IHNob3VsZCBiZSBjaGVja2VkIGFzIEpTT04uIiIiCiAgICAgICAgIHBhdGhzID0g WwpAQCAtNTEyLDcgKzUzNSw2IEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0Y2hUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgImZvby5odG1sIiwKICAgICAgICAgICAg ImZvby5pZGwiLAogICAgICAgICAgICAiZm9vLmluIiwKLSAgICAgICAgICAgImZvby5qcyIsCiAg ICAgICAgICAgICJmb28ubW0iLAogICAgICAgICAgICAiZm9vLnBocCIsCiAgICAgICAgICAgICJm b28ucGwiLApAQCAtNTI1LDcgKzU0Nyw5IEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0 Y2hUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgImZvby53bSIsCiAgICAgICAg ICAgICJmb28ueGh0bWwiLAogICAgICAgICAgICAiZm9vLnkiLAotICAgICAgICAgICBvcy5wYXRo LmpvaW4oIlNvdXJjZSIsICJXZWJDb3JlIiwgImluc3BlY3RvciIsICJmcm9udC1lbmQiLCAiaW5z cGVjdG9yLmpzIiksCisgICAgICAgICAgICJTb3VyY2UvV2ViSW5zcGVjdG9yVUkvRXh0ZXJuYWwv Y29kZW1pcnJvci5qcyIsCisgICAgICAgICAgICJMYXlvdXRUZXN0cy9mYXN0L2Zvby5qcyIsCisg ICAgICAgICAgICJXZWJzaXRlcy93ZWJraXQub3JnL2Zvby5qcyIsCiAgICAgICAgICAgIG9zLnBh dGguam9pbigiVG9vbHMiLCAiU2NyaXB0cyIsICJjaGVjay13ZWJraXQtc3R5bGUiKSwKICAgICAg ICAgXQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L2pzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qcy5weQpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5mZTJjODczNzgyNGM0NWRlNjViM2Q3MjI1M2YyOWQ3YTU5MTU2MDU4Ci0tLSAvZGV2 L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qcy5weQpA QCAtMCwwICsxLDQyIEBACisjIENvcHlyaWdodCAoQykgMjAxMyBVbml2ZXJzaXR5IG9mIFdhc2hp bmd0b24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMg YXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdo dCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElT IiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVD SUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworIiIiU3VwcG9ydHMgY2hlY2tpbmcgV2ViS2l0IHN0 eWxlIGluIEphdmFTY3JpcHQgZmlsZXMiIiIKKworZnJvbSBjb21tb24gaW1wb3J0IFRhYkNoZWNr ZXIKKworCitjbGFzcyBKU0NoZWNrZXIob2JqZWN0KToKKyAgICAiIiJQcm9jZXNzZXMgSmF2YVNj cmlwdCBsaW5lcyBmb3IgY2hlY2tpbmcgc3R5bGUuIiIiCisKKyAgICAjIEZJWE1FOiBwbHVnIGlu IGEgSmF2YVNjcmlwdCBwYXJzZXIgdG8gZmluZCBzeW50YXggZXJyb3JzLgorICAgIGNhdGVnb3Jp ZXMgPSBzZXQoKCdqcy9zeW50YXgnLCkpCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZmlsZV9w YXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpOgorICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJy b3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKyAgICAgICAgc2VsZi5fdGFiX2NoZWNrZXIgPSBUYWJD aGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQorCisgICAgZGVmIGNoZWNrKHNl bGYsIGxpbmVzKToKKyAgICAgICAgc2VsZi5fdGFiX2NoZWNrZXIuY2hlY2sobGluZXMpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pzX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qc191bml0dGVzdC5w eQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi4yOGJhNDRkNjRhYjhjZTQzY2RmNTdhMmQ3MDMwMjBiMzc0N2NlODg0Ci0t LSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9q c191bml0dGVzdC5weQpAQCAtMCwwICsxLDczIEBACisjIENvcHlyaWdodCAoQykgMjAwOSBHb29n bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTMgVW5pdmVy c2l0eSBvZiBXYXNoaW5ndG9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK KyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAg ICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAgKiBOZWl0 aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisjIGNvbnRy aWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZl ZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBl cm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdI VCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisj IEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBU SEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBE SVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAor IyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFD VCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKworIiIiVW5pdCB0ZXN0IGZvciBqcy5weS4iIiIKKworaW1wb3J0IHVuaXR0ZXN0MiBhcyB1 bml0dGVzdAorCitmcm9tIGpzIGltcG9ydCBKU0NoZWNrZXIKKworCitjbGFzcyBKU1Rlc3RDYXNl KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICAiIiJUZXN0Q2FzZSBmb3IganMucHkiIiIKKworICAg IGRlZiBhc3NlcnROb0Vycm9yKHNlbGYsIGxpbmVzKToKKyAgICAgICAgIiIiQXNzZXJ0cyB0aGF0 IHRoZSBzcGVjaWZpZWQgbGluZXMgaGFzIG5vIGVycm9ycy4iIiIKKyAgICAgICAgc2VsZi5oYWRf ZXJyb3IgPSBGYWxzZQorCisgICAgICAgIGRlZiBlcnJvcl9mb3JfdGVzdChsaW5lX251bWJlciwg Y2F0ZWdvcnksIGNvbmZpZGVuY2UsIG1lc3NhZ2UpOgorICAgICAgICAgICAgIiIiUmVjb3JkcyBp ZiBhbiBlcnJvciBvY2N1cnMuIiIiCisgICAgICAgICAgICBzZWxmLmhhZF9lcnJvciA9IFRydWUK KworICAgICAgICBjaGVja2VyID0gSlNDaGVja2VyKCcnLCBlcnJvcl9mb3JfdGVzdCkKKyAgICAg ICAgY2hlY2tlci5jaGVjayhsaW5lcykKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLmhh ZF9lcnJvciwgJyVzIHNob3VsZCBub3QgaGF2ZSBhbnkgZXJyb3JzLicgJSBsaW5lcykKKworICAg IGRlZiBhc3NlcnRFcnJvcihzZWxmLCBsaW5lcywgZXhwZWN0ZWRfbGluZV9udW1iZXIpOgorICAg ICAgICAiIiJBc3NlcnRzIHRoYXQgdGhlIHNwZWNpZmllZCBsaW5lcyBoYXMgYW4gZXJyb3IuIiIi CisgICAgICAgIHNlbGYuaGFkX2Vycm9yID0gRmFsc2UKKworICAgICAgICBkZWYgZXJyb3JfZm9y X3Rlc3QobGluZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNlLCBtZXNzYWdlKToKKyAgICAg ICAgICAgICIiIkNoZWNrcyBpZiB0aGUgZXhwZWN0ZWQgZXJyb3Igb2NjdXJzLiIiIgorICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RlZF9saW5lX251bWJlciwgbGluZV9udW1iZXIp CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCd3aGl0ZXNwYWNlL3RhYicsIGNhdGVnb3J5 KQorICAgICAgICAgICAgc2VsZi5oYWRfZXJyb3IgPSBUcnVlCisKKyAgICAgICAgY2hlY2tlciA9 IEpTQ2hlY2tlcignJywgZXJyb3JfZm9yX3Rlc3QpCisgICAgICAgIGNoZWNrZXIuY2hlY2sobGlu ZXMpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLmhhZF9lcnJvciwgJyVzIHNob3VsZCBo YXZlIGFuIGVycm9yIFt3aGl0ZXNwYWNlL3RhYl0uJyAlIGxpbmVzKQorCisgICAgZGVmIHRlc3Rf bm9fZXJyb3Ioc2VsZik6CisgICAgICAgICIiIlRlc3RzIGZvciBubyBlcnJvciBjYXNlcy4iIiIK KyAgICAgICAgc2VsZi5hc3NlcnROb0Vycm9yKFsnJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0Tm9F cnJvcihbJ2FiYyBkZWYnLCAnZ2dnJ10pCisKKyAgICBkZWYgdGVzdF9lcnJvcihzZWxmKToKKyAg ICAgICAgIiIiVGVzdHMgZm9yIGVycm9yIGNhc2VzLiIiIgorICAgICAgICBzZWxmLmFzc2VydEVy cm9yKFsnXHR2YXIgZm9vID0gd2luZG93O1xuJ10sIDEpCg==