124820 2013-11-24 17:59:55 -0800 check-webkit-style should check member initialization indentation 2013-12-04 09:06:47 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.webkit.org/coding/coding-style.html#punctuation-member-init P2 Normal --- 1 burg webkit-unassigned bfulgham commit-queue darin glenn llango.u-szeged rniwa oldest_to_newest 953879 0 burg 2013-11-24 17:59:55 -0800 The solution should be added in the vicinity of Source/Tools/Scripts/webkitpy/style/checkers/cpp.py, in function check_spacing. 953968 1 llango.u-szeged 2013-11-25 04:43:06 -0800 (In reply to comment #0) > The solution should be added in the vicinity of Source/Tools/Scripts/webkitpy/style/checkers/cpp.py, in function check_spacing. Are you working on the fix, or just reported the bug? 954010 2 burg 2013-11-25 08:05:59 -0800 (In reply to comment #1) > (In reply to comment #0) > > The solution should be added in the vicinity of Source/Tools/Scripts/webkitpy/style/checkers/cpp.py, in function check_spacing. > > Are you working on the fix, or just reported the bug? Reported only, with some hints in case I decide to look at it sometime later. 954483 3 217932 llango.u-szeged 2013-11-27 02:33:50 -0800 Created attachment 217932 Patch 954752 4 217932 galpeter 2013-11-28 09:09:29 -0800 Comment on attachment 217932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217932&action=review > Tools/Scripts/webkitpy/style/checkers/cpp.py:1979 > + if search(r'\b([A-Za-z0-9_]*_)\(\1\)', line): Why is there an underscore in the end of the first group? > Tools/Scripts/webkitpy/style/checkers/cpp.py:1997 > + if search(r'(?P<indentation>\s*)([^\s]\(.*\)\s?\:|^\s*\:).*[^;]*$', line): > + if search(r'[^:]\:[^\:\s]+', line): > + error(line_number, 'whitespace/init', 4, > + 'Missing spaces around :') > + if search(r'[^\s]\(.*\)\s?\:.*[^;]*$', line): > + error(line_number, 'whitespace/indent', 4, > + 'Should be indented on a separate line, with the colon or comma first on that line.') > + else: > + begin_line, begin_line_number = get_previous_non_blank_line(clean_lines, line_number) > + > + matched = search(r'(?P<indentation>\s*).*', begin_line) For this 'matched 'you could use the regex's return value in the if above. 954884 5 llango.u-szeged 2013-11-28 23:10:42 -0800 (In reply to comment #4) > (From update of attachment 217932 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=217932&action=review > > > Tools/Scripts/webkitpy/style/checkers/cpp.py:1979 > > + if search(r'\b([A-Za-z0-9_]*_)\(\1\)', line): > > Why is there an underscore in the end of the first group? I don't know, that is not my code. I just moved it into this new method, because this functionality should be here. > > > Tools/Scripts/webkitpy/style/checkers/cpp.py:1997 > > + if search(r'(?P<indentation>\s*)([^\s]\(.*\)\s?\:|^\s*\:).*[^;]*$', line): > > + if search(r'[^:]\:[^\:\s]+', line): > > + error(line_number, 'whitespace/init', 4, > > + 'Missing spaces around :') > > + if search(r'[^\s]\(.*\)\s?\:.*[^;]*$', line): > > + error(line_number, 'whitespace/indent', 4, > > + 'Should be indented on a separate line, with the colon or comma first on that line.') > > + else: > > + begin_line, begin_line_number = get_previous_non_blank_line(clean_lines, line_number) > > + > > + matched = search(r'(?P<indentation>\s*).*', begin_line) > > For this 'matched 'you could use the regex's return value in the if above. No it's not the same. The base of the indention can be the previous non blank line. example: myClass() : myInt(0) { } The above if you mentioned will match on the second line, but we need the indention of the first line. 954902 6 217932 galpeter 2013-11-29 01:15:46 -0800 Comment on attachment 217932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217932&action=review >>> Tools/Scripts/webkitpy/style/checkers/cpp.py:1997 >>> + matched = search(r'(?P<indentation>\s*).*', begin_line) >> >> For this 'matched 'you could use the regex's return value in the if above. > > No it's not the same. The base of the indention can be the previous non blank line. example: > > myClass() > : myInt(0) > { } > > The above if you mentioned will match on the second line, but we need the indention of the first line. Oh.. I missed the second parameter of the search. My bad. 956331 7 217932 zherczeg 2013-12-04 02:51:25 -0800 Comment on attachment 217932 Patch Nice python magic. r=me 956340 8 217932 commit-queue 2013-12-04 03:08:47 -0800 Comment on attachment 217932 Patch Clearing flags on attachment: 217932 Committed r160084: <http://trac.webkit.org/changeset/160084> 956341 9 commit-queue 2013-12-04 03:08:53 -0800 All reviewed patches have been landed. Closing bug. 956404 10 burg 2013-12-04 09:06:47 -0800 Great work, thanks for picking these up! 217932 2013-11-27 02:33:50 -0800 2013-12-04 03:08:47 -0800 Patch bug-124820-20131127023349.patch text/plain 11048 llango.u-szeged U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NzQxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGNjYzhiNjQ5ZjE4N2YzMTNlN2I0OWQ0YzE3NjM4OTQ0 Zjg2NWIwZC4uYzQyOTFjYWNiOTE1N2MyNTllZDg0MmQ2NTIxZmI4NWIyOTA2MmQzMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEzLTExLTI3ICBMw6FzemzDsyBMYW5nw7MgIDxsYW5nb0BpbmYudS1zemVnZWQuaHU+ CisKKyAgICAgICAgY2hlY2std2Via2l0LXN0eWxlIHNob3VsZCBjaGVjayBtZW1iZXIgaW5pdGlh bGl6YXRpb24gaW5kZW50YXRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQ4MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBjaGVjay13ZWJraXQtc3R5bGUgc2hvdWxkIGNoZWNrIG1lbWJlciBpbml0 aWFsaXphdGlvbiBpbmRlbnRhdGlvbgorICAgICAgICBiZWxvbmdzIHRvIHdlYmtpdCBjb2Rpbmcg c3R5bGU6CisgICAgICAgIGh0dHA6Ly93d3cud2Via2l0Lm9yZy9jb2RpbmcvY29kaW5nLXN0eWxl Lmh0bWwjcHVuY3R1YXRpb24tbWVtYmVyLWluaXQKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5OgorICAgICAgICAoY2hlY2tfbWVtYmVyX2luaXRpYWxp emF0aW9uX2xpc3QpOiBBZGQgbmV3IG1ldGhvZCB0byBjaGVjayBtZW1iZXIKKyAgICAgICAgaW5p dGlhbGl6YXRpb24gbGlzdC4KKyAgICAgICAgKGNoZWNrX3N0eWxlKTogQWRkIHRoZSBjYWxsIG9m IHRoZSBuZXcgbWV0aG9kLgorICAgICAgICAoY2hlY2tfbGFuZ3VhZ2UpOiBNb3ZlIHNlbGYgaW5p dGlhbGl6YXRpb24gY2hlY2tpbmcgaW50byB0aGUgbmV3IG1ldGhvZC4KKyAgICAgICAgKENwcENo ZWNrZXIpOiBBZGQgYSBuZXcgY2F0ZWdvcnkgZm9yIGluaXRpYWxpemF0aW9uIGxpc3QuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHk6Cisg ICAgICAgIChDcHBTdHlsZVRlc3QudGVzdF9ydW50aW1lX3NlbGZpbml0KToKKyAgICAgICAgKENw cFN0eWxlVGVzdC50ZXN0X2RlcHJlY2F0ZWRfY2FzdCk6CisgICAgICAgIChXZWJLaXRTdHlsZVRl c3QudGVzdF9tZW1iZXJfaW5pdGlhbGl6YXRpb25fbGlzdCk6IEFkZCBuZXcgdGVzdGNhc2VzIGZv cgorICAgICAgICB0aGUgbmV3IGZlYXR1cmUuCisKIDIwMTMtMTEtMjIgIERlYW4gSmFja3NvbiAg PGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFNwZWN1bGF0aXZlIE1vdW50YWluIExpb24gYnVp bGQgZml4LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy cy9jcHAucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weQpp bmRleCAyZDU1OWJkNzMzNjlkODViMjZjMTlhOTc1ZjQxZGQyZmE1YWE5MWE3Li42ZDcxZWNjNzI0 MWE4MTkxMGFhNmJiMmJmYmI2YzhmMzQzODRkODNjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weQpAQCAtMTk2NCw2ICsxOTY0LDU3IEBAIGRlZiBjaGVj a19zcGFjaW5nKGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9y KToKICAgICAgICAgICAgICAgJ1NlbWljb2xvbiBkZWZpbmluZyBlbXB0eSBzdGF0ZW1lbnQgZm9y IHRoaXMgbG9vcC4gVXNlIHsgfSBpbnN0ZWFkLicpCiAKIAorZGVmIGNoZWNrX21lbWJlcl9pbml0 aWFsaXphdGlvbl9saXN0KGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZXJyb3IpOgorICAgICIi IiBMb29rIGZvciBzdHlsZSBlcnJvcnMgaW4gbWVtYmVyIGluaXRpYWxpemF0aW9uIGxpc3Qgb2Yg Y2xhc3Nlcy4KKworICAgIEFyZ3M6CisgICAgICBjbGVhbl9saW5lczogQSBDbGVhbnNlZExpbmVz IGluc3RhbmNlIGNvbnRhaW5pbmcgdGhlIGZpbGUuCisgICAgICBsaW5lX251bWJlcjogVGhlIG51 bWJlciBvZiB0aGUgbGluZSB0byBjaGVjay4KKyAgICAgIGVycm9yOiBUaGUgZnVuY3Rpb24gdG8g Y2FsbCB3aXRoIGFueSBlcnJvcnMgZm91bmQuCisgICAgIiIiCisKKyAgICByYXcgPSBjbGVhbl9s aW5lcy5yYXdfbGluZXMKKyAgICBsaW5lID0gcmF3W2xpbmVfbnVtYmVyXQorCisgICAgaWYgc2Vh cmNoKHInXGIoW0EtWmEtejAtOV9dKl8pXChcMVwpJywgbGluZSk6CisgICAgICAgIGVycm9yKGxp bmVfbnVtYmVyLCAncnVudGltZS9pbml0JywgNCwKKyAgICAgICAgICAgICAgJ1lvdSBzZWVtIHRv IGJlIGluaXRpYWxpemluZyBhIG1lbWJlciB2YXJpYWJsZSB3aXRoIGl0c2VsZi4nKQorCisgICAg IyBDaGVjayB0aGUgc3R5bGUgb2YgdGhlIGluaXRpYWxpemVyIGxpc3QuCisgICAgIyBFYWNoIG1l bWJlciAoYW5kIHN1cGVyY2xhc3MpIHNob3VsZCBiZSBpbmRlbnRlZCBvbiBhIHNlcGFyYXRlIGxp bmUsCisgICAgIyB3aXRoIHRoZSBjb2xvbiBvciBjb21tYSBwcmVjZWRpbmcgdGhlIG1lbWJlciBv biB0aGF0IGxpbmUuCisgICAgYmVnaW5fbGluZSA9IGxpbmUKKyAgICBpZiBzZWFyY2gocicoP1A8 aW5kZW50YXRpb24+XHMqKShbXlxzXVwoLipcKVxzP1w6fF5ccypcOikuKlteO10qJCcsIGxpbmUp OgorICAgICAgICBpZiBzZWFyY2gocidbXjpdXDpbXlw6XHNdKycsIGxpbmUpOgorICAgICAgICAg ICAgZXJyb3IobGluZV9udW1iZXIsICd3aGl0ZXNwYWNlL2luaXQnLCA0LAorICAgICAgICAgICAg ICAgICdNaXNzaW5nIHNwYWNlcyBhcm91bmQgOicpCisgICAgICAgIGlmIHNlYXJjaChyJ1teXHNd XCguKlwpXHM/XDouKlteO10qJCcsIGxpbmUpOgorICAgICAgICAgICAgZXJyb3IobGluZV9udW1i ZXIsICd3aGl0ZXNwYWNlL2luZGVudCcsIDQsCisgICAgICAgICAgICAgICAgJ1Nob3VsZCBiZSBp bmRlbnRlZCBvbiBhIHNlcGFyYXRlIGxpbmUsIHdpdGggdGhlIGNvbG9uIG9yIGNvbW1hIGZpcnN0 IG9uIHRoYXQgbGluZS4nKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgYmVnaW5fbGluZSwg YmVnaW5fbGluZV9udW1iZXIgPSBnZXRfcHJldmlvdXNfbm9uX2JsYW5rX2xpbmUoY2xlYW5fbGlu ZXMsIGxpbmVfbnVtYmVyKQorCisgICAgICAgIG1hdGNoZWQgPSBzZWFyY2gocicoP1A8aW5kZW50 YXRpb24+XHMqKS4qJywgYmVnaW5fbGluZSkKKyAgICAgICAgaW5kZW50YXRpb24gPSBtYXRjaGVk Lmdyb3VwKCdpbmRlbnRhdGlvbicpCisgICAgICAgIGlubmVyX2luZGVudGF0aW9uID0gaW5kZW50 YXRpb24gKyAnICcgKiA0CisKKyAgICAgICAgd2hpbGUobm90IHNlYXJjaChyJ3snLCBsaW5lKSk6 CisgICAgICAgICAgICAjIERvbid0IGNoZWNrIGluaGVyaXRhbmNlIHN0eWxlCisgICAgICAgICAg ICBpZiBzZWFyY2gocidcU1woLipcKScsIGxpbmUpOgorICAgICAgICAgICAgICAgIGlmIG5vdCBs aW5lLnN0YXJ0c3dpdGgoaW5uZXJfaW5kZW50YXRpb24pIGFuZCBiZWdpbl9saW5lICE9IGxpbmU6 CisgICAgICAgICAgICAgICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFjZS9pbmRl bnQnLCA0LAorICAgICAgICAgICAgICAgICAgICAgICAgJ1dyb25nIG51bWJlciBvZiBzcGFjZXMg YmVmb3JlIHN0YXRlbWVudC4gKGV4cGVjdGVkOiAlZCknICUgbGVuKGlubmVyX2luZGVudGF0aW9u KSkKKyAgICAgICAgICAgICAgICBpZiBzZWFyY2gocidcU1xzKiwnLCBsaW5lKToKKyAgICAgICAg ICAgICAgICAgICAgZXJyb3IobGluZV9udW1iZXIsICd3aGl0ZXNwYWNlL2luaXQnLCA0LAorICAg ICAgICAgICAgICAgICAgICAgICAgJ0NvbW1hIHNob3VsZCBiZSBhdCB0aGUgYmVnZ2luaW5nIG9m IHRoZSBsaW5lIGluIGEgbWVtYmVyIGluaXRpYWxpemF0aW9uIGxpc3QuJykKKworICAgICAgICAg ICAgIyBUbyBhdm9pZCBpbmZpbml0ZSBsb29wLCBpZiBjYW4ndCBmaW5kIHRoZSBlbmQgb2YgbWVt YmVyIGluaXRpYWxpemF0aW9uIGxpc3QKKyAgICAgICAgICAgIGlmIGxpbmVfbnVtYmVyIDwgbGVu KHJhdykgLSAxOgorICAgICAgICAgICAgICAgIGxpbmVfbnVtYmVyID0gbGluZV9udW1iZXIgKyAx CisgICAgICAgICAgICAgICAgbGluZSA9IHJhd1tsaW5lX251bWJlcl0KKyAgICAgICAgICAgIGVs c2U6CisgICAgICAgICAgICAgICAgYnJlYWsKKwogZGVmIGdldF9wcmV2aW91c19ub25fYmxhbmtf bGluZShjbGVhbl9saW5lcywgbGluZV9udW1iZXIpOgogICAgICIiIlJldHVybiB0aGUgbW9zdCBy ZWNlbnQgbm9uLWJsYW5rIGxpbmUgYW5kIGl0cyBsaW5lIG51bWJlci4KIApAQCAtMjYzOSw2ICsy NjkwLDcgQEAgZGVmIGNoZWNrX3N0eWxlKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZmlsZV9l eHRlbnNpb24sIGNsYXNzX3N0YXRlLCBmaWxlX3N0YXQKICAgICBjaGVja19icmFjZXMoY2xlYW5f bGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcikKICAgICBjaGVja19leGl0X3N0YXRlbWVudF9zaW1w bGlmaWNhdGlvbnMoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcikKICAgICBjaGVja19z cGFjaW5nKGZpbGVfZXh0ZW5zaW9uLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKQor ICAgIGNoZWNrX21lbWJlcl9pbml0aWFsaXphdGlvbl9saXN0KGNsZWFuX2xpbmVzLCBsaW5lX251 bWJlciwgZXJyb3IpCiAgICAgY2hlY2tfY2hlY2soY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBl cnJvcikKICAgICBjaGVja19mb3JfY29tcGFyaXNvbnNfdG9femVybyhjbGVhbl9saW5lcywgbGlu ZV9udW1iZXIsIGVycm9yKQogICAgIGNoZWNrX2Zvcl9udWxsKGNsZWFuX2xpbmVzLCBsaW5lX251 bWJlciwgZmlsZV9zdGF0ZSwgZXJyb3IpCkBAIC0yOTQzLDEwICsyOTk1LDYgQEAgZGVmIGNoZWNr X2xhbmd1YWdlKGZpbGVuYW1lLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5z aW9uLCBpbmNsdWRlX3MKICAgICAgICAgICAgICAgImhpZXJhcmNoeSwgdXNlIHN0YXRpY19jYXN0 PD4gdG8gdXBjYXN0LiAgR29vZ2xlIGRvZXNuJ3Qgc3VwcG9ydCAiCiAgICAgICAgICAgICAgICdS VFRJLicpCiAKLSAgICBpZiBzZWFyY2gocidcYihbQS1aYS16MC05X10qXylcKFwxXCknLCBsaW5l KToKLSAgICAgICAgZXJyb3IobGluZV9udW1iZXIsICdydW50aW1lL2luaXQnLCA0LAotICAgICAg ICAgICAgICAnWW91IHNlZW0gdG8gYmUgaW5pdGlhbGl6aW5nIGEgbWVtYmVyIHZhcmlhYmxlIHdp dGggaXRzZWxmLicpCi0KICAgICBpZiBmaWxlX2V4dGVuc2lvbiA9PSAnaCc6CiAgICAgICAgICMg RklYTUU6IGNoZWNrIHRoYXQgMS1hcmcgY29uc3RydWN0b3JzIGFyZSBleHBsaWNpdC4KICAgICAg ICAgIyAgICAgICAgSG93IHRvIHRlbGwgaXQncyBhIGNvbnN0cnVjdG9yPwpAQCAtMzY1Nyw2ICsz NzA1LDcgQEAgY2xhc3MgQ3BwQ2hlY2tlcihvYmplY3QpOgogICAgICAgICAnd2hpdGVzcGFjZS9l bmRfb2ZfbGluZScsCiAgICAgICAgICd3aGl0ZXNwYWNlL2VuZGluZ19uZXdsaW5lJywKICAgICAg ICAgJ3doaXRlc3BhY2UvaW5kZW50JywKKyAgICAgICAgJ3doaXRlc3BhY2UvaW5pdCcsCiAgICAg ICAgICd3aGl0ZXNwYWNlL2xpbmVfbGVuZ3RoJywKICAgICAgICAgJ3doaXRlc3BhY2UvbmV3bGlu ZScsCiAgICAgICAgICd3aGl0ZXNwYWNlL29wZXJhdG9ycycsCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CmluZGV4IGUxNDM1 YmI3NDI1ODI1ODBlNWFkMzNhNzY0MTNlZTZmNjgwMDExMzcuLmQ0OTEzNTAyMzZlMWRjMGI2NGVj Yzg2MmU2ZDBlYzQxYzY0ZTRlN2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CkBAIC03NDgsMTUgKzc0OCwyNyBAQCBj bGFzcyBDcHBTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAnJykKIAog ICAgIGRlZiB0ZXN0X3J1bnRpbWVfc2VsZmluaXQoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0 X2xpbnQoCi0gICAgICAgICAgICAnRm9vOjpGb28oQmFyIHIsIEJlbCBsKSA6IHJfKHJfKSwgbF8o bF8pIHsgfScsCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKKyAgICAgICAg ICAgICcnJ1wKKyAgICAgICAgICAgIEZvbzo6Rm9vKEJhciByLCBCZWwgbCkKKyAgICAgICAgICAg ICAgICA6IHJfKHJfKQorICAgICAgICAgICAgICAgICwgbF8obF8pIHsgfScnJywKKyAgICAgICAg ICAgIFsnWW91IHNlZW0gdG8gYmUgaW5pdGlhbGl6aW5nIGEgbWVtYmVyIHZhcmlhYmxlIHdpdGgg aXRzZWxmLicKKyAgICAgICAgICAgICcgIFtydW50aW1lL2luaXRdIFs0XScsCiAgICAgICAgICAg ICAnWW91IHNlZW0gdG8gYmUgaW5pdGlhbGl6aW5nIGEgbWVtYmVyIHZhcmlhYmxlIHdpdGggaXRz ZWxmLicKLSAgICAgICAgICAgICcgIFtydW50aW1lL2luaXRdIFs0XScpCi0gICAgICAgIHNlbGYu YXNzZXJ0X2xpbnQoCi0gICAgICAgICAgICAnRm9vOjpGb28oQmFyIHIsIEJlbCBsKSA6IHJfKHIp LCBsXyhsKSB7IH0nLAorICAgICAgICAgICAgJyAgW3J1bnRpbWUvaW5pdF0gWzRdJ10pCisgICAg ICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKKyAgICAgICAgICAgICcnJ1wKKyAgICAg ICAgICAgIEZvbzo6Rm9vKEJhciByLCBCZWwgbCkKKyAgICAgICAgICAgICAgICA6IHJfKHIpCisg ICAgICAgICAgICAgICAgLCBsXyhsKSB7IH0nJycsCiAgICAgICAgICAgICAnJykKLSAgICAgICAg c2VsZi5hc3NlcnRfbGludCgKLSAgICAgICAgICAgICdGb286OkZvbyhCYXIgcikgOiByXyhyKSwg bF8ocl8pLCBsbF8obF8pIHsgfScsCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGlu dCgKKyAgICAgICAgICAgICcnJ1wKKyAgICAgICAgICAgIEZvbzo6Rm9vKEJhciByKQorICAgICAg ICAgICAgICAgIDogcl8ocikKKyAgICAgICAgICAgICAgICAsIGxfKHJfKQorICAgICAgICAgICAg ICAgICwgbGxfKGxfKSB7IH0nJycsCiAgICAgICAgICAgICAnJykKIAogICAgIGRlZiB0ZXN0X3J1 bnRpbWVfcnR0aShzZWxmKToKQEAgLTgxOCw4ICs4MzAsMTAgQEAgY2xhc3MgQ3BwU3R5bGVUZXN0 KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICBzZWxmLmFzc2VydF9saW50KAogICAgICAgICAg ICAgJ2ludCBhID0gaW50KCk7IC8vIENvbnN0cnVjdG9yLCBvLmsuJywKICAgICAgICAgICAgICcn KQotICAgICAgICBzZWxmLmFzc2VydF9saW50KAotICAgICAgICAgICAgJ1g6OlgoKSA6IGEoaW50 KCkpIHsgfSAvLyBkZWZhdWx0IENvbnN0cnVjdG9yLCBvLmsuJywKKyAgICAgICAgc2VsZi5hc3Nl cnRfbXVsdGlfbGluZV9saW50KAorICAgICAgICAgICAgJycnXAorICAgICAgICAgICAgWDo6WCgp CisgICAgICAgICAgICAgICAgOiBhKGludCgpKSB7IH0gLy8gZGVmYXVsdCBDb25zdHJ1Y3Rvciwg by5rLicnJywKICAgICAgICAgICAgICcnKQogICAgICAgICBzZWxmLmFzc2VydF9saW50KAogICAg ICAgICAgICAgJ29wZXJhdG9yIGJvb2woKTsgLy8gQ29udmVyc2lvbiBvcGVyYXRvciwgby5rLics CkBAIC00ODgxLDYgKzQ4OTUsNzcgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVz dEJhc2UpOgogICAgICAgICAgICAgICAgICd0ZXN0LmgnLAogICAgICAgICAgICAgICAgIHdlYmtp dF9leHBvcnRfZXJyb3JfcnVsZXMpKQogCisgICAgZGVmIHRlc3RfbWVtYmVyX2luaXRpYWxpemF0 aW9uX2xpc3Qoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ015Q2xhc3M6Ok15Q2xh c3MoRG9jdW1lbnQqIGRvYykgOiBNeVN1cGVyQ2xhc3MoKSB7IH0nLAorICAgICAgICAnU2hvdWxk IGJlIGluZGVudGVkIG9uIGEgc2VwYXJhdGUgbGluZSwgd2l0aCB0aGUgY29sb24gb3IgY29tbWEg Zmlyc3Qgb24gdGhhdCBsaW5lLicKKyAgICAgICAgJyAgW3doaXRlc3BhY2UvaW5kZW50XSBbNF0n KQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoJycnXAorICAgICAgICBNeUNs YXNzOjpNeUNsYXNzKERvY3VtZW50KiBkb2MpIDogTXlTdXBlckNsYXNzKCkKKyAgICAgICAgeyB9 JycnLAorICAgICAgICAnU2hvdWxkIGJlIGluZGVudGVkIG9uIGEgc2VwYXJhdGUgbGluZSwgd2l0 aCB0aGUgY29sb24gb3IgY29tbWEgZmlyc3Qgb24gdGhhdCBsaW5lLicKKyAgICAgICAgJyAgW3do aXRlc3BhY2UvaW5kZW50XSBbNF0nKQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xp bnQoJycnXAorICAgICAgICBNeUNsYXNzOjpNeUNsYXNzKERvY3VtZW50KiBkb2MpCisgICAgICAg IDogTXlTdXBlckNsYXNzKCkKKyAgICAgICAgeyB9JycnLAorICAgICAgICAnV3JvbmcgbnVtYmVy IG9mIHNwYWNlcyBiZWZvcmUgc3RhdGVtZW50LiAoZXhwZWN0ZWQ6IDEyKScKKyAgICAgICAgJyAg W3doaXRlc3BhY2UvaW5kZW50XSBbNF0nKQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5l X2xpbnQoJycnXAorICAgICAgICBNeUNsYXNzOjpNeUNsYXNzKERvY3VtZW50KiBkb2MpIDoKKyAg ICAgICAgICAgIE15U3VwZXJDbGFzcygpLAorICAgICAgICAgICAgbV9kb2MoMCkKKyAgICAgICAg eyB9JycnLAorICAgICAgICBbJ1Nob3VsZCBiZSBpbmRlbnRlZCBvbiBhIHNlcGFyYXRlIGxpbmUs IHdpdGggdGhlIGNvbG9uIG9yIGNvbW1hIGZpcnN0IG9uIHRoYXQgbGluZS4nCisgICAgICAgICAn ICBbd2hpdGVzcGFjZS9pbmRlbnRdIFs0XScsCisgICAgICAgICAnQ29tbWEgc2hvdWxkIGJlIGF0 IHRoZSBiZWdnaW5pbmcgb2YgdGhlIGxpbmUgaW4gYSBtZW1iZXIgaW5pdGlhbGl6YXRpb24gbGlz dC4nCisgICAgICAgICAnICBbd2hpdGVzcGFjZS9pbml0XSBbNF0nXSkKKyAgICAgICAgc2VsZi5h c3NlcnRfbXVsdGlfbGluZV9saW50KCcnJ1wKKyAgICAgICAgTXlDbGFzczo6TXlDbGFzcyhEb2N1 bWVudCogZG9jKSA6TXlTdXBlckNsYXNzKCkKKyAgICAgICAgeyB9JycnLAorICAgICAgICBbJ01p c3Npbmcgc3BhY2VzIGFyb3VuZCA6ICBbd2hpdGVzcGFjZS9pbml0XSBbNF0nLAorICAgICAgICAg J1Nob3VsZCBiZSBpbmRlbnRlZCBvbiBhIHNlcGFyYXRlIGxpbmUsIHdpdGggdGhlIGNvbG9uIG9y IGNvbW1hIGZpcnN0IG9uIHRoYXQgbGluZS4nCisgICAgICAgICAnICBbd2hpdGVzcGFjZS9pbmRl bnRdIFs0XSddKQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoJycnXAorICAg ICAgICBNeUNsYXNzOjpNeUNsYXNzKERvY3VtZW50KiBkb2MpOk15U3VwZXJDbGFzcygpCisgICAg ICAgIHsgfScnJywKKyAgICAgICAgWydNaXNzaW5nIHNwYWNlcyBhcm91bmQgOiAgW3doaXRlc3Bh Y2UvaW5pdF0gWzRdJywKKyAgICAgICAgICdTaG91bGQgYmUgaW5kZW50ZWQgb24gYSBzZXBhcmF0 ZSBsaW5lLCB3aXRoIHRoZSBjb2xvbiBvciBjb21tYSBmaXJzdCBvbiB0aGF0IGxpbmUuJworICAg ICAgICAgJyAgW3doaXRlc3BhY2UvaW5kZW50XSBbNF0nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRf bXVsdGlfbGluZV9saW50KCcnJ1wKKyAgICAgICAgTXlDbGFzczo6TXlDbGFzcyhEb2N1bWVudCog ZG9jKSA6IE15U3VwZXJDbGFzcygpCisgICAgICAgICxNeVN1cGVyQ2xhc3MoKQorICAgICAgICAs IG1fZG9jKDApCisgICAgICAgICAgICAsIG1fbXlNZW1iZXIoMCkKKyAgICAgICAgeyB9JycnLAor ICAgICAgICBbJ1Nob3VsZCBiZSBpbmRlbnRlZCBvbiBhIHNlcGFyYXRlIGxpbmUsIHdpdGggdGhl IGNvbG9uIG9yIGNvbW1hIGZpcnN0IG9uIHRoYXQgbGluZS4nCisgICAgICAgICAnICBbd2hpdGVz cGFjZS9pbmRlbnRdIFs0XScsCisgICAgICAgICAnV3JvbmcgbnVtYmVyIG9mIHNwYWNlcyBiZWZv cmUgc3RhdGVtZW50LiAoZXhwZWN0ZWQ6IDEyKScKKyAgICAgICAgICcgIFt3aGl0ZXNwYWNlL2lu ZGVudF0gWzRdJywKKyAgICAgICAgICdXcm9uZyBudW1iZXIgb2Ygc3BhY2VzIGJlZm9yZSBzdGF0 ZW1lbnQuIChleHBlY3RlZDogMTIpJworICAgICAgICAgJyAgW3doaXRlc3BhY2UvaW5kZW50XSBb NF0nLAorICAgICAgICAgJ01pc3Npbmcgc3BhY2UgYWZ0ZXIgLCAgW3doaXRlc3BhY2UvY29tbWFd IFszXSddKQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoJycnXAorICAgICAg ICBNeUNsYXNzOjpNeUNsYXNzKERvY3VtZW50KiBkb2MpCisgICAgICAgICAgICA6TXlTdXBlckNs YXNzKCkKKyAgICAgICAgeyB9JycnLAorICAgICAgICAnTWlzc2luZyBzcGFjZXMgYXJvdW5kIDog IFt3aGl0ZXNwYWNlL2luaXRdIFs0XScpCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVf bGludCgnJydcCisgICAgICAgIE15Q2xhc3M6Ok15Q2xhc3MoRG9jdW1lbnQqIGRvYykKKyAgICAg ICAgICAgIDogTXlTdXBlckNsYXNzKCkgLCBtX2RvYygwKQorICAgICAgICB7IH0nJycsCisgICAg ICAgICdDb21tYSBzaG91bGQgYmUgYXQgdGhlIGJlZ2dpbmluZyBvZiB0aGUgbGluZSBpbiBhIG1l bWJlciBpbml0aWFsaXphdGlvbiBsaXN0LicKKyAgICAgICAgJyAgW3doaXRlc3BhY2UvaW5pdF0g WzRdJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbXVsdGlfbGluZV9saW50KCcnJ1wKKyAgICAgICAg Y2xhc3MgTXlDbGFzcyA6IHB1YmxpYyBHb28geworICAgICAgICB9OycnJywKKyAgICAgICAgJycp CisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgnJydcCisgICAgICAgIGNsYXNz IE15Q2xhc3MKKyAgICAgICAgOiBwdWJsaWMgR29vCisgICAgICAgICwgcHVibGljIGZvbyB7Cisg ICAgICAgIH07JycnLAorICAgICAgICAnJykKKwogICAgIGRlZiB0ZXN0X290aGVyKHNlbGYpOgog ICAgICAgICAjIEZJWE1FOiBJbXBsZW1lbnQgdGhpcy4KICAgICAgICAgcGFzcwo=