134884 2014-07-14 09:08:56 -0700 check-webkit-style should apply C++ rules to Objective-C++ files 2014-07-14 15:23:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates commit-queue darin ddkilzer glenn joepeck oldest_to_newest 1022218 0 dbates 2014-07-14 09:08:56 -0700 Currently check-webkit-style considers Objective-C++ files as Objective-C files and hence doesn't apply rules that are applicable to C++ code. We should teach check-webkit-style to apply its C++ rules to Objective-C++ files (if applicable - see remark (*)) to identify Objective-C++ code that doesn't conform to the WebKit Code Style Guidelines. (*) At the time of writing, we allow Objective-C code in an Objective-C++ file to use NULL for a null pointer instead of the C++ idiom nullptr per <http://www.webkit.org/coding/coding-style.html#zero-null>. 1022224 1 234856 dbates 2014-07-14 09:21:05 -0700 Created attachment 234856 Patch and unit tests 1022255 2 234856 joepeck 2014-07-14 11:01:33 -0700 Comment on attachment 234856 Patch and unit tests r=me, nice! 1022338 3 dbates 2014-07-14 15:23:11 -0700 Committed r171088: <http://trac.webkit.org/changeset/171088> 234856 2014-07-14 09:21:05 -0700 2014-07-14 11:01:33 -0700 Patch and unit tests bug-134884-20140714092048.patch text/plain 9809 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMDY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmEzMGEzZDg3MmVhMGM5MzY4MTI4NDUzMDdiNDhlZDI1 MDQ4M2IxYi4uYWI5MTFhMTcwMjBkNzc3ZDVlMzMzZjFhNGU3MGQ1ZDI2OTVmNjU1YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDE0LTA3LTE0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAg ICAgICBjaGVjay13ZWJraXQtc3R5bGUgc2hvdWxkIGFwcGx5IEMrKyBydWxlcyB0byBPYmplY3Rp dmUtQysrIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzQ4ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXhlcyBhbiBpc3N1ZSB3aGVyZSBjaGVjay13ZWJraXQtc3R5bGUgZG9lc24ndCBhcHBs eSBhcHBsaWNhYmxlIEMrKyBydWxlcyB0bworICAgICAgICBPYmplY3RpdmUtQysrIGZpbGVzLgor CisgICAgICAgIEN1cnJlbnRseSBjaGVjay13ZWJraXQtc3R5bGUgZG9lc24ndCBhcHBseSB0aGUg Zm9sbG93aW5nIHJ1bGVzIHRvIE9iamVjdGl2ZS1DKysKKyAgICAgICAgZmlsZXM6IGJ1aWxkL3Vz aW5nX3N0ZCwgcnVudGltZS9tYXhfbWluX21hY3JvcywgcnVudGltZS93dGZfbW92ZSwgcmVhZGFi aWxpdHkvbnVsbC4KKyAgICAgICAgSW5zdGVhZCwgd2Ugc2hvdWxkIHRlYWNoIGNoZWNrLXdlYmtp dC1zdHlsZSB0byBhcHBseSB0aGVzZSBydWxlcyBiZWNhdXNlLCBhcworICAgICAgICBpdHMgbmFt ZSBpbXBsaWVzLCBhbiBPYmplY3RpdmUtQysrIGZpbGUgbWF5IGNvbnRhaW4gQysrIGNvZGUuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAg ICAgKF9GaWxlU3RhdGUuX19pbml0X18pOiBBZGQgaW5zdGFuY2UgdmFyaWFibGUgX2lzX29iamVj dGl2ZV9jcHAgdG8gdHJhY2sgd2hldGhlciBhIGZpbGUgaGFzCisgICAgICAgIGV4dGVuc2lvbiBt bSAoaS5lLiBhbiBPYmplY3RpdmUtQysrIGZpbGUpLgorICAgICAgICAoX0ZpbGVTdGF0ZS5pc19v YmplY3RpdmVfY19vcl9vYmplY3RpdmVfY3BwKTogQWRkZWQ7IHJldHVybnMgdHJ1ZSBpZiB0aGUg ZmlsZQorICAgICAgICBoYXMgZXh0ZW5zaW9uIG0gb3IgbW0gb3IgaWYgdGhlIGZpbGUgaGFzIGV4 dGVuc2lvbiBoIGFuZCBjb250YWlucyBPYmplY3RpdmUtQyBkaXJlY3RpdmVzLgorICAgICAgICAo Y2hlY2tfZm9yX251bGwpOiBObyBjaGFuZ2UgaW4gYmVoYXZpb3I7IGRvbid0IGFwcGx5IHJ1bGUg dG8gT2JqZWN0aXZlLUMrKyBmaWxlLgorICAgICAgICAoY2hlY2tfaWRlbnRpZmllcl9uYW1lX2lu X2RlY2xhcmF0aW9uKTogU3Vic3RpdHV0ZSBfRmlsZVN0YXRlLmlzX29iamVjdGl2ZV9jX29yX29i amVjdGl2ZV9jcHAoKSBmb3IKKyAgICAgICAgX0ZpbGVTdGF0ZS5pc19jX29yX29iamVjdGl2ZV9j KCkKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVz dC5weToKKyAgICAgICAgKFdlYktpdFN0eWxlVGVzdC50ZXN0X251bGxfZmFsc2VfemVybyk6IEFk ZGVkIHRlc3QgY2FzZSBmb3IgT2JqZWN0aXZlLUMrKyBmaWxlLgorICAgICAgICAoV2ViS2l0U3R5 bGVUZXN0LnRlc3RfbWF4X21hY3JvKTogQWRkIHRlc3QgY2FzZSBmb3IgT2JqZWN0aXZlLUMgYW5k IE9iamVjdGl2ZS1DKysgZmlsZS4KKyAgICAgICAgKFdlYktpdFN0eWxlVGVzdC50ZXN0X21pbl9t YWNybyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0U3R5bGVUZXN0LnRlc3Rfd3RmX21vdmUpOiBB ZGQgdGVzdCBjYXNlIGZvciBPYmplY3RpdmUtQysrIGZpbGUuCisKKzIwMTQtMDctMTQgIERhbmll bCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIFRlYWNoIGNoZWNrLXdlYmtp dC1zdHlsZSB0byBzdWdnZXN0IFdURjo6bW92ZSgpIHdoZW4gaXQgc2VlcyBzdGQ6Om1vdmUoKQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NjIwCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5kZXggYjI5 OTQwNTYyYTZmMzdhY2RiNzExOTUxNjhjOWI0NWY5ZTNiYmY0Mi4uNmE5ODRkYjQxNDM5OTg1NTJk YTEwZDZjMmY4Yzg5NjgxNjYxZGIxZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9jcHAucHkKQEAgLTExNDUsMTkgKzExNDUsMjcgQEAgY2xhc3MgX0ZpbGVTdGF0 ZShvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjbGVhbl9saW5lcywgZmlsZV9leHRl bnNpb24pOgogICAgICAgICBzZWxmLl9kaWRfaW5zaWRlX25hbWVzcGFjZV9pbmRlbnRfd2Fybmlu ZyA9IEZhbHNlCiAgICAgICAgIHNlbGYuX2NsZWFuX2xpbmVzID0gY2xlYW5fbGluZXMKLSAgICAg ICAgaWYgZmlsZV9leHRlbnNpb24gaW4gWydtJywgJ21tJ106CisgICAgICAgIGlmIGZpbGVfZXh0 ZW5zaW9uID09ICdtJzoKKyAgICAgICAgICAgIHNlbGYuX2lzX29iamVjdGl2ZV9jcHAgPSBGYWxz ZQogICAgICAgICAgICAgc2VsZi5faXNfb2JqZWN0aXZlX2MgPSBUcnVlCiAgICAgICAgICAgICBz ZWxmLl9pc19jID0gRmFsc2UKKyAgICAgICAgZWxpZiBmaWxlX2V4dGVuc2lvbiA9PSAnbW0nOgor ICAgICAgICAgICAgc2VsZi5faXNfb2JqZWN0aXZlX2NwcCA9IFRydWUKKyAgICAgICAgICAgIHNl bGYuX2lzX29iamVjdGl2ZV9jID0gRmFsc2UKKyAgICAgICAgICAgIHNlbGYuX2lzX2MgPSBGYWxz ZQogICAgICAgICBlbGlmIGZpbGVfZXh0ZW5zaW9uID09ICdoJzoKICAgICAgICAgICAgICMgSW4g dGhlIGNhc2Ugb2YgaGVhZGVyIGZpbGVzLCBpdCBpcyB1bmtub3duIGlmIHRoZSBmaWxlCi0gICAg ICAgICAgICAjIGlzIGMgLyBvYmplY3RpdmUgYyBvciBub3QsIHNvIHNldCB0aGlzIHZhbHVlIHRv IE5vbmUgYW5kIHRoZW4KKyAgICAgICAgICAgICMgaXMgQyAvIE9iamVjdGl2ZS1DIC8gT2JqZWN0 aXZlLUMrKyBvciBub3QsIHNvIHNldCB0aGlzIHZhbHVlIHRvIE5vbmUgYW5kIHRoZW4KICAgICAg ICAgICAgICMgaWYgaXQgaXMgcmVxdWVzdGVkLCB1c2UgaGV1cmlzdGljcyB0byBndWVzcyB0aGUg dmFsdWUuCisgICAgICAgICAgICBzZWxmLl9pc19vYmplY3RpdmVfY3BwID0gTm9uZQogICAgICAg ICAgICAgc2VsZi5faXNfb2JqZWN0aXZlX2MgPSBOb25lCiAgICAgICAgICAgICBzZWxmLl9pc19j ID0gTm9uZQogICAgICAgICBlbGlmIGZpbGVfZXh0ZW5zaW9uID09ICdjJzoKKyAgICAgICAgICAg IHNlbGYuX2lzX29iamVjdGl2ZV9jcHAgPSBGYWxzZQogICAgICAgICAgICAgc2VsZi5faXNfYyA9 IFRydWUKICAgICAgICAgICAgIHNlbGYuX2lzX29iamVjdGl2ZV9jID0gRmFsc2UKICAgICAgICAg ZWxzZToKKyAgICAgICAgICAgIHNlbGYuX2lzX29iamVjdGl2ZV9jcHAgPSBGYWxzZQogICAgICAg ICAgICAgc2VsZi5faXNfb2JqZWN0aXZlX2MgPSBGYWxzZQogICAgICAgICAgICAgc2VsZi5faXNf YyA9IEZhbHNlCiAKQEAgLTExNzksNiArMTE4Nyw5IEBAIGNsYXNzIF9GaWxlU3RhdGUob2JqZWN0 KToKICAgICAgICAgICAgICAgICBzZWxmLl9pc19vYmplY3RpdmVfYyA9IEZhbHNlCiAgICAgICAg IHJldHVybiBzZWxmLl9pc19vYmplY3RpdmVfYwogCisgICAgZGVmIGlzX29iamVjdGl2ZV9jX29y X29iamVjdGl2ZV9jcHAoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9pc19vYmplY3RpdmVf Y3BwIG9yIHNlbGYuaXNfb2JqZWN0aXZlX2MoKQorCiAgICAgZGVmIGlzX2Moc2VsZik6CiAgICAg ICAgIGlmIHNlbGYuX2lzX2MgaXMgTm9uZToKICAgICAgICAgICAgIGZvciBsaW5lIGluIHNlbGYu X2NsZWFuX2xpbmVzLmxpbmVzOgpAQCAtMjY2Myw4ICsyNjc0LDggQEAgZGVmIGNoZWNrX2Zvcl9j b21wYXJpc29uc190b196ZXJvKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZXJyb3IpOgogCiAK IGRlZiBjaGVja19mb3JfbnVsbChjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfc3RhdGUs IGVycm9yKToKLSAgICAjIFRoaXMgY2hlY2sgZG9lc24ndCBhcHBseSB0byBDIG9yIE9iamVjdGl2 ZS1DIGltcGxlbWVudGF0aW9uIGZpbGVzLgotICAgIGlmIGZpbGVfc3RhdGUuaXNfY19vcl9vYmpl Y3RpdmVfYygpOgorICAgICMgVGhpcyBjaGVjayBkb2Vzbid0IGFwcGx5IHRvIEMsIE9iamVjdGl2 ZS1DLCBPYmplY3RpdmUtQysrIGltcGxlbWVudGF0aW9uIGZpbGVzLgorICAgIGlmIGZpbGVfc3Rh dGUuaXNfYygpIG9yIGZpbGVfc3RhdGUuaXNfb2JqZWN0aXZlX2Nfb3Jfb2JqZWN0aXZlX2NwcCgp OgogICAgICAgICByZXR1cm4KIAogICAgIGxpbmUgPSBjbGVhbl9saW5lcy5lbGlkZWRbbGluZV9u dW1iZXJdCkBAIC0yNjkwLDYgKzI3MDEsOCBAQCBkZWYgY2hlY2tfZm9yX251bGwoY2xlYW5fbGlu ZXMsIGxpbmVfbnVtYmVyLCBmaWxlX3N0YXRlLCBlcnJvcik6CiAgICAgICAgIHJldHVybgogCiAg ICAgaWYgc2VhcmNoKHInXGJOVUxMXGInLCBsaW5lKToKKyAgICAgICAgIyBGSVhNRTogV2Ugc2hv dWxkIHJlY29tbWVuZCB1c2luZyBudWxscHRyIGluc3RlYWQgb2YgTlVMTCBpbiBDKysgY29kZSBw ZXIKKyAgICAgICAgIyA8aHR0cDovL3d3dy53ZWJraXQub3JnL2NvZGluZy9jb2Rpbmctc3R5bGUu aHRtbCN6ZXJvLW51bGw+LgogICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3JlYWRhYmlsaXR5 L251bGwnLCA1LCAnVXNlIDAgaW5zdGVhZCBvZiBOVUxMLicpCiAgICAgICAgIHJldHVybgogCkBA IC0yNjk4LDYgKzI3MTEsOCBAQCBkZWYgY2hlY2tfZm9yX251bGwoY2xlYW5fbGluZXMsIGxpbmVf bnVtYmVyLCBmaWxlX3N0YXRlLCBlcnJvcik6CiAgICAgIyBtYXRjaGVzLCB0aGVuIGRvIHRoZSBj aGVjayB3aXRoIHN0cmluZ3MgY29sbGFwc2VkIHRvIGF2b2lkIGdpdmluZyBlcnJvcnMgZm9yCiAg ICAgIyBOVUxMcyBvY2N1cnJpbmcgaW4gc3RyaW5ncy4KICAgICBpZiBzZWFyY2gocidcYk5VTExc YicsIGxpbmUpIGFuZCBzZWFyY2gocidcYk5VTExcYicsIENsZWFuc2VkTGluZXMuY29sbGFwc2Vf c3RyaW5ncyhsaW5lKSk6CisgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCByZWNvbW1lbmQgdXNp bmcgbnVsbHB0ciBpbnN0ZWFkIG9mIDAgb3IgbnVsbCBpbiBDKysgY29kZSBwZXIKKyAgICAgICAg IyA8aHR0cDovL3d3dy53ZWJraXQub3JnL2NvZGluZy9jb2Rpbmctc3R5bGUuaHRtbCN6ZXJvLW51 bGw+LgogICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3JlYWRhYmlsaXR5L251bGwnLCA0LCAn VXNlIDAgb3IgbnVsbCBpbnN0ZWFkIG9mIE5VTEwgKGV2ZW4gaW4gKmNvbW1lbnRzKikuJykKIAog ZGVmIGdldF9saW5lX3dpZHRoKGxpbmUpOgpAQCAtMzMzOSw3ICszMzU0LDcgQEAgZGVmIGNoZWNr X2lkZW50aWZpZXJfbmFtZV9pbl9kZWNsYXJhdGlvbihmaWxlbmFtZSwgbGluZV9udW1iZXIsIGxp bmUsIGZpbGVfc3RhdGUKIAogICAgICAgICAjIFJlbW92ZSAibV8iIGFuZCAic18iIHRvIGFsbG93 IHRoZW0uCiAgICAgICAgIG1vZGlmaWVkX2lkZW50aWZpZXIgPSBzdWIocicoXnwoPzw9OjopKVtt c11fJywgJycsIGlkZW50aWZpZXIpCi0gICAgICAgIGlmIG5vdCBmaWxlX3N0YXRlLmlzX29iamVj dGl2ZV9jKCkgYW5kIG1vZGlmaWVkX2lkZW50aWZpZXIuZmluZCgnXycpID49IDA6CisgICAgICAg IGlmIG5vdCBmaWxlX3N0YXRlLmlzX29iamVjdGl2ZV9jX29yX29iamVjdGl2ZV9jcHAoKSBhbmQg bW9kaWZpZWRfaWRlbnRpZmllci5maW5kKCdfJykgPj0gMDoKICAgICAgICAgICAgICMgVmFyaW91 cyBleGNlcHRpb25zIHRvIHRoZSBydWxlOiBKYXZhU2NyaXB0IG9wIGNvZGVzIGZ1bmN0aW9ucywg Y29uc3RfaXRlcmF0b3IuCiAgICAgICAgICAgICBpZiAobm90IChmaWxlbmFtZS5maW5kKCdKYXZh U2NyaXB0Q29yZScpID49IDAgYW5kIG1vZGlmaWVkX2lkZW50aWZpZXIuZmluZCgnb3BfJykgPj0g MCkKICAgICAgICAgICAgICAgICBhbmQgbm90IChmaWxlbmFtZS5maW5kKCdndGsnKSA+PSAwIGFu ZCBtb2RpZmllZF9pZGVudGlmaWVyLnN0YXJ0c3dpdGgoJ3dlYmtpdF8nKSA+PSAwKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5w eQppbmRleCBmYWRmODEwYzgxMDczNzAxYzYzYTJlNWZkZWM5YjY5ZTUzNjBkYWQ5Li5hMjZlZjQ1 OGRkMjI0NzFkYTNmNDM4ZTJiNmJiOWIyYWU3NjZiZTVhIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQpAQCAtNDUwMCw3 ICs0NTAwLDcgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAg ICAgICAgICAgJ215VmFyaWFibGUgPSBOVUxMaWZ5JywKICAgICAgICAgICAgICcnLAogICAgICAg ICAgICAgJ2Zvby5jcHAnKQotICAgICAgICAjIE1ha2Ugc3VyZSB0aGF0IHRoZSBOVUxMIGNoZWNr IGRvZXMgbm90IGFwcGx5IHRvIEMgYW5kIE9iamVjdGl2ZS1DIGZpbGVzLgorICAgICAgICAjIE1h a2Ugc3VyZSB0aGF0IHRoZSBOVUxMIGNoZWNrIGRvZXMgbm90IGFwcGx5IHRvIEMsIE9iamVjdGl2 ZS1DLCBhbmQgT2JqZWN0aXZlLUMrKyBmaWxlcy4KICAgICAgICAgc2VsZi5hc3NlcnRfbGludCgK ICAgICAgICAgICAgICdmdW5jdGlvbkNhbGwoTlVMTCknLAogICAgICAgICAgICAgJycsCkBAIC00 NTA5LDYgKzQ1MDksMTAgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2Up OgogICAgICAgICAgICAgJ2Z1bmN0aW9uQ2FsbChOVUxMKScsCiAgICAgICAgICAgICAnJywKICAg ICAgICAgICAgICdmb28ubScpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoCisgICAgICAgICAg ICAnZnVuY3Rpb25DYWxsKE5VTEwpJywKKyAgICAgICAgICAgICcnLAorICAgICAgICAgICAgJ2Zv by5tbScpCiAKICAgICAgICAgIyBNYWtlIHN1cmUgdGhhdCB0aGUgTlVMTCBjaGVjayBkb2VzIG5v dCBhcHBseSB0byBnX29iamVjdF97c2V0LGdldH0gYW5kCiAgICAgICAgICMgZ19zdHJ7am9pbixj b25jYXR9CkBAIC00Njc2LDYgKzQ2ODAsMTIgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0 eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAgIiAgW2J1aWxkL3VzaW5nX3N0ZF0gWzRdIiwKICAg ICAgICAgICAgICdmb28uY3BwJykKIAorICAgICAgICBzZWxmLmFzc2VydF9saW50KAorICAgICAg ICAgICAgJ3VzaW5nIHN0ZDo6bWluOycsCisgICAgICAgICAgICAiVXNlICd1c2luZyBuYW1lc3Bh Y2Ugc3RkOycgaW5zdGVhZCBvZiAndXNpbmcgc3RkOjptaW47Jy4iCisgICAgICAgICAgICAiICBb YnVpbGQvdXNpbmdfc3RkXSBbNF0iLAorICAgICAgICAgICAgJ2Zvby5tbScpCisKICAgICBkZWYg dGVzdF91c2luZ19uYW1lc3BhY2Uoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoCiAg ICAgICAgICAgICAndXNpbmcgbmFtZXNwYWNlIGZvbzsnLApAQCAtNDY5MSwxMSArNDcwMSwyMiBA QCBjbGFzcyBXZWJLaXRTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAKICAgICAgICAgc2Vs Zi5hc3NlcnRfbGludCgKICAgICAgICAgICAgICdpbnQgaSA9IE1BWCgwLCAxKTsnLAorICAgICAg ICAgICAgJycsCisgICAgICAgICAgICAnZm9vLm0nKQorCisgICAgICAgIHNlbGYuYXNzZXJ0X2xp bnQoCisgICAgICAgICAgICAnaW50IGkgPSBNQVgoMCwgMSk7JywKICAgICAgICAgICAgICdVc2Ug c3RkOjptYXgoKSBvciBzdGQ6Om1heDx0eXBlPigpIGluc3RlYWQgb2YgdGhlIE1BWCgpIG1hY3Jv LicKICAgICAgICAgICAgICcgIFtydW50aW1lL21heF9taW5fbWFjcm9zXSBbNF0nLAogICAgICAg ICAgICAgJ2Zvby5jcHAnKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoCisgICAgICAgICAg ICAnaW50IGkgPSBNQVgoMCwgMSk7JywKKyAgICAgICAgICAgICdVc2Ugc3RkOjptYXgoKSBvciBz dGQ6Om1heDx0eXBlPigpIGluc3RlYWQgb2YgdGhlIE1BWCgpIG1hY3JvLicKKyAgICAgICAgICAg ICcgIFtydW50aW1lL21heF9taW5fbWFjcm9zXSBbNF0nLAorICAgICAgICAgICAgJ2Zvby5tbScp CisKKyAgICAgICAgc2VsZi5hc3NlcnRfbGludCgKICAgICAgICAgICAgICdpbmxpbmUgaW50IGZv bygpIHsgcmV0dXJuIE1BWCgwLCAxKTsgfScsCiAgICAgICAgICAgICAnVXNlIHN0ZDo6bWF4KCkg b3Igc3RkOjptYXg8dHlwZT4oKSBpbnN0ZWFkIG9mIHRoZSBNQVgoKSBtYWNyby4nCiAgICAgICAg ICAgICAnICBbcnVudGltZS9tYXhfbWluX21hY3Jvc10gWzRdJywKQEAgLTQ3MDksMTEgKzQ3MzAs MjIgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogCiAgICAgICAg IHNlbGYuYXNzZXJ0X2xpbnQoCiAgICAgICAgICAgICAnaW50IGkgPSBNSU4oMCwgMSk7JywKKyAg ICAgICAgICAgICcnLAorICAgICAgICAgICAgJ2Zvby5tJykKKworICAgICAgICBzZWxmLmFzc2Vy dF9saW50KAorICAgICAgICAgICAgJ2ludCBpID0gTUlOKDAsIDEpOycsCiAgICAgICAgICAgICAn VXNlIHN0ZDo6bWluKCkgb3Igc3RkOjptaW48dHlwZT4oKSBpbnN0ZWFkIG9mIHRoZSBNSU4oKSBt YWNyby4nCiAgICAgICAgICAgICAnICBbcnVudGltZS9tYXhfbWluX21hY3Jvc10gWzRdJywKICAg ICAgICAgICAgICdmb28uY3BwJykKIAogICAgICAgICBzZWxmLmFzc2VydF9saW50KAorICAgICAg ICAgICAgJ2ludCBpID0gTUlOKDAsIDEpOycsCisgICAgICAgICAgICAnVXNlIHN0ZDo6bWluKCkg b3Igc3RkOjptaW48dHlwZT4oKSBpbnN0ZWFkIG9mIHRoZSBNSU4oKSBtYWNyby4nCisgICAgICAg ICAgICAnICBbcnVudGltZS9tYXhfbWluX21hY3Jvc10gWzRdJywKKyAgICAgICAgICAgICdmb28u bW0nKQorCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoCiAgICAgICAgICAgICAnaW5saW5lIGlu dCBmb28oKSB7IHJldHVybiBNSU4oMCwgMSk7IH0nLAogICAgICAgICAgICAgJ1VzZSBzdGQ6Om1p bigpIG9yIHN0ZDo6bWluPHR5cGU+KCkgaW5zdGVhZCBvZiB0aGUgTUlOKCkgbWFjcm8uJwogICAg ICAgICAgICAgJyAgW3J1bnRpbWUvbWF4X21pbl9tYWNyb3NdIFs0XScsCkBAIC00NzMxLDYgKzQ3 NjMsMTIgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAg ICAgICAgIiAgW3J1bnRpbWUvd3RmX21vdmVdIFs0XSIsCiAgICAgICAgICAgICAnZm9vLmNwcCcp CiAKKyAgICAgICAgc2VsZi5hc3NlcnRfbGludCgKKyAgICAgICAgICAgICdBIGEgPSBzdGQ6Om1v dmUoYik7JywKKyAgICAgICAgICAgICJVc2UgJ1dURjo6bW92ZSgpJyBpbnN0ZWFkIG9mICdzdGQ6 Om1vdmUoKScuIgorICAgICAgICAgICAgIiAgW3J1bnRpbWUvd3RmX21vdmVdIFs0XSIsCisgICAg ICAgICAgICAnZm9vLm1tJykKKwogICAgIGRlZiB0ZXN0X2N0eXBlX2Z1Y250aW9uKHNlbGYpOgog ICAgICAgICBzZWxmLmFzc2VydF9saW50KAogICAgICAgICAgICAgJ2ludCBpID0gaXNhc2NpaSg4 KTsnLAo=