58348 2011-04-12 10:43:07 -0700 commit-queue should upload failure diffs when tests fail 2011-04-12 11:30:28 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth dbates jamesr oldest_to_newest 384129 0 eric 2011-04-12 10:43:07 -0700 commit-queue should upload failure diffs when tests fail I get several requests a week for people wanting to see the results from their failures. Best to just make it automatic. 384132 1 eric 2011-04-12 10:43:33 -0700 *** Bug 46685 has been marked as a duplicate of this bug. *** 384138 2 89226 eric 2011-04-12 10:47:02 -0700 Created attachment 89226 Patch 384147 3 89226 abarth 2011-04-12 10:52:50 -0700 Comment on attachment 89226 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89226&action=review > Tools/Scripts/webkitpy/tool/commands/queues.py:-54 > - We probably should keep this line, right? > Tools/Scripts/webkitpy/tool/commands/queues.py:263 > + bot_id = self._tool.status_server.bot_id or "bot" self.name instead of "bot" ? > Tools/Scripts/webkitpy/tool/commands/queues.py:270 > + comment_text = "The attached test failures were seen while running run-webkit-tests on the %s.\n" % (self.name) No () needed. 384166 4 89226 eric 2011-04-12 11:05:14 -0700 Comment on attachment 89226 Patch I'm running it locally for a bit first. 384177 5 89226 eric 2011-04-12 11:21:45 -0700 Comment on attachment 89226 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89226&action=review >> Tools/Scripts/webkitpy/tool/commands/queues.py:263 >> + bot_id = self._tool.status_server.bot_id or "bot" > > self.name instead of "bot" ? I guess. it's not really a bot id. But you could argue that file name should include commit-queue instead of id of the cq bot in question. This currently matches what the flaky test reporting does. >> Tools/Scripts/webkitpy/tool/commands/queues.py:270 >> + comment_text = "The attached test failures were seen while running run-webkit-tests on the %s.\n" % (self.name) > > No () needed. True. I don't know what pep8 says about this. I generally include them for consistency. 384183 6 eric 2011-04-12 11:30:28 -0700 Committed r83614: <http://trac.webkit.org/changeset/83614> 89226 2011-04-12 10:47:02 -0700 2011-04-12 11:21:45 -0700 Patch bug-58348-20110412104700.patch text/plain 17918 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODM1OTMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5ZWUyYzdiNTI0YjY5M2ZiYzA3ZDE4OWQ1MTlhMTk4YmRk ZTE4OTdiLi5mY2NkY2NiYjI1OTg1MTIxODA5YjhkZjk3YzhmNTg4M2YwZjgzZGE2IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTEtMDQtMTIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbW1pdC1xdWV1ZSBzaG91 bGQgdXBsb2FkIGZhaWx1cmUgZGlmZnMgd2hlbiB0ZXN0cyBmYWlsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODM0OAorCisgICAgICAgIFRoaXMgY2hh bmdlIHdhcyBtb3N0bHkganVzdCBwbHVtYmluZy4gIFdlIHdlcmUgYWxyZWFkeSBzYXZpbmcKKyAg ICAgICAgdGhpcyBpbmZvcm1hdGlvbiBmb3IgZmxha3kgdGVzdCByZXBvcnRpbmcuICBJIGp1c3Qg bWFkZSBpdCBwb3NzaWJsZQorICAgICAgICBmb3Igbm9ybWFsIGZhaWx1cmVzIHRvIHJlcG9ydCBh cmNoaXZlcyBhcyB3ZWxsLgorCisgICAgICAgIEkgZGlkIGEgbGl0dGxlIGFic3RyYWN0aW9uIHdv cmsgdG8gdHJ5IGFuZCBzaGFyZSBzb21lIGNvZGUgYmV0d2VlbgorICAgICAgICBmbGFreXRlc3Ry ZXBvcnRlci5weSBhbmQgdGhpcyBuZXcgY29kZS4gIFRoZXJlIGlzIHN0aWxsIG1vcmUgd2UgY291 bGQgZG8uCisKKyAgICAgICAgSW4gbWFraW5nIHRoaXMgY2hhbmdlIEkgYWxzbyB3ZW50IHRocm91 Z2ggYW5kIHVwZGF0ZWQgdGhlIHZhcmlvdXMKKyAgICAgICAgcGxhY2VzIHdlIGhhdmUgdXJscyBo YXJkLWNvZGVkIGluIG91ciBweXRob24gYW5kIHBvaW50ZWQgdGhlbSBhdAorICAgICAgICBjb21t b24uY29uZmlnLnVybHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3pp bGxhL2J1Z3ppbGxhLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWlsZGJvdC9idWlsZGJvdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvc3RhdHVzc2VydmVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2Jv dGluZm8ucHk6IEFkZGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvYm90 aW5mb191bml0dGVzdC5weTogQWRkZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29s L2JvdC9jb21taXRxdWV1ZXRhc2sucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29s L2JvdC9mbGFreXRlc3RyZXBvcnRlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rv b2wvYm90L2ZsYWt5dGVzdHJlcG9ydGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHk6CisKIDIwMTEtMDQtMTEgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNz b24uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHkKaW5k ZXggYWExODI4ZmIyZTJmZjhkZGFhZTJiNDMxNjBkNTc4M2U0NTRhM2U2Yi4uNzUwZDM2ZTdjNTg5 Y2Q0NzEzMjAxOTVmZTA2ZTRiOGE4ZWI4MzZmMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQpAQCAtMzIwLDcgKzMyMCw3IEBAIGNsYXNzIFNDTToK IAogCiBjbGFzcyBTVk4oU0NNKToKLSAgICAjIEZJWE1FOiBXZSBzaG91bGQgbW92ZSB0aGVzZSB2 YWx1ZXMgdG8gYSBXZWJLaXQtc3BlY2lmaWMgY29uZmlnIGZpbGUuCisgICAgIyBGSVhNRTogVGhl c2UgYmVsb25nIGluIGNvbW1vbi5jb25maWcudXJscwogICAgIHN2bl9zZXJ2ZXJfaG9zdCA9ICJz dm4ud2Via2l0Lm9yZyIKICAgICBzdm5fc2VydmVyX3JlYWxtID0gIjxodHRwOi8vc3ZuLndlYmtp dC5vcmc6ODA+IE1hYyBPUyBGb3JnZSIKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CmluZGV4IGM0ZDk1ZGQyY2YyYTg1 ZTc5MTc0OTk4NDg5Zjg2M2ZhZWUyNGU1MWQuLmM3ODFkZmIwMGQ3MDFhNjkwNWEwZDI3MzA0MDBj MmJiOThiNDA5ODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9idWd6aWxsYS9idWd6aWxsYS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKQEAgLTIyMCw3ICsyMjAsOCBAQCBjbGFzcyBCdWd6 aWxsYShvYmplY3QpOgogICAgICAgICAjIHNjcmlwdC4KICAgICAgICAgc2VsZi5icm93c2VyLnNl dF9oYW5kbGVfcm9ib3RzKEZhbHNlKQogCi0gICAgIyBGSVhNRTogTXVjaCBvZiB0aGlzIHNob3Vs ZCBnbyBpbnRvIHNvbWUgc29ydCBvZiBjb25maWcgbW9kdWxlOgorICAgICMgRklYTUU6IE11Y2gg b2YgdGhpcyBzaG91bGQgZ28gaW50byBzb21lIHNvcnQgb2YgY29uZmlnIG1vZHVsZSwKKyAgICAj IHN1Y2ggYXMgY29tbW9uLmNvbmZpZy51cmxzLgogICAgIGJ1Z19zZXJ2ZXJfaG9zdCA9ICJidWdz LndlYmtpdC5vcmciCiAgICAgYnVnX3NlcnZlcl9yZWdleCA9ICJodHRwcz86Ly8lcy8iICUgcmUu c3ViKCdcLicsICdcXC4nLCBidWdfc2VydmVyX2hvc3QpCiAgICAgYnVnX3NlcnZlcl91cmwgPSAi aHR0cHM6Ly8lcy8iICUgYnVnX3NlcnZlcl9ob3N0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3QucHkKaW5kZXggZDIzYTZjYzUw Yzk5MjIyOThjZmRlYmI1MzQ3MjAwNTMxOTdjODAwYy4uNWZkZjE4NDEwY2ZhYzcxZmRlZTAyZDE2 MDUxOWRiNmNiMmQxN2NiYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9idWlsZGJvdC9idWlsZGJvdC5weQpAQCAtMjY3LDcgKzI2Nyw3IEBAIGNsYXNz IEJ1aWxkKG9iamVjdCk6CiAKIAogY2xhc3MgQnVpbGRCb3Qob2JqZWN0KToKLSAgICAjIEZJWE1F OiBUaGlzIHNob3VsZCBtb3ZlIGludG8gc29tZSBzb3J0IG9mIHdlYmtpdF9jb25maWcucHkKKyAg ICAjIEZJWE1FOiBUaGlzIHNob3VsZCBtb3ZlIGludG8gY29tbW9uLmNvbmZpZy51cmxzLgogICAg IGRlZmF1bHRfaG9zdCA9ICJidWlsZC53ZWJraXQub3JnIgogCiAgICAgZGVmIF9faW5pdF9fKHNl bGYsIGhvc3Q9ZGVmYXVsdF9ob3N0KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9zdGF0dXNzZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvc3RhdHVzc2VydmVyLnB5CmluZGV4IGFiZDI5OGFjNzBlOWNkNzcyMDc0ZmUxMGEw NTY0ZGNkYTc0YzMwNzIuLjk2MjJjODliZDM1M2NmN2Q0YzA2YWEyNDQ4MDEwN2EzMGNhYTA2NWUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9zdGF0dXNzZXJ2 ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L3N0YXR1c3NlcnZl ci5weQpAQCAtMjUsNiArMjUsOCBAQAogIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCiAjIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorIworIyBUaGlzIHRoZSBjbGllbnQgZGVzaWduZWQgdG8gdGFsayB0byBUb29s cy9RdWV1ZVN0YXR1c1NlcnZlci4KIAogZnJvbSB3ZWJraXRweS5jb21tb24ubmV0Lm5ldHdvcmt0 cmFuc2FjdGlvbiBpbXBvcnQgTmV0d29ya1RyYW5zYWN0aW9uCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0uZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBsb2cKQEAgLTM5LDYgKzQxLDcgQEAg X2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5jb21tb24ubmV0LnN0YXR1c3NlcnZl ciIpCiAKIAogY2xhc3MgU3RhdHVzU2VydmVyOgorICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHBy b2JhYmx5IG1vdmUgdG8gY29tbW9uLmNvbmZpZy51cmxzLgogICAgIGRlZmF1bHRfaG9zdCA9ICJx dWV1ZXMud2Via2l0Lm9yZyIKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0PWRlZmF1bHRf aG9zdCwgYnJvd3Nlcj1Ob25lLCBib3RfaWQ9Tm9uZSk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggN2EyZTI0ZmE4MDA0NTU5NDcy ZDE4YjM2MjI0MGQ4MjBhOThmNjUzOC4uODY0ZmI5MWZmNjllZTA2MjJjNDI3MzVlZWU5ODk3ODg2 NzMwMGIzZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQpAQCAtMTI5LDYgKzEyOSw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAg ICAgIyBodHRwOi8vYnVncy5weXRob24ub3JnL2lzc3VlMzIxMAogICAgICAgICBzZWxmLl93ZGlm Zl9hdmFpbGFibGUgPSBUcnVlCiAKKyAgICAgICAgIyBGSVhNRTogcHJldHR5cGF0Y2gucHkga25v d3MgdGhpcyBwYXRoLCB3aHkgaXMgaXQgY29waWVkIGhlcmU/CiAgICAgICAgIHNlbGYuX3ByZXR0 eV9wYXRjaF9wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIldlYnNpdGVzIiwKICAg ICAgICAgICAgICJidWdzLndlYmtpdC5vcmciLCAiUHJldHR5UGF0Y2giLCAicHJldHRpZnkucmIi KQogICAgICAgICAjIElmIHdlJ3JlIHJ1bm5pbmcgb24gYSBtb2NrZWQtb3V0IGZpbGVzeXN0ZW0s IHRoaXMgZmlsZSBhbG1vc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9ib3QvYm90aW5mby5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvYm90aW5m by5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5iOWZkOTM4YWE1ZjAxNmE2YjRhZGYzMDhmMTViYmU3NzhhYWRjOThj Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9ib3Rp bmZvLnB5CkBAIC0wLDAgKzEsMzkgQEAKKyMgQ29weXJpZ2h0IChjKSAyMDExIEdvb2dsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisj IG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIK KyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29v Z2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2Vk IHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0 d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRS SUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dO RVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBU SEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZ LCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCisKKyMgRklYTUU6IFdl IHNob3VsZCBjb25zaWRlciBoYW5naW5nIG9uZSBvZiB0aGVzZSBvZmYgdGhlIHRvb2wgb2JqZWN0 LgorY2xhc3MgQm90SW5mbyhvYmplY3QpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0b29sKToK KyAgICAgICAgc2VsZi5fdG9vbCA9IHRvb2wKKworICAgIGRlZiBzdW1tYXJ5X3RleHQoc2VsZik6 CisgICAgICAgICMgYm90X2lkIGlzIGFsc28gc3RvcmVkIG9uIHRoZSBvcHRpb25zIGRpY3Rpb25h cnkgb24gdGhlIHRvb2wuCisgICAgICAgIGJvdF9pZCA9IHNlbGYuX3Rvb2wuc3RhdHVzX3NlcnZl ci5ib3RfaWQKKyAgICAgICAgYm90X2lkX3N0cmluZyA9ICJCb3Q6ICVzICAiICUgKGJvdF9pZCkg aWYgYm90X2lkIGVsc2UgIiIKKyAgICAgICAgcmV0dXJuICIlc1BvcnQ6ICVzICBQbGF0Zm9ybTog JXMiICUgKGJvdF9pZF9zdHJpbmcsIHNlbGYuX3Rvb2wucG9ydCgpLm5hbWUoKSwgc2VsZi5fdG9v bC5wbGF0Zm9ybS5kaXNwbGF5X25hbWUoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9ib3QvYm90aW5mb191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9ib3QvYm90aW5mb191bml0dGVzdC5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNTRhY2ZjMTFhNDZj MGJiNmJkNTg1N2QwMTI2ODI3Yzc2YTM5YmFhCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2JvdC9ib3RpbmZvX3VuaXR0ZXN0LnB5CkBAIC0wLDAgKzEsNDAg QEAKKyMgQ29weXJpZ2h0IChjKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRp b24uCisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1l cyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90 ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmlj IHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAor IyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBB TkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QK KyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQ VElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorCitpbXBvcnQgdW5pdHRlc3QKKworZnJvbSB3ZWJraXRweS50 b29sLmJvdC5ib3RpbmZvIGltcG9ydCBCb3RJbmZvCitmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rv b2wgaW1wb3J0IE1vY2tUb29sLCBNb2NrU3RhdHVzU2VydmVyCisKKworY2xhc3MgQm90SW5mb1Rl c3QodW5pdHRlc3QuVGVzdENhc2UpOgorCisgICAgZGVmIHRlc3Rfc3VtbWFyeV90ZXh0KHNlbGYp OgorICAgICAgICB0b29sID0gTW9ja1Rvb2woKQorICAgICAgICB0b29sLnN0YXR1c19zZXJ2ZXIg PSBNb2NrU3RhdHVzU2VydmVyKCJNb2NrQm90SWQiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KEJvdEluZm8odG9vbCkuc3VtbWFyeV90ZXh0KCksICJCb3Q6IE1vY2tCb3RJZCAgUG9ydDogTW9j a1BvcnQgIFBsYXRmb3JtOiBNb2NrUGxhdGZvcm0gMS4wIikKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvY29tbWl0cXVldWV0YXNrLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2JvdC9jb21taXRxdWV1ZXRhc2sucHkKaW5kZXggYzVkOTAwMTZhOTBh MzMxZWI3MjdjM2NmNDc4ZTVhZGY5OWM1Y2ZkZS4uZTk5ZGQxOTQxMzM4M2NjMDQ0OTQ3NDk4YWEx ZWM3ZmRhYmY2N2JhNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Jv dC9jb21taXRxdWV1ZXRhc2sucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Jv dC9jb21taXRxdWV1ZXRhc2sucHkKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29tbWl0UXVldWVU YXNrKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2RlbGVnYXRlID0gZGVsZWdhdGUKICAgICAgICAg c2VsZi5fcGF0Y2ggPSBwYXRjaAogICAgICAgICBzZWxmLl9zY3JpcHRfZXJyb3IgPSBOb25lCisg ICAgICAgIHNlbGYuX3Jlc3VsdHNfYXJjaGl2ZV9mcm9tX3BhdGNoX3Rlc3RfcnVuID0gTm9uZQog CiAgICAgZGVmIF92YWxpZGF0ZShzZWxmKToKICAgICAgICAgIyBCdWdzIG1pZ2h0IGdldCBjbG9z ZWQsIG9yIHBhdGNoZXMgbWlnaHQgYmUgb2Jzb2xldGVkIG9yIHItJ2Qgd2hpbGUgdGhlCkBAIC0y MDEsMTIgKzIwMiwxNyBAQCBjbGFzcyBDb21taXRRdWV1ZVRhc2sob2JqZWN0KToKICAgICAgICAg ICAgIHJldHVybiBGYWxzZQogCiAgICAgICAgIGlmIHNlbGYuX2J1aWxkX2FuZF90ZXN0X3dpdGhv dXRfcGF0Y2goKToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLnJlcG9ydF9mYWlsdXJlKCkgICMg VGhlIGVycm9yIGZyb20gdGhlIHByZXZpb3VzIC5fdGVzdCgpIHJ1biBpcyByZWFsLCByZXBvcnQg aXQuCisgICAgICAgICAgICByZXR1cm4gc2VsZi5yZXBvcnRfZmFpbHVyZShmaXJzdF9yZXN1bHRz X2FyY2hpdmUpICAjIFRoZSBlcnJvciBmcm9tIHRoZSBwcmV2aW91cyAuX3Rlc3QoKSBydW4gaXMg cmVhbCwgcmVwb3J0IGl0LgogICAgICAgICByZXR1cm4gRmFsc2UgICMgVHJlZSBtdXN0IGJlIHJl ZCwganVzdCByZXRyeSBsYXRlci4KIAotICAgIGRlZiByZXBvcnRfZmFpbHVyZShzZWxmKToKKyAg ICBkZWYgcmVzdWx0c19hcmNoaXZlX2Zyb21fcGF0Y2hfdGVzdF9ydW4oc2VsZiwgcGF0Y2gpOgor ICAgICAgICBhc3NlcnQoc2VsZi5fcGF0Y2guaWQoKSA9PSBwYXRjaC5pZCgpKSAgIyBDb21taXRR dWV1ZVRhc2sgaXMgbm90IGN1cnJlbnRseSByZS11c2VhYmxlLgorICAgICAgICByZXR1cm4gc2Vs Zi5fcmVzdWx0c19hcmNoaXZlX2Zyb21fcGF0Y2hfdGVzdF9ydW4KKworICAgIGRlZiByZXBvcnRf ZmFpbHVyZShzZWxmLCByZXN1bHRzX2FyY2hpdmU9Tm9uZSk6CiAgICAgICAgIGlmIG5vdCBzZWxm Ll92YWxpZGF0ZSgpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgIHNlbGYuX3Jl c3VsdHNfYXJjaGl2ZV9mcm9tX3BhdGNoX3Rlc3RfcnVuID0gcmVzdWx0c19hcmNoaXZlCiAgICAg ICAgIHJhaXNlIHNlbGYuX3NjcmlwdF9lcnJvcgogCiAgICAgZGVmIHJ1bihzZWxmKToKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZmxha3l0ZXN0cmVwb3J0ZXIu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2ZsYWt5dGVzdHJlcG9ydGVyLnB5 CmluZGV4IGJlYzU5M2I2ZTYwMjczOTM5YTU1MDM5OGJmZWQxOWQ3MWFiZmVlNGQuLjY4ZTFjOTQx OGFlYTMyMjQxMGE1NTNlNzA1YTE3ZWUxMDRjYzE2MmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9ib3QvZmxha3l0ZXN0cmVwb3J0ZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2JvdC9mbGFreXRlc3RyZXBvcnRlci5weQpAQCAtMzMsNiArMzMs NyBAQCBpbXBvcnQgb3MucGF0aAogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQubGF5b3V0dGVz dHJlc3VsdHMgaW1wb3J0IHBhdGhfZm9yX2xheW91dF90ZXN0LCBMYXlvdXRUZXN0UmVzdWx0cwog ZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnIGltcG9ydCB1cmxzCitmcm9tIHdlYmtpdHB5LnRv b2wuYm90LmJvdGluZm8gaW1wb3J0IEJvdEluZm8KIGZyb20gd2Via2l0cHkudG9vbC5ncmFtbWFy IGltcG9ydCBwbHVyYWwsIHBsdXJhbGl6ZSwgam9pbl93aXRoX3NlcGFyYXRvcnMKIAogX2xvZyA9 IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtNDIsNiArNDMsNyBAQCBjbGFzcyBGbGFr eVRlc3RSZXBvcnRlcihvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0b29sLCBib3Rf bmFtZSk6CiAgICAgICAgIHNlbGYuX3Rvb2wgPSB0b29sCiAgICAgICAgIHNlbGYuX2JvdF9uYW1l ID0gYm90X25hbWUKKyAgICAgICAgc2VsZi5fYm90X2luZm8gPSBCb3RJbmZvKHRvb2wpCiAKICAg ICBkZWYgX2F1dGhvcl9lbWFpbHNfZm9yX3Rlc3Qoc2VsZiwgZmxha3lfdGVzdCk6CiAgICAgICAg IHRlc3RfcGF0aCA9IHBhdGhfZm9yX2xheW91dF90ZXN0KGZsYWt5X3Rlc3QpCkBAIC0xMjEsMTUg KzEyMywxMCBAQCBJZiB5b3Ugd291bGQgbGlrZSB0byB0cmFjayB0aGlzIHRlc3QgZml4IHdpdGgg YW5vdGhlciBidWcsIHBsZWFzZSBjbG9zZSB0aGlzIGJ1ZwogICAgICAgICBhdXRob3JzX3N0cmlu ZyA9IGpvaW5fd2l0aF9zZXBhcmF0b3JzKHNvcnRlZChhdXRob3JfZW1haWxzKSkKICAgICAgICAg cmV0dXJuICIgKCVzOiAlcykiICUgKGhlYWRpbmdfc3RyaW5nLCBhdXRob3JzX3N0cmluZykKIAot ICAgIGRlZiBfYm90X2luZm9ybWF0aW9uKHNlbGYpOgotICAgICAgICBib3RfaWQgPSBzZWxmLl90 b29sLnN0YXR1c19zZXJ2ZXIuYm90X2lkCi0gICAgICAgIGJvdF9pZF9zdHJpbmcgPSAiQm90OiAl cyAgIiAlIChib3RfaWQpIGlmIGJvdF9pZCBlbHNlICIiCi0gICAgICAgIHJldHVybiAiJXNQb3J0 OiAlcyAgUGxhdGZvcm06ICVzIiAlIChib3RfaWRfc3RyaW5nLCBzZWxmLl90b29sLnBvcnQoKS5u YW1lKCksIHNlbGYuX3Rvb2wucGxhdGZvcm0uZGlzcGxheV9uYW1lKCkpCi0KICAgICBkZWYgX2xh dGVzdF9mbGFrZV9tZXNzYWdlKHNlbGYsIGZsYWt5X3Jlc3VsdCwgcGF0Y2gpOgogICAgICAgICBm YWlsdXJlX21lc3NhZ2VzID0gW2ZhaWx1cmUubWVzc2FnZSgpIGZvciBmYWlsdXJlIGluIGZsYWt5 X3Jlc3VsdC5mYWlsdXJlc10KICAgICAgICAgZmxha2VfbWVzc2FnZSA9ICJUaGUgJXMganVzdCBz YXcgJXMgZmxha2UgKCVzKSB3aGlsZSBwcm9jZXNzaW5nIGF0dGFjaG1lbnQgJXMgb24gYnVnICVz LiIgJSAoc2VsZi5fYm90X25hbWUsIGZsYWt5X3Jlc3VsdC5maWxlbmFtZSwgIiwgIi5qb2luKGZh aWx1cmVfbWVzc2FnZXMpLCBwYXRjaC5pZCgpLCBwYXRjaC5idWdfaWQoKSkKLSAgICAgICAgcmV0 dXJuICIlc1xuJXMiICUgKGZsYWtlX21lc3NhZ2UsIHNlbGYuX2JvdF9pbmZvcm1hdGlvbigpKQor ICAgICAgICByZXR1cm4gIiVzXG4lcyIgJSAoZmxha2VfbWVzc2FnZSwgc2VsZi5fYm90X2luZm8u c3VtbWFyeV90ZXh0KCkpCiAKICAgICBkZWYgX3Jlc3VsdHNfZGlmZl9wYXRoX2Zvcl90ZXN0KHNl bGYsIHRlc3RfcGF0aCk6CiAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBiaWcgaGFjay4gIFdl IHNob3VsZCBnZXQgdGhpcyBwYXRoIGZyb20gcmVzdWx0cy5qc29uCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2ZsYWt5dGVzdHJlcG9ydGVyX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9mbGFreXRlc3RyZXBvcnRlcl91bml0 dGVzdC5weQppbmRleCAyNmM5OGMxNDYyMTUyNzU2ZmVlYmI3YWVkM2I1MjdmYTM3M2NmYTU1Li4x ZTNmMzVhYTU1OGZjNGRkZThlNzM1M2M3NmE5MDE2NDU2NTY4MTAxIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2ZsYWt5dGVzdHJlcG9ydGVyX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZmxha3l0ZXN0cmVwb3J0ZXJf dW5pdHRlc3QucHkKQEAgLTk3LDEyICs5Nyw2IEBAIGJsb2NrZWQ6IDUwODU2CiAgICAgICAgIGJ1 ZyA9IHRvb2wuYnVncy5mZXRjaF9idWcoNzgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVw b3J0ZXIuX2ZvbGxvd19kdXBsaWNhdGVfY2hhaW4oYnVnKS5pZCgpLCA3NikKIAotICAgIGRlZiB0 ZXN0X2JvdF9pbmZvcm1hdGlvbihzZWxmKToKLSAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKLSAg ICAgICAgdG9vbC5zdGF0dXNfc2VydmVyID0gTW9ja1N0YXR1c1NlcnZlcigiTW9ja0JvdElkIikK LSAgICAgICAgcmVwb3J0ZXIgPSBGbGFreVRlc3RSZXBvcnRlcih0b29sLCAnZHVtbXktcXVldWUn KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG9ydGVyLl9ib3RfaW5mb3JtYXRpb24oKSwg IkJvdDogTW9ja0JvdElkICBQb3J0OiBNb2NrUG9ydCAgUGxhdGZvcm06IE1vY2tQbGF0Zm9ybSAx LjAiKQotCiAgICAgZGVmIHRlc3RfcmVwb3J0X2ZsYWt5X3Rlc3RzX2NyZWF0aW5nX2J1ZyhzZWxm KToKICAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKICAgICAgICAgdG9vbC5maWxlc3lzdGVtID0g TW9ja0ZpbGVTeXN0ZW0oeyIvbW9jay9mb28vYmFyLWRpZmZzLnR4dCI6ICJtb2NrIn0pCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQppbmRleCA5ZTUw ZGQ0YmJiNjgzYmFlYzdjMDhjOGUzMjY4MGI0ZTk1OThjYjljLi5iOWM1ZTEyYWVjODNlMzk4MDRl ZjY4N2JiNGE0OTRlYmFjMjhlMDE0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9xdWV1ZXMucHkKQEAgLTQ0LDYgKzQ0LDcgQEAgZnJvbSB3ZWJraXRweS5jb21t b24ubmV0LmxheW91dHRlc3RyZXN1bHRzIGltcG9ydCBMYXlvdXRUZXN0UmVzdWx0cwogZnJvbSB3 ZWJraXRweS5jb21tb24ubmV0LnN0YXR1c3NlcnZlciBpbXBvcnQgU3RhdHVzU2VydmVyCiBmcm9t IHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBlcnJvciwg bG9nCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRF cnJvcgorZnJvbSB3ZWJraXRweS50b29sLmJvdC5ib3RpbmZvIGltcG9ydCBCb3RJbmZvCiBmcm9t IHdlYmtpdHB5LnRvb2wuYm90LmNvbW1pdHF1ZXVldGFzayBpbXBvcnQgQ29tbWl0UXVldWVUYXNr LCBDb21taXRRdWV1ZVRhc2tEZWxlZ2F0ZQogZnJvbSB3ZWJraXRweS50b29sLmJvdC5mZWVkZXJz IGltcG9ydCBDb21taXRRdWV1ZUZlZWRlciwgRVdTRmVlZGVyCiBmcm9tIHdlYmtpdHB5LnRvb2wu Ym90LnF1ZXVlZW5naW5lIGltcG9ydCBRdWV1ZUVuZ2luZSwgUXVldWVFbmdpbmVEZWxlZ2F0ZQpA QCAtNTEsNyArNTIsNiBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuYm90LmZsYWt5dGVzdHJlcG9ydGVy IGltcG9ydCBGbGFreVRlc3RSZXBvcnRlcgogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnN0 ZXBzZXF1ZW5jZSBpbXBvcnQgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVyCiBmcm9tIHdlYmtpdHB5 LnRvb2wubXVsdGljb21tYW5kdG9vbCBpbXBvcnQgQ29tbWFuZCwgVHJ5QWdhaW4KIAotCiBjbGFz cyBBYnN0cmFjdFF1ZXVlKENvbW1hbmQsIFF1ZXVlRW5naW5lRGVsZWdhdGUpOgogICAgIHdhdGNo ZXJzID0gWwogICAgIF0KQEAgLTI1OCw2ICsyNTgsMjAgQEAgY2xhc3MgQ29tbWl0UXVldWUoQWJz dHJhY3RQYXRjaFF1ZXVlLCBTdGVwU2VxdWVuY2VFcnJvckhhbmRsZXIsIENvbW1pdFF1ZXVlVGFz a0QKICAgICAgICAgc2VsZi5fdXBkYXRlX3N0YXR1cygiUHJvY2Vzc2luZyAlcyIgJSBwYXRjaF90 ZXh0LCBwYXRjaCkKICAgICAgICAgcmV0dXJuIFRydWUKIAorICAgICMgRklYTUU6IFRoaXMgaXMg bm90IHJlYWxseSBzcGVjaWZpYyB0byB0aGUgY29tbWl0LXF1ZXVlIGFuZCBjb3VsZCBiZSBzaGFy ZWQuCisgICAgZGVmIF91cGxvYWRfcmVzdWx0c19hcmNoaXZlX2Zvcl9wYXRjaChzZWxmLCBwYXRj aCwgcmVzdWx0c19hcmNoaXZlX3ppcCk6CisgICAgICAgIGJvdF9pZCA9IHNlbGYuX3Rvb2wuc3Rh dHVzX3NlcnZlci5ib3RfaWQgb3IgImJvdCIKKyAgICAgICAgZGVzY3JpcHRpb24gPSAiQXJjaGl2 ZSBvZiBsYXlvdXQtdGVzdC1yZXN1bHRzIGZyb20gJXMiICUgYm90X2lkCisgICAgICAgICMgcmVz dWx0c19hcmNoaXZlIGlzIGEgWmlwRmlsZSBvYmplY3QsIGdyYWIgdGhlIEZpbGUgb2JqZWN0ICgu ZnApIHRvIHBhc3MgdG8gTWVjaGFuaXplIGZvciB1cGxvYWRpbmcuCisgICAgICAgIHJlc3VsdHNf YXJjaGl2ZV9maWxlID0gcmVzdWx0c19hcmNoaXZlX3ppcC5mcAorICAgICAgICAjIFJld2luZCB0 aGUgZmlsZSBvYmplY3QgdG8gc3RhcnQgKHNpbmNlIE1lY2hhbml6ZSB3b24ndCBkbyB0aGF0IGF1 dG9tYXRpY2FsbHkpCisgICAgICAgICMgU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NDU5MworICAgICAgICByZXN1bHRzX2FyY2hpdmVfZmlsZS5zZWVrKDApCisg ICAgICAgIGNvbW1lbnRfdGV4dCA9ICJUaGUgYXR0YWNoZWQgdGVzdCBmYWlsdXJlcyB3ZXJlIHNl ZW4gd2hpbGUgcnVubmluZyBydW4td2Via2l0LXRlc3RzIG9uIHRoZSAlcy5cbiIgJSAoc2VsZi5u YW1lKQorICAgICAgICAjIEZJWE1FOiBXZSBjb3VsZCBlYXNpbHkgbGlzdCB0aGUgdGVzdCBmYWls dXJlcyBmcm9tIHRoZSBhcmNoaXZlIGhlcmUuCisgICAgICAgIGNvbW1lbnRfdGV4dCArPSBCb3RJ bmZvKHNlbGYuX3Rvb2wpLnN1bW1hcnlfdGV4dCgpCisgICAgICAgIHNlbGYuX3Rvb2wuYnVncy5h ZGRfYXR0YWNobWVudF90b19idWcocGF0Y2guYnVnX2lkKCksIHJlc3VsdHNfYXJjaGl2ZV9maWxl LCBkZXNjcmlwdGlvbiwgZmlsZW5hbWU9ImxheW91dC10ZXN0LXJlc3VsdHMuemlwIiwgY29tbWVu dF90ZXh0PWNvbW1lbnRfdGV4dCkKKwogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBw YXRjaCk6CiAgICAgICAgIHNlbGYuX2NjX3dhdGNoZXJzKHBhdGNoLmJ1Z19pZCgpKQogICAgICAg ICB0YXNrID0gQ29tbWl0UXVldWVUYXNrKHNlbGYsIHBhdGNoKQpAQCAtMjY5LDYgKzI4Myw5IEBA IGNsYXNzIENvbW1pdFF1ZXVlKEFic3RyYWN0UGF0Y2hRdWV1ZSwgU3RlcFNlcXVlbmNlRXJyb3JI YW5kbGVyLCBDb21taXRRdWV1ZVRhc2tECiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToK ICAgICAgICAgICAgIHZhbGlkYXRvciA9IENvbW1pdHRlclZhbGlkYXRvcihzZWxmLl90b29sLmJ1 Z3MpCiAgICAgICAgICAgICB2YWxpZGF0b3IucmVqZWN0X3BhdGNoX2Zyb21fY29tbWl0X3F1ZXVl KHBhdGNoLmlkKCksIHNlbGYuX2Vycm9yX21lc3NhZ2VfZm9yX2J1Zyh0YXNrLmZhaWx1cmVfc3Rh dHVzX2lkLCBlKSkKKyAgICAgICAgICAgIHJlc3VsdHNfYXJjaGl2ZSA9IHRhc2sucmVzdWx0c19h cmNoaXZlX2Zyb21fcGF0Y2hfdGVzdF9ydW4ocGF0Y2gpCisgICAgICAgICAgICBpZiByZXN1bHRz X2FyY2hpdmU6CisgICAgICAgICAgICAgICAgc2VsZi5fdXBsb2FkX3Jlc3VsdHNfYXJjaGl2ZV9m b3JfcGF0Y2gocGF0Y2gsIHJlc3VsdHNfYXJjaGl2ZSkKICAgICAgICAgICAgIHNlbGYuX2RpZF9m YWlsKHBhdGNoKQogCiAgICAgZGVmIF9lcnJvcl9tZXNzYWdlX2Zvcl9idWcoc2VsZiwgc3RhdHVz X2lkLCBzY3JpcHRfZXJyb3IpOgo=