51452 2010-12-22 00:09:04 -0800 check-webkit-style shouldn't complaint about underscores in variables in objective C files. 2010-12-22 07:35:12 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 levin levin darin eric hamaji oldest_to_newest 325404 0 levin 2010-12-22 00:09:04 -0800 See summary. 325408 1 77194 levin 2010-12-22 00:24:25 -0800 Created attachment 77194 Patch 325410 2 levin 2010-12-22 00:26:55 -0800 See https://bugs.webkit.org/show_bug.cgi?id=49481#c70 325411 3 levin 2010-12-22 00:28:22 -0800 Perhaps, I made the check too liberal by ignoring all _ in Objective C variables. Maybe it should only allow a single leading _. (If this is so, speak up and I believe I can adjust this.) 325428 4 eric 2010-12-22 02:40:32 -0800 I believe only leading _ is allowed for AppKit style objc. 325458 5 77194 hamaji 2010-12-22 05:32:05 -0800 Comment on attachment 77194 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77194&action=review Looks good. I think it's OK to land this patch as is. If we want a stricter rule, we may be able to create another patch. > Tools/Scripts/webkitpy/style/checkers/cpp.py:933 > + self._is_objective_c = None I feel we want a comment here which describes we'll guess this value in is_objective_c. 325486 6 77194 levin 2010-12-22 07:35:00 -0800 Comment on attachment 77194 Patch Landed as http://trac.webkit.org/changeset/74478. Agreed with Shinichiro that we can make the check more strict in another patch. (It will be nice to get rid of this false positive now and I suspect the issue of underscores in variables is a less common mistake for Objective C programmers.) 77194 2010-12-22 00:24:25 -0800 2010-12-22 07:35:00 -0800 Patch bug-51452-20101222002424.patch text/plain 15052 levin ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNWU0 ZTQ1YTczNmMzM2I5NWUzNmMzZTJlMDlhYzBmYTJhZDM0YjU4Li5iYTU5NTRhMDkwZTc1ZjFiNWI5 NTAwMjgyYTEzZmEyMzBkZjYwNmEwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTAtMTItMjIgIERhdmlkIExldmlu ICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSBzaG91bGRuJ3QgY29tcGxhaW50IGFi b3V0IHVuZGVyc2NvcmVzIGluIHZhcmlhYmxlcyBpbiBvYmplY3RpdmUgQyBmaWxlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNDUyCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAgICAgKF9G aWxlU3RhdGUuX19pbml0X18pOiBBZGRlZCB0aGUgaW5mb3JtYXRpb24gdG8gZGV0ZXJtaW5lIGlm IGEgZmlsZSBpcyBDIG9yIE9iamVjdGl2ZSBDLgorICAgICAgICBVc2luZyB0aGUgZmlsZSBleHRl bnNpb24gaWYgcG9zc2libGUgYnV0IGZhbGxpbmcgYmFjayB0byB0aGUgZmlsZSBjb250ZW50cyBp ZiB3ZSBoYXZlIGEgaGVhZGVyIGZpbGUuCisgICAgICAgIChfRmlsZVN0YXRlLmlzX29iamVjdGl2 ZV9jKTogRGV0ZXJtaW5lIGlmIHdlIGhhdmUgYW4gT2JqZWN0aXZlIEMgYnkgZXhhbWluaW5nIHRo ZSBmaWxlIGNvbnRlbnRzIGlmIG5lZWRlZC4KKyAgICAgICAgKF9GaWxlU3RhdGUuaXNfY19vcl9v YmplY3RpdmVfYyk6CisgICAgICAgIChjaGVja191c2luZ19zdGQpOiBDaGFuZ2VkIHRvIHVzaW5n IF9GaWxlU3RhdGUgdG8gZGV0ZXJtaW5lIHRoZSBmaWxlIHR5cGUuCisgICAgICAgIChjaGVja19t YXhfbWluX21hY3Jvcyk6IERpdHRvLgorICAgICAgICAoY2hlY2tfZm9yX251bGwpOiBEaXR0by4K KyAgICAgICAgKGNoZWNrX3N0eWxlKTogQ2hhbmdlZCB0aGUgcGFyYW1ldGVycyB0byB2YXJpb3Vz IGNhbGxzIHNpbmNlIHRoZXkgbm93IG5lZWQgX0ZpbGVTdGF0ZQorICAgICAgICB0byBkZXRlcm1p bmUgdGhlIGZpbGUgdHlwZS4KKyAgICAgICAgKGNoZWNrX2xhbmd1YWdlKTogQWRkZWQgdGhlIGZp bGVfc3RhdGUgcGFyYW1ldGVyIHNvIGl0IGNvdWxkIGJlIHBhc3NlZAorICAgICAgICB0byBjaGVj a19pZGVudGlmaWVyX25hbWVfaW5fZGVjbGFyYXRpb24uCisgICAgICAgIChjaGVja19pZGVudGlm aWVyX25hbWVfaW5fZGVjbGFyYXRpb24pOiBEb24ndCB3YXJuIGFib3V0IHVuZGVyc2NvcmVzIGlu IHZhcmlhYmxlcyBpZgorICAgICAgICB0aGlzIGlzIGFuIE9iamVjdGl2ZSBDIGZpbGUuCisgICAg ICAgIChfcHJvY2Vzc19saW5lcyk6IEFkZGVkIGluZm9ybWF0aW9uIGZvciB0aGUgX0ZpbGVTdGF0 ZSBjb25zdHJ1Y3RvciAoYW5kIG1vdmVkIHRoZQorICAgICAgICBjYWxsIHRvIGEgcGxhY2UgdGhh dCBoYWQgdGhlIGluZm9ybWF0aW9uKS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcF91bml0dGVzdC5weToKKyAgICAgICAgKENwcEZ1bmN0aW9uc1Rlc3QudGVz dF9pc19jX29yX29iamVjdGl2ZV9jKTogQ2hhbmdlZCB0aGUgdGVzdHMgdG8gdXNlIEZpbGVTdGF0 ZSBhbmQgZXhlcmNpc2UKKyAgICAgICAgaXRzIGZ1bmN0aW9uYWxpdHkuCisgICAgICAgIChXZWJL aXRTdHlsZVRlc3QudGVzdF9uYW1lcyk6IEFkZCB0ZXN0cyBmb3IgdW5kZXJzY29yZXMgaW4gT2Jq ZWN0aXZlIEMgZmlsZXMuCisKIDIwMTAtMTItMjEgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5kZXggM2ZmYWViOWRmNDdmZTRjNDg4NzJi YTEzNjM3YmRmNjU4ZDRmMDMwZC4uYTIzOWM1ZDRiMGMyZWNkZTQ5OTkyNDQ2YWRjMWRkMjRkNWJl YjBmNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9j cHAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkK QEAgLTM4NCwxNiArMzg0LDYgQEAgY2xhc3MgX0luY2x1ZGVFcnJvcihFeGNlcHRpb24pOgogICAg IHBhc3MKIAogCi1kZWYgaXNfY19vcl9vYmplY3RpdmVfYyhmaWxlX2V4dGVuc2lvbik6Ci0gICAi IiJSZXR1cm4gd2hldGhlciB0aGUgZmlsZSBleHRlbnNpb24gY29ycmVzcG9uZHMgdG8gQyBvciBP YmplY3RpdmUtQy4KLQotICAgQXJnczoKLSAgICAgZmlsZV9leHRlbnNpb246IFRoZSBmaWxlIGV4 dGVuc2lvbiB3aXRob3V0IHRoZSBsZWFkaW5nIGRvdC4KLQotICAgIiIiCi0gICByZXR1cm4gZmls ZV9leHRlbnNpb24gaW4gWydjJywgJ20nXQotCi0KIGNsYXNzIEZpbGVJbmZvOgogICAgICIiIlBy b3ZpZGVzIHV0aWxpdHkgZnVuY3Rpb25zIGZvciBmaWxlbmFtZXMuCiAKQEAgLTkzNCw4ICs5MjQs MTYgQEAgY2xhc3MgX0NsYXNzU3RhdGUob2JqZWN0KToKIAogCiBjbGFzcyBfRmlsZVN0YXRlKG9i amVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBj bGVhbl9saW5lcywgZmlsZV9leHRlbnNpb24pOgogICAgICAgICBzZWxmLl9kaWRfaW5zaWRlX25h bWVzcGFjZV9pbmRlbnRfd2FybmluZyA9IEZhbHNlCisgICAgICAgIHNlbGYuX2NsZWFuX2xpbmVz ID0gY2xlYW5fbGluZXMKKyAgICAgICAgaWYgZmlsZV9leHRlbnNpb24gaW4gWydtJywgJ21tJ106 CisgICAgICAgICAgICBzZWxmLl9pc19vYmplY3RpdmVfYyA9IFRydWUKKyAgICAgICAgZWxpZiBm aWxlX2V4dGVuc2lvbiA9PSAnaCc6CisgICAgICAgICAgICBzZWxmLl9pc19vYmplY3RpdmVfYyA9 IE5vbmUKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHNlbGYuX2lzX29iamVjdGl2ZV9jID0g RmFsc2UKKyAgICAgICAgc2VsZi5faXNfYyA9IGZpbGVfZXh0ZW5zaW9uID09ICdjJwogCiAgICAg ZGVmIHNldF9kaWRfaW5zaWRlX25hbWVzcGFjZV9pbmRlbnRfd2FybmluZyhzZWxmKToKICAgICAg ICAgc2VsZi5fZGlkX2luc2lkZV9uYW1lc3BhY2VfaW5kZW50X3dhcm5pbmcgPSBUcnVlCkBAIC05 NDMsNiArOTQxLDIzIEBAIGNsYXNzIF9GaWxlU3RhdGUob2JqZWN0KToKICAgICBkZWYgZGlkX2lu c2lkZV9uYW1lc3BhY2VfaW5kZW50X3dhcm5pbmcoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxm Ll9kaWRfaW5zaWRlX25hbWVzcGFjZV9pbmRlbnRfd2FybmluZwogCisgICAgZGVmIGlzX29iamVj dGl2ZV9jKHNlbGYpOgorICAgICAgICBpZiBzZWxmLl9pc19vYmplY3RpdmVfYyBpcyBOb25lOgor ICAgICAgICAgICAgZm9yIGxpbmUgaW4gc2VsZi5fY2xlYW5fbGluZXMuZWxpZGVkOgorICAgICAg ICAgICAgICAgICMgU3RhcnRpbmcgd2l0aCBAIG9yICNpbXBvcnQgc2VlbSBsaWtlIHRoZSBiZXN0 IGluZGljYXRpb25zCisgICAgICAgICAgICAgICAgIyB0aGF0IHdlIGhhdmUgYW4gT2JqZWN0aXZl IEMgZmlsZS4KKyAgICAgICAgICAgICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgoIkAiKSBvciBsaW5l LnN0YXJ0c3dpdGgoIiNpbXBvcnQiKToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5faXNfb2Jq ZWN0aXZlX2MgPSBUcnVlCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICBl bHNlOgorICAgICAgICAgICAgICAgIHNlbGYuX2lzX29iamVjdGl2ZV9jID0gRmFsc2UKKyAgICAg ICAgcmV0dXJuIHNlbGYuX2lzX29iamVjdGl2ZV9jCisKKyAgICBkZWYgaXNfY19vcl9vYmplY3Rp dmVfYyhzZWxmKToKKyAgICAgICAgIiIiUmV0dXJuIHdoZXRoZXIgdGhlIGZpbGUgZXh0ZW5zaW9u IGNvcnJlc3BvbmRzIHRvIEMgb3IgT2JqZWN0aXZlLUMuIiIiCisgICAgICAgIHJldHVybiBzZWxm Ll9pc19jIG9yIHNlbGYuaXNfb2JqZWN0aXZlX2MoKQorCisKIGRlZiBjaGVja19mb3Jfbm9uX3N0 YW5kYXJkX2NvbnN0cnVjdHMoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjbGFzc19zdGF0ZSwgZXJyb3IpOgogICAgICIiIkxv Z3MgYW4gZXJyb3IgaWYgd2Ugc2VlIGNlcnRhaW4gbm9uLUFOU0kgY29uc3RydWN0cyBpZ25vcmVk IGJ5IGdjYy0yLgpAQCAtMTYyMCwxOCArMTYzNSwyMCBAQCBkZWYgY2hlY2tfbmFtZXNwYWNlX2lu ZGVudGF0aW9uKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9leHRlbnNpb24sIGZpbGVf cwogICAgICAgICBpZiBjdXJyZW50X2luZGVudGF0aW9uX2xldmVsIDwgMDoKICAgICAgICAgICAg IGJyZWFrOwogCi1kZWYgY2hlY2tfdXNpbmdfc3RkKGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5l cywgbGluZV9udW1iZXIsIGVycm9yKToKKworZGVmIGNoZWNrX3VzaW5nX3N0ZChjbGVhbl9saW5l cywgbGluZV9udW1iZXIsIGZpbGVfc3RhdGUsIGVycm9yKToKICAgICAiIiJMb29rcyBmb3IgJ3Vz aW5nIHN0ZDo6Zm9vOycgc3RhdGVtZW50cyB3aGljaCBzaG91bGQgYmUgcmVwbGFjZWQgd2l0aCAn dXNpbmcgbmFtZXNwYWNlIHN0ZDsnLgogCiAgICAgQXJnczoKLSAgICAgIGZpbGVfZXh0ZW5zaW9u OiBUaGUgZXh0ZW5zaW9uIG9mIHRoZSBjdXJyZW50IGZpbGUsIHdpdGhvdXQgdGhlIGxlYWRpbmcg ZG90LgogICAgICAgY2xlYW5fbGluZXM6IEEgQ2xlYW5zZWRMaW5lcyBpbnN0YW5jZSBjb250YWlu aW5nIHRoZSBmaWxlLgogICAgICAgbGluZV9udW1iZXI6IFRoZSBudW1iZXIgb2YgdGhlIGxpbmUg dG8gY2hlY2suCisgICAgICBmaWxlX3N0YXRlOiBBIF9GaWxlU3RhdGUgaW5zdGFuY2Ugd2hpY2gg bWFpbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0CisgICAgICAgICAgICAgICAgICB0aGUgc3RhdGUg b2YgdGhpbmdzIGluIHRoZSBmaWxlLgogICAgICAgZXJyb3I6IFRoZSBmdW5jdGlvbiB0byBjYWxs IHdpdGggYW55IGVycm9ycyBmb3VuZC4KICAgICAiIiIKIAogICAgICMgVGhpcyBjaGVjayBkb2Vz bid0IGFwcGx5IHRvIEMgb3IgT2JqZWN0aXZlLUMgaW1wbGVtZW50YXRpb24gZmlsZXMuCi0gICAg aWYgaXNfY19vcl9vYmplY3RpdmVfYyhmaWxlX2V4dGVuc2lvbik6CisgICAgaWYgZmlsZV9zdGF0 ZS5pc19jX29yX29iamVjdGl2ZV9jKCk6CiAgICAgICAgIHJldHVybgogCiAgICAgbGluZSA9IGNs ZWFuX2xpbmVzLmVsaWRlZFtsaW5lX251bWJlcl0gIyBHZXQgcmlkIG9mIGNvbW1lbnRzIGFuZCBz dHJpbmdzLgpAQCAtMTY0NSwxOCArMTY2MiwxOSBAQCBkZWYgY2hlY2tfdXNpbmdfc3RkKGZpbGVf ZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToKICAgICAgICAgICAi VXNlICd1c2luZyBuYW1lc3BhY2Ugc3RkOycgaW5zdGVhZCBvZiAndXNpbmcgc3RkOjolczsnLiIg JSBtZXRob2RfbmFtZSkKIAogCi1kZWYgY2hlY2tfbWF4X21pbl9tYWNyb3MoZmlsZV9leHRlbnNp b24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZXJyb3IpOgorZGVmIGNoZWNrX21heF9taW5f bWFjcm9zKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9zdGF0ZSwgZXJyb3IpOgogICAg ICIiIkxvb2tzIHVzZSBvZiBNQVgoKSBhbmQgTUlOKCkgbWFjcm9zIHRoYXQgc2hvdWxkIGJlIHJl cGxhY2VkIHdpdGggc3RkOjptYXgoKSBhbmQgc3RkOjptaW4oKS4KIAogICAgIEFyZ3M6Ci0gICAg ICBmaWxlX2V4dGVuc2lvbjogVGhlIGV4dGVuc2lvbiBvZiB0aGUgY3VycmVudCBmaWxlLCB3aXRo b3V0IHRoZSBsZWFkaW5nIGRvdC4KICAgICAgIGNsZWFuX2xpbmVzOiBBIENsZWFuc2VkTGluZXMg aW5zdGFuY2UgY29udGFpbmluZyB0aGUgZmlsZS4KICAgICAgIGxpbmVfbnVtYmVyOiBUaGUgbnVt YmVyIG9mIHRoZSBsaW5lIHRvIGNoZWNrLgorICAgICAgZmlsZV9zdGF0ZTogQSBfRmlsZVN0YXRl IGluc3RhbmNlIHdoaWNoIG1haW50YWlucyBpbmZvcm1hdGlvbiBhYm91dAorICAgICAgICAgICAg ICAgICAgdGhlIHN0YXRlIG9mIHRoaW5ncyBpbiB0aGUgZmlsZS4KICAgICAgIGVycm9yOiBUaGUg ZnVuY3Rpb24gdG8gY2FsbCB3aXRoIGFueSBlcnJvcnMgZm91bmQuCiAgICAgIiIiCiAKICAgICAj IFRoaXMgY2hlY2sgZG9lc24ndCBhcHBseSB0byBDIG9yIE9iamVjdGl2ZS1DIGltcGxlbWVudGF0 aW9uIGZpbGVzLgotICAgIGlmIGlzX2Nfb3Jfb2JqZWN0aXZlX2MoZmlsZV9leHRlbnNpb24pOgor ICAgIGlmIGZpbGVfc3RhdGUuaXNfY19vcl9vYmplY3RpdmVfYygpOgogICAgICAgICByZXR1cm4K IAogICAgIGxpbmUgPSBjbGVhbl9saW5lcy5lbGlkZWRbbGluZV9udW1iZXJdICMgR2V0IHJpZCBv ZiBjb21tZW50cyBhbmQgc3RyaW5ncy4KQEAgLTE5ODQsOSArMjAwMiw5IEBAIGRlZiBjaGVja19m b3JfY29tcGFyaXNvbnNfdG9femVybyhjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToK ICAgICAgICAgICAgICAgJ1Rlc3RzIGZvciB0cnVlL2ZhbHNlLCBudWxsL25vbi1udWxsLCBhbmQg emVyby9ub24temVybyBzaG91bGQgYWxsIGJlIGRvbmUgd2l0aG91dCBlcXVhbGl0eSBjb21wYXJp c29ucy4nKQogCiAKLWRlZiBjaGVja19mb3JfbnVsbChmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGlu ZXMsIGxpbmVfbnVtYmVyLCBlcnJvcik6CitkZWYgY2hlY2tfZm9yX251bGwoY2xlYW5fbGluZXMs IGxpbmVfbnVtYmVyLCBmaWxlX3N0YXRlLCBlcnJvcik6CiAgICAgIyBUaGlzIGNoZWNrIGRvZXNu J3QgYXBwbHkgdG8gQyBvciBPYmplY3RpdmUtQyBpbXBsZW1lbnRhdGlvbiBmaWxlcy4KLSAgICBp ZiBpc19jX29yX29iamVjdGl2ZV9jKGZpbGVfZXh0ZW5zaW9uKToKKyAgICBpZiBmaWxlX3N0YXRl LmlzX2Nfb3Jfb2JqZWN0aXZlX2MoKToKICAgICAgICAgcmV0dXJuCiAKICAgICBsaW5lID0gY2xl YW5fbGluZXMuZWxpZGVkW2xpbmVfbnVtYmVyXQpAQCAtMjEyNywxNSArMjE0NSwxNSBAQCBkZWYg Y2hlY2tfc3R5bGUoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2lvbiwgY2xh c3Nfc3RhdGUsIGZpbGVfc3RhdAogCiAgICAgIyBTb21lIG1vcmUgc3R5bGUgY2hlY2tzCiAgICAg Y2hlY2tfbmFtZXNwYWNlX2luZGVudGF0aW9uKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmls ZV9leHRlbnNpb24sIGZpbGVfc3RhdGUsIGVycm9yKQotICAgIGNoZWNrX3VzaW5nX3N0ZChmaWxl X2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcikKLSAgICBjaGVja19t YXhfbWluX21hY3JvcyhmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBl cnJvcikKKyAgICBjaGVja191c2luZ19zdGQoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmaWxl X3N0YXRlLCBlcnJvcikKKyAgICBjaGVja19tYXhfbWluX21hY3JvcyhjbGVhbl9saW5lcywgbGlu ZV9udW1iZXIsIGZpbGVfc3RhdGUsIGVycm9yKQogICAgIGNoZWNrX3N3aXRjaF9pbmRlbnRhdGlv bihjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKQogICAgIGNoZWNrX2JyYWNlcyhjbGVh bl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKQogICAgIGNoZWNrX2V4aXRfc3RhdGVtZW50X3Np bXBsaWZpY2F0aW9ucyhjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKQogICAgIGNoZWNr X3NwYWNpbmcoZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZXJyb3Ip CiAgICAgY2hlY2tfY2hlY2soY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcikKICAgICBj aGVja19mb3JfY29tcGFyaXNvbnNfdG9femVybyhjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVy cm9yKQotICAgIGNoZWNrX2Zvcl9udWxsKGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGlu ZV9udW1iZXIsIGVycm9yKQorICAgIGNoZWNrX2Zvcl9udWxsKGNsZWFuX2xpbmVzLCBsaW5lX251 bWJlciwgZmlsZV9zdGF0ZSwgZXJyb3IpCiAKIAogX1JFX1BBVFRFUk5fSU5DTFVERV9ORVdfU1RZ TEUgPSByZS5jb21waWxlKHInI2luY2x1ZGUgKyJbXi9dK1wuaCInKQpAQCAtMjMzNyw3ICsyMzU1 LDcgQEAgZGVmIGNoZWNrX2luY2x1ZGVfbGluZShmaWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGNs ZWFuX2xpbmVzLCBsaW5lX251bWJlciwgaW5jbHUKIAogCiBkZWYgY2hlY2tfbGFuZ3VhZ2UoZmls ZW5hbWUsIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9leHRlbnNpb24sIGluY2x1ZGVf c3RhdGUsCi0gICAgICAgICAgICAgICAgICAgZXJyb3IpOgorICAgICAgICAgICAgICAgICAgIGZp bGVfc3RhdGUsIGVycm9yKToKICAgICAiIiJDaGVja3MgcnVsZXMgZnJvbSB0aGUgJ0MrKyBsYW5n dWFnZSBydWxlcycgc2VjdGlvbiBvZiBjcHBndWlkZS5odG1sLgogCiAgICAgU29tZSBvZiB0aGVz ZSBydWxlcyBhcmUgaGFyZCB0byB0ZXN0IChmdW5jdGlvbiBvdmVybG9hZGluZywgdXNpbmcKQEAg LTIzNDksNiArMjM2Nyw4IEBAIGRlZiBjaGVja19sYW5ndWFnZShmaWxlbmFtZSwgY2xlYW5fbGlu ZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2lvbiwgaW5jbHVkZV9zCiAgICAgICBsaW5lX251 bWJlcjogVGhlIG51bWJlciBvZiB0aGUgbGluZSB0byBjaGVjay4KICAgICAgIGZpbGVfZXh0ZW5z aW9uOiBUaGUgZXh0ZW5zaW9uICh3aXRob3V0IHRoZSBkb3QpIG9mIHRoZSBmaWxlbmFtZS4KICAg ICAgIGluY2x1ZGVfc3RhdGU6IEFuIF9JbmNsdWRlU3RhdGUgaW5zdGFuY2UgaW4gd2hpY2ggdGhl IGhlYWRlcnMgYXJlIGluc2VydGVkLgorICAgICAgZmlsZV9zdGF0ZTogQSBfRmlsZVN0YXRlIGlu c3RhbmNlIHdoaWNoIG1haW50YWlucyBpbmZvcm1hdGlvbiBhYm91dAorICAgICAgICAgICAgICAg ICAgdGhlIHN0YXRlIG9mIHRoaW5ncyBpbiB0aGUgZmlsZS4KICAgICAgIGVycm9yOiBUaGUgZnVu Y3Rpb24gdG8gY2FsbCB3aXRoIGFueSBlcnJvcnMgZm91bmQuCiAgICAgIiIiCiAgICAgIyBJZiB0 aGUgbGluZSBpcyBlbXB0eSBvciBjb25zaXN0cyBvZiBlbnRpcmVseSBhIGNvbW1lbnQsIG5vIG5l ZWQgdG8KQEAgLTI1MzgsMTAgKzI1NTgsMTAgQEAgZGVmIGNoZWNrX2xhbmd1YWdlKGZpbGVuYW1l LCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaW9uLCBpbmNsdWRlX3MKICAg ICAgICAgICAgICAgJ2h0dHA6Ly9nb29nbGUtc3R5bGVndWlkZS5nb29nbGVjb2RlLmNvbS9zdm4v dHJ1bmsvY3BwZ3VpZGUueG1sI05hbWVzcGFjZXMnCiAgICAgICAgICAgICAgICcgZm9yIG1vcmUg aW5mb3JtYXRpb24uJykKIAotICAgIGNoZWNrX2lkZW50aWZpZXJfbmFtZV9pbl9kZWNsYXJhdGlv bihmaWxlbmFtZSwgbGluZV9udW1iZXIsIGxpbmUsIGVycm9yKQorICAgIGNoZWNrX2lkZW50aWZp ZXJfbmFtZV9pbl9kZWNsYXJhdGlvbihmaWxlbmFtZSwgbGluZV9udW1iZXIsIGxpbmUsIGZpbGVf c3RhdGUsIGVycm9yKQogCiAKLWRlZiBjaGVja19pZGVudGlmaWVyX25hbWVfaW5fZGVjbGFyYXRp b24oZmlsZW5hbWUsIGxpbmVfbnVtYmVyLCBsaW5lLCBlcnJvcik6CitkZWYgY2hlY2tfaWRlbnRp Zmllcl9uYW1lX2luX2RlY2xhcmF0aW9uKGZpbGVuYW1lLCBsaW5lX251bWJlciwgbGluZSwgZmls ZV9zdGF0ZSwgZXJyb3IpOgogICAgICIiIkNoZWNrcyBpZiBpZGVudGlmaWVyIG5hbWVzIGNvbnRh aW4gYW55IHVuZGVyc2NvcmVzLgogCiAgICAgQXMgaWRlbnRpZmllcnMgaW4gbGlicmFyaWVzIHdl IGFyZSB1c2luZyBoYXZlIGEgYnVuY2ggb2YKQEAgLTI1NTIsNiArMjU3Miw4IEBAIGRlZiBjaGVj a19pZGVudGlmaWVyX25hbWVfaW5fZGVjbGFyYXRpb24oZmlsZW5hbWUsIGxpbmVfbnVtYmVyLCBs aW5lLCBlcnJvcik6CiAgICAgICBmaWxlbmFtZTogVGhlIG5hbWUgb2YgdGhlIGN1cnJlbnQgZmls ZS4KICAgICAgIGxpbmVfbnVtYmVyOiBUaGUgbnVtYmVyIG9mIHRoZSBsaW5lIHRvIGNoZWNrLgog ICAgICAgbGluZTogVGhlIGxpbmUgb2YgY29kZSB0byBjaGVjay4KKyAgICAgIGZpbGVfc3RhdGU6 IEEgX0ZpbGVTdGF0ZSBpbnN0YW5jZSB3aGljaCBtYWludGFpbnMgaW5mb3JtYXRpb24gYWJvdXQK KyAgICAgICAgICAgICAgICAgIHRoZSBzdGF0ZSBvZiB0aGluZ3MgaW4gdGhlIGZpbGUuCiAgICAg ICBlcnJvcjogVGhlIGZ1bmN0aW9uIHRvIGNhbGwgd2l0aCBhbnkgZXJyb3JzIGZvdW5kLgogICAg ICIiIgogICAgICMgV2UgZG9uJ3QgY2hlY2sgYSByZXR1cm4gc3RhdGVtZW50LgpAQCAtMjYyOSw3 ICsyNjUxLDcgQEAgZGVmIGNoZWNrX2lkZW50aWZpZXJfbmFtZV9pbl9kZWNsYXJhdGlvbihmaWxl bmFtZSwgbGluZV9udW1iZXIsIGxpbmUsIGVycm9yKToKIAogICAgICAgICAjIFJlbW92ZSAibV8i IGFuZCAic18iIHRvIGFsbG93IHRoZW0uCiAgICAgICAgIG1vZGlmaWVkX2lkZW50aWZpZXIgPSBz dWIocicoXnwoPzw9OjopKVttc11fJywgJycsIGlkZW50aWZpZXIpCi0gICAgICAgIGlmIG1vZGlm aWVkX2lkZW50aWZpZXIuZmluZCgnXycpID49IDA6CisgICAgICAgIGlmIG5vdCBmaWxlX3N0YXRl LmlzX29iamVjdGl2ZV9jKCkgYW5kIG1vZGlmaWVkX2lkZW50aWZpZXIuZmluZCgnXycpID49IDA6 CiAgICAgICAgICAgICAjIFZhcmlvdXMgZXhjZXB0aW9ucyB0byB0aGUgcnVsZTogSmF2YVNjcmlw dCBvcCBjb2RlcyBmdW5jdGlvbnMsIGNvbnN0X2l0ZXJhdG9yLgogICAgICAgICAgICAgaWYgKG5v dCAoZmlsZW5hbWUuZmluZCgnSmF2YVNjcmlwdENvcmUnKSA+PSAwIGFuZCBtb2RpZmllZF9pZGVu dGlmaWVyLmZpbmQoJ29wXycpID49IDApCiAgICAgICAgICAgICAgICAgYW5kIG5vdCBtb2RpZmll ZF9pZGVudGlmaWVyLnN0YXJ0c3dpdGgoJ3RzdF8nKQpAQCAtMjk4MCw3ICszMDAyLDcgQEAgZGVm IHByb2Nlc3NfbGluZShmaWxlbmFtZSwgZmlsZV9leHRlbnNpb24sCiAgICAgY2hlY2tfZm9yX211 bHRpbGluZV9jb21tZW50c19hbmRfc3RyaW5ncyhjbGVhbl9saW5lcywgbGluZSwgZXJyb3IpCiAg ICAgY2hlY2tfc3R5bGUoY2xlYW5fbGluZXMsIGxpbmUsIGZpbGVfZXh0ZW5zaW9uLCBjbGFzc19z dGF0ZSwgZmlsZV9zdGF0ZSwgZXJyb3IpCiAgICAgY2hlY2tfbGFuZ3VhZ2UoZmlsZW5hbWUsIGNs ZWFuX2xpbmVzLCBsaW5lLCBmaWxlX2V4dGVuc2lvbiwgaW5jbHVkZV9zdGF0ZSwKLSAgICAgICAg ICAgICAgICAgICBlcnJvcikKKyAgICAgICAgICAgICAgICAgICBmaWxlX3N0YXRlLCBlcnJvcikK ICAgICBjaGVja19mb3Jfbm9uX3N0YW5kYXJkX2NvbnN0cnVjdHMoY2xlYW5fbGluZXMsIGxpbmUs IGNsYXNzX3N0YXRlLCBlcnJvcikKICAgICBjaGVja19wb3NpeF90aHJlYWRpbmcoY2xlYW5fbGlu ZXMsIGxpbmUsIGVycm9yKQogICAgIGNoZWNrX2ludmFsaWRfaW5jcmVtZW50KGNsZWFuX2xpbmVz LCBsaW5lLCBlcnJvcikKQEAgLTMwMDIsNyArMzAyNCw2IEBAIGRlZiBfcHJvY2Vzc19saW5lcyhm aWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGxpbmVzLCBlcnJvciwgbWluX2NvbmZpZGVuY2UpOgog ICAgIGluY2x1ZGVfc3RhdGUgPSBfSW5jbHVkZVN0YXRlKCkKICAgICBmdW5jdGlvbl9zdGF0ZSA9 IF9GdW5jdGlvblN0YXRlKG1pbl9jb25maWRlbmNlKQogICAgIGNsYXNzX3N0YXRlID0gX0NsYXNz U3RhdGUoKQotICAgIGZpbGVfc3RhdGUgPSBfRmlsZVN0YXRlKCkKIAogICAgIGNoZWNrX2Zvcl9j b3B5cmlnaHQobGluZXMsIGVycm9yKQogCkBAIC0zMDExLDYgKzMwMzIsNyBAQCBkZWYgX3Byb2Nl c3NfbGluZXMoZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLCBsaW5lcywgZXJyb3IsIG1pbl9jb25m aWRlbmNlKToKIAogICAgIHJlbW92ZV9tdWx0aV9saW5lX2NvbW1lbnRzKGxpbmVzLCBlcnJvcikK ICAgICBjbGVhbl9saW5lcyA9IENsZWFuc2VkTGluZXMobGluZXMpCisgICAgZmlsZV9zdGF0ZSA9 IF9GaWxlU3RhdGUoY2xlYW5fbGluZXMsIGZpbGVfZXh0ZW5zaW9uKQogICAgIGZvciBsaW5lIGlu IHhyYW5nZShjbGVhbl9saW5lcy5udW1fbGluZXMoKSk6CiAgICAgICAgIHByb2Nlc3NfbGluZShm aWxlbmFtZSwgZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lLAogICAgICAgICAgICAg ICAgICAgICAgaW5jbHVkZV9zdGF0ZSwgZnVuY3Rpb25fc3RhdGUsIGNsYXNzX3N0YXRlLCBmaWxl X3N0YXRlLCBlcnJvcikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy9jcHBfdW5pdHRlc3QucHkKaW5kZXggZDJjMjU3MDVmM2RkNDFkODA4MzA0YzNjMmEy ODczM2JjOGM1MjkxOS4uNzBkZjFlYTVlY2NlMTgyNzg5YmQwZDYwYzk0NDlmOTlmZjA5MWE0NiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBf dW5pdHRlc3QucHkKQEAgLTExMCw5ICsxMTAsMTQgQEAgY2xhc3MgQ3BwRnVuY3Rpb25zVGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgIiIiU3VwcG9ydHMgdGVzdGluZyBmdW5jdGlvbnMgdGhh dCBkbyBub3QgbmVlZCBDcHBTdHlsZVRlc3RCYXNlLiIiIgogCiAgICAgZGVmIHRlc3RfaXNfY19v cl9vYmplY3RpdmVfYyhzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGNwcF9zdHlsZS5p c19jX29yX29iamVjdGl2ZV9jKCJjIikpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShjcHBfc3R5 bGUuaXNfY19vcl9vYmplY3RpdmVfYygibSIpKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGNw cF9zdHlsZS5pc19jX29yX29iamVjdGl2ZV9jKCJjcHAiKSkKKyAgICAgICAgY2xlYW5fbGluZXMg PSBjcHBfc3R5bGUuQ2xlYW5zZWRMaW5lcyhbJyddKQorICAgICAgICBjbGVhbl9vYmpjX2xpbmVz ID0gY3BwX3N0eWxlLkNsZWFuc2VkTGluZXMoWycjaW1wb3J0ICJoZWFkZXIuaCInXSkKKyAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGNwcF9zdHlsZS5fRmlsZVN0YXRlKGNsZWFuX2xpbmVzLCAnYycp LmlzX2Nfb3Jfb2JqZWN0aXZlX2MoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGNwcF9zdHls ZS5fRmlsZVN0YXRlKGNsZWFuX2xpbmVzLCAnbScpLmlzX2Nfb3Jfb2JqZWN0aXZlX2MoKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRGYWxzZShjcHBfc3R5bGUuX0ZpbGVTdGF0ZShjbGVhbl9saW5lcywg J2NwcCcpLmlzX2Nfb3Jfb2JqZWN0aXZlX2MoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShj cHBfc3R5bGUuX0ZpbGVTdGF0ZShjbGVhbl9saW5lcywgJ2NjJykuaXNfY19vcl9vYmplY3RpdmVf YygpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGNwcF9zdHlsZS5fRmlsZVN0YXRlKGNsZWFu X2xpbmVzLCAnaCcpLmlzX2Nfb3Jfb2JqZWN0aXZlX2MoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRU cnVlKGNwcF9zdHlsZS5fRmlsZVN0YXRlKGNsZWFuX29iamNfbGluZXMsICdoJykuaXNfY19vcl9v YmplY3RpdmVfYygpKQogCiAKIGNsYXNzIENwcFN0eWxlVGVzdEJhc2UodW5pdHRlc3QuVGVzdENh c2UpOgpAQCAtMzc1NSw2ICszNzYwLDMwIEBAIGNsYXNzIFdlYktpdFN0eWxlVGVzdChDcHBTdHls ZVRlc3RCYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRfbGludCgndW5zaWduZWQgbG9uZyBsb25n IF9sZW5ndGg7JywKICAgICAgICAgICAgICAgICAgICAgICAgICAnX2xlbmd0aCcgKyBuYW1lX3Vu ZGVyc2NvcmVfZXJyb3JfbWVzc2FnZSkKIAorICAgICAgICAjIEFsbG93IHVuZGVyc2NvcmVzIGlu IE9iamVjdGl2ZSBDIGZpbGVzLgorICAgICAgICBzZWxmLmFzc2VydF9saW50KCd1bnNpZ25lZCBs b25nIGxvbmcgX2xlbmd0aDsnLAorICAgICAgICAgICAgICAgICAgICAgICAgICcnLAorICAgICAg ICAgICAgICAgICAgICAgICAgICdmb28ubScpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ3Vu c2lnbmVkIGxvbmcgbG9uZyBfbGVuZ3RoOycsCisgICAgICAgICAgICAgICAgICAgICAgICAgJycs CisgICAgICAgICAgICAgICAgICAgICAgICAgJ2Zvby5tbScpCisgICAgICAgIHNlbGYuYXNzZXJ0 X2xpbnQoJyNpbXBvcnQgImhlYWRlcl9maWxlLmgiXG4nCisgICAgICAgICAgICAgICAgICAgICAg ICAgJ3Vuc2lnbmVkIGxvbmcgbG9uZyBfbGVuZ3RoOycsCisgICAgICAgICAgICAgICAgICAgICAg ICAgJycsCisgICAgICAgICAgICAgICAgICAgICAgICAgJ2Zvby5oJykKKyAgICAgICAgc2VsZi5h c3NlcnRfbGludCgndW5zaWduZWQgbG9uZyBsb25nIF9sZW5ndGg7XG4nCisgICAgICAgICAgICAg ICAgICAgICAgICAgJ0BpbnRlcmZhY2UgV2ViRnVsbHNjcmVlbldpbmRvdzsnLAorICAgICAgICAg ICAgICAgICAgICAgICAgICcnLAorICAgICAgICAgICAgICAgICAgICAgICAgICdmb28uaCcpCisg ICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ3Vuc2lnbmVkIGxvbmcgbG9uZyBfbGVuZ3RoO1xuJwor ICAgICAgICAgICAgICAgICAgICAgICAgICdAaW1wbGVtZW50YXRpb24gV2ViRnVsbHNjcmVlbldp bmRvdzsnLAorICAgICAgICAgICAgICAgICAgICAgICAgICcnLAorICAgICAgICAgICAgICAgICAg ICAgICAgICdmb28uaCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ3Vuc2lnbmVkIGxvbmcg bG9uZyBfbGVuZ3RoO1xuJworICAgICAgICAgICAgICAgICAgICAgICAgICdAY2xhc3MgV2ViV2lu ZG93RmFkZUFuaW1hdGlvbjsnLAorICAgICAgICAgICAgICAgICAgICAgICAgICcnLAorICAgICAg ICAgICAgICAgICAgICAgICAgICdmb28uaCcpCisKICAgICAgICAgIyBWYXJpYWJsZSBuYW1lICds JyBpcyBlYXN5IHRvIGNvbmZ1c2Ugd2l0aCAnMScKICAgICAgICAgc2VsZi5hc3NlcnRfbGludCgn aW50IGw7JywgJ2wnICsgbmFtZV90b29zaG9ydF9lcnJvcl9tZXNzYWdlKQogICAgICAgICBzZWxm LmFzc2VydF9saW50KCdzaXplX3QgbDsnLCAnbCcgKyBuYW1lX3Rvb3Nob3J0X2Vycm9yX21lc3Nh Z2UpCg==