33814 2010-01-18 15:35:51 -0800 WebKitTools/Scripts/check-webkit-style gives false positives in single-line functions. 2010-07-28 20:36:57 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough webkit-unassigned bashi commit-queue hamaji oldest_to_newest 182018 0 barraclough 2010-01-18 15:35:51 -0800 Some examples in: https://bugs.webkit.org/show_bug.cgi?id=33731 We allow single-line functions declared in the header (within the class definition) for fairly trivial accessors. Not a big issue, but would be awesome if the script was aware of these cases. 257181 1 62831 bashi 2010-07-28 08:57:59 -0700 Created attachment 62831 Patch 257292 2 62831 hamaji 2010-07-28 12:30:57 -0700 Comment on attachment 62831 Patch Looks great. I'll make the following changes when I'll land this patch. WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py:2600 + '}\n', I'd put a semicolon so this code is valid as C++. WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py:2608 + '}\n', ditto 257425 3 barraclough 2010-07-28 16:23:55 -0700 Yay! this bug has been annoying me so much I've been considering learning python! This is constantly biting me, I'm so happy to see this fixed, thank you! 257482 4 62901 bashi 2010-07-28 17:43:20 -0700 Created attachment 62901 Hamaji-san, Thank you for your quick review. I put semicolons after brackets. 257498 5 62901 hamaji 2010-07-28 18:05:22 -0700 Comment on attachment 62901 Hamaji-san, Thank you for your quick review. I put semicolons after brackets. Thanks for your update! 257531 6 62901 commit-queue 2010-07-28 20:36:52 -0700 Comment on attachment 62901 Hamaji-san, Thank you for your quick review. I put semicolons after brackets. Clearing flags on attachment: 62901 Committed r64263: <http://trac.webkit.org/changeset/64263> 257532 7 commit-queue 2010-07-28 20:36:57 -0700 All reviewed patches have been landed. Closing bug. 62831 2010-07-28 08:57:59 -0700 2010-07-28 17:43:14 -0700 Patch bug-33814-20100729005756.patch text/plain 5062 bashi ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwODcwZGVmNTg0YTgwNDA4Nzk2ZWY4ZTMxNjEwY2U5NmU2MjUxM2U3Li4xNTQ3YWMx N2I3NDdlMGQ3OTMyZjJkMDQ1Mzk1YTM1NTc5OWI3YzZjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMjggIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAZ29vZ2xlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlZCA8aHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzODE0PgorICAgICAgICBjaGVjay13 ZWJraXQtc3R5bGUgZ2l2ZXMgZmFsc2UgcG9zaXRpdmVzIGluIHNpbmdsZS1saW5lIGZ1bmN0aW9u cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5 OgorCiAyMDEwLTA3LTI3ICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weQppbmRleCBlYmI3OTJkMzM3ZjZhZTVm MmFlM2NhZjAwM2E4ZDNhZjM3MWNiYzQ4Li43NzBhYjQwYjEwNGVjMTk1NWNjMGJmOWVlYjkxODAw MDI3ZGM4M2Q4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NwcC5weQpAQCAtMTkyMCw3ICsxOTIwLDcgQEAgZGVmIGdldF9saW5lX3dpZHRo KGxpbmUpOgogICAgIHJldHVybiBsZW4obGluZSkKIAogCi1kZWYgY2hlY2tfc3R5bGUoY2xlYW5f bGluZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2lvbiwgZmlsZV9zdGF0ZSwgZXJyb3IpOgor ZGVmIGNoZWNrX3N0eWxlKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9leHRlbnNpb24s IGNsYXNzX3N0YXRlLCBmaWxlX3N0YXRlLCBlcnJvcik6CiAgICAgIiIiQ2hlY2tzIHJ1bGVzIGZy b20gdGhlICdDKysgc3R5bGUgcnVsZXMnIHNlY3Rpb24gb2YgY3BwZ3VpZGUuaHRtbC4KIAogICAg IE1vc3Qgb2YgdGhlc2UgcnVsZXMgYXJlIGhhcmQgdG8gdGVzdCAobmFtaW5nLCBjb21tZW50IHN0 eWxlKSwgYnV0IHdlCkBAIC0xOTMxLDYgKzE5MzEsOCBAQCBkZWYgY2hlY2tfc3R5bGUoY2xlYW5f bGluZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2lvbiwgZmlsZV9zdGF0ZSwgZXJyb3IpOgog ICAgICAgY2xlYW5fbGluZXM6IEEgQ2xlYW5zZWRMaW5lcyBpbnN0YW5jZSBjb250YWluaW5nIHRo ZSBmaWxlLgogICAgICAgbGluZV9udW1iZXI6IFRoZSBudW1iZXIgb2YgdGhlIGxpbmUgdG8gY2hl Y2suCiAgICAgICBmaWxlX2V4dGVuc2lvbjogVGhlIGV4dGVuc2lvbiAod2l0aG91dCB0aGUgZG90 KSBvZiB0aGUgZmlsZW5hbWUuCisgICAgICBjbGFzc19zdGF0ZTogQSBfQ2xhc3NTdGF0ZSBpbnN0 YW5jZSB3aGljaCBtYWludGFpbnMgaW5mb3JtYXRpb24gYWJvdXQKKyAgICAgICAgICAgICAgICAg ICB0aGUgY3VycmVudCBzdGFjayBvZiBuZXN0ZWQgY2xhc3MgZGVjbGFyYXRpb25zIGJlaW5nIHBh cnNlZC4KICAgICAgIGZpbGVfc3RhdGU6IEEgX0ZpbGVTdGF0ZSBpbnN0YW5jZSB3aGljaCBtYWlu dGFpbnMgaW5mb3JtYXRpb24gYWJvdXQKICAgICAgICAgICAgICAgICAgIHRoZSBzdGF0ZSBvZiB0 aGluZ3MgaW4gdGhlIGZpbGUuCiAgICAgICBlcnJvcjogVGhlIGZ1bmN0aW9uIHRvIGNhbGwgd2l0 aCBhbnkgZXJyb3JzIGZvdW5kLgpAQCAtMTk5MSw2ICsxOTkzLDEwIEBAIGRlZiBjaGVja19zdHls ZShjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaW9uLCBmaWxlX3N0YXRlLCBl cnJvcik6CiAgICAgICAgIGFuZCBub3QgKChjbGVhbnNlZF9saW5lLmZpbmQoJ2Nhc2UgJykgIT0g LTEKICAgICAgICAgICAgICAgICAgIG9yIGNsZWFuc2VkX2xpbmUuZmluZCgnZGVmYXVsdDonKSAh PSAtMSkKICAgICAgICAgICAgICAgICAgYW5kIGNsZWFuc2VkX2xpbmUuZmluZCgnYnJlYWs7Jykg IT0gLTEpCisgICAgICAgICMgQWxzbyBpdCdzIG9rIHRvIGhhdmUgbWFueSBjb21tYW5kcyBpbiB0 cml2aWFsIHNpbmdsZS1saW5lIGFjY2Vzc29ycyBpbiBjbGFzcyBkZWZpbml0aW9ucy4KKyAgICAg ICAgYW5kIG5vdCAobWF0Y2gocicuKlwoLipcKS4qey4qLn0nLCBsaW5lKQorICAgICAgICAgICAg ICAgICBhbmQgY2xhc3Nfc3RhdGUuY2xhc3NpbmZvX3N0YWNrCisgICAgICAgICAgICAgICAgIGFu ZCBsaW5lLmNvdW50KCd7JykgPT0gbGluZS5jb3VudCgnfScpKQogICAgICAgICBhbmQgbm90IGNs ZWFuc2VkX2xpbmUuc3RhcnRzd2l0aCgnI2RlZmluZSAnKSk6CiAgICAgICAgIGVycm9yKGxpbmVf bnVtYmVyLCAnd2hpdGVzcGFjZS9uZXdsaW5lJywgNCwKICAgICAgICAgICAgICAgJ01vcmUgdGhh biBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBsaW5lJykKQEAgLTI4NDUsNyArMjg1MSw3IEBAIGRl ZiBwcm9jZXNzX2xpbmUoZmlsZW5hbWUsIGZpbGVfZXh0ZW5zaW9uLAogICAgIGlmIHNlYXJjaChy J1xiTk9MSU5UXGInLCByYXdfbGluZXNbbGluZV0pOiAgIyBpZ25vcmUgbm9saW50IGxpbmVzCiAg ICAgICAgIHJldHVybgogICAgIGNoZWNrX2Zvcl9tdWx0aWxpbmVfY29tbWVudHNfYW5kX3N0cmlu Z3MoY2xlYW5fbGluZXMsIGxpbmUsIGVycm9yKQotICAgIGNoZWNrX3N0eWxlKGNsZWFuX2xpbmVz LCBsaW5lLCBmaWxlX2V4dGVuc2lvbiwgZmlsZV9zdGF0ZSwgZXJyb3IpCisgICAgY2hlY2tfc3R5 bGUoY2xlYW5fbGluZXMsIGxpbmUsIGZpbGVfZXh0ZW5zaW9uLCBjbGFzc19zdGF0ZSwgZmlsZV9z dGF0ZSwgZXJyb3IpCiAgICAgY2hlY2tfbGFuZ3VhZ2UoZmlsZW5hbWUsIGNsZWFuX2xpbmVzLCBs aW5lLCBmaWxlX2V4dGVuc2lvbiwgaW5jbHVkZV9zdGF0ZSwKICAgICAgICAgICAgICAgICAgICBl cnJvcikKICAgICBjaGVja19mb3Jfbm9uX3N0YW5kYXJkX2NvbnN0cnVjdHMoY2xlYW5fbGluZXMs IGxpbmUsIGNsYXNzX3N0YXRlLCBlcnJvcikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKaW5kZXggYjU1 ODRkMDNiZjZjZDhmM2VkMWRlMTQyMDFhZjBhYmFjODJhMmU0NS4uNTJlMDY2YzY3ZTBkYzE3YjE3 ZTRlYzQ5YTZmZDM1YTcyMzIzNjdlYSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKQEAgLTE2NCw3 ICsxNjQsNyBAQCBjbGFzcyBDcHBTdHlsZVRlc3RCYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgY2xhc3Nfc3RhdGUgPSBjcHBfc3R5bGUuX0NsYXNzU3RhdGUoKQogICAgICAgICBmaWxl X3N0YXRlID0gY3BwX3N0eWxlLl9GaWxlU3RhdGUoKQogICAgICAgICBmb3IgaSBpbiB4cmFuZ2Uo bGluZXMubnVtX2xpbmVzKCkpOgotICAgICAgICAgICAgY3BwX3N0eWxlLmNoZWNrX3N0eWxlKGxp bmVzLCBpLCBmaWxlX2V4dGVuc2lvbiwgZmlsZV9zdGF0ZSwgZXJyb3JfY29sbGVjdG9yKQorICAg ICAgICAgICAgY3BwX3N0eWxlLmNoZWNrX3N0eWxlKGxpbmVzLCBpLCBmaWxlX2V4dGVuc2lvbiwg Y2xhc3Nfc3RhdGUsIGZpbGVfc3RhdGUsIGVycm9yX2NvbGxlY3RvcikKICAgICAgICAgICAgIGNw cF9zdHlsZS5jaGVja19mb3Jfbm9uX3N0YW5kYXJkX2NvbnN0cnVjdHMobGluZXMsIGksIGNsYXNz X3N0YXRlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlcnJvcl9jb2xsZWN0b3IpCiAgICAgICAgIGNsYXNzX3N0YXRlLmNoZWNrX2Zpbmlz aGVkKGVycm9yX2NvbGxlY3RvcikKQEAgLTI1OTQsNiArMjU5NCwxOSBAQCBjbGFzcyBOb05vblZp cnR1YWxEZXN0cnVjdG9yc1Rlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgIHNlbGYuYXNz ZXJ0X211bHRpX2xpbmVfbGludCgKICAgICAgICAgICAgICdjbGFzcyBGb28geyB2b2lkIGZvbygp OyB9OycsCiAgICAgICAgICAgICAnTW9yZSB0aGFuIG9uZSBjb21tYW5kIG9uIHRoZSBzYW1lIGxp bmUgIFt3aGl0ZXNwYWNlL25ld2xpbmVdIFs0XScpCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRp X2xpbmVfbGludCgKKyAgICAgICAgICAgICdjbGFzcyBNeUNsYXNzIHtcbicKKyAgICAgICAgICAg ICcgICAgaW50IGdldEludFZhbHVlKCkgeyBBU1NFUlQobV9wdHIpOyByZXR1cm4gKm1fcHRyOyB9 XG4nCisgICAgICAgICAgICAnfVxuJywKKyAgICAgICAgICAgICcnKQorICAgICAgICBzZWxmLmFz c2VydF9tdWx0aV9saW5lX2xpbnQoCisgICAgICAgICAgICAnY2xhc3MgTXlDbGFzcyB7XG4nCisg ICAgICAgICAgICAnICAgIGludCBnZXRJbnRWYWx1ZSgpXG4nCisgICAgICAgICAgICAnICAgIHtc bicKKyAgICAgICAgICAgICcgICAgICAgIEFTU0VSVChtX3B0cik7IHJldHVybiAqbV9wdHI7XG4n CisgICAgICAgICAgICAnICAgIH1cbicKKyAgICAgICAgICAgICd9XG4nLAorICAgICAgICAgICAg J01vcmUgdGhhbiBvbmUgY29tbWFuZCBvbiB0aGUgc2FtZSBsaW5lICBbd2hpdGVzcGFjZS9uZXds aW5lXSBbNF0nKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKICAgICAg ICAgICAgICcnJ2NsYXNzIFF1YWxpZmllZDo6R29vIDogcHVibGljIEZvbyB7Cg== 62901 2010-07-28 17:43:20 -0700 2010-07-28 20:36:52 -0700 Hamaji-san, Thank you for your quick review. I put semicolons after brackets. bug-33814-20100729094317.patch text/plain 5063 bashi ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiNzNkMTJmZmY2OTllNWU3Y2Q2NTI2NWJlODJjNTYyMzk1MTlkM2I4Li45YjFmNDZj ZDI0M2I2YTdmMzdlYjE4OWYxZDFkODRjZDkwOWUzZWU2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMjggIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAZ29vZ2xlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlZCA8aHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzODE0PgorICAgICAgICBjaGVjay13 ZWJraXQtc3R5bGUgZ2l2ZXMgZmFsc2UgcG9zaXRpdmVzIGluIHNpbmdsZS1saW5lIGZ1bmN0aW9u cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5 OgorCiAyMDEwLTA3LTI4ICBSb2JpbiBEdW5uICA8cm9iaW5AYWxsZHVubi5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgS2V2aW4gT2xsaXZpZXIuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CmluZGV4IGViYjc5MmQzMzdmNmFlNWYy YWUzY2FmMDAzYThkM2FmMzcxY2JjNDguLjc3MGFiNDBiMTA0ZWMxOTU1Y2MwYmY5ZWViOTE4MDAw MjdkYzgzZDggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5CkBAIC0xOTIwLDcgKzE5MjAsNyBAQCBkZWYgZ2V0X2xpbmVfd2lkdGgo bGluZSk6CiAgICAgcmV0dXJuIGxlbihsaW5lKQogCiAKLWRlZiBjaGVja19zdHlsZShjbGVhbl9s aW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaW9uLCBmaWxlX3N0YXRlLCBlcnJvcik6Citk ZWYgY2hlY2tfc3R5bGUoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2lvbiwg Y2xhc3Nfc3RhdGUsIGZpbGVfc3RhdGUsIGVycm9yKToKICAgICAiIiJDaGVja3MgcnVsZXMgZnJv bSB0aGUgJ0MrKyBzdHlsZSBydWxlcycgc2VjdGlvbiBvZiBjcHBndWlkZS5odG1sLgogCiAgICAg TW9zdCBvZiB0aGVzZSBydWxlcyBhcmUgaGFyZCB0byB0ZXN0IChuYW1pbmcsIGNvbW1lbnQgc3R5 bGUpLCBidXQgd2UKQEAgLTE5MzEsNiArMTkzMSw4IEBAIGRlZiBjaGVja19zdHlsZShjbGVhbl9s aW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaW9uLCBmaWxlX3N0YXRlLCBlcnJvcik6CiAg ICAgICBjbGVhbl9saW5lczogQSBDbGVhbnNlZExpbmVzIGluc3RhbmNlIGNvbnRhaW5pbmcgdGhl IGZpbGUuCiAgICAgICBsaW5lX251bWJlcjogVGhlIG51bWJlciBvZiB0aGUgbGluZSB0byBjaGVj ay4KICAgICAgIGZpbGVfZXh0ZW5zaW9uOiBUaGUgZXh0ZW5zaW9uICh3aXRob3V0IHRoZSBkb3Qp IG9mIHRoZSBmaWxlbmFtZS4KKyAgICAgIGNsYXNzX3N0YXRlOiBBIF9DbGFzc1N0YXRlIGluc3Rh bmNlIHdoaWNoIG1haW50YWlucyBpbmZvcm1hdGlvbiBhYm91dAorICAgICAgICAgICAgICAgICAg IHRoZSBjdXJyZW50IHN0YWNrIG9mIG5lc3RlZCBjbGFzcyBkZWNsYXJhdGlvbnMgYmVpbmcgcGFy c2VkLgogICAgICAgZmlsZV9zdGF0ZTogQSBfRmlsZVN0YXRlIGluc3RhbmNlIHdoaWNoIG1haW50 YWlucyBpbmZvcm1hdGlvbiBhYm91dAogICAgICAgICAgICAgICAgICAgdGhlIHN0YXRlIG9mIHRo aW5ncyBpbiB0aGUgZmlsZS4KICAgICAgIGVycm9yOiBUaGUgZnVuY3Rpb24gdG8gY2FsbCB3aXRo IGFueSBlcnJvcnMgZm91bmQuCkBAIC0xOTkxLDYgKzE5OTMsMTAgQEAgZGVmIGNoZWNrX3N0eWxl KGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9leHRlbnNpb24sIGZpbGVfc3RhdGUsIGVy cm9yKToKICAgICAgICAgYW5kIG5vdCAoKGNsZWFuc2VkX2xpbmUuZmluZCgnY2FzZSAnKSAhPSAt MQogICAgICAgICAgICAgICAgICAgb3IgY2xlYW5zZWRfbGluZS5maW5kKCdkZWZhdWx0OicpICE9 IC0xKQogICAgICAgICAgICAgICAgICBhbmQgY2xlYW5zZWRfbGluZS5maW5kKCdicmVhazsnKSAh PSAtMSkKKyAgICAgICAgIyBBbHNvIGl0J3Mgb2sgdG8gaGF2ZSBtYW55IGNvbW1hbmRzIGluIHRy aXZpYWwgc2luZ2xlLWxpbmUgYWNjZXNzb3JzIGluIGNsYXNzIGRlZmluaXRpb25zLgorICAgICAg ICBhbmQgbm90IChtYXRjaChyJy4qXCguKlwpLip7LioufScsIGxpbmUpCisgICAgICAgICAgICAg ICAgIGFuZCBjbGFzc19zdGF0ZS5jbGFzc2luZm9fc3RhY2sKKyAgICAgICAgICAgICAgICAgYW5k IGxpbmUuY291bnQoJ3snKSA9PSBsaW5lLmNvdW50KCd9JykpCiAgICAgICAgIGFuZCBub3QgY2xl YW5zZWRfbGluZS5zdGFydHN3aXRoKCcjZGVmaW5lICcpKToKICAgICAgICAgZXJyb3IobGluZV9u dW1iZXIsICd3aGl0ZXNwYWNlL25ld2xpbmUnLCA0LAogICAgICAgICAgICAgICAnTW9yZSB0aGFu IG9uZSBjb21tYW5kIG9uIHRoZSBzYW1lIGxpbmUnKQpAQCAtMjg0NSw3ICsyODUxLDcgQEAgZGVm IHByb2Nlc3NfbGluZShmaWxlbmFtZSwgZmlsZV9leHRlbnNpb24sCiAgICAgaWYgc2VhcmNoKHIn XGJOT0xJTlRcYicsIHJhd19saW5lc1tsaW5lXSk6ICAjIGlnbm9yZSBub2xpbnQgbGluZXMKICAg ICAgICAgcmV0dXJuCiAgICAgY2hlY2tfZm9yX211bHRpbGluZV9jb21tZW50c19hbmRfc3RyaW5n cyhjbGVhbl9saW5lcywgbGluZSwgZXJyb3IpCi0gICAgY2hlY2tfc3R5bGUoY2xlYW5fbGluZXMs IGxpbmUsIGZpbGVfZXh0ZW5zaW9uLCBmaWxlX3N0YXRlLCBlcnJvcikKKyAgICBjaGVja19zdHls ZShjbGVhbl9saW5lcywgbGluZSwgZmlsZV9leHRlbnNpb24sIGNsYXNzX3N0YXRlLCBmaWxlX3N0 YXRlLCBlcnJvcikKICAgICBjaGVja19sYW5ndWFnZShmaWxlbmFtZSwgY2xlYW5fbGluZXMsIGxp bmUsIGZpbGVfZXh0ZW5zaW9uLCBpbmNsdWRlX3N0YXRlLAogICAgICAgICAgICAgICAgICAgIGVy cm9yKQogICAgIGNoZWNrX2Zvcl9ub25fc3RhbmRhcmRfY29uc3RydWN0cyhjbGVhbl9saW5lcywg bGluZSwgY2xhc3Nfc3RhdGUsIGVycm9yKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQppbmRleCBiNTU4 NGQwM2JmNmNkOGYzZWQxZGUxNDIwMWFmMGFiYWM4MmEyZTQ1Li5lZTgyOWFhY2RjMjNkYTZmMzU3 Y2JiMTE5MWFmOGM0ODM1NTU1ODIzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQpAQCAtMTY0LDcg KzE2NCw3IEBAIGNsYXNzIENwcFN0eWxlVGVzdEJhc2UodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICBjbGFzc19zdGF0ZSA9IGNwcF9zdHlsZS5fQ2xhc3NTdGF0ZSgpCiAgICAgICAgIGZpbGVf c3RhdGUgPSBjcHBfc3R5bGUuX0ZpbGVTdGF0ZSgpCiAgICAgICAgIGZvciBpIGluIHhyYW5nZShs aW5lcy5udW1fbGluZXMoKSk6Ci0gICAgICAgICAgICBjcHBfc3R5bGUuY2hlY2tfc3R5bGUobGlu ZXMsIGksIGZpbGVfZXh0ZW5zaW9uLCBmaWxlX3N0YXRlLCBlcnJvcl9jb2xsZWN0b3IpCisgICAg ICAgICAgICBjcHBfc3R5bGUuY2hlY2tfc3R5bGUobGluZXMsIGksIGZpbGVfZXh0ZW5zaW9uLCBj bGFzc19zdGF0ZSwgZmlsZV9zdGF0ZSwgZXJyb3JfY29sbGVjdG9yKQogICAgICAgICAgICAgY3Bw X3N0eWxlLmNoZWNrX2Zvcl9ub25fc3RhbmRhcmRfY29uc3RydWN0cyhsaW5lcywgaSwgY2xhc3Nf c3RhdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVycm9yX2NvbGxlY3RvcikKICAgICAgICAgY2xhc3Nfc3RhdGUuY2hlY2tfZmluaXNo ZWQoZXJyb3JfY29sbGVjdG9yKQpAQCAtMjU5NCw2ICsyNTk0LDE5IEBAIGNsYXNzIE5vTm9uVmly dHVhbERlc3RydWN0b3JzVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgc2VsZi5hc3Nl cnRfbXVsdGlfbGluZV9saW50KAogICAgICAgICAgICAgJ2NsYXNzIEZvbyB7IHZvaWQgZm9vKCk7 IH07JywKICAgICAgICAgICAgICdNb3JlIHRoYW4gb25lIGNvbW1hbmQgb24gdGhlIHNhbWUgbGlu ZSAgW3doaXRlc3BhY2UvbmV3bGluZV0gWzRdJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbXVsdGlf bGluZV9saW50KAorICAgICAgICAgICAgJ2NsYXNzIE15Q2xhc3Mge1xuJworICAgICAgICAgICAg JyAgICBpbnQgZ2V0SW50VmFsdWUoKSB7IEFTU0VSVChtX3B0cik7IHJldHVybiAqbV9wdHI7IH1c bicKKyAgICAgICAgICAgICd9O1xuJywKKyAgICAgICAgICAgICcnKQorICAgICAgICBzZWxmLmFz c2VydF9tdWx0aV9saW5lX2xpbnQoCisgICAgICAgICAgICAnY2xhc3MgTXlDbGFzcyB7XG4nCisg ICAgICAgICAgICAnICAgIGludCBnZXRJbnRWYWx1ZSgpXG4nCisgICAgICAgICAgICAnICAgIHtc bicKKyAgICAgICAgICAgICcgICAgICAgIEFTU0VSVChtX3B0cik7IHJldHVybiAqbV9wdHI7XG4n CisgICAgICAgICAgICAnICAgIH1cbicKKyAgICAgICAgICAgICd9O1xuJywKKyAgICAgICAgICAg ICdNb3JlIHRoYW4gb25lIGNvbW1hbmQgb24gdGhlIHNhbWUgbGluZSAgW3doaXRlc3BhY2UvbmV3 bGluZV0gWzRdJykKIAogICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoCiAgICAg ICAgICAgICAnJydjbGFzcyBRdWFsaWZpZWQ6OkdvbyA6IHB1YmxpYyBGb28gewo=