131708 2014-04-15 15:11:52 -0700 check-webkit-style doesn't check code style in .mm or .m files 2014-04-16 10:18:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca ap commit-queue darin glenn mitz ossy rniwa simon.fraser oldest_to_newest 1000989 0 thorton 2014-04-15 15:11:52 -0700 They're treated as plaintext, so we do check indentation and stuff, but do not apply code rules! Additionally, the style checker isn't quite smart enough to handle ObjC yet, so we have to adjust some of the rules a bit. 1000990 1 thorton 2014-04-15 15:12:29 -0700 Most stuff already works because we frequently check style of ObjC headers. 1001005 2 229410 thorton 2014-04-15 15:40:17 -0700 Created attachment 229410 patch This covers all of the obvious false positives in a few ObjC(++) files I tested, but I'm sure there will be more, which we can fix as they come up. 1001006 3 229411 thorton 2014-04-15 15:43:02 -0700 Created attachment 229411 fix the test too 1001186 4 thorton 2014-04-16 10:18:49 -0700 http://trac.webkit.org/changeset/167350 229410 2014-04-15 15:40:17 -0700 2014-04-15 15:43:02 -0700 patch style-objc.diff text/plain 6331 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlMjJi YWJiLi5lZTdlZmFhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTQtMDQtMTUgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgY2hlY2std2Via2l0LXN0eWxlIGRvZXNuJ3Qg Y2hlY2sgY29kZSBzdHlsZSBpbiAubW0gb3IgLm0gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTcwOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyLnB5OgorICAgICAgICBDaGVjayAubW0gYW5kIC5tIGZpbGVzIGFzIEMrKy4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5OgorICAgICAgICAoY2hl Y2tfc3BhY2luZyk6CisgICAgICAgIEFkZCBhbiBvdmVycmlkZSBmb3Igb3VyIG9yZGluYXJ5ICJt aXNzaW5nIHNwYWNlcyBhcm91bmQgPSIgZm9yIEBzeW50aGVzaXplLAorICAgICAgICB3aGljaCBz aG91bGQgbG9vayBsaWtlICJAc3ludGhlc2l6ZSBwcm9wZXJ0eU5hbWU9X3Zhck5hbWU7IgorCisg ICAgICAgIEFkZCBhbiBvdmVycmlkZSBmb3IgIm1pc3Npbmcgc3BhY2UgYmVmb3JlIHsiIGZvciBi bG9ja3MnICJeeyIuCisKKyAgICAgICAgRG9uJ3QgZm9sbG93IHRoZSAiZXh0cmEgc3BhY2UgYmVm b3JlIFsiIHJ1bGUgZm9yIE9iamVjdGl2ZS1DLCBiZWNhdXNlCisgICAgICAgIGl0IGJyZWFrcyB0 aGlzIHJ1bGUgaW4gYSBtdWx0aXR1ZGUgb2Ygd2F5cyBiZWNhdXNlIG9mIG1ldGhvZCBjYWxscy4K KworICAgICAgICAoY2hlY2tfYnJhY2VzKToKKyAgICAgICAgRG9uJ3QgY29tcGxhaW4gYWJvdXQg eyBub3QgYmVpbmcgb24gdGhlIGVuZCBvZiB0aGUgcHJldmlvdXMgbGluZSBpZgorICAgICAgICB0 aGUgcHJldmlvdXMgbGluZSBzdGFydHMgd2l0aCAiLSAoIiBvciAiKyAoIiwgd2hpY2ggd291bGQg aW5kaWNhdGUgYQorICAgICAgICBPYmplY3RpdmUtQyBtZXRob2QgZGVmaW5pdGlvbi4KKwogMjAx NC0wNC0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gUmVkdWNlIHRoZSBiaW5hcnkgc2l6ZSBieSBjb21wcmVzc2luZyB0aGUgdGV4 dCBiYXNlZCB3ZWIgaW5zcGVjdG9yIHJlc291cmNlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2VyLnB5CmluZGV4IGI4MDIxNjYuLjMzMGEzNDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXIucHkKQEAgLTI1Nyw2ICsyNTcsOCBAQCBfQ1BQX0ZJTEVfRVhURU5T SU9OUyA9IFsKICAgICAnYycsCiAgICAgJ2NwcCcsCiAgICAgJ2gnLAorICAgICdtbScsCisgICAg J20nLAogICAgIF0KIAogX0pTX0ZJTEVfRVhURU5TSU9OID0gJ2pzJwpAQCAtMjc3LDcgKzI3OSw2 IEBAIF9URVhUX0ZJTEVfRVhURU5TSU9OUyA9IFsKICAgICAnaHRtbCcsCiAgICAgJ2lkbCcsCiAg ICAgJ2luJywKLSAgICAnbW0nLAogICAgICdwaHAnLAogICAgICdwbCcsCiAgICAgJ3BtJywKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5kZXggYjkyNWEw Mi4uMWNhNzRlOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy9jcHAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9j cHAucHkKQEAgLTE4NDgsMTMgKzE4NDgsMjEgQEAgZGVmIGNoZWNrX3NwYWNpbmcoZmlsZV9leHRl bnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZXJyb3IpOgogICAgICAgICAgICAgZXJy b3IobGluZV9udW1iZXIsICd3aGl0ZXNwYWNlL3Byb3BlcnR5JywgNCwKICAgICAgICAgICAgICAg ICAgICdTaG91bGQgbm90IGhhdmUgc3BhY2VzIGFyb3VuZCA9IGluIHByb3BlcnR5IGF0dHJpYnV0 ZXMuJykKIAorICAgICMgT2JqZWN0aXZlLUMgQHN5bnRoZXNpemUgbGluZXMuCisgICAgaXNfb2Jq ZWN0aXZlX2Nfc3ludGhlc2l6ZSA9IHNlYXJjaChyJ15Ac3ludGhlc2l6ZScsIGxpbmUpCisgICAg aWYgaXNfb2JqZWN0aXZlX2Nfc3ludGhlc2l6ZToKKyAgICAgICAgIyAicHJvcD1fdmFyTmFtZSIg bm90ICJwcm9wID0gX3Zhck5hbWUiCisgICAgICAgIGlmIHNlYXJjaChyJyhccys9fD1ccyspJywg bGluZSk6CisgICAgICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3doaXRlc3BhY2UvcHJvcGVy dHknLCA0LAorICAgICAgICAgICAgICAgICAgJ1Nob3VsZCBub3QgaGF2ZSBzcGFjZXMgYXJvdW5k ID0gaW4gcHJvcGVydHkgc3ludGhlc2lzLicpCisKICAgICAjIERvbid0IHRyeSB0byBkbyBzcGFj aW5nIGNoZWNrcyBmb3Igb3BlcmF0b3IgbWV0aG9kcwogICAgIGxpbmUgPSBzdWIocidvcGVyYXRv cig9PXwhPXw8fDw8fDw9fD49fD4+fD58XCs9fC09fFwqPXwvPXwlPXwmPXxcfD18Xj18PDw9fD4+ PXwvKVwoJywgJ29wZXJhdG9yXCgnLCBsaW5lKQogICAgICMgRG9uJ3QgdHJ5IHRvIGRvIHNwYWNp bmcgY2hlY2tzIGZvciAjaW5jbHVkZSwgI2ltcG9ydCwgb3IgI2lmIHN0YXRlbWVudHMgYXQKICAg ICAjIG1pbmltdW0gYmVjYXVzZSBpdCBtZXNzZXMgdXAgY2hlY2tzIGZvciBzcGFjaW5nIGFyb3Vu ZCAvCiAgICAgaWYgbWF0Y2gocidccyojXHMqKD86aW5jbHVkZXxpbXBvcnR8aWYpJywgbGluZSk6 CiAgICAgICAgIHJldHVybgotICAgIGlmIG5vdCBpc19vYmplY3RpdmVfY19wcm9wZXJ0eSBhbmQg c2VhcmNoKHInW1x3Ll09W1x3Ll0nLCBsaW5lKToKKyAgICBpZiBub3QgaXNfb2JqZWN0aXZlX2Nf cHJvcGVydHkgYW5kIG5vdCBpc19vYmplY3RpdmVfY19zeW50aGVzaXplIGFuZCBzZWFyY2gocidb XHcuXT1bXHcuXScsIGxpbmUpOgogICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3doaXRlc3Bh Y2Uvb3BlcmF0b3JzJywgNCwKICAgICAgICAgICAgICAgJ01pc3Npbmcgc3BhY2VzIGFyb3VuZCA9 JykKIApAQCAtMTk1MCwxMCArMTk1OCwxMCBAQCBkZWYgY2hlY2tfc3BhY2luZyhmaWxlX2V4dGVu c2lvbiwgY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcik6CiAgICAgIyBOZXh0IHdlIHdp bGwgbG9vayBmb3IgaXNzdWVzIHdpdGggZnVuY3Rpb24gY2FsbHMuCiAgICAgY2hlY2tfc3BhY2lu Z19mb3JfZnVuY3Rpb25fY2FsbChsaW5lLCBsaW5lX251bWJlciwgZXJyb3IpCiAKLSAgICAjIEV4 Y2VwdCBhZnRlciBhbiBvcGVuaW5nIHBhcmVuLCB5b3Ugc2hvdWxkIGhhdmUgc3BhY2VzIGJlZm9y ZSB5b3VyIGJyYWNlcy4KLSAgICAjIEFuZCBzaW5jZSB5b3Ugc2hvdWxkIG5ldmVyIGhhdmUgYnJh Y2VzIGF0IHRoZSBiZWdpbm5pbmcgb2YgYSBsaW5lLCB0aGlzIGlzCi0gICAgIyBhbiBlYXN5IHRl c3QuCi0gICAgaWYgc2VhcmNoKHInW14gKHtdeycsIGxpbmUpOgorICAgICMgRXhjZXB0IGFmdGVy IGFuIG9wZW5pbmcgcGFyZW4gKG9yIF4sIGZvciBibG9ja3MpLCB5b3Ugc2hvdWxkIGhhdmUgc3Bh Y2VzCisgICAgIyBiZWZvcmUgeW91ciBicmFjZXMuIEFuZCBzaW5jZSB5b3Ugc2hvdWxkIG5ldmVy IGhhdmUgYnJhY2VzIGF0IHRoZQorICAgICMgYmVnaW5uaW5nIG9mIGEgbGluZSwgdGhpcyBpcyBh biBlYXN5IHRlc3QuCisgICAgaWYgc2VhcmNoKHInW14gKHtcXl17JywgbGluZSk6CiAgICAgICAg IGVycm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFjZS9icmFjZXMnLCA1LAogICAgICAgICAgICAg ICAnTWlzc2luZyBzcGFjZSBiZWZvcmUgeycpCiAKQEAgLTE5NjMsMTAgKzE5NzEsMTIgQEAgZGVm IGNoZWNrX3NwYWNpbmcoZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwg ZXJyb3IpOgogICAgICAgICAgICAgICAnTWlzc2luZyBzcGFjZSBiZWZvcmUgZWxzZScpCiAKICAg ICAjIFlvdSBzaG91bGRuJ3QgaGF2ZSBzcGFjZXMgYmVmb3JlIHlvdXIgYnJhY2tldHMsIGV4Y2Vw dCBtYXliZSBhZnRlcgotICAgICMgJ2RlbGV0ZSBbXScgb3IgJ25ldyBjaGFyICogW10nLgotICAg IGlmIHNlYXJjaChyJ1x3XHMrXFsnLCBsaW5lKSBhbmQgbm90IHNlYXJjaChyJ2RlbGV0ZVxzK1xb JywgbGluZSk6Ci0gICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFjZS9icmFjZXMn LCA1LAotICAgICAgICAgICAgICAnRXh0cmEgc3BhY2UgYmVmb3JlIFsnKQorICAgICMgJ2RlbGV0 ZSBbXScgb3IgJ25ldyBjaGFyICogW10nLiBPYmplY3RpdmUtQyBjYW4ndCBmb2xsb3cgdGhpcyBy dWxlCisgICAgIyBiZWNhdXNlIG9mIG1ldGhvZCBjYWxscy4KKyAgICBpZiBmaWxlX2V4dGVuc2lv biAhPSAnbW0nIGFuZCBmaWxlX2V4dGVuc2lvbiAhPSAnbSc6CisgICAgICAgIGlmIHNlYXJjaChy J1x3XHMrXFsnLCBsaW5lKSBhbmQgbm90IHNlYXJjaChyJ2RlbGV0ZVxzK1xbJywgbGluZSk6Cisg ICAgICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3doaXRlc3BhY2UvYnJhY2VzJywgNSwKKyAg ICAgICAgICAgICAgICAgICdFeHRyYSBzcGFjZSBiZWZvcmUgWycpCiAKICAgICAjIFRoZXJlIHNo b3VsZCBhbHdheXMgYmUgYSBzaW5nbGUgc3BhY2UgaW4gYmV0d2VlbiBicmFjZXMgb24gdGhlIHNh bWUgbGluZS4KICAgICBpZiBzZWFyY2gocidce1x9JywgbGluZSk6CkBAIC0yMTYzLDcgKzIxNzMs NiBAQCBkZWYgZ2V0X2luaXRpYWxfc3BhY2VzX2Zvcl9saW5lKGNsZWFuX2xpbmUpOgogICAgICAg ICBpbml0aWFsX3NwYWNlcyArPSAxCiAgICAgcmV0dXJuIGluaXRpYWxfc3BhY2VzCiAKLQogZGVm IGNoZWNrX2luZGVudGF0aW9uX2Ftb3VudChjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9y KToKICAgICBsaW5lID0gY2xlYW5fbGluZXMuZWxpZGVkW2xpbmVfbnVtYmVyXQogICAgIGluaXRp YWxfc3BhY2VzID0gZ2V0X2luaXRpYWxfc3BhY2VzX2Zvcl9saW5lKGxpbmUpCkBAIC0yMzcyLDEx ICsyMzgxLDE0IEBAIGRlZiBjaGVja19icmFjZXMoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBl cnJvcik6CiAgICAgICAgICMgcGVyZmVjdGx5OiB3ZSBqdXN0IGRvbid0IGNvbXBsYWluIGlmIHRo ZSBsYXN0IG5vbi13aGl0ZXNwYWNlCiAgICAgICAgICMgY2hhcmFjdGVyIG9uIHRoZSBwcmV2aW91 cyBub24tYmxhbmsgbGluZSBpcyAnOycsICc6JywgJ3snLCAnfScsCiAgICAgICAgICMgJyknLCBv ciAnKSBjb25zdCcgYW5kIGRvZXNuJ3QgYmVnaW4gd2l0aCAnaWZ8Zm9yfHdoaWxlfHN3aXRjaHxl bHNlJy4KLSAgICAgICAgIyBXZSBhbHNvIGFsbG93ICcjJyBmb3IgI2VuZGlmIGFuZCAnPScgZm9y IGFycmF5IGluaXRpYWxpemF0aW9uLgorICAgICAgICAjIFdlIGFsc28gYWxsb3cgJyMnIGZvciAj ZW5kaWYgYW5kICc9JyBmb3IgYXJyYXkgaW5pdGlhbGl6YXRpb24sCisgICAgICAgICMgYW5kICct ICgnIGFuZCAnKyAoJyBmb3IgT2JqZWN0aXZlLUMgbWV0aG9kcy4KICAgICAgICAgcHJldmlvdXNf bGluZSA9IGdldF9wcmV2aW91c19ub25fYmxhbmtfbGluZShjbGVhbl9saW5lcywgbGluZV9udW1i ZXIpWzBdCiAgICAgICAgIGlmICgobm90IHNlYXJjaChyJ1s7On17KT1dXHMqJHxcKVxzKigoY29u c3R8b3ZlcnJpZGUpXHMqKT8oLT5ccypcUyspP1xzKiQnLCBwcmV2aW91c19saW5lKQogICAgICAg ICAgICAgIG9yIHNlYXJjaChyJ1xiKGlmfGZvcnx3aGlsZXxzd2l0Y2h8ZWxzZXxOU19FTlVNKVxi JywgcHJldmlvdXNfbGluZSkpCi0gICAgICAgICAgICBhbmQgcHJldmlvdXNfbGluZS5maW5kKCcj JykgPCAwKToKKyAgICAgICAgICAgIGFuZCBwcmV2aW91c19saW5lLmZpbmQoJyMnKSA8IDAKKyAg ICAgICAgICAgIGFuZCBwcmV2aW91c19saW5lLmZpbmQoJy0gKCcpICE9IDAKKyAgICAgICAgICAg IGFuZCBwcmV2aW91c19saW5lLmZpbmQoJysgKCcpICE9IDApOgogICAgICAgICAgICAgZXJyb3Io bGluZV9udW1iZXIsICd3aGl0ZXNwYWNlL2JyYWNlcycsIDQsCiAgICAgICAgICAgICAgICAgICAn VGhpcyB7IHNob3VsZCBiZSBhdCB0aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBsaW5lJykKICAgICBl bGlmIChzZWFyY2gocidcKVxzKigoKGNvbnN0fG92ZXJyaWRlKVxzKikqXHMqKT97XHMqJCcsIGxp bmUpCg== 229411 2014-04-15 15:43:02 -0700 2014-04-16 09:38:11 -0700 fix the test too style-objc.diff text/plain 7222 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlMjJi YWJiLi5lOTIyYzVkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTQtMDQtMTUgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgY2hlY2std2Via2l0LXN0eWxlIGRvZXNuJ3Qg Y2hlY2sgY29kZSBzdHlsZSBpbiAubW0gb3IgLm0gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTcwOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVz dC5weToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0Y2hUZXN0LnRlc3RfY3BwX3Bh dGhzKToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0Y2hUZXN0LnRlc3RfdGV4dF9w YXRocyk6CisgICAgICAgIENoZWNrIC5tbSBhbmQgLm0gZmlsZXMgYXMgQysrLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHk6CisgICAgICAgIChjaGVj a19zcGFjaW5nKToKKyAgICAgICAgQWRkIGFuIG92ZXJyaWRlIGZvciBvdXIgb3JkaW5hcnkgIm1p c3Npbmcgc3BhY2VzIGFyb3VuZCA9IiBmb3IgQHN5bnRoZXNpemUsCisgICAgICAgIHdoaWNoIHNo b3VsZCBsb29rIGxpa2UgIkBzeW50aGVzaXplIHByb3BlcnR5TmFtZT1fdmFyTmFtZTsiCisKKyAg ICAgICAgQWRkIGFuIG92ZXJyaWRlIGZvciAibWlzc2luZyBzcGFjZSBiZWZvcmUgeyIgZm9yIGJs b2NrcycgIl57Ii4KKworICAgICAgICBEb24ndCBmb2xsb3cgdGhlICJleHRyYSBzcGFjZSBiZWZv cmUgWyIgcnVsZSBmb3IgT2JqZWN0aXZlLUMsIGJlY2F1c2UKKyAgICAgICAgaXQgYnJlYWtzIHRo aXMgcnVsZSBpbiBhIG11bHRpdHVkZSBvZiB3YXlzIGJlY2F1c2Ugb2YgbWV0aG9kIGNhbGxzLgor CisgICAgICAgIChjaGVja19icmFjZXMpOgorICAgICAgICBEb24ndCBjb21wbGFpbiBhYm91dCB7 IG5vdCBiZWluZyBvbiB0aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBsaW5lIGlmCisgICAgICAgIHRo ZSBwcmV2aW91cyBsaW5lIHN0YXJ0cyB3aXRoICItICgiIG9yICIrICgiLCB3aGljaCB3b3VsZCBp bmRpY2F0ZSBhCisgICAgICAgIE9iamVjdGl2ZS1DIG1ldGhvZCBkZWZpbml0aW9uLgorCiAyMDE0 LTA0LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1RLXSBSZWR1Y2UgdGhlIGJpbmFyeSBzaXplIGJ5IGNvbXByZXNzaW5nIHRoZSB0ZXh0 IGJhc2VkIHdlYiBpbnNwZWN0b3IgcmVzb3VyY2VzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXIucHkKaW5kZXggYjgwMjE2Ni4uMzMwYTM0OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlci5weQpAQCAtMjU3LDYgKzI1Nyw4IEBAIF9DUFBfRklMRV9FWFRFTlNJ T05TID0gWwogICAgICdjJywKICAgICAnY3BwJywKICAgICAnaCcsCisgICAgJ21tJywKKyAgICAn bScsCiAgICAgXQogCiBfSlNfRklMRV9FWFRFTlNJT04gPSAnanMnCkBAIC0yNzcsNyArMjc5LDYg QEAgX1RFWFRfRklMRV9FWFRFTlNJT05TID0gWwogICAgICdodG1sJywKICAgICAnaWRsJywKICAg ICAnaW4nLAotICAgICdtbScsCiAgICAgJ3BocCcsCiAgICAgJ3BsJywKICAgICAncG0nLApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CmluZGV4 IGI5NTRlNmIuLmYzZjNjNjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJfdW5pdHRlc3QucHkKQEAgLTQ0Miw2ICs0NDIsOCBAQCBjbGFzcyBDaGVja2VyRGlz cGF0Y2hlckRpc3BhdGNoVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAiZm9v LmMiLAogICAgICAgICAgICAgImZvby5jcHAiLAogICAgICAgICAgICAgImZvby5oIiwKKyAgICAg ICAgICAgICJmb28ubW0iLAorICAgICAgICAgICAgImZvby5tIiwKICAgICAgICAgICAgIF0KIAog ICAgICAgICBmb3IgcGF0aCBpbiBwYXRoczoKQEAgLTUzNyw3ICs1MzksNiBAQCBjbGFzcyBDaGVj a2VyRGlzcGF0Y2hlckRpc3BhdGNoVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAg ICJmb28uaHRtbCIsCiAgICAgICAgICAgICJmb28uaWRsIiwKICAgICAgICAgICAgImZvby5pbiIs Ci0gICAgICAgICAgICJmb28ubW0iLAogICAgICAgICAgICAiZm9vLnBocCIsCiAgICAgICAgICAg ICJmb28ucGwiLAogICAgICAgICAgICAiZm9vLnBtIiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5kZXggYjkyNWEwMi4uMWNhNzRlOSAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKQEAgLTE4NDgsMTMgKzE4 NDgsMjEgQEAgZGVmIGNoZWNrX3NwYWNpbmcoZmlsZV9leHRlbnNpb24sIGNsZWFuX2xpbmVzLCBs aW5lX251bWJlciwgZXJyb3IpOgogICAgICAgICAgICAgZXJyb3IobGluZV9udW1iZXIsICd3aGl0 ZXNwYWNlL3Byb3BlcnR5JywgNCwKICAgICAgICAgICAgICAgICAgICdTaG91bGQgbm90IGhhdmUg c3BhY2VzIGFyb3VuZCA9IGluIHByb3BlcnR5IGF0dHJpYnV0ZXMuJykKIAorICAgICMgT2JqZWN0 aXZlLUMgQHN5bnRoZXNpemUgbGluZXMuCisgICAgaXNfb2JqZWN0aXZlX2Nfc3ludGhlc2l6ZSA9 IHNlYXJjaChyJ15Ac3ludGhlc2l6ZScsIGxpbmUpCisgICAgaWYgaXNfb2JqZWN0aXZlX2Nfc3lu dGhlc2l6ZToKKyAgICAgICAgIyAicHJvcD1fdmFyTmFtZSIgbm90ICJwcm9wID0gX3Zhck5hbWUi CisgICAgICAgIGlmIHNlYXJjaChyJyhccys9fD1ccyspJywgbGluZSk6CisgICAgICAgICAgICBl cnJvcihsaW5lX251bWJlciwgJ3doaXRlc3BhY2UvcHJvcGVydHknLCA0LAorICAgICAgICAgICAg ICAgICAgJ1Nob3VsZCBub3QgaGF2ZSBzcGFjZXMgYXJvdW5kID0gaW4gcHJvcGVydHkgc3ludGhl c2lzLicpCisKICAgICAjIERvbid0IHRyeSB0byBkbyBzcGFjaW5nIGNoZWNrcyBmb3Igb3BlcmF0 b3IgbWV0aG9kcwogICAgIGxpbmUgPSBzdWIocidvcGVyYXRvcig9PXwhPXw8fDw8fDw9fD49fD4+ fD58XCs9fC09fFwqPXwvPXwlPXwmPXxcfD18Xj18PDw9fD4+PXwvKVwoJywgJ29wZXJhdG9yXCgn LCBsaW5lKQogICAgICMgRG9uJ3QgdHJ5IHRvIGRvIHNwYWNpbmcgY2hlY2tzIGZvciAjaW5jbHVk ZSwgI2ltcG9ydCwgb3IgI2lmIHN0YXRlbWVudHMgYXQKICAgICAjIG1pbmltdW0gYmVjYXVzZSBp dCBtZXNzZXMgdXAgY2hlY2tzIGZvciBzcGFjaW5nIGFyb3VuZCAvCiAgICAgaWYgbWF0Y2gocidc cyojXHMqKD86aW5jbHVkZXxpbXBvcnR8aWYpJywgbGluZSk6CiAgICAgICAgIHJldHVybgotICAg IGlmIG5vdCBpc19vYmplY3RpdmVfY19wcm9wZXJ0eSBhbmQgc2VhcmNoKHInW1x3Ll09W1x3Ll0n LCBsaW5lKToKKyAgICBpZiBub3QgaXNfb2JqZWN0aXZlX2NfcHJvcGVydHkgYW5kIG5vdCBpc19v YmplY3RpdmVfY19zeW50aGVzaXplIGFuZCBzZWFyY2gocidbXHcuXT1bXHcuXScsIGxpbmUpOgog ICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3doaXRlc3BhY2Uvb3BlcmF0b3JzJywgNCwKICAg ICAgICAgICAgICAgJ01pc3Npbmcgc3BhY2VzIGFyb3VuZCA9JykKIApAQCAtMTk1MCwxMCArMTk1 OCwxMCBAQCBkZWYgY2hlY2tfc3BhY2luZyhmaWxlX2V4dGVuc2lvbiwgY2xlYW5fbGluZXMsIGxp bmVfbnVtYmVyLCBlcnJvcik6CiAgICAgIyBOZXh0IHdlIHdpbGwgbG9vayBmb3IgaXNzdWVzIHdp dGggZnVuY3Rpb24gY2FsbHMuCiAgICAgY2hlY2tfc3BhY2luZ19mb3JfZnVuY3Rpb25fY2FsbChs aW5lLCBsaW5lX251bWJlciwgZXJyb3IpCiAKLSAgICAjIEV4Y2VwdCBhZnRlciBhbiBvcGVuaW5n IHBhcmVuLCB5b3Ugc2hvdWxkIGhhdmUgc3BhY2VzIGJlZm9yZSB5b3VyIGJyYWNlcy4KLSAgICAj IEFuZCBzaW5jZSB5b3Ugc2hvdWxkIG5ldmVyIGhhdmUgYnJhY2VzIGF0IHRoZSBiZWdpbm5pbmcg b2YgYSBsaW5lLCB0aGlzIGlzCi0gICAgIyBhbiBlYXN5IHRlc3QuCi0gICAgaWYgc2VhcmNoKHIn W14gKHtdeycsIGxpbmUpOgorICAgICMgRXhjZXB0IGFmdGVyIGFuIG9wZW5pbmcgcGFyZW4gKG9y IF4sIGZvciBibG9ja3MpLCB5b3Ugc2hvdWxkIGhhdmUgc3BhY2VzCisgICAgIyBiZWZvcmUgeW91 ciBicmFjZXMuIEFuZCBzaW5jZSB5b3Ugc2hvdWxkIG5ldmVyIGhhdmUgYnJhY2VzIGF0IHRoZQor ICAgICMgYmVnaW5uaW5nIG9mIGEgbGluZSwgdGhpcyBpcyBhbiBlYXN5IHRlc3QuCisgICAgaWYg c2VhcmNoKHInW14gKHtcXl17JywgbGluZSk6CiAgICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAn d2hpdGVzcGFjZS9icmFjZXMnLCA1LAogICAgICAgICAgICAgICAnTWlzc2luZyBzcGFjZSBiZWZv cmUgeycpCiAKQEAgLTE5NjMsMTAgKzE5NzEsMTIgQEAgZGVmIGNoZWNrX3NwYWNpbmcoZmlsZV9l eHRlbnNpb24sIGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZXJyb3IpOgogICAgICAgICAgICAg ICAnTWlzc2luZyBzcGFjZSBiZWZvcmUgZWxzZScpCiAKICAgICAjIFlvdSBzaG91bGRuJ3QgaGF2 ZSBzcGFjZXMgYmVmb3JlIHlvdXIgYnJhY2tldHMsIGV4Y2VwdCBtYXliZSBhZnRlcgotICAgICMg J2RlbGV0ZSBbXScgb3IgJ25ldyBjaGFyICogW10nLgotICAgIGlmIHNlYXJjaChyJ1x3XHMrXFsn LCBsaW5lKSBhbmQgbm90IHNlYXJjaChyJ2RlbGV0ZVxzK1xbJywgbGluZSk6Ci0gICAgICAgIGVy cm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFjZS9icmFjZXMnLCA1LAotICAgICAgICAgICAgICAn RXh0cmEgc3BhY2UgYmVmb3JlIFsnKQorICAgICMgJ2RlbGV0ZSBbXScgb3IgJ25ldyBjaGFyICog W10nLiBPYmplY3RpdmUtQyBjYW4ndCBmb2xsb3cgdGhpcyBydWxlCisgICAgIyBiZWNhdXNlIG9m IG1ldGhvZCBjYWxscy4KKyAgICBpZiBmaWxlX2V4dGVuc2lvbiAhPSAnbW0nIGFuZCBmaWxlX2V4 dGVuc2lvbiAhPSAnbSc6CisgICAgICAgIGlmIHNlYXJjaChyJ1x3XHMrXFsnLCBsaW5lKSBhbmQg bm90IHNlYXJjaChyJ2RlbGV0ZVxzK1xbJywgbGluZSk6CisgICAgICAgICAgICBlcnJvcihsaW5l X251bWJlciwgJ3doaXRlc3BhY2UvYnJhY2VzJywgNSwKKyAgICAgICAgICAgICAgICAgICdFeHRy YSBzcGFjZSBiZWZvcmUgWycpCiAKICAgICAjIFRoZXJlIHNob3VsZCBhbHdheXMgYmUgYSBzaW5n bGUgc3BhY2UgaW4gYmV0d2VlbiBicmFjZXMgb24gdGhlIHNhbWUgbGluZS4KICAgICBpZiBzZWFy Y2gocidce1x9JywgbGluZSk6CkBAIC0yMTYzLDcgKzIxNzMsNiBAQCBkZWYgZ2V0X2luaXRpYWxf c3BhY2VzX2Zvcl9saW5lKGNsZWFuX2xpbmUpOgogICAgICAgICBpbml0aWFsX3NwYWNlcyArPSAx CiAgICAgcmV0dXJuIGluaXRpYWxfc3BhY2VzCiAKLQogZGVmIGNoZWNrX2luZGVudGF0aW9uX2Ft b3VudChjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToKICAgICBsaW5lID0gY2xlYW5f bGluZXMuZWxpZGVkW2xpbmVfbnVtYmVyXQogICAgIGluaXRpYWxfc3BhY2VzID0gZ2V0X2luaXRp YWxfc3BhY2VzX2Zvcl9saW5lKGxpbmUpCkBAIC0yMzcyLDExICsyMzgxLDE0IEBAIGRlZiBjaGVj a19icmFjZXMoY2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcik6CiAgICAgICAgICMgcGVy ZmVjdGx5OiB3ZSBqdXN0IGRvbid0IGNvbXBsYWluIGlmIHRoZSBsYXN0IG5vbi13aGl0ZXNwYWNl CiAgICAgICAgICMgY2hhcmFjdGVyIG9uIHRoZSBwcmV2aW91cyBub24tYmxhbmsgbGluZSBpcyAn OycsICc6JywgJ3snLCAnfScsCiAgICAgICAgICMgJyknLCBvciAnKSBjb25zdCcgYW5kIGRvZXNu J3QgYmVnaW4gd2l0aCAnaWZ8Zm9yfHdoaWxlfHN3aXRjaHxlbHNlJy4KLSAgICAgICAgIyBXZSBh bHNvIGFsbG93ICcjJyBmb3IgI2VuZGlmIGFuZCAnPScgZm9yIGFycmF5IGluaXRpYWxpemF0aW9u LgorICAgICAgICAjIFdlIGFsc28gYWxsb3cgJyMnIGZvciAjZW5kaWYgYW5kICc9JyBmb3IgYXJy YXkgaW5pdGlhbGl6YXRpb24sCisgICAgICAgICMgYW5kICctICgnIGFuZCAnKyAoJyBmb3IgT2Jq ZWN0aXZlLUMgbWV0aG9kcy4KICAgICAgICAgcHJldmlvdXNfbGluZSA9IGdldF9wcmV2aW91c19u b25fYmxhbmtfbGluZShjbGVhbl9saW5lcywgbGluZV9udW1iZXIpWzBdCiAgICAgICAgIGlmICgo bm90IHNlYXJjaChyJ1s7On17KT1dXHMqJHxcKVxzKigoY29uc3R8b3ZlcnJpZGUpXHMqKT8oLT5c cypcUyspP1xzKiQnLCBwcmV2aW91c19saW5lKQogICAgICAgICAgICAgIG9yIHNlYXJjaChyJ1xi KGlmfGZvcnx3aGlsZXxzd2l0Y2h8ZWxzZXxOU19FTlVNKVxiJywgcHJldmlvdXNfbGluZSkpCi0g ICAgICAgICAgICBhbmQgcHJldmlvdXNfbGluZS5maW5kKCcjJykgPCAwKToKKyAgICAgICAgICAg IGFuZCBwcmV2aW91c19saW5lLmZpbmQoJyMnKSA8IDAKKyAgICAgICAgICAgIGFuZCBwcmV2aW91 c19saW5lLmZpbmQoJy0gKCcpICE9IDAKKyAgICAgICAgICAgIGFuZCBwcmV2aW91c19saW5lLmZp bmQoJysgKCcpICE9IDApOgogICAgICAgICAgICAgZXJyb3IobGluZV9udW1iZXIsICd3aGl0ZXNw YWNlL2JyYWNlcycsIDQsCiAgICAgICAgICAgICAgICAgICAnVGhpcyB7IHNob3VsZCBiZSBhdCB0 aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBsaW5lJykKICAgICBlbGlmIChzZWFyY2gocidcKVxzKigo KGNvbnN0fG92ZXJyaWRlKVxzKikqXHMqKT97XHMqJCcsIGxpbmUpCg==