206530 2020-01-21 07:06:42 -0800 [ews] commit-queue should check cq+ flag 2020-01-21 12:05:55 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201934 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1609017 0 aakash_jain 2020-01-21 07:06:42 -0800 [ews] commit-queue should check cq+ flag on the patch while processing it. It should skip the patch if patch doesn't/no-longer have cq+ flag. It is possible that the patch was cq+ed, and later someone found an issue with the patch and cq- it. commit-queue should be smart about not committing such patches. 1609018 1 webkit-bug-importer 2020-01-21 07:07:04 -0800 <rdar://problem/58758367> 1609079 2 388308 aakash_jain 2020-01-21 09:23:14 -0800 Created attachment 388308 Patch 1609136 3 388320 aakash_jain 2020-01-21 10:50:31 -0800 Created attachment 388320 Patch 1609138 4 aakash_jain 2020-01-21 10:51:33 -0800 Sample run: https://ews-build.webkit-uat.org/#/builders/26/builds/350 1609142 5 388320 jbedard 2020-01-21 10:56:49 -0800 Comment on attachment 388320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388320&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:-332 > - def __init__(self, verifyObsolete=True, verifyBugClosed=True, verifyReviewDenied=True, addURLs=True, **kwargs): We removed kwargs here. Was that deliberate? > Tools/BuildSlaveSupport/ews-build/steps.py:481 > + cq_plus = self._is_patch_cq_plus(patch_id) if self.verifycqplus else 1 Why the intermediate variable and not: if self.verifycqplus and self._is_patch_cq_plus(patch_id) != 1: ... 1609153 6 388320 aakash_jain 2020-01-21 11:08:23 -0800 Comment on attachment 388320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388320&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:-332 >> - def __init__(self, verifyObsolete=True, verifyBugClosed=True, verifyReviewDenied=True, addURLs=True, **kwargs): > > We removed kwargs here. Was that deliberate? Yeah, minor cleanup. although it doesn't make any difference. >> Tools/BuildSlaveSupport/ews-build/steps.py:481 >> + cq_plus = self._is_patch_cq_plus(patch_id) if self.verifycqplus else 1 > > Why the intermediate variable and not: > > if self.verifycqplus and self._is_patch_cq_plus(patch_id) != 1: > ... I was just keeping it consistent with the code above (e.g.: review_denied), but I can change it to the one you suggested. Which one do you prefer? 1609177 7 jbedard 2020-01-21 11:51:51 -0800 (In reply to Aakash Jain from comment #6) > Comment on attachment 388320 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=388320&action=review > > >> Tools/BuildSlaveSupport/ews-build/steps.py:-332 > >> - def __init__(self, verifyObsolete=True, verifyBugClosed=True, verifyReviewDenied=True, addURLs=True, **kwargs): > > > > We removed kwargs here. Was that deliberate? > > Yeah, minor cleanup. although it doesn't make any difference. > > >> Tools/BuildSlaveSupport/ews-build/steps.py:481 > >> + cq_plus = self._is_patch_cq_plus(patch_id) if self.verifycqplus else 1 > > > > Why the intermediate variable and not: > > > > if self.verifycqplus and self._is_patch_cq_plus(patch_id) != 1: > > ... > > I was just keeping it consistent with the code above (e.g.: review_denied), > but I can change it to the one you suggested. Which one do you prefer? I prefer putting it without the intermediate variable, but I don't feel very strongly about that. 1609191 8 388320 aakash_jain 2020-01-21 12:05:52 -0800 Comment on attachment 388320 Patch Clearing flags on attachment: 388320 Committed r254870: <https://trac.webkit.org/changeset/254870> 1609192 9 aakash_jain 2020-01-21 12:05:55 -0800 All reviewed patches have been landed. Closing bug. 388308 2020-01-21 09:23:14 -0800 2020-01-21 10:50:27 -0800 Patch bug-206530-20200121122313.patch text/plain 6123 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDg1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTAxLTIxICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIGNoZWNrIGNxKyBmbGFnCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY1MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICBWYWxpZGF0ZVBhdGNoLl9pc19wYXRj aF9jcV9wbHVzKTogTWV0aG9kIHRvIGNoZWNrIGNxKyBmbGFnIG9uIHBhdGNoLgorICAgICAgICAo VmFsaWRhdGVQYXRjaC5zdGFydCk6CisKIDIwMjAtMDEtMjAgIEFha2FzaCBKYWluICA8YWFrYXNo X2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtld3NdIEFkZCBidWlsZCBhbmQgbGF5b3V0LXRl c3Qgc3RlcHMgZm9yIGNvbW1pdC1xdWV1ZSBpbiBuZXcgZXdzCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDI1NDg1NSkK KysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtp bmcgY29weSkKQEAgLTEsNCArMSw0IEBACi0jIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE4LTIwMjAgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC0zMywxMiArMzMsMTIgQEAgZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5UGF0Y2gsIEFwcGx5 V2F0YwogCiAKIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVz PU5vbmUsIGJ1aWxkT25seT1UcnVlLCB0cmlnZ2Vycz1Ob25lLCByZW1vdGVzPU5vbmUsIGFkZGl0 aW9uYWxBcmd1bWVudHM9Tm9uZSwgY2hlY2tSZWxldmFuY2U9RmFsc2UsICoqa3dhcmdzKToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0 ZWN0dXJlcz1Ob25lLCBidWlsZE9ubHk9VHJ1ZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25l LCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCB2ZXJpZnlj cXBsdXM9RmFsc2UsICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19p bml0X18oc2VsZikKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3Jt PXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXM9YXJj aGl0ZWN0dXJlcywgYnVpbGRPbmx5PWJ1aWxkT25seSwgdHJpZ2dlcnM9dHJpZ2dlcnMsIHJlbW90 ZXM9cmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cz1hZGRpdGlvbmFsQXJndW1lbnRzKSkKICAg ICAgICAgaWYgY2hlY2tSZWxldmFuY2U6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tQ YXRjaFJlbGV2YW5jZSgpKQotICAgICAgICBzZWxmLmFkZFN0ZXAoVmFsaWRhdGVQYXRjaCgpKQor ICAgICAgICBzZWxmLmFkZFN0ZXAoVmFsaWRhdGVQYXRjaCh2ZXJpZnljcXBsdXM9dmVyaWZ5Y3Fw bHVzKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFByaW50Q29uZmlndXJhdGlvbigpKQogICAgICAg ICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2UoKSkKICAgICAgICAgIyBDaGVja091dFNvdXJj ZSBzdGVwIHB1bGxzIHRoZSBsYXRlc3QgcmV2aXNpb24sIHNpbmNlIHdlIHVzZSBhbHdheXNVc2VM YXRlc3Q9VHJ1ZS4gV2l0aG91dCBhbHdheXNVc2VMYXRlc3QgQnVpbGRib3Qgd2lsbApAQCAtMTkx LDkgKzE5MSw5IEBAIGNsYXNzIFNlcnZpY2VzRmFjdG9yeShGYWN0b3J5KToKIAogY2xhc3MgQ29t bWl0UXVldWVGYWN0b3J5KEZhY3RvcnkpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9y bSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5vbmUsIHRyaWdnZXJzPU5vbmUs IGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBGYWN0b3J5Ll9f aW5pdF9fKHNlbGYsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXM9YXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vy cz10cmlnZ2VycywgYWRkaXRpb25hbEFyZ3VtZW50cz1hZGRpdGlvbmFsQXJndW1lbnRzKQorICAg ICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0 aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXM9YXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5 PUZhbHNlLCB0cmlnZ2Vycz10cmlnZ2VycywgYWRkaXRpb25hbEFyZ3VtZW50cz1hZGRpdGlvbmFs QXJndW1lbnRzLCB2ZXJpZnljcXBsdXM9VHJ1ZSkKICAgICAgICAgc2VsZi5hZGRTdGVwKEtpbGxP bGRQcm9jZXNzZXMoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQoc2tpcFVw bG9hZD1UcnVlKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKEtpbGxPbGRQcm9jZXNzZXMoKSkKLSAg ICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goYWRkVVJMcz1GYWxzZSkpCisgICAgICAg IHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKGFkZFVSTHM9RmFsc2UsIHZlcmlmeWNxcGx1cz1U cnVlKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdDFUZXN0cygpKQpJbmRleDogVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjU0ODU1 KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxOC0yMDIwIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpA QCAtMzI5LDEwICszMjksMTEgQEAgY2xhc3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRT dGVwKQogICAgIGJ1Z19vcGVuX3N0YXR1c2VzID0gWydVTkNPTkZJUk1FRCcsICdORVcnLCAnQVNT SUdORUQnLCAnUkVPUEVORUQnXQogICAgIGJ1Z19jbG9zZWRfc3RhdHVzZXMgPSBbJ1JFU09MVkVE JywgJ1ZFUklGSUVEJywgJ0NMT1NFRCddCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgdmVyaWZ5 T2Jzb2xldGU9VHJ1ZSwgdmVyaWZ5QnVnQ2xvc2VkPVRydWUsIHZlcmlmeVJldmlld0RlbmllZD1U cnVlLCBhZGRVUkxzPVRydWUsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdmVy aWZ5T2Jzb2xldGU9VHJ1ZSwgdmVyaWZ5QnVnQ2xvc2VkPVRydWUsIHZlcmlmeVJldmlld0Rlbmll ZD1UcnVlLCBhZGRVUkxzPVRydWUsIHZlcmlmeWNxcGx1cz1GYWxzZSwgKiprd2FyZ3MpOgogICAg ICAgICBzZWxmLnZlcmlmeU9ic29sZXRlID0gdmVyaWZ5T2Jzb2xldGUKICAgICAgICAgc2VsZi52 ZXJpZnlCdWdDbG9zZWQgPSB2ZXJpZnlCdWdDbG9zZWQKICAgICAgICAgc2VsZi52ZXJpZnlSZXZp ZXdEZW5pZWQgPSB2ZXJpZnlSZXZpZXdEZW5pZWQKKyAgICAgICAgc2VsZi52ZXJpZnljcXBsdXMg PSB2ZXJpZnljcXBsdXMKICAgICAgICAgc2VsZi5hZGRVUkxzID0gYWRkVVJMcwogICAgICAgICBi dWlsZHN0ZXAuQnVpbGRTdGVwLl9faW5pdF9fKHNlbGYpCiAKQEAgLTQxMiw2ICs0MTMsMTcgQEAg Y2xhc3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVwKQogICAgICAgICAgICAgICAg IHJldHVybiAxCiAgICAgICAgIHJldHVybiAwCiAKKyAgICBkZWYgX2lzX3BhdGNoX2NxX3BsdXMo c2VsZiwgcGF0Y2hfaWQpOgorICAgICAgICBwYXRjaF9qc29uID0gc2VsZi5nZXRfcGF0Y2hfanNv bihwYXRjaF9pZCkKKyAgICAgICAgaWYgbm90IHBhdGNoX2pzb246CisgICAgICAgICAgICBzZWxm Ll9hZGRUb0xvZygnc3RkaW8nLCAnVW5hYmxlIHRvIGZldGNoIHBhdGNoIHt9LlxuJy5mb3JtYXQo cGF0Y2hfaWQpKQorICAgICAgICAgICAgcmV0dXJuIC0xCisKKyAgICAgICAgZm9yIGZsYWcgaW4g cGF0Y2hfanNvbi5nZXQoJ2ZsYWdzJywgW10pOgorICAgICAgICAgICAgaWYgZmxhZy5nZXQoJ25h bWUnKSA9PSAnY29tbWl0LXF1ZXVlJyBhbmQgZmxhZy5nZXQoJ3N0YXR1cycpID09ICcrJzoKKyAg ICAgICAgICAgICAgICByZXR1cm4gMQorICAgICAgICByZXR1cm4gMAorCiAgICAgZGVmIF9pc19i dWdfY2xvc2VkKHNlbGYsIGJ1Z19pZCk6CiAgICAgICAgIGlmIG5vdCBidWdfaWQ6CiAgICAgICAg ICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAnU2tpcHBpbmcgYnVnIHN0YXR1cyB2YWxpZGF0 aW9uIHNpbmNlIGJ1ZyBpZCBpcyBOb25lLlxuJykKQEAgLTQ2Niw2ICs0NzgsMTEgQEAgY2xhc3Mg VmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVwKQogICAgICAgICAgICAgc2VsZi5za2lw X2J1aWxkKCdQYXRjaCB7fSBpcyBtYXJrZWQgci0nLmZvcm1hdChwYXRjaF9pZCkpCiAgICAgICAg ICAgICByZXR1cm4gTm9uZQogCisgICAgICAgIGNxX3BsdXMgPSBzZWxmLl9pc19wYXRjaF9jcV9w bHVzKHBhdGNoX2lkKSBpZiBzZWxmLnZlcmlmeWNxcGx1cyBlbHNlIDEKKyAgICAgICAgaWYgY3Ff cGx1cyAhPSAxOgorICAgICAgICAgICAgc2VsZi5za2lwX2J1aWxkKCdQYXRjaCB7fSBpcyBub3Qg bWFya2VkIGNxKy4nLmZvcm1hdChwYXRjaF9pZCkpCisgICAgICAgICAgICByZXR1cm4gTm9uZQor CiAgICAgICAgIGlmIG9ic29sZXRlID09IC0xIG9yIHJldmlld19kZW5pZWQgPT0gLTEgb3IgYnVn X2Nsb3NlZCA9PSAtMToKICAgICAgICAgICAgIHNlbGYuZmluaXNoZWQoV0FSTklOR1MpCiAgICAg ICAgICAgICBzZWxmLnNldFByb3BlcnR5KCd2YWxpZGF0ZWQnLCBGYWxzZSkKQEAgLTQ3Nyw2ICs0 OTQsOCBAQCBjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXApCiAgICAgICAg ICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAnUGF0Y2ggaXMgbm90IG9ic29sZXRlLlxuJykK ICAgICAgICAgaWYgc2VsZi52ZXJpZnlSZXZpZXdEZW5pZWQ6CiAgICAgICAgICAgICBzZWxmLl9h ZGRUb0xvZygnc3RkaW8nLCAnUGF0Y2ggaXMgbm90IG1hcmtlZCByLS5cbicpCisgICAgICAgIGlm IHNlbGYudmVyaWZ5Y3FwbHVzOgorICAgICAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywg J1BhdGNoIGlzIG1hcmtlZCBjcSsuXG4nKQogICAgICAgICBzZWxmLmZpbmlzaGVkKFNVQ0NFU1Mp CiAgICAgICAgIHJldHVybiBOb25lCiAK 388320 2020-01-21 10:50:31 -0800 2020-01-21 12:05:52 -0800 Patch bug-206530-20200121135029.patch text/plain 10478 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDg1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTAxLTIxICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBjb21taXQtcXVldWUgc2hvdWxkIGNoZWNrIGNxKyBmbGFnCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY1MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAgICAgVmFsaWRhdGVQYXRjaC5faXNf cGF0Y2hfY3FfcGx1cyk6IE1ldGhvZCB0byBjaGVjayBjcSsgZmxhZyBvbiBwYXRjaC4KKyAgICAg ICAgKFZhbGlkYXRlUGF0Y2guc3RhcnQpOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weTogVXBkYXRlZCB1bml0LXRlc3RzLgorCiAyMDIwLTAx LTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdz XSBBZGQgYnVpbGQgYW5kIGxheW91dC10ZXN0IHN0ZXBzIGZvciBjb21taXQtcXVldWUgaW4gbmV3 IGV3cwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9y aWVzLnB5CShyZXZpc2lvbiAyNTQ4NTUpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5 cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENv cHlyaWdodCAoQykgMjAxOC0yMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMK ICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzMsMTIgKzMzLDEyIEBAIGZyb20gc3RlcHMg aW1wb3J0IChBcHBseVBhdGNoLCBBcHBseVdhdGMKIAogCiBjbGFzcyBGYWN0b3J5KGZhY3Rvcnku QnVpbGRGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCBidWlsZE9ubHk9VHJ1ZSwgdHJpZ2dlcnM9 Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIGNoZWNrUmVsZXZh bmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBj b25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVpbGRPbmx5PVRydWUsIHRy aWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCBjaGVj a1JlbGV2YW5jZT1GYWxzZSwgdmVyaWZ5Y3FwbHVzPUZhbHNlLCAqKmt3YXJncyk6CiAgICAgICAg IGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9faW5pdF9fKHNlbGYpCiAgICAgICAgIHNlbGYuYWRkU3Rl cChDb25maWd1cmVCdWlsZChwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1jb25maWd1 cmF0aW9uLCBhcmNoaXRlY3R1cmVzPWFyY2hpdGVjdHVyZXMsIGJ1aWxkT25seT1idWlsZE9ubHks IHRyaWdnZXJzPXRyaWdnZXJzLCByZW1vdGVzPXJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVudHM9 YWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIGlmIGNoZWNrUmVsZXZhbmNlOgogICAgICAg ICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKLSAgICAgICAgc2VsZi5h ZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0 Y2godmVyaWZ5Y3FwbHVzPXZlcmlmeWNxcGx1cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmlu dENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkp CiAgICAgICAgICMgQ2hlY2tPdXRTb3VyY2Ugc3RlcCBwdWxscyB0aGUgbGF0ZXN0IHJldmlzaW9u LCBzaW5jZSB3ZSB1c2UgYWx3YXlzVXNlTGF0ZXN0PVRydWUuIFdpdGhvdXQgYWx3YXlzVXNlTGF0 ZXN0IEJ1aWxkYm90IHdpbGwKQEAgLTE5MSw5ICsxOTEsOSBAQCBjbGFzcyBTZXJ2aWNlc0ZhY3Rv cnkoRmFjdG9yeSk6CiAKIGNsYXNzIENvbW1pdFF1ZXVlRmFjdG9yeShGYWN0b3J5KToKICAgICBk ZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0 dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dh cmdzKToKLSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybT1wbGF0Zm9ybSwg Y29uZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzPWFyY2hpdGVjdHVyZXMs IGJ1aWxkT25seT1GYWxzZSwgdHJpZ2dlcnM9dHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHM9 YWRkaXRpb25hbEFyZ3VtZW50cykKKyAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybT1wbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz PWFyY2hpdGVjdHVyZXMsIGJ1aWxkT25seT1GYWxzZSwgdHJpZ2dlcnM9dHJpZ2dlcnMsIGFkZGl0 aW9uYWxBcmd1bWVudHM9YWRkaXRpb25hbEFyZ3VtZW50cywgdmVyaWZ5Y3FwbHVzPVRydWUpCiAg ICAgICAgIHNlbGYuYWRkU3RlcChLaWxsT2xkUHJvY2Vzc2VzKCkpCiAgICAgICAgIHNlbGYuYWRk U3RlcChDb21waWxlV2ViS2l0KHNraXBVcGxvYWQ9VHJ1ZSkpCiAgICAgICAgIHNlbGYuYWRkU3Rl cChLaWxsT2xkUHJvY2Vzc2VzKCkpCi0gICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNo KGFkZFVSTHM9RmFsc2UpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoVmFsaWRhdGVQYXRjaChhZGRV UkxzPUZhbHNlLCB2ZXJpZnljcXBsdXM9VHJ1ZSkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChSdW5X ZWJLaXQxVGVzdHMoKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9m YWN0b3JpZXNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjU0ODU1KQorKysg VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQko d29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBAQCBjbGFzcyBUZXN0R2VuZXJpY0ZhY3Rvcnko VGVzdENhc2UpOgogICAgICAgICBmYWN0b3J5ID0gZmFjdG9yaWVzLkZhY3RvcnkocGxhdGZvcm09 J2lvcy1zaW11bGF0b3ItMTMnLCBjb25maWd1cmF0aW9uPSdyZWxlYXNlJywgYXJjaGl0ZWN0dXJl cz0nYXJtNjQnKQogICAgICAgICBzZWxmLmFzc2VydEJ1aWxkU3RlcHMoZmFjdG9yeS5zdGVwcywg WwogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ29uZmlndXJlQnVpbGQsIHBs YXRmb3JtPSdpb3Mtc2ltdWxhdG9yLTEzJywgY29uZmlndXJhdGlvbj0ncmVsZWFzZScsIGFyY2hp dGVjdHVyZXM9J2FybTY0JywgYnVpbGRPbmx5PVRydWUsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9 Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lKSwKLSAgICAgICAgICAgIF9CdWlsZFN0ZXBG YWN0b3J5KHN0ZXBzLlZhbGlkYXRlUGF0Y2gpLAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rv cnkoc3RlcHMuVmFsaWRhdGVQYXRjaCwgdmVyaWZ5Y3FwbHVzPUZhbHNlKSwKICAgICAgICAgICAg IF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlByaW50Q29uZmlndXJhdGlvbiksCiAgICAgICAgICAg ICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5DaGVja091dFNvdXJjZSksCiAgICAgICAgICAgICBf QnVpbGRTdGVwRmFjdG9yeShzdGVwcy5DaGVja091dFNwZWNpZmljUmV2aXNpb24pLApAQCAtNjMs NyArNjMsNyBAQCBjbGFzcyBUZXN0R2VuZXJpY0ZhY3RvcnkoVGVzdENhc2UpOgogICAgICAgICBz ZWxmLmFzc2VydEJ1aWxkU3RlcHMoZmFjdG9yeS5zdGVwcywgWwogICAgICAgICAgICAgX0J1aWxk U3RlcEZhY3Rvcnkoc3RlcHMuQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPSdpb3Mtc2ltdWxhdG9y LTEzJywgY29uZmlndXJhdGlvbj0ncmVsZWFzZScsIGFyY2hpdGVjdHVyZXM9J2FybTY0JywgYnVp bGRPbmx5PVRydWUsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3Vt ZW50cz1Ob25lKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNoZWNrUGF0 Y2hSZWxldmFuY2UpLAotICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRh dGVQYXRjaCksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5WYWxpZGF0ZVBh dGNoLCB2ZXJpZnljcXBsdXM9RmFsc2UpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnko c3RlcHMuUHJpbnRDb25maWd1cmF0aW9uKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5 KHN0ZXBzLkNoZWNrT3V0U291cmNlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0 ZXBzLkNoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbiksCkBAIC0xMDQsNyArMTA0LDcgQEAgY2xhc3Mg VGVzdFRlc3RzRmFjdG9yeShUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0QnVpbGRTdGVw cyhmYWN0b3J5LnN0ZXBzLCBbCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5D b25maWd1cmVCdWlsZCwgcGxhdGZvcm09JyonLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVj dHVyZXM9Tm9uZSwgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vycz1Ob25lLCByZW1vdGVzPU5vbmUs IGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9y eShzdGVwcy5DaGVja1BhdGNoUmVsZXZhbmNlKSwKLSAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0 b3J5KHN0ZXBzLlZhbGlkYXRlUGF0Y2gpLAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnko c3RlcHMuVmFsaWRhdGVQYXRjaCwgdmVyaWZ5Y3FwbHVzPUZhbHNlKSwKICAgICAgICAgICAgIF9C dWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlByaW50Q29uZmlndXJhdGlvbiksCiAgICAgICAgICAgICBf QnVpbGRTdGVwRmFjdG9yeShzdGVwcy5DaGVja091dFNvdXJjZSksCiAgICAgICAgICAgICBfQnVp bGRTdGVwRmFjdG9yeShzdGVwcy5DaGVja091dFNwZWNpZmljUmV2aXNpb24pLApAQCAtMTE2LDcg KzExNiw3IEBAIGNsYXNzIFRlc3RUZXN0c0ZhY3RvcnkoVGVzdENhc2UpOgogICAgICAgICBmYWN0 b3J5ID0gZmFjdG9yaWVzLldlYktpdFBlcmxGYWN0b3J5KHBsYXRmb3JtPScqJywgY29uZmlndXJh dGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0QnVpbGRT dGVwcyhmYWN0b3J5LnN0ZXBzLCBbCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5Db25maWd1cmVCdWlsZCwgcGxhdGZvcm09JyonLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hp dGVjdHVyZXM9Tm9uZSwgYnVpbGRPbmx5PUZhbHNlLCB0cmlnZ2Vycz1Ob25lLCByZW1vdGVzPU5v bmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSksCi0gICAgICAgICAgICBfQnVpbGRTdGVwRmFj dG9yeShzdGVwcy5WYWxpZGF0ZVBhdGNoKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5 KHN0ZXBzLlZhbGlkYXRlUGF0Y2gsIHZlcmlmeWNxcGx1cz1GYWxzZSksCiAgICAgICAgICAgICBf QnVpbGRTdGVwRmFjdG9yeShzdGVwcy5QcmludENvbmZpZ3VyYXRpb24pLAogICAgICAgICAgICAg X0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tPdXRTb3VyY2UpLAogICAgICAgICAgICAgX0J1 aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uKSwKQEAgLTEyOSw3 ICsxMjksNyBAQCBjbGFzcyBUZXN0VGVzdHNGYWN0b3J5KFRlc3RDYXNlKToKICAgICAgICAgc2Vs Zi5hc3NlcnRCdWlsZFN0ZXBzKGZhY3Rvcnkuc3RlcHMsIFsKICAgICAgICAgICAgIF9CdWlsZFN0 ZXBGYWN0b3J5KHN0ZXBzLkNvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9ybT0nKicsIGNvbmZpZ3VyYXRp b249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCBidWlsZE9ubHk9RmFsc2UsIHRyaWdnZXJzPU5v bmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lKSwKICAgICAgICAgICAg IF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNoZWNrUGF0Y2hSZWxldmFuY2UpLAotICAgICAgICAg ICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRhdGVQYXRjaCksCisgICAgICAgICAgICBf QnVpbGRTdGVwRmFjdG9yeShzdGVwcy5WYWxpZGF0ZVBhdGNoLCB2ZXJpZnljcXBsdXM9RmFsc2Up LAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuUHJpbnRDb25maWd1cmF0aW9u KSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNoZWNrT3V0U291cmNlKSwK ICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNoZWNrT3V0U3BlY2lmaWNSZXZp c2lvbiksCkBAIC0xNDMsNyArMTQzLDcgQEAgY2xhc3MgVGVzdFRlc3RzRmFjdG9yeShUZXN0Q2Fz ZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0QnVpbGRTdGVwcyhmYWN0b3J5LnN0ZXBzLCBbCiAgICAg ICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5Db25maWd1cmVCdWlsZCwgcGxhdGZvcm09 JyonLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVpbGRPbmx5PUZh bHNlLCB0cmlnZ2Vycz1Ob25lLCByZW1vdGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9u ZSksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5DaGVja1BhdGNoUmVsZXZh bmNlKSwKLSAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlZhbGlkYXRlUGF0Y2gp LAorICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRhdGVQYXRjaCwgdmVy aWZ5Y3FwbHVzPUZhbHNlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlBy aW50Q29uZmlndXJhdGlvbiksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5D aGVja091dFNvdXJjZSksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5DaGVj a091dFNwZWNpZmljUmV2aXNpb24pLApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjU0ODU1KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAot IyBDb3B5cmlnaHQgKEMpIDIwMTgtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisjIENvcHlyaWdodCAoQykgMjAxOC0yMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzI5LDEwICszMjksMTEgQEAgY2xh c3MgVmFsaWRhdGVQYXRjaChidWlsZHN0ZXAuQnVpbGRTdGVwKQogICAgIGJ1Z19vcGVuX3N0YXR1 c2VzID0gWydVTkNPTkZJUk1FRCcsICdORVcnLCAnQVNTSUdORUQnLCAnUkVPUEVORUQnXQogICAg IGJ1Z19jbG9zZWRfc3RhdHVzZXMgPSBbJ1JFU09MVkVEJywgJ1ZFUklGSUVEJywgJ0NMT1NFRCdd CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgdmVyaWZ5T2Jzb2xldGU9VHJ1ZSwgdmVyaWZ5QnVn Q2xvc2VkPVRydWUsIHZlcmlmeVJldmlld0RlbmllZD1UcnVlLCBhZGRVUkxzPVRydWUsICoqa3dh cmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdmVyaWZ5T2Jzb2xldGU9VHJ1ZSwgdmVyaWZ5 QnVnQ2xvc2VkPVRydWUsIHZlcmlmeVJldmlld0RlbmllZD1UcnVlLCBhZGRVUkxzPVRydWUsIHZl cmlmeWNxcGx1cz1GYWxzZSk6CiAgICAgICAgIHNlbGYudmVyaWZ5T2Jzb2xldGUgPSB2ZXJpZnlP YnNvbGV0ZQogICAgICAgICBzZWxmLnZlcmlmeUJ1Z0Nsb3NlZCA9IHZlcmlmeUJ1Z0Nsb3NlZAog ICAgICAgICBzZWxmLnZlcmlmeVJldmlld0RlbmllZCA9IHZlcmlmeVJldmlld0RlbmllZAorICAg ICAgICBzZWxmLnZlcmlmeWNxcGx1cyA9IHZlcmlmeWNxcGx1cwogICAgICAgICBzZWxmLmFkZFVS THMgPSBhZGRVUkxzCiAgICAgICAgIGJ1aWxkc3RlcC5CdWlsZFN0ZXAuX19pbml0X18oc2VsZikK IApAQCAtNDEyLDYgKzQxMywxNyBAQCBjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWls ZFN0ZXApCiAgICAgICAgICAgICAgICAgcmV0dXJuIDEKICAgICAgICAgcmV0dXJuIDAKIAorICAg IGRlZiBfaXNfcGF0Y2hfY3FfcGx1cyhzZWxmLCBwYXRjaF9pZCk6CisgICAgICAgIHBhdGNoX2pz b24gPSBzZWxmLmdldF9wYXRjaF9qc29uKHBhdGNoX2lkKQorICAgICAgICBpZiBub3QgcGF0Y2hf anNvbjoKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdVbmFibGUgdG8gZmV0 Y2ggcGF0Y2gge30uXG4nLmZvcm1hdChwYXRjaF9pZCkpCisgICAgICAgICAgICByZXR1cm4gLTEK KworICAgICAgICBmb3IgZmxhZyBpbiBwYXRjaF9qc29uLmdldCgnZmxhZ3MnLCBbXSk6CisgICAg ICAgICAgICBpZiBmbGFnLmdldCgnbmFtZScpID09ICdjb21taXQtcXVldWUnIGFuZCBmbGFnLmdl dCgnc3RhdHVzJykgPT0gJysnOgorICAgICAgICAgICAgICAgIHJldHVybiAxCisgICAgICAgIHJl dHVybiAwCisKICAgICBkZWYgX2lzX2J1Z19jbG9zZWQoc2VsZiwgYnVnX2lkKToKICAgICAgICAg aWYgbm90IGJ1Z19pZDoKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdTa2lw cGluZyBidWcgc3RhdHVzIHZhbGlkYXRpb24gc2luY2UgYnVnIGlkIGlzIE5vbmUuXG4nKQpAQCAt NDY2LDYgKzQ3OCwxMSBAQCBjbGFzcyBWYWxpZGF0ZVBhdGNoKGJ1aWxkc3RlcC5CdWlsZFN0ZXAp CiAgICAgICAgICAgICBzZWxmLnNraXBfYnVpbGQoJ1BhdGNoIHt9IGlzIG1hcmtlZCByLScuZm9y bWF0KHBhdGNoX2lkKSkKICAgICAgICAgICAgIHJldHVybiBOb25lCiAKKyAgICAgICAgY3FfcGx1 cyA9IHNlbGYuX2lzX3BhdGNoX2NxX3BsdXMocGF0Y2hfaWQpIGlmIHNlbGYudmVyaWZ5Y3FwbHVz IGVsc2UgMQorICAgICAgICBpZiBjcV9wbHVzICE9IDE6CisgICAgICAgICAgICBzZWxmLnNraXBf YnVpbGQoJ1BhdGNoIHt9IGlzIG5vdCBtYXJrZWQgY3ErLicuZm9ybWF0KHBhdGNoX2lkKSkKKyAg ICAgICAgICAgIHJldHVybiBOb25lCisKICAgICAgICAgaWYgb2Jzb2xldGUgPT0gLTEgb3IgcmV2 aWV3X2RlbmllZCA9PSAtMSBvciBidWdfY2xvc2VkID09IC0xOgogICAgICAgICAgICAgc2VsZi5m aW5pc2hlZChXQVJOSU5HUykKICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3ZhbGlkYXRl ZCcsIEZhbHNlKQpAQCAtNDc3LDYgKzQ5NCw4IEBAIGNsYXNzIFZhbGlkYXRlUGF0Y2goYnVpbGRz dGVwLkJ1aWxkU3RlcCkKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdQYXRj aCBpcyBub3Qgb2Jzb2xldGUuXG4nKQogICAgICAgICBpZiBzZWxmLnZlcmlmeVJldmlld0Rlbmll ZDoKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdQYXRjaCBpcyBub3QgbWFy a2VkIHItLlxuJykKKyAgICAgICAgaWYgc2VsZi52ZXJpZnljcXBsdXM6CisgICAgICAgICAgICBz ZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAnUGF0Y2ggaXMgbWFya2VkIGNxKy5cbicpCiAgICAgICAg IHNlbGYuZmluaXNoZWQoU1VDQ0VTUykKICAgICAgICAgcmV0dXJuIE5vbmUKIAo=