37067 2010-04-03 19:45:17 -0700 check-webkit-style: Eliminate the PatchStyleErrorHandler 2010-04-05 00:41:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 37065 1 cjerdonek cjerdonek cjerdonek commit-queue hamaji oldest_to_newest 208317 0 cjerdonek 2010-04-03 19:45:17 -0700 See master bug for details. 208370 1 52513 cjerdonek 2010-04-04 11:43:31 -0700 Created attachment 52513 Proposed patch 208402 2 52513 hamaji 2010-04-05 00:23:45 -0700 Comment on attachment 52513 Proposed patch OK. 208407 3 cjerdonek 2010-04-05 00:28:54 -0700 (In reply to comment #2) > (From update of attachment 52513 [details]) > OK. Thanks! 208411 4 52513 commit-queue 2010-04-05 00:41:10 -0700 Comment on attachment 52513 Proposed patch Clearing flags on attachment: 52513 Committed r57066: <http://trac.webkit.org/changeset/57066> 208412 5 commit-queue 2010-04-05 00:41:14 -0700 All reviewed patches have been landed. Closing bug. 52513 2010-04-04 11:43:31 -0700 2010-04-05 00:41:10 -0700 Proposed patch _patch-37067-1.diff text/plain 22078 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlNTg4ODEyLi5mMjJhOTRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYgQEAKKzIwMTAtMDQt MDQgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgUGF0Y2hTdHls ZUVycm9ySGFuZGxlciBjbGFzcyBhbmQgaW5jb3Jwb3JhdGVkIGl0cworICAgICAgICBmdW5jdGlv bmFsaXR5IGludG8gdGhlIERlZmF1bHRTdHlsZUVycm9ySGFuZGxlciBjbGFzcy4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjcKKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weToKKyAgICAgICAgICAtIEluIHRo ZSBTdHlsZUNoZWNrZXIgY2xhc3M6CisgICAgICAgICAgICAtIEFkZGVkIGEgbGluZV9udW1iZXIg cGFyYW1ldGVyIHRvIHRoZSBjaGVja19maWxlKCkgbWV0aG9kLgorICAgICAgICAgICAgLSBSZW5h bWVkIHRoZSBoYW5kbGVfc3R5bGVfZXJyb3IgcGFyYW1ldGVyIHRvCisgICAgICAgICAgICAgIG1v Y2tfaGFuZGxlX3N0eWxlX2Vycm9yIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCB0aGUgb3RoZXIgbW9j a18qCisgICAgICAgICAgICAgIHBhcmFtZXRlciBuYW1lcy4KKyAgICAgICAgICAgIC0gQWRkZWQg YSBtb2NrX2NoZWNrX2ZpbGUgcGFyYW1ldGVyIHRvIHRoZSBjaGVja19wYXRjaCgpIG1ldGhvZAor ICAgICAgICAgICAgICB0byBmYWNpbGl0YXRlIHVuaXQgdGVzdGluZyB0aGUgY2hhbmdlcyBpbiB0 aGlzIHBhdGNoLgorICAgICAgICAgICAgLSBSZXdyb3RlIHRoZSBjaGVja19wYXRjaCgpIG1ldGhv ZCB3aXRoIHRoZSBwYXRjaC1wYXJzaW5nIGxvZ2ljCisgICAgICAgICAgICAgIHRha2VuIGZyb20g dGhlIFBhdGNoU3R5bGVFcnJvckhhbmRsZXIgY2xhc3MuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHk6CisgICAgICAgICAgLSBBZGRlZCBhIFN0 eWxlQ2hlY2tlckNoZWNrRmlsZUJhc2UgY2xhc3MgYW5kIHN1Yi1jbGFzc2VkIHRoZQorICAgICAg ICAgICAgZXhpc3RpbmcgU3R5bGVDaGVja2VyQ2hlY2tGaWxlVGVzdCBjbGFzcyBmcm9tIGl0Lgor ICAgICAgICAgIC0gQWRkZWQgYSBTdHlsZUNoZWNrZXJDaGVja1BhdGNoVGVzdCBjbGFzcyB0byB1 bml0LXRlc3QgdGhlCisgICAgICAgICAgICByZXdyaXR0ZW4gY2hlY2tfcGF0Y2goKSBtZXRob2Qu CisgICAgICAgICAgLSBSZW1vdmVkIHRoZSB2ZXN0aWdpYWwgX19tYWluX18gY29kZSBhdCB0aGUg Ym90dG9tIG9mIHRoZSBmaWxlLgorICAgICAgICAgICAgVGhpcyBpcyBsZWZ0IG92ZXIgZnJvbSB3 aGVuIGNoZWNrLXdlYmtpdC1zdHlsZSB3YXMgaW1wbGVtZW50ZWQKKyAgICAgICAgICAgIGFzIGEg bW9kdWxlIGFuZCBhIHdyYXBwZXIgbW9kdWxlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9lcnJvcl9oYW5kbGVycy5weToKKyAgICAgICAgICAtIEFkZGVkIGFuIG9wdGlvbmFs IGxpbmVfbnVtYmVycyBwYXJhbWV0ZXIgdG8gdGhlCisgICAgICAgICAgICBEZWZhdWx0U3R5bGVF cnJvckhhbmRsZXIgY2xhc3MgY29uc3RydWN0b3IgYW5kIGFkanVzdGVkIHRoZQorICAgICAgICAg ICAgX19jYWxsX18oKSBtZXRob2QgYXMgbmVjZXNzYXJ5LgorICAgICAgICAgIC0gUmVtb3ZlZCB0 aGUgUGF0Y2hTdHlsZUVycm9ySGFuZGxlciBjbGFzcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5pdHRlc3QucHk6CisgICAgICAgICAgLSBSZW1v dmVkIHRoZSBQYXRjaFN0eWxlRXJyb3JIYW5kbGVyVGVzdCBjbGFzcyB3aGljaCB1bml0LXRlc3Rl ZAorICAgICAgICAgICAgdGhlIFBhdGNoU3R5bGVFcnJvckhhbmRsZXIgY2xhc3Mgd2hpY2ggaXMg YmVpbmcgcmVtb3ZlZCBpbiB0aGlzCisgICAgICAgICAgICBwYXRjaC4KKyAgICAgICAgICAtIEFk ZGVkIGEgdGVzdF9saW5lX251bWJlcnMoKSB0ZXN0IG1ldGhvZCB0byB0aGUKKyAgICAgICAgICAg IERlZmF1bHRTdHlsZUVycm9ySGFuZGxlclRlc3QgY2xhc3MgdG8gdGVzdCB1c2Ugb2YgdGhlCisg ICAgICAgICAgICBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIncyBuZXcgbGluZV9udW1iZXJzIGF0 dHJpYnV0ZS4KKwogMjAxMC0wNC0wMyAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFqaS4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQppbmRleCAxYjAyZDA5Li5m NWZhZTQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXIucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy LnB5CkBAIC0zNiw3ICszNiw2IEBAIGltcG9ydCBvcy5wYXRoCiBpbXBvcnQgc3lzCiAKIGZyb20g ZXJyb3JfaGFuZGxlcnMgaW1wb3J0IERlZmF1bHRTdHlsZUVycm9ySGFuZGxlcgotZnJvbSBlcnJv cl9oYW5kbGVycyBpbXBvcnQgUGF0Y2hTdHlsZUVycm9ySGFuZGxlcgogZnJvbSBmaWx0ZXIgaW1w b3J0IEZpbHRlckNvbmZpZ3VyYXRpb24KIGZyb20gb3B0cGFyc2VyIGltcG9ydCBBcmd1bWVudFBh cnNlcgogZnJvbSBvcHRwYXJzZXIgaW1wb3J0IERlZmF1bHRDb21tYW5kT3B0aW9uVmFsdWVzCkBA IC02MzYsNyArNjM1LDggQEAgY2xhc3MgU3R5bGVDaGVja2VyKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKGRpcl9wYXRoLCBmaWxlX25hbWUpCiAgICAg ICAgICAgICAgICAgY2hlY2tfZmlsZShmaWxlX3BhdGgpCiAKLSAgICBkZWYgY2hlY2tfZmlsZShz ZWxmLCBmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcj1Ob25lLAorICAgIGRlZiBjaGVja19m aWxlKHNlbGYsIGZpbGVfcGF0aCwgbGluZV9udW1iZXJzPU5vbmUsCisgICAgICAgICAgICAgICAg ICAgbW9ja19oYW5kbGVfc3R5bGVfZXJyb3I9Tm9uZSwKICAgICAgICAgICAgICAgICAgICBtb2Nr X29zX3BhdGhfZXhpc3RzPU5vbmUsCiAgICAgICAgICAgICAgICAgICAgbW9ja19wcm9jZXNzX2Zp bGU9Tm9uZSk6CiAgICAgICAgICIiIkNoZWNrIHN0eWxlIGluIHRoZSBnaXZlbiBmaWxlLgpAQCAt NjQ1LDEwICs2NDUsMTQgQEAgY2xhc3MgU3R5bGVDaGVja2VyKG9iamVjdCk6CiAgICAgICAgICAg ZmlsZV9wYXRoOiBUaGUgcGF0aCBvZiB0aGUgZmlsZSB0byBwcm9jZXNzLiAgSWYgcG9zc2libGUs IHRoZSBwYXRoCiAgICAgICAgICAgICAgICAgICAgICBzaG91bGQgYmUgcmVsYXRpdmUgdG8gdGhl IHNvdXJjZSByb290LiAgT3RoZXJ3aXNlLAogICAgICAgICAgICAgICAgICAgICAgcGF0aC1zcGVj aWZpYyBsb2dpYyBtYXkgbm90IGJlaGF2ZSBhcyBleHBlY3RlZC4KLSAgICAgICAgICBoYW5kbGVf c3R5bGVfZXJyb3I6IFRoZSBmdW5jdGlvbiB0byBjYWxsIHdoZW4gYSBzdHlsZSBlcnJvcgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgb2NjdXJzLiBUaGlzIHBhcmFtZXRlciBpcyBtZWFu dCBmb3IgaW50ZXJuYWwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZSB3aXRoaW4g dGhpcyBjbGFzcy4gRGVmYXVsdHMgdG8gYQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg RGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyIGluc3RhbmNlLgorICAgICAgICAgIGxpbmVfbnVtYmVy czogQW4gYXJyYXkgb2YgbGluZSBudW1iZXJzIG9mIHRoZSBsaW5lcyBmb3Igd2hpY2gKKyAgICAg ICAgICAgICAgICAgICAgICAgIHN0eWxlIGVycm9ycyBzaG91bGQgYmUgcmVwb3J0ZWQsIG9yIE5v bmUgaWYgZXJyb3JzCisgICAgICAgICAgICAgICAgICAgICAgICBmb3IgYWxsIGxpbmVzIHNob3Vs ZCBiZSByZXBvcnRlZC4gIE5vcm1hbGx5LCB0aGlzCisgICAgICAgICAgICAgICAgICAgICAgICBh cnJheSBjb250YWlucyB0aGUgbGluZSBudW1iZXJzIGNvcnJlc3BvbmRpbmcgdG8gdGhlCisgICAg ICAgICAgICAgICAgICAgICAgICBtb2RpZmllZCBsaW5lcyBvZiBhIHBhdGNoLgorICAgICAgICAg IG1vY2tfaGFuZGxlX3N0eWxlX2Vycm9yOiBBIHVuaXQtdGVzdGluZyByZXBsYWNlbWVudCBmb3Ig dGhlIGZ1bmN0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRvIGNhbGwg d2hlbiBhIHN0eWxlIGVycm9yIG9jY3Vycy4gRGVmYXVsdHMKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdG8gYSBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIgaW5zdGFuY2UuCiAg ICAgICAgICAgbW9ja19vc19wYXRoX2V4aXN0czogQSB1bml0LXRlc3QgcmVwbGFjZW1lbnQgZm9y IG9zLnBhdGguZXhpc3RzLgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRoaXMgcGFy YW1ldGVyIHNob3VsZCBvbmx5IGJlIHVzZWQgZm9yIHVuaXQKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB0ZXN0cy4KQEAgLTY1OCw2ICs2NjIsMTYgQEAgY2xhc3MgU3R5bGVDaGVja2Vy KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsYXNzLgogCiAgICAgICAg ICIiIgorICAgICAgICBpZiBtb2NrX2hhbmRsZV9zdHlsZV9lcnJvciBpcyBOb25lOgorICAgICAg ICAgICAgaW5jcmVtZW50ID0gc2VsZi5faW5jcmVtZW50X2Vycm9yX2NvdW50CisgICAgICAgICAg ICBoYW5kbGVfc3R5bGVfZXJyb3IgPSBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIoCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uZmlndXJhdGlvbj1zZWxmLl9jb25maWd1 cmF0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGVfcGF0aD1m aWxlX3BhdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5jcmVtZW50 X2Vycm9yX2NvdW50PWluY3JlbWVudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBsaW5lX251bWJlcnM9bGluZV9udW1iZXJzKQorICAgICAgICBlbHNlOgorICAgICAgICAg ICAgaGFuZGxlX3N0eWxlX2Vycm9yID0gbW9ja19oYW5kbGVfc3R5bGVfZXJyb3IKKwogICAgICAg ICBvc19wYXRoX2V4aXN0cyA9IChvcy5wYXRoLmV4aXN0cyBpZiBtb2NrX29zX3BhdGhfZXhpc3Rz IGlzIE5vbmUgZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgICBtb2NrX29zX3BhdGhfZXhp c3RzKQogICAgICAgICBwcm9jZXNzX2ZpbGUgPSAoc2VsZi5fcHJvY2Vzc19maWxlIGlmIG1vY2tf cHJvY2Vzc19maWxlIGlzIE5vbmUgZWxzZQpAQCAtNjY4LDEyICs2ODIsNyBAQCBjbGFzcyBTdHls ZUNoZWNrZXIob2JqZWN0KToKICAgICAgICAgICAgIHN5cy5leGl0KDEpCiAKICAgICAgICAgX2xv Zy5kZWJ1ZygiQ2hlY2tpbmc6ICIgKyBmaWxlX3BhdGgpCi0gICAgICAgIGlmIGhhbmRsZV9zdHls ZV9lcnJvciBpcyBOb25lOgotICAgICAgICAgICAgaGFuZGxlX3N0eWxlX2Vycm9yID0gRGVmYXVs dFN0eWxlRXJyb3JIYW5kbGVyKAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbmZpZ3VyYXRpb249c2VsZi5fY29uZmlndXJhdGlvbiwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBmaWxlX3BhdGg9ZmlsZV9wYXRoLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGluY3JlbWVudF9lcnJvcl9jb3VudD0KLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5faW5jcmVtZW50X2Vycm9yX2NvdW50KQor CiAgICAgICAgIHNlbGYuZmlsZV9jb3VudCArPSAxCiAKICAgICAgICAgZGlzcGF0Y2hlciA9IFBy b2Nlc3NvckRpc3BhdGNoZXIoKQpAQCAtNjk0LDIzICs3MDMsMzUgQEAgY2xhc3MgU3R5bGVDaGVj a2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICAgICUgZmlsZV9wYXRoKQogICAgICAg ICAgICAgcmV0dXJuCiAKLQogICAgICAgICBfbG9nLmRlYnVnKCJVc2luZyBjbGFzczogIiArIHBy b2Nlc3Nvci5fX2NsYXNzX18uX19uYW1lX18pCiAKICAgICAgICAgcHJvY2Vzc19maWxlKHByb2Nl c3NvciwgZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCiAKLSAgICBkZWYgY2hlY2tfcGF0 Y2goc2VsZiwgcGF0Y2hfc3RyaW5nKToKKyAgICAjIEZJWE1FOiBFbGltaW5hdGUgdGhpcyBtZXRo b2QgYW5kIG1vdmUgaXRzIGxvZ2ljIHRvIHN0eWxlL21haW4ucHkuCisgICAgIyAgICAgICAgQ2Fs bHMgdG8gY2hlY2tfcGF0Y2goKSBjYW4gYmUgcmVwbGFjZWQgYnkgYXBwcm9wcmlhdGUgY2FsbHMK KyAgICAjICAgICAgICB0byBjaGVja19maWxlKCkgdXNpbmcgdGhlIG9wdGlvbmFsIGxpbmVfbnVt YmVycyBwYXJhbWV0ZXIuCisgICAgZGVmIGNoZWNrX3BhdGNoKHNlbGYsIHBhdGNoX3N0cmluZywg bW9ja19jaGVja19maWxlPU5vbmUpOgogICAgICAgICAiIiJDaGVjayBzdHlsZSBpbiB0aGUgZ2l2 ZW4gcGF0Y2guCiAKICAgICAgICAgQXJnczoKICAgICAgICAgICBwYXRjaF9zdHJpbmc6IEEgc3Ry aW5nIHRoYXQgaXMgYSBwYXRjaCBzdHJpbmcuCiAKICAgICAgICAgIiIiCisgICAgICAgIGNoZWNr X2ZpbGUgPSAoc2VsZi5jaGVja19maWxlIGlmIG1vY2tfY2hlY2tfZmlsZSBpcyBOb25lIGVsc2UK KyAgICAgICAgICAgICAgICAgICAgICBtb2NrX2NoZWNrX2ZpbGUpCisKICAgICAgICAgcGF0Y2hf ZmlsZXMgPSBwYXJzZV9wYXRjaChwYXRjaF9zdHJpbmcpCisKKyAgICAgICAgIyBUaGUgZGlmZiB2 YXJpYWJsZSBpcyBhIERpZmZGaWxlIGluc3RhbmNlLgogICAgICAgICBmb3IgZmlsZV9wYXRoLCBk aWZmIGluIHBhdGNoX2ZpbGVzLml0ZXJpdGVtcygpOgotICAgICAgICAgICAgc3R5bGVfZXJyb3Jf aGFuZGxlciA9IFBhdGNoU3R5bGVFcnJvckhhbmRsZXIoZGlmZiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZmlsZV9wYXRoLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzZWxmLl9jb25maWd1cmF0aW9uLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl9pbmNyZW1lbnRfZXJyb3JfY291bnQpCisgICAgICAgICAg ICBsaW5lX251bWJlcnMgPSBzZXQoKQorICAgICAgICAgICAgZm9yIGxpbmUgaW4gZGlmZi5saW5l czoKKyAgICAgICAgICAgICAgICAjIFdoZW4gZGVsZXRlZCBsaW5lIGlzIG5vdCBzZXQsIGl0IG1l YW5zIHRoYXQKKyAgICAgICAgICAgICAgICAjIHRoZSBsaW5lIGlzIG5ld2x5IGFkZGVkIChvciBt b2RpZmllZCkuCisgICAgICAgICAgICAgICAgaWYgbm90IGxpbmVbMF06CisgICAgICAgICAgICAg ICAgICAgIGxpbmVfbnVtYmVycy5hZGQobGluZVsxXSkKKworICAgICAgICAgICAgX2xvZy5kZWJ1 ZygnRm91bmQgJXMgbW9kaWZpZWQgbGluZXMgaW4gcGF0Y2ggZm9yOiAlcycKKyAgICAgICAgICAg ICAgICAgICAgICAgJSAobGVuKGxpbmVfbnVtYmVycyksIGZpbGVfcGF0aCkpCiAKLSAgICAgICAg ICAgIHNlbGYuY2hlY2tfZmlsZShmaWxlX3BhdGgsIHN0eWxlX2Vycm9yX2hhbmRsZXIpCisgICAg ICAgICAgICBjaGVja19maWxlKGZpbGVfcGF0aD1maWxlX3BhdGgsIGxpbmVfbnVtYmVycz1saW5l X251bWJlcnMpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJfdW5pdHRlc3QucHkKaW5kZXggMzQ2MWI3MC4uMDk2ZTg1ZiAxMDA3NTUKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5w eQpAQCAtMzksNiArMzksNyBAQCBpbXBvcnQgb3MKIGltcG9ydCB1bml0dGVzdAogCiBpbXBvcnQg Y2hlY2tlciBhcyBzdHlsZQorZnJvbSB3ZWJraXRweS5zdHlsZV9yZWZlcmVuY2VzIGltcG9ydCBw YXJzZV9wYXRjaAogZnJvbSB3ZWJraXRweS5zdHlsZV9yZWZlcmVuY2VzIGltcG9ydCBMb2dUZXN0 aW5nCiBmcm9tIHdlYmtpdHB5LnN0eWxlX3JlZmVyZW5jZXMgaW1wb3J0IFRlc3RMb2dTdHJlYW0K IGZyb20gY2hlY2tlciBpbXBvcnQgX0JBU0VfRklMVEVSX1JVTEVTCkBAIC01MzYsNyArNTM3LDI1 IEBAIGNsYXNzIFN0eWxlQ2hlY2tlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhzdHlsZV9jaGVja2VyLmZpbGVfY291bnQsIDApCiAKIAotY2xhc3Mg U3R5bGVDaGVja2VyQ2hlY2tGaWxlVGVzdChMb2dnaW5nVGVzdENhc2UpOgorY2xhc3MgU3R5bGVD aGVja2VyQ2hlY2tGaWxlQmFzZShMb2dnaW5nVGVzdENhc2UpOgorCisgICAgZGVmIHNldFVwKHNl bGYpOgorICAgICAgICBMb2dnaW5nVGVzdENhc2Uuc2V0VXAoc2VsZikKKyAgICAgICAgc2VsZi53 YXJuaW5nX21lc3NhZ2VzID0gIiIKKworICAgIGRlZiBtb2NrX3N0ZGVycl93cml0ZShzZWxmLCB3 YXJuaW5nX21lc3NhZ2UpOgorICAgICAgICBzZWxmLndhcm5pbmdfbWVzc2FnZXMgKz0gd2Fybmlu Z19tZXNzYWdlCisKKyAgICBkZWYgX3N0eWxlX2NoZWNrZXJfY29uZmlndXJhdGlvbihzZWxmKToK KyAgICAgICAgcmV0dXJuIFN0eWxlQ2hlY2tlckNvbmZpZ3VyYXRpb24oCisgICAgICAgICAgICBm aWx0ZXJfY29uZmlndXJhdGlvbj1GaWx0ZXJDb25maWd1cmF0aW9uKCksCisgICAgICAgICAgICBt YXhfcmVwb3J0c19wZXJfY2F0ZWdvcnk9eyJ3aGl0ZXNwYWNlL25ld2xpbmUiOiAxfSwKKyAgICAg ICAgICAgIG1pbl9jb25maWRlbmNlPTMsCisgICAgICAgICAgICBvdXRwdXRfZm9ybWF0PSJ2czci LAorICAgICAgICAgICAgc3RkZXJyX3dyaXRlPXNlbGYubW9ja19zdGRlcnJfd3JpdGUpCisKKwor Y2xhc3MgU3R5bGVDaGVja2VyQ2hlY2tGaWxlVGVzdChTdHlsZUNoZWNrZXJDaGVja0ZpbGVCYXNl KToKIAogICAgICIiIlRlc3QgdGhlIGNoZWNrX2ZpbGUoKSBtZXRob2Qgb2YgdGhlIFN0eWxlQ2hl Y2tlciBjbGFzcy4KIApAQCAtNTYyLDE0ICs1ODEsMTAgQEAgY2xhc3MgU3R5bGVDaGVja2VyQ2hl Y2tGaWxlVGVzdChMb2dnaW5nVGVzdENhc2UpOgogCiAgICAgIiIiCiAgICAgZGVmIHNldFVwKHNl bGYpOgotICAgICAgICBMb2dnaW5nVGVzdENhc2Uuc2V0VXAoc2VsZikKKyAgICAgICAgU3R5bGVD aGVja2VyQ2hlY2tGaWxlQmFzZS5zZXRVcChzZWxmKQogICAgICAgICBzZWxmLmdvdF9maWxlX3Bh dGggPSBOb25lCiAgICAgICAgIHNlbGYuZ290X2hhbmRsZV9zdHlsZV9lcnJvciA9IE5vbmUKICAg ICAgICAgc2VsZi5nb3RfcHJvY2Vzc29yID0gTm9uZQotICAgICAgICBzZWxmLndhcm5pbmdfbWVz c2FnZXMgPSAiIgotCi0gICAgZGVmIG1vY2tfc3RkZXJyX3dyaXRlKHNlbGYsIHdhcm5pbmdfbWVz c2FnZSk6Ci0gICAgICAgIHNlbGYud2FybmluZ19tZXNzYWdlcyArPSB3YXJuaW5nX21lc3NhZ2UK IAogICAgIGRlZiBtb2NrX2hhbmRsZV9zdHlsZV9lcnJvcihzZWxmKToKICAgICAgICAgcGFzcwpA QCAtNjA2LDE3ICs2MjEsMTIgQEAgY2xhc3MgU3R5bGVDaGVja2VyQ2hlY2tGaWxlVGVzdChMb2dn aW5nVGVzdENhc2UpOgogICAgICAgICAjIENvbmZpcm0gdGhhdCB0aGUgYXR0cmlidXRlcyBhcmUg cmVzZXQuCiAgICAgICAgIHNlbGYuYXNzZXJ0X2F0dHJpYnV0ZXMoTm9uZSwgTm9uZSwgTm9uZSwg IiIpCiAKLSAgICAgICAgY29uZmlndXJhdGlvbiA9IFN0eWxlQ2hlY2tlckNvbmZpZ3VyYXRpb24o Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsdGVyX2NvbmZpZ3VyYXRpb249RmlsdGVy Q29uZmlndXJhdGlvbigpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heF9yZXBvcnRz X3Blcl9jYXRlZ29yeT17IndoaXRlc3BhY2UvbmV3bGluZSI6IDF9LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1pbl9jb25maWRlbmNlPTMsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgb3V0cHV0X2Zvcm1hdD0idnM3IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRl cnJfd3JpdGU9c2VsZi5tb2NrX3N0ZGVycl93cml0ZSkKKyAgICAgICAgY29uZmlndXJhdGlvbiA9 IHNlbGYuX3N0eWxlX2NoZWNrZXJfY29uZmlndXJhdGlvbigpCiAKICAgICAgICAgc3R5bGVfY2hl Y2tlciA9IFN0eWxlQ2hlY2tlcihjb25maWd1cmF0aW9uKQogCiAgICAgICAgIHN0eWxlX2NoZWNr ZXIuY2hlY2tfZmlsZShmaWxlX3BhdGg9ZmlsZV9wYXRoLAotICAgICAgICAgICAgaGFuZGxlX3N0 eWxlX2Vycm9yPXNlbGYubW9ja19oYW5kbGVfc3R5bGVfZXJyb3IsCisgICAgICAgICAgICBtb2Nr X2hhbmRsZV9zdHlsZV9lcnJvcj1zZWxmLm1vY2tfaGFuZGxlX3N0eWxlX2Vycm9yLAogICAgICAg ICAgICAgbW9ja19vc19wYXRoX2V4aXN0cz1zZWxmLm1vY2tfb3NfcGF0aF9leGlzdHMsCiAgICAg ICAgICAgICBtb2NrX3Byb2Nlc3NfZmlsZT1zZWxmLm1vY2tfcHJvY2Vzc19maWxlKQogCkBAIC02 ODcsNiArNjk3LDYxIEBAIGNsYXNzIFN0eWxlQ2hlY2tlckNoZWNrRmlsZVRlc3QoTG9nZ2luZ1Rl c3RDYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIikKIAogCitjbGFzcyBT dHlsZUNoZWNrZXJDaGVja1BhdGNoVGVzdChTdHlsZUNoZWNrZXJDaGVja0ZpbGVCYXNlKToKKwor ICAgICIiIlRlc3QgdGhlIGNoZWNrX3BhdGNoKCkgbWV0aG9kIG9mIHRoZSBTdHlsZUNoZWNrZXIg Y2xhc3MuCisKKyAgICBJbnRlcm5hbGx5LCB0aGUgY2hlY2tfcGF0Y2goKSBtZXRob2QgY2FsbHMg U3R5bGVDaGVja2VyLmNoZWNrX2ZpbGUoKSBmb3IKKyAgICBlYWNoIGZpbGUgdGhhdCBhcHBlYXJz IGluIHRoZSBwYXRjaCBzdHJpbmcuICBUaGlzIGNsYXNzIHBhc3NlcyBhIG1vY2sKKyAgICBjaGVj a19maWxlKCkgbWV0aG9kIHRvIGNoZWNrX3BhdGNoKCkgdG8gZmFjaWxpdGF0ZSB1bml0LXRlc3Rp bmcuICBUaGUKKyAgICAiZ290XyoiIGF0dHJpYnV0ZXMgb2YgdGhpcyBjbGFzcyBhcmUgdGhlIHBh cmFtZXRlcnMgdGhhdCBjaGVja19wYXRjaCgpCisgICAgcGFzc2VkIHRvIGNoZWNrX2ZpbGUoKS4g IChXZSB0ZXN0IG9ubHkgYSBzaW5nbGUgY2FsbC4pICBUaGVzZSBhdHRyaWJ1dGVzCisgICAgbGV0 IHVzIGNoZWNrIHRoYXQgY2hlY2tfcGF0Y2goKSBpcyBjYWxsaW5nIGNoZWNrX2ZpbGUoKSBjb3Jy ZWN0bHkuCisKKyAgICBBdHRyaWJ1dGVzOgorICAgICAgZ290X2ZpbGVfcGF0aDogVGhlIHZhbHVl IHRoYXQgY2hlY2tfcGF0Y2goKSBwYXNzZWQgYXMgdGhlIGZpbGVfcGF0aAorICAgICAgICAgICAg ICAgICAgICAgcGFyYW1ldGVyIHRvIHRoZSBtb2NrX2NoZWNrX2ZpbGUoKSBmdW5jdGlvbi4KKyAg ICAgIGdvdF9saW5lX251bWJlcnM6IFRoZSB2YWx1ZSB0aGF0IGNoZWNrX3BhdGNoKCkgcGFzc2Vk IGFzIHRoZSBsaW5lX251bWJlcnMKKyAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtZXRlciB0 byB0aGUgbW9ja19jaGVja19maWxlKCkgZnVuY3Rpb24uCisKKyAgICAiIiIKKworICAgIF9maWxl X3BhdGggPSAiX19pbml0X18ucHkiCisKKyAgICAjIFRoZSBtb2RpZmllZCBsaW5lX251bWJlcnMg YXJyYXkgZm9yIHRoaXMgcGF0Y2ggaXM6IFsyXS4KKyAgICBfcGF0Y2hfc3RyaW5nID0gIiIiZGlm ZiAtLWdpdCBhL19faW5pdF9fLnB5IGIvX19pbml0X18ucHkKK2luZGV4IGVmNjViZWUuLmUzZGI3 MGUgMTAwNjQ0CistLS0gYS9fX2luaXRfXy5weQorKysrIGIvX19pbml0X18ucHkKK0BAIC0xLDEg KzEsMiBAQAorICMgUmVxdWlyZWQgZm9yIFB5dGhvbiB0byBzZWFyY2ggdGhpcyBkaXJlY3Rvcnkg Zm9yIG1vZHVsZSBmaWxlcworKyMgTmV3IGxpbmUKKyIiIgorCisgICAgZGVmIHNldFVwKHNlbGYp OgorICAgICAgICBTdHlsZUNoZWNrZXJDaGVja0ZpbGVCYXNlLnNldFVwKHNlbGYpCisgICAgICAg IHNlbGYuX2dvdF9maWxlX3BhdGggPSBOb25lCisgICAgICAgIHNlbGYuX2dvdF9saW5lX251bWJl cnMgPSBOb25lCisKKyAgICBkZWYgX21vY2tfY2hlY2tfZmlsZShzZWxmLCBmaWxlX3BhdGgsIGxp bmVfbnVtYmVycyk6CisgICAgICAgIHNlbGYuX2dvdF9maWxlX3BhdGggPSBmaWxlX3BhdGgKKyAg ICAgICAgc2VsZi5fZ290X2xpbmVfbnVtYmVycyA9IGxpbmVfbnVtYmVycworCisgICAgZGVmIHRl c3RfY2hlY2tfcGF0Y2goc2VsZik6CisgICAgICAgIHBhdGNoX2ZpbGVzID0gcGFyc2VfcGF0Y2go c2VsZi5fcGF0Y2hfc3RyaW5nKQorICAgICAgICBkaWZmID0gcGF0Y2hfZmlsZXNbc2VsZi5fZmls ZV9wYXRoXQorCisgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBzZWxmLl9zdHlsZV9jaGVja2VyX2Nv bmZpZ3VyYXRpb24oKQorCisgICAgICAgIHN0eWxlX2NoZWNrZXIgPSBTdHlsZUNoZWNrZXIoY29u ZmlndXJhdGlvbikKKworICAgICAgICBzdHlsZV9jaGVja2VyLmNoZWNrX3BhdGNoKHBhdGNoX3N0 cmluZz1zZWxmLl9wYXRjaF9zdHJpbmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbW9ja19jaGVja19maWxlPXNlbGYuX21vY2tfY2hlY2tfZmlsZSkKKworICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhzZWxmLl9nb3RfZmlsZV9wYXRoLCAiX19pbml0X18ucHkiKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLl9nb3RfbGluZV9udW1iZXJzLCBzZXQoWzJdKSkKKwor CiBjbGFzcyBTdHlsZUNoZWNrZXJDaGVja1BhdGhzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAK ICAgICAiIiJUZXN0IHRoZSBjaGVja19wYXRocygpIG1ldGhvZCBvZiB0aGUgU3R5bGVDaGVja2Vy IGNsYXNzLiIiIgpAQCAtNzMzLDkgKzc5OCwzIEBAIGNsYXNzIFN0eWxlQ2hlY2tlckNoZWNrUGF0 aHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9z LnBhdGguam9pbigiZGlyX3BhdGgxIiwgImZpbGUxIiksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICBvcy5wYXRoLmpvaW4oImRpcl9wYXRoMSIsICJmaWxlMiIpLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgb3MucGF0aC5qb2luKCJkaXJfcGF0aDIiLCAiZmlsZTMiKV0pCi0KLQotaWYg X19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICBpbXBvcnQgc3lzCi0KLSAgICB1bml0dGVzdC5t YWluKCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJy b3JfaGFuZGxlcnMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9y X2hhbmRsZXJzLnB5CmluZGV4IDY4ZGZhMGEuLmVjNTMyZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnMucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVycy5weQpAQCAtNTYsNyAr NTYsOCBAQCBjbGFzcyBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIob2JqZWN0KToKIAogICAgICIi IlRoZSBkZWZhdWx0IHN0eWxlIGVycm9yIGhhbmRsZXIuIiIiCiAKLSAgICBkZWYgX19pbml0X18o c2VsZiwgZmlsZV9wYXRoLCBjb25maWd1cmF0aW9uLCBpbmNyZW1lbnRfZXJyb3JfY291bnQpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBmaWxlX3BhdGgsIGNvbmZpZ3VyYXRpb24sIGluY3JlbWVu dF9lcnJvcl9jb3VudCwKKyAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJzPU5vbmUpOgogICAg ICAgICAiIiJDcmVhdGUgYSBkZWZhdWx0IHN0eWxlIGVycm9yIGhhbmRsZXIuCiAKICAgICAgICAg QXJnczoKQEAgLTY2LDExICs2NywyMCBAQCBjbGFzcyBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIo b2JqZWN0KToKICAgICAgICAgICBpbmNyZW1lbnRfZXJyb3JfY291bnQ6IEEgZnVuY3Rpb24gdGhh dCB0YWtlcyBubyBhcmd1bWVudHMgYW5kCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbmNyZW1lbnRzIHRoZSB0b3RhbCBjb3VudCBvZiByZXBvcnRhYmxlCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBlcnJvcnMuCisgICAgICAgICAgbGluZV9udW1iZXJzOiBBbiBh cnJheSBvZiBsaW5lIG51bWJlcnMgb2YgdGhlIGxpbmVzIGZvciB3aGljaAorICAgICAgICAgICAg ICAgICAgICAgICAgc3R5bGUgZXJyb3JzIHNob3VsZCBiZSByZXBvcnRlZCwgb3IgTm9uZSBpZiBl cnJvcnMKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvciBhbGwgbGluZXMgc2hvdWxkIGJlIHJl cG9ydGVkLiAgV2hlbiBpdCBpcyBub3QKKyAgICAgICAgICAgICAgICAgICAgICAgIE5vbmUsIHRo aXMgYXJyYXkgbm9ybWFsbHkgY29udGFpbnMgdGhlIGxpbmUgbnVtYmVycworICAgICAgICAgICAg ICAgICAgICAgICAgY29ycmVzcG9uZGluZyB0byB0aGUgbW9kaWZpZWQgbGluZXMgb2YgYSBwYXRj aC4KIAogICAgICAgICAiIiIKKyAgICAgICAgaWYgbGluZV9udW1iZXJzIGlzIG5vdCBOb25lOgor ICAgICAgICAgICAgbGluZV9udW1iZXJzID0gc2V0KGxpbmVfbnVtYmVycykKKwogICAgICAgICBz ZWxmLl9maWxlX3BhdGggPSBmaWxlX3BhdGgKICAgICAgICAgc2VsZi5fY29uZmlndXJhdGlvbiA9 IGNvbmZpZ3VyYXRpb24KICAgICAgICAgc2VsZi5faW5jcmVtZW50X2Vycm9yX2NvdW50ID0gaW5j cmVtZW50X2Vycm9yX2NvdW50CisgICAgICAgIHNlbGYuX2xpbmVfbnVtYmVycyA9IGxpbmVfbnVt YmVycwogCiAgICAgICAgICMgQSBzdHJpbmcgdG8gaW50ZWdlciBkaWN0aW9uYXJ5IGNhY2hlIG9m IHRoZSBudW1iZXIgb2YgcmVwb3J0YWJsZQogICAgICAgICAjIGVycm9ycyBwZXIgY2F0ZWdvcnkg cGFzc2VkIHRvIHRoaXMgaW5zdGFuY2UuCkBAIC0xMDAsNiArMTEwLDEyIEBAIGNsYXNzIERlZmF1 bHRTdHlsZUVycm9ySGFuZGxlcihvYmplY3QpOgogICAgICAgICBTZWUgdGhlIGRvY3N0cmluZyBv ZiB0aGlzIG1vZHVsZSBmb3IgbW9yZSBpbmZvcm1hdGlvbi4KIAogICAgICAgICAiIiIKKyAgICAg ICAgaWYgKHNlbGYuX2xpbmVfbnVtYmVycyBpcyBub3QgTm9uZSBhbmQKKyAgICAgICAgICAgIGxp bmVfbnVtYmVyIG5vdCBpbiBzZWxmLl9saW5lX251bWJlcnMpOgorICAgICAgICAgICAgIyBUaGVu IHRoZSBlcnJvciBvY2N1cnJlZCBpbiBhIGxpbmUgdGhhdCB3YXMgbm90IG1vZGlmaWVkLCBzbwor ICAgICAgICAgICAgIyB0aGUgZXJyb3IgaXMgbm90IHJlcG9ydGFibGUuCisgICAgICAgICAgICBy ZXR1cm4KKwogICAgICAgICBpZiBub3Qgc2VsZi5fY29uZmlndXJhdGlvbi5pc19yZXBvcnRhYmxl KGNhdGVnb3J5PWNhdGVnb3J5LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbmZpZGVuY2VfaW5fZXJyb3I9Y29uZmlkZW5jZSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlX3BhdGg9c2VsZi5fZmls ZV9wYXRoKToKQEAgLTEyMiw1NiArMTM4LDMgQEAgY2xhc3MgRGVmYXVsdFN0eWxlRXJyb3JIYW5k bGVyKG9iamVjdCk6CiAgICAgICAgIGlmIGNhdGVnb3J5X3RvdGFsID09IG1heF9yZXBvcnRzOgog ICAgICAgICAgICAgc2VsZi5fY29uZmlndXJhdGlvbi5zdGRlcnJfd3JpdGUoIlN1cHByZXNzaW5n IGZ1cnRoZXIgWyVzXSByZXBvcnRzICIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJmb3IgdGhpcyBmaWxlLlxuIiAlIGNhdGVnb3J5KQotCi0KLWNsYXNzIFBh dGNoU3R5bGVFcnJvckhhbmRsZXIob2JqZWN0KToKLQotICAgICIiIlRoZSBzdHlsZSBlcnJvciBm dW5jdGlvbiBmb3IgcGF0Y2ggZmlsZXMuIiIiCi0KLSAgICBkZWYgX19pbml0X18oc2VsZiwgZGlm ZiwgZmlsZV9wYXRoLCBjb25maWd1cmF0aW9uLCBpbmNyZW1lbnRfZXJyb3JfY291bnQpOgotICAg ICAgICAiIiJDcmVhdGUgYSBwYXRjaCBzdHlsZSBlcnJvciBoYW5kbGVyIGZvciB0aGUgZ2l2ZW4g cGF0aC4KLQotICAgICAgICBBcmdzOgotICAgICAgICAgIGRpZmY6IEEgRGlmZkZpbGUgaW5zdGFu Y2UuCi0gICAgICAgICAgT3RoZXIgYXJndW1lbnRzOiBzZWUgdGhlIERlZmF1bHRTdHlsZUVycm9y SGFuZGxlci5fX2luaXRfXygpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBkb2N1bWVudGF0 aW9uIGZvciB0aGUgb3RoZXIgYXJndW1lbnRzLgotCi0gICAgICAgICIiIgotICAgICAgICBzZWxm Ll9kaWZmID0gZGlmZgotCi0gICAgICAgIHNlbGYuX2RlZmF1bHRfZXJyb3JfaGFuZGxlciA9IERl ZmF1bHRTdHlsZUVycm9ySGFuZGxlcigKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGVfcGF0aD1maWxlX3BhdGgsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmNyZW1lbnRfZXJyb3JfY291bnQ9Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5jcmVtZW50X2Vy cm9yX2NvdW50KQotCi0gICAgICAgICMgVGhlIGxpbmUgbnVtYmVycyBvZiB0aGUgbW9kaWZpZWQg bGluZXMuIFRoaXMgaXMgc2V0IGxhemlseS4KLSAgICAgICAgc2VsZi5fbGluZV9udW1iZXJzID0g c2V0KCkKLQotICAgIGRlZiBfZ2V0X2xpbmVfbnVtYmVycyhzZWxmKToKLSAgICAgICAgIiIiUmV0 dXJuIHRoZSBsaW5lIG51bWJlcnMgb2YgdGhlIG1vZGlmaWVkIGxpbmVzLiIiIgotICAgICAgICBp ZiBub3Qgc2VsZi5fbGluZV9udW1iZXJzOgotICAgICAgICAgICAgZm9yIGxpbmUgaW4gc2VsZi5f ZGlmZi5saW5lczoKLSAgICAgICAgICAgICAgICAjIFdoZW4gZGVsZXRlZCBsaW5lIGlzIG5vdCBz ZXQsIGl0IG1lYW5zIHRoYXQKLSAgICAgICAgICAgICAgICAjIHRoZSBsaW5lIGlzIG5ld2x5IGFk ZGVkIChvciBtb2RpZmllZCkuCi0gICAgICAgICAgICAgICAgaWYgbm90IGxpbmVbMF06Ci0gICAg ICAgICAgICAgICAgICAgIHNlbGYuX2xpbmVfbnVtYmVycy5hZGQobGluZVsxXSkKLQotICAgICAg ICByZXR1cm4gc2VsZi5fbGluZV9udW1iZXJzCi0KLSAgICBkZWYgX19jYWxsX18oc2VsZiwgbGlu ZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNlLCBtZXNzYWdlKToKLSAgICAgICAgIiIiSGFu ZGxlIHRoZSBvY2N1cnJlbmNlIG9mIGEgc3R5bGUgZXJyb3IuCi0KLSAgICAgICAgVGhpcyBmdW5j dGlvbiBkb2VzIG5vdCByZXBvcnQgZXJyb3JzIG9jY3VycmluZyBpbiBsaW5lcyBub3QKLSAgICAg ICAgbWFya2VkIGFzIG1vZGlmaWVkIG9yIGFkZGVkIGluIHRoZSBwYXRjaC4KLQotICAgICAgICBT ZWUgdGhlIGRvY3N0cmluZyBvZiB0aGlzIG1vZHVsZSBmb3IgbW9yZSBpbmZvcm1hdGlvbi4KLQot ICAgICAgICAiIiIKLSAgICAgICAgaWYgbGluZV9udW1iZXIgbm90IGluIHNlbGYuX2dldF9saW5l X251bWJlcnMoKToKLSAgICAgICAgICAgICMgVGhlbiB0aGUgZXJyb3IgaXMgbm90IHJlcG9ydGFi bGUuCi0gICAgICAgICAgICByZXR1cm4KLQotICAgICAgICBzZWxmLl9kZWZhdWx0X2Vycm9yX2hh bmRsZXIobGluZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNlLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSkKLQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5pdHRlc3QucHkK aW5kZXggZjExOGZmNC4uMmJhNmUwMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzX3VuaXR0ZXN0LnB5CkBAIC0y NSwxMCArMjUsOCBAQAogCiBpbXBvcnQgdW5pdHRlc3QKIAotZnJvbSAuLiBzdHlsZV9yZWZlcmVu Y2VzIGltcG9ydCBwYXJzZV9wYXRjaAogZnJvbSBjaGVja2VyIGltcG9ydCBTdHlsZUNoZWNrZXJD b25maWd1cmF0aW9uCiBmcm9tIGVycm9yX2hhbmRsZXJzIGltcG9ydCBEZWZhdWx0U3R5bGVFcnJv ckhhbmRsZXIKLWZyb20gZXJyb3JfaGFuZGxlcnMgaW1wb3J0IFBhdGNoU3R5bGVFcnJvckhhbmRs ZXIKIGZyb20gZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1cmF0aW9uCiAKIGNsYXNzIFN0eWxl RXJyb3JIYW5kbGVyVGVzdEJhc2UodW5pdHRlc3QuVGVzdENhc2UpOgpAQCAtNzEsMTQgKzY5LDE1 IEBAIGNsYXNzIERlZmF1bHRTdHlsZUVycm9ySGFuZGxlclRlc3QoU3R5bGVFcnJvckhhbmRsZXJU ZXN0QmFzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDAsIHNlbGYuX2Vycm9yX2NvdW50 KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygwLCBsZW4oc2VsZi5fZXJyb3JfbWVzc2FnZXMp KQogCi0gICAgZGVmIF9lcnJvcl9oYW5kbGVyKHNlbGYsIGNvbmZpZ3VyYXRpb24pOgorICAgIGRl ZiBfZXJyb3JfaGFuZGxlcihzZWxmLCBjb25maWd1cmF0aW9uLCBsaW5lX251bWJlcnM9Tm9uZSk6 CiAgICAgICAgIHJldHVybiBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIoY29uZmlndXJhdGlvbj1j b25maWd1cmF0aW9uLAogICAgICAgICAgICAgICAgICAgIGZpbGVfcGF0aD1zZWxmLl9maWxlX3Bh dGgsCi0gICAgICAgICAgICAgICAgICAgaW5jcmVtZW50X2Vycm9yX2NvdW50PXNlbGYuX21vY2tf aW5jcmVtZW50X2Vycm9yX2NvdW50KQorICAgICAgICAgICAgICAgICAgIGluY3JlbWVudF9lcnJv cl9jb3VudD1zZWxmLl9tb2NrX2luY3JlbWVudF9lcnJvcl9jb3VudCwKKyAgICAgICAgICAgICAg ICAgICBsaW5lX251bWJlcnM9bGluZV9udW1iZXJzKQogCi0gICAgZGVmIF9jYWxsX2Vycm9yX2hh bmRsZXIoc2VsZiwgaGFuZGxlX2Vycm9yLCBjb25maWRlbmNlKToKKyAgICBkZWYgX2NhbGxfZXJy b3JfaGFuZGxlcihzZWxmLCBoYW5kbGVfZXJyb3IsIGNvbmZpZGVuY2UsIGxpbmVfbnVtYmVyPTEw MCk6CiAgICAgICAgICIiIkNhbGwgdGhlIGdpdmVuIGVycm9yIGhhbmRsZXIgd2l0aCBhIHRlc3Qg ZXJyb3IuIiIiCi0gICAgICAgIGhhbmRsZV9lcnJvcihsaW5lX251bWJlcj0xMDAsCisgICAgICAg IGhhbmRsZV9lcnJvcihsaW5lX251bWJlcj1saW5lX251bWJlciwKICAgICAgICAgICAgICAgICAg ICAgIGNhdGVnb3J5PXNlbGYuX2NhdGVnb3J5LAogICAgICAgICAgICAgICAgICAgICAgY29uZmlk ZW5jZT1jb25maWRlbmNlLAogICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZT0ibWVzc2FnZSIp CkBAIC0xMzIsNTIgKzEzMSwyMSBAQCBjbGFzcyBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXJUZXN0 KFN0eWxlRXJyb3JIYW5kbGVyVGVzdEJhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygz LCBzZWxmLl9lcnJvcl9jb3VudCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoMywgbGVuKHNl bGYuX2Vycm9yX21lc3NhZ2VzKSkKIAotCi1jbGFzcyBQYXRjaFN0eWxlRXJyb3JIYW5kbGVyVGVz dChTdHlsZUVycm9ySGFuZGxlclRlc3RCYXNlKToKLQotICAgICIiIlRlc3RzIFBhdGNoU3R5bGVF cnJvckhhbmRsZXIgY2xhc3MuIiIiCi0KLSAgICBfZmlsZV9wYXRoID0gIl9faW5pdF9fLnB5Igot Ci0gICAgX3BhdGNoX3N0cmluZyA9ICIiImRpZmYgLS1naXQgYS9fX2luaXRfXy5weSBiL19faW5p dF9fLnB5Ci1pbmRleCBlZjY1YmVlLi5lM2RiNzBlIDEwMDY0NAotLS0tIGEvX19pbml0X18ucHkK LSsrKyBiL19faW5pdF9fLnB5Ci1AQCAtMSArMSwyIEBACi0gIyBSZXF1aXJlZCBmb3IgUHl0aG9u IHRvIHNlYXJjaCB0aGlzIGRpcmVjdG9yeSBmb3IgbW9kdWxlIGZpbGVzCi0rIyBOZXcgbGluZQot Ci0iIiIKLQotICAgIGRlZiB0ZXN0X2NhbGwoc2VsZik6Ci0gICAgICAgIHBhdGNoX2ZpbGVzID0g cGFyc2VfcGF0Y2goc2VsZi5fcGF0Y2hfc3RyaW5nKQotICAgICAgICBkaWZmID0gcGF0Y2hfZmls ZXNbc2VsZi5fZmlsZV9wYXRoXQotCisgICAgZGVmIHRlc3RfbGluZV9udW1iZXJzKHNlbGYpOgor ICAgICAgICAiIiJUZXN0IHRoZSBsaW5lX251bWJlcnMgcGFyYW1ldGVyLiIiIgorICAgICAgICBz ZWxmLl9jaGVja19pbml0aWFsaXplZCgpCiAgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBzZWxmLl9z dHlsZV9jaGVja2VyX2NvbmZpZ3VyYXRpb24oKQotCi0gICAgICAgIGhhbmRsZV9lcnJvciA9IFBh dGNoU3R5bGVFcnJvckhhbmRsZXIoZGlmZj1kaWZmLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZpbGVfcGF0aD1zZWxmLl9maWxlX3BhdGgsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uZmlndXJhdGlvbj1jb25m aWd1cmF0aW9uLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGluY3JlbWVudF9lcnJvcl9jb3VudD0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzZWxmLl9tb2NrX2luY3JlbWVudF9lcnJvcl9jb3VudCkKLQotICAgICAg ICBjYXRlZ29yeSA9ICJ3aGl0ZXNwYWNlL3RhYiIKKyAgICAgICAgZXJyb3JfaGFuZGxlciA9IHNl bGYuX2Vycm9yX2hhbmRsZXIoY29uZmlndXJhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbGluZV9udW1iZXJzPVs1MF0pCiAgICAgICAgIGNvbmZpZGVu Y2UgPSA1Ci0gICAgICAgIG1lc3NhZ2UgPSAibWVzc2FnZSIKLQotICAgICAgICAjIENvbmZpcm0g ZXJyb3IgaXMgcmVwb3J0YWJsZS4KLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGNvbmZpZ3VyYXRp b24uaXNfcmVwb3J0YWJsZShjYXRlZ29yeSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25maWRlbmNlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVfcGF0aCkpCi0KLSAgICAg ICAgIyBDb25maXJtIGVycm9yIGNvdW50IGluaXRpYWxpemVkIHRvIHplcm8uCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKDAsIHNlbGYuX2Vycm9yX2NvdW50KQogCi0gICAgICAgICMgVGVzdCBl cnJvciBpbiB1bm1vZGlmaWVkIGxpbmUgKGVycm9yIGNvdW50IGRvZXMgbm90IGluY3JlbWVudCku Ci0gICAgICAgIGhhbmRsZV9lcnJvcigxLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwgbWVzc2FnZSkK KyAgICAgICAgIyBFcnJvciBvbiBub24tbW9kaWZpZWQgbGluZTogbm8gZXJyb3IuCisgICAgICAg IHNlbGYuX2NhbGxfZXJyb3JfaGFuZGxlcihlcnJvcl9oYW5kbGVyLCBjb25maWRlbmNlLCBsaW5l X251bWJlcj02MCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoMCwgc2VsZi5fZXJyb3JfY291 bnQpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFtdLCBzZWxmLl9lcnJvcl9tZXNzYWdlcykK IAotICAgICAgICAjIFRlc3QgZXJyb3IgaW4gbW9kaWZpZWQgbGluZSAoZXJyb3IgY291bnQgaW5j cmVtZW50cykuCi0gICAgICAgIGhhbmRsZV9lcnJvcigyLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwg bWVzc2FnZSkKKyAgICAgICAgIyBFcnJvciBvbiBtb2RpZmllZCBsaW5lOiBlcnJvci4KKyAgICAg ICAgc2VsZi5fY2FsbF9lcnJvcl9oYW5kbGVyKGVycm9yX2hhbmRsZXIsIGNvbmZpZGVuY2UsIGxp bmVfbnVtYmVyPTUwKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygxLCBzZWxmLl9lcnJvcl9j b3VudCkKLQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLl9lcnJvcl9tZXNzYWdlcywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgWyJmb28uaCg1MCk6ICBtZXNzYWdlICBbd2hpdGVz cGFjZS90YWJdIFs1XVxuIl0pCg==