222432 2021-02-25 12:28:41 -0800 [run-webkit-tests] Use webkitscmpy when reporting results 2021-03-02 14:53:11 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu ews-watchlist glenn slewis webkit-bug-importer oldest_to_newest 1733457 0 jbedard 2021-02-25 12:28:41 -0800 We should use webkitscmpy when reporting results, since it supports identifiers and has better unit testing. 1733458 1 webkit-bug-importer 2021-02-25 12:29:05 -0800 <rdar://problem/74755765> 1733462 2 421554 jbedard 2021-02-25 12:33:05 -0800 Created attachment 421554 Patch 1734886 3 421554 aakash_jain 2021-03-02 09:34:21 -0800 Comment on attachment 421554 Patch rs=me 1734962 4 421976 jbedard 2021-03-02 12:08:05 -0800 Created attachment 421976 Patch 1734993 5 421985 jbedard 2021-03-02 13:33:20 -0800 Created attachment 421985 Patch 1735044 6 ews-feeder 2021-03-02 14:53:09 -0800 Committed r273762: <https://commits.webkit.org/r273762> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421985. 421554 2021-02-25 12:33:05 -0800 2021-03-02 12:08:03 -0800 Patch bug-222432-20210225123304.patch text/plain 9035 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzUwMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIxLTAyLTI1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gVXNlIHdlYmtpdHNjbXB5IHdoZW4gcmVw b3J0aW5nIHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyMjQzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ3NTU3NjU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBCdW1wIHZl cnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbW9ja3MvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0KTogVGhlIHJvb3QgZGlyZWN0b3J5 IHNob3VsZCBiZSB0cmVhdGVkIGFzIGlmIGl0IGRvZXMgbm90IGV4aXN0LgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoU3VtbWFyaXplZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3JldmlzaW9u KTogVXNlIHdlYmtpdHNjbXB5J3MgbW9jayByZXBvc2l0b3J5LgorICAgICAgICAoU3VtbWFyaXpl ZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3JldmlzaW9uX2dpdCk6IEFkZGVkLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zvcl91 cGxvYWQpOiBVc2Ugd2Via2l0c2NtcHkgaW5zdGVhZCBvZiB3ZWJraXRweSBmb3IgcmVwb3NpdG9y eSBtYW5pcHVsYXRpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5p dHRlc3QucHk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2NvbW1pdHNfZm9yX3VwbG9hZCk6IFVz ZSB3ZWJraXRzY21weSdzIG1vY2sgcmVwb3NpdG9yeS4KKyAgICAgICAgKFBvcnRUZXN0LnRlc3Rf Y29tbWl0c19mb3JfdXBsb2FkX2dpdF9zdm4pOiBBZGRlZC4KKwogMjAyMS0wMi0yNSAgSm9uYXRo YW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICBbYnVpbGQud2Via2l0Lm9y Z10gU3RvcCBwYXNzaW5nIC0tbWFzdGVyLW5hbWUgdG8gcnVuLXdlYmtpdC10ZXN0cwpJbmRleDog VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJKHJldmlzaW9u IDI3MzQ5OCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAo CiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249JzAuMTEuMScsCisgICAgdmVy c2lvbj0nMC4xMS4yJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRl cmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRp b249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18u cHkJKHJldmlzaW9uIDI3MzQ5OCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3 IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNv cmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBh Y2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAxMSwgMSkK K3ZlcnNpb24gPSBWZXJzaW9uKDAsIDExLCAyKQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr YWdlKCdlbnRyeXBvaW50cycsIFZlcnNpb24oMCwgMywgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0 ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQpJbmRleDogVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjczNDk4KQorKysgVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02NCw3ICs2NCw3IEBAIGNsYXNzIEdpdChtb2Nrcy5TdWJw cm9jZXNzKToKICAgICAgICAgc2VsZi50YWdzID0ge30KIAogICAgICAgICAjIElmIHRoZSBkaXJl Y3RvcnkgcHJvdmlkZWQgYWN0dWFsbHkgZXhpc3RzLCBwb3B1bGF0ZSBpdAotICAgICAgICBpZiBv cy5wYXRoLmlzZGlyKHNlbGYucGF0aCk6CisgICAgICAgIGlmIHNlbGYucGF0aCAhPSAnLycgYW5k IG9zLnBhdGguaXNkaXIoc2VsZi5wYXRoKToKICAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmlz ZGlyKG9zLnBhdGguam9pbihzZWxmLnBhdGgsICcuZ2l0JykpOgogICAgICAgICAgICAgICAgIG9z Lm1rZGlyKG9zLnBhdGguam9pbihzZWxmLnBhdGgsICcuZ2l0JykpCiAgICAgICAgICAgICB3aXRo IG9wZW4ob3MucGF0aC5qb2luKHNlbGYucGF0aCwgJy5naXQnLCAnY29uZmlnJyksICd3JykgYXMg Y29uZmlnOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3Qu cHkJKHJldmlzaW9uIDI3MzQ5OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBA IC0zNSw2ICszNSw4IEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscyBpbXBvcnQK IGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscyBpbXBvcnQgdGVzdF9ydW5fcmVzdWx0 cwogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucwogCitmcm9t IHdlYmtpdHNjbXB5IGltcG9ydCBtb2NrcworCiAKIGRlZiBnZXRfcmVzdWx0KHRlc3RfbmFtZSwg cmVzdWx0X3R5cGU9dGVzdF9leHBlY3RhdGlvbnMuUEFTUywgcnVuX3RpbWU9MCk6CiAgICAgZmFp bHVyZXMgPSBbXQpAQCAtMTYwLDkgKzE2MiwxNiBAQCBjbGFzcyBTdW1tYXJpemVkUmVzdWx0c1Rl c3QodW5pdHRlc3QuVGVzCiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90RXF1YWxzKHN1bW1hcnlbJ3Jl dmlzaW9uJ10sICcnKQogCiAgICAgZGVmIHRlc3Rfc3ZuX3JldmlzaW9uKHNlbGYpOgotICAgICAg ICBzZWxmLnBvcnQuX29wdGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXInCi0gICAg ICAgIHN1bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBlY3RlZD1GYWxz ZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHN1bW1hcnlbJ3JldmlzaW9uJ10sICcyNzM4NDk5JykKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2Nh bC5Tdm4ocGF0aD0nLycpLCBtb2Nrcy5sb2NhbC5HaXQoKToKKyAgICAgICAgICAgIHNlbGYucG9y dC5fb3B0aW9ucy5idWlsZGVyX25hbWUgPSAnZHVtbXkgYnVpbGRlcicKKyAgICAgICAgICAgIHN1 bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZi5wb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFz c2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhz dW1tYXJ5WydyZXZpc2lvbiddLCAnNicpCisKKyAgICBkZWYgdGVzdF9zdm5fcmV2aXNpb25fZ2l0 KHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bigpLCBtb2Nrcy5sb2NhbC5HaXQo cGF0aD0nLycsIGdpdF9zdm49VHJ1ZSk6CisgICAgICAgICAgICBzZWxmLnBvcnQuX29wdGlvbnMu YnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXInCisgICAgICAgICAgICBzdW1tYXJ5ID0gc3Vt bWFyaXplZF9yZXN1bHRzKHNlbGYucG9ydCwgZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2Us IGZsYWt5PUZhbHNlKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3VtbWFyeVsncmV2 aXNpb24nXSwgJzYnKQogCiAgICAgZGVmIHRlc3Rfc3VtbWFyaXplZF9yZXN1bHRzX3dvbnRmaXgo c2VsZik6CiAgICAgICAgIHNlbGYucG9ydC5fb3B0aW9ucy5idWlsZGVyX25hbWUgPSAnZHVtbXkg YnVpbGRlcicKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CShyZXZpc2lvbiAy NzM0OTgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkod29ya2luZyBj b3B5KQpAQCAtNDIsNiArNDIsNyBAQCBpbXBvcnQgc3lzCiBmcm9tIGNvbGxlY3Rpb25zIGltcG9y dCBPcmRlcmVkRGljdAogZnJvbSBmdW5jdG9vbHMgaW1wb3J0IHBhcnRpYWwKIGZyb20gd2Via2l0 Y29yZXB5IGltcG9ydCBzdHJpbmdfdXRpbHMsIGRlY29yYXRvcnMKK2Zyb20gd2Via2l0c2NtcHkg aW1wb3J0IGxvY2FsCiAKIGZyb20gd2Via2l0cHkuY29tbW9uIGltcG9ydCBmaW5kX2ZpbGVzCiBm cm9tIHdlYmtpdHB5LmNvbW1vbiBpbXBvcnQgcmVhZF9jaGVja3N1bV9mcm9tX3BuZwpAQCAtMTUx MSwzMSArMTUxMiwzMSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgZGVmIGNvbW1pdHNfZm9y X3VwbG9hZChzZWxmKToKICAgICAgICAgZnJvbSB3ZWJraXRweS5yZXN1bHRzLnVwbG9hZCBpbXBv cnQgVXBsb2FkCiAKLSAgICAgICAgc2VsZi5ob3N0LmluaXRpYWxpemVfc2NtKCkKICAgICAgICAg cmVwb3MgPSB7fQogICAgICAgICBpZiBwb3J0X2NvbmZpZy5hcHBsZV9hZGRpdGlvbnMoKSBhbmQg Z2V0YXR0cihwb3J0X2NvbmZpZy5hcHBsZV9hZGRpdGlvbnMoKSwgJ3JlcG9zJywgRmFsc2UpOgot ICAgICAgICAgICAgcmVwb3MgPSBwb3J0X2NvbmZpZy5hcHBsZV9hZGRpdGlvbnMoKS5yZXBvcygp Ci0gICAgICAgIHJlcG9zWyd3ZWJraXQnXSA9IHNlbGYuaG9zdC5zY20oKS5jaGVja291dF9yb290 Ci0gICAgICAgIGNvbW1pdHMgPSBbXQotICAgICAgICBmb3IgcmVwb19pZCwgcGF0aCBpbiByZXBv cy5pdGVtcygpOgotICAgICAgICAgICAgc2NtID0gU0NNRGV0ZWN0b3Ioc2VsZi5fZmlsZXN5c3Rl bSwgc2VsZi5fZXhlY3V0aXZlKS5kZXRlY3Rfc2NtX3N5c3RlbShwYXRoKQorICAgICAgICAgICAg cmVwb3MgPSB7CisgICAgICAgICAgICAgICAgbmFtZTogbG9jYWwuU2NtLmZyb21fcGF0aChwdGgp CisgICAgICAgICAgICAgICAgZm9yIG5hbWUsIHB0aCBpbiBwb3J0X2NvbmZpZy5hcHBsZV9hZGRp dGlvbnMoKS5yZXBvcygpLml0ZW1zKCkKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgIyBJ ZiB1c2luZyBnaXQtc3ZuIGZvciBXZWJLaXQsIHByZWZlciB0aGUgU1ZOIGJyYW5jaC9yZXZpc2lv bi4KLSAgICAgICAgICAgIHN2bl9yZXZpc2lvbiA9IHNjbS5zdm5fcmV2aXNpb24ocGF0aCkKLSAg ICAgICAgICAgIGlmIHJlcG9faWQgPT0gJ3dlYmtpdCcgYW5kIHN2bl9yZXZpc2lvbjoKLSAgICAg ICAgICAgICAgICB1c2VkX3JldmlzaW9uID0gc3ZuX3JldmlzaW9uCi0gICAgICAgICAgICBlbHNl OgotICAgICAgICAgICAgICAgIHVzZWRfcmV2aXNpb24gPSBzY20ubmF0aXZlX3JldmlzaW9uKHBh dGgpCisgICAgICAgIGlmICd3ZWJraXQnIG5vdCBpbiByZXBvczoKKyAgICAgICAgICAgIHRyeToK KyAgICAgICAgICAgICAgICByZXBvc1snd2Via2l0J10gPSBsb2NhbC5TY20uZnJvbV9wYXRoKHNl bGYuaG9zdC5maWxlc3lzdGVtLmdldGN3ZCgpKQorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3I6 CisgICAgICAgICAgICAgICAgcmVwb3NbJ3dlYmtpdCddID0gbG9jYWwuU2NtLmZyb21fcGF0aChz ZWxmLmhvc3QuZmlsZXN5c3RlbS5kaXJuYW1lKF9fZmlsZV9fKSkKIAotICAgICAgICAgICAgc3Zu X2JyYW5jaCA9IHNjbS5zdm5fYnJhbmNoKHBhdGgpCi0gICAgICAgICAgICBpZiByZXBvX2lkID09 ICd3ZWJraXQnIGFuZCBzdm5fYnJhbmNoOgotICAgICAgICAgICAgICAgIHVzZWRfYnJhbmNoID0g c3ZuX2JyYW5jaAotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICB1c2VkX2JyYW5j aCA9IHNjbS5uYXRpdmVfYnJhbmNoKHBhdGgpCisgICAgICAgIGNvbW1pdHMgPSBbXQorICAgICAg ICBmb3IgcmVwb19pZCwgcmVwbyBpbiByZXBvcy5pdGVtcygpOgorICAgICAgICAgICAgY29tbWl0 ID0gcmVwby5jb21taXQoaW5jbHVkZV9sb2c9RmFsc2UsIGluY2x1ZGVfaWRlbnRpZmllcj1GYWxz ZSkKKworICAgICAgICAgICAgIyBTcGVjaWFsIGNhc2UgZm9yIFdlYktpdCBzaW5jZSB3ZSBoYXZl IG11bHRpcGxlIHJlcHJlc2VudGF0aW9ucyBhdCB0aGUgbW9tZW50CisgICAgICAgICAgICBicmFu Y2ggPSBjb21taXQuYnJhbmNoCisgICAgICAgICAgICBpZiByZXBvX2lkID09ICd3ZWJraXQnIGFu ZCBicmFuY2ggaW4gcmVwby5ERUZBVUxUX0JSQU5DSEVTOgorICAgICAgICAgICAgICAgIGJyYW5j aCA9ICd0cnVuaycKIAogICAgICAgICAgICAgY29tbWl0cy5hcHBlbmQoVXBsb2FkLmNyZWF0ZV9j b21taXQoCiAgICAgICAgICAgICAgICAgcmVwb3NpdG9yeV9pZD1yZXBvX2lkLAotICAgICAgICAg ICAgICAgIGlkPXVzZWRfcmV2aXNpb24sCi0gICAgICAgICAgICAgICAgYnJhbmNoPXVzZWRfYnJh bmNoLAorICAgICAgICAgICAgICAgIGlkPXN0cihjb21taXQucmV2aXNpb24gb3IgY29tbWl0Lmhh c2gpLAorICAgICAgICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICApKQogICAg ICAgICByZXR1cm4gY29tbWl0cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jh c2VfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2Jhc2VfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3MzQ5OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3 IEBAIGZyb20gd2Via2l0cHkucG9ydCBpbXBvcnQgUG9ydAogZnJvbSB3ZWJraXRweS5wb3J0LnRl c3QgaW1wb3J0IGFkZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbSwgVGVzdFBvcnQKIAog ZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUKK2Zyb20gd2Via2l0c2NtcHkg aW1wb3J0IG1vY2tzCiAKIAogZGVmIGNtcChhLCBiKToKQEAgLTMyMyw4ICszMjQsMTQgQEAgY2xh c3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICApCiAKICAgICBkZWYgdGVz dF9jb21taXRzX2Zvcl91cGxvYWQoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9y dChwb3J0X25hbWU9J2ZvbycpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoW3sncmVwb3NpdG9y eV9pZCc6ICd3ZWJraXQnLCAnaWQnOiAnMjczODQ5OScsICdicmFuY2gnOiAndHJ1bmsnfV0sIHBv cnQuY29tbWl0c19mb3JfdXBsb2FkKCkpCisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHBh dGg9Jy8nKSwgbW9ja3MubG9jYWwuR2l0KCk6CisgICAgICAgICAgICBwb3J0ID0gc2VsZi5tYWtl X3BvcnQocG9ydF9uYW1lPSdmb28nKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbeydy ZXBvc2l0b3J5X2lkJzogJ3dlYmtpdCcsICdpZCc6ICc2JywgJ2JyYW5jaCc6ICd0cnVuayd9XSwg cG9ydC5jb21taXRzX2Zvcl91cGxvYWQoKSkKKworICAgIGRlZiB0ZXN0X2NvbW1pdHNfZm9yX3Vw bG9hZF9naXRfc3ZuKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bigpLCBtb2Nr cy5sb2NhbC5HaXQocGF0aD0nLycsIGdpdF9zdm49VHJ1ZSk6CisgICAgICAgICAgICBwb3J0ID0g c2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdmb28nKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChbeydyZXBvc2l0b3J5X2lkJzogJ3dlYmtpdCcsICdpZCc6ICc2JywgJ2JyYW5jaCc6ICd0 cnVuayd9XSwgcG9ydC5jb21taXRzX2Zvcl91cGxvYWQoKSkKIAogCiBjbGFzcyBOYXR1cmFsQ29t cGFyZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgo= 421976 2021-03-02 12:08:05 -0800 2021-03-02 13:33:18 -0800 Patch bug-222432-20210302120804.patch text/plain 9016 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mzc1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIxLTAzLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gVXNlIHdlYmtpdHNjbXB5IHdoZW4gcmVw b3J0aW5nIHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyMjQzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ3NTU3NjU+CisKKyAgICAg ICAgUnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBCdW1w IHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0KTogVGhlIHJvb3QgZGlyZWN0 b3J5IHNob3VsZCBiZSB0cmVhdGVkIGFzIGlmIGl0IGRvZXMgbm90IGV4aXN0LgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3Vu aXR0ZXN0LnB5OgorICAgICAgICAoU3VtbWFyaXplZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3Jldmlz aW9uKTogVXNlIHdlYmtpdHNjbXB5J3MgbW9jayByZXBvc2l0b3J5LgorICAgICAgICAoU3VtbWFy aXplZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3JldmlzaW9uX2dpdCk6IEFkZGVkLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zv cl91cGxvYWQpOiBVc2Ugd2Via2l0c2NtcHkgaW5zdGVhZCBvZiB3ZWJraXRweSBmb3IgcmVwb3Np dG9yeSBtYW5pcHVsYXRpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Vf dW5pdHRlc3QucHk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2NvbW1pdHNfZm9yX3VwbG9hZCk6 IFVzZSB3ZWJraXRzY21weSdzIG1vY2sgcmVwb3NpdG9yeS4KKyAgICAgICAgKFBvcnRUZXN0LnRl c3RfY29tbWl0c19mb3JfdXBsb2FkX2dpdF9zdm4pOiBBZGRlZC4KKwogMjAyMS0wMy0wMiAgQWFr YXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBidWlsZC53 ZWJraXQub3JnIGxvYWRjb25maWcgc2ltaWxhciB0byBFV1MKSW5kZXg6IFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CShyZXZpc2lvbiAyNzM3NTApCisrKyBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkod29ya2luZyBjb3B5 KQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dl YmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScwLjExLjMnLAorICAgIHZlcnNpb249JzAuMTEuNCcs CiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQg YW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAog ICAgIGNsYXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAy NzM3NTApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1w b3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlw IGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVS TD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMTEsIDMpCit2ZXJzaW9uID0gVmVy c2lvbigwLCAxMSwgNCkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJz JywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9u b3RvbmljJywgVmVyc2lvbigxLCA1KSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5CShyZXZpc2lvbiAyNzM3NTApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkK QEAgLTY0LDcgKzY0LDcgQEAgY2xhc3MgR2l0KG1vY2tzLlN1YnByb2Nlc3MpOgogICAgICAgICBz ZWxmLnRhZ3MgPSB7fQogCiAgICAgICAgICMgSWYgdGhlIGRpcmVjdG9yeSBwcm92aWRlZCBhY3R1 YWxseSBleGlzdHMsIHBvcHVsYXRlIGl0Ci0gICAgICAgIGlmIG9zLnBhdGguaXNkaXIoc2VsZi5w YXRoKToKKyAgICAgICAgaWYgc2VsZi5wYXRoICE9ICcvJyBhbmQgb3MucGF0aC5pc2RpcihzZWxm LnBhdGgpOgogICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIob3MucGF0aC5qb2luKHNl bGYucGF0aCwgJy5naXQnKSk6CiAgICAgICAgICAgICAgICAgb3MubWtkaXIob3MucGF0aC5qb2lu KHNlbGYucGF0aCwgJy5naXQnKSkKICAgICAgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4o c2VsZi5wYXRoLCAnLmdpdCcsICdjb25maWcnKSwgJ3cnKSBhcyBjb25maWc6CkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0c191 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0c191bml0dGVzdC5weQkocmV2aXNpb24gMjczNzUw KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVu X3Jlc3VsdHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDggQEAgZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydAogZnJvbSB3ZWJraXRweS5sYXlv dXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X3J1bl9yZXN1bHRzCiBmcm9tIHdlYmtpdHB5LnRv b2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0 IG1vY2tzCisKIAogZGVmIGdldF9yZXN1bHQodGVzdF9uYW1lLCByZXN1bHRfdHlwZT10ZXN0X2V4 cGVjdGF0aW9ucy5QQVNTLCBydW5fdGltZT0wKToKICAgICBmYWlsdXJlcyA9IFtdCkBAIC0xNjAs OSArMTYyLDE2IEBAIGNsYXNzIFN1bW1hcml6ZWRSZXN1bHRzVGVzdCh1bml0dGVzdC5UZXMKICAg ICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbHMoc3VtbWFyeVsncmV2aXNpb24nXSwgJycpCiAKICAg ICBkZWYgdGVzdF9zdm5fcmV2aXNpb24oc2VsZik6Ci0gICAgICAgIHNlbGYucG9ydC5fb3B0aW9u cy5idWlsZGVyX25hbWUgPSAnZHVtbXkgYnVpbGRlcicKLSAgICAgICAgc3VtbWFyeSA9IHN1bW1h cml6ZWRfcmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBm bGFreT1GYWxzZSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3VtbWFyeVsncmV2aXNpb24n XSwgJzI3Mzg0OTknKQorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bihwYXRoPScvJyksIG1v Y2tzLmxvY2FsLkdpdCgpOgorICAgICAgICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJf bmFtZSA9ICdkdW1teSBidWlsZGVyJworICAgICAgICAgICAgc3VtbWFyeSA9IHN1bW1hcml6ZWRf cmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1G YWxzZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHN1bW1hcnlbJ3JldmlzaW9uJ10s ICc2JykKKworICAgIGRlZiB0ZXN0X3N2bl9yZXZpc2lvbl9naXQoc2VsZik6CisgICAgICAgIHdp dGggbW9ja3MubG9jYWwuU3ZuKCksIG1vY2tzLmxvY2FsLkdpdChwYXRoPScvJywgZ2l0X3N2bj1U cnVlKToKKyAgICAgICAgICAgIHNlbGYucG9ydC5fb3B0aW9ucy5idWlsZGVyX25hbWUgPSAnZHVt bXkgYnVpbGRlcicKKyAgICAgICAgICAgIHN1bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2Vs Zi5wb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCisgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzdW1tYXJ5WydyZXZpc2lvbiddLCAnNicpCiAKICAg ICBkZWYgdGVzdF9zdW1tYXJpemVkX3Jlc3VsdHNfd29udGZpeChzZWxmKToKICAgICAgICAgc2Vs Zi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVyJwpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI3Mzc1MCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3 IEBAIGltcG9ydCBzeXMKIGZyb20gY29sbGVjdGlvbnMgaW1wb3J0IE9yZGVyZWREaWN0CiBmcm9t IGZ1bmN0b29scyBpbXBvcnQgcGFydGlhbAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHN0cmlu Z191dGlscywgZGVjb3JhdG9ycworZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogZnJv bSB3ZWJraXRweS5jb21tb24gaW1wb3J0IGZpbmRfZmlsZXMKIGZyb20gd2Via2l0cHkuY29tbW9u IGltcG9ydCByZWFkX2NoZWNrc3VtX2Zyb21fcG5nCkBAIC0xNTExLDMxICsxNTEyLDMxIEBAIGNs YXNzIFBvcnQob2JqZWN0KToKICAgICBkZWYgY29tbWl0c19mb3JfdXBsb2FkKHNlbGYpOgogICAg ICAgICBmcm9tIHdlYmtpdHB5LnJlc3VsdHMudXBsb2FkIGltcG9ydCBVcGxvYWQKIAotICAgICAg ICBzZWxmLmhvc3QuaW5pdGlhbGl6ZV9zY20oKQogICAgICAgICByZXBvcyA9IHt9CiAgICAgICAg IGlmIHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpIGFuZCBnZXRhdHRyKHBvcnRfY29uZmln LmFwcGxlX2FkZGl0aW9ucygpLCAncmVwb3MnLCBGYWxzZSk6Ci0gICAgICAgICAgICByZXBvcyA9 IHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpLnJlcG9zKCkKLSAgICAgICAgcmVwb3NbJ3dl YmtpdCddID0gc2VsZi5ob3N0LnNjbSgpLmNoZWNrb3V0X3Jvb3QKLSAgICAgICAgY29tbWl0cyA9 IFtdCi0gICAgICAgIGZvciByZXBvX2lkLCBwYXRoIGluIHJlcG9zLml0ZW1zKCk6Ci0gICAgICAg ICAgICBzY20gPSBTQ01EZXRlY3RvcihzZWxmLl9maWxlc3lzdGVtLCBzZWxmLl9leGVjdXRpdmUp LmRldGVjdF9zY21fc3lzdGVtKHBhdGgpCisgICAgICAgICAgICByZXBvcyA9IHsKKyAgICAgICAg ICAgICAgICBuYW1lOiBsb2NhbC5TY20uZnJvbV9wYXRoKHB0aCkKKyAgICAgICAgICAgICAgICBm b3IgbmFtZSwgcHRoIGluIHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpLnJlcG9zKCkuaXRl bXMoKQorICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAjIElmIHVzaW5nIGdpdC1zdm4gZm9y IFdlYktpdCwgcHJlZmVyIHRoZSBTVk4gYnJhbmNoL3JldmlzaW9uLgotICAgICAgICAgICAgc3Zu X3JldmlzaW9uID0gc2NtLnN2bl9yZXZpc2lvbihwYXRoKQotICAgICAgICAgICAgaWYgcmVwb19p ZCA9PSAnd2Via2l0JyBhbmQgc3ZuX3JldmlzaW9uOgotICAgICAgICAgICAgICAgIHVzZWRfcmV2 aXNpb24gPSBzdm5fcmV2aXNpb24KLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAg dXNlZF9yZXZpc2lvbiA9IHNjbS5uYXRpdmVfcmV2aXNpb24ocGF0aCkKKyAgICAgICAgaWYgJ3dl YmtpdCcgbm90IGluIHJlcG9zOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIHJl cG9zWyd3ZWJraXQnXSA9IGxvY2FsLlNjbS5mcm9tX3BhdGgoc2VsZi5ob3N0LmZpbGVzeXN0ZW0u Z2V0Y3dkKCkpCisgICAgICAgICAgICBleGNlcHQgT1NFcnJvcjoKKyAgICAgICAgICAgICAgICBy ZXBvc1snd2Via2l0J10gPSBsb2NhbC5TY20uZnJvbV9wYXRoKHNlbGYuaG9zdC5maWxlc3lzdGVt LmRpcm5hbWUoX19maWxlX18pKQogCi0gICAgICAgICAgICBzdm5fYnJhbmNoID0gc2NtLnN2bl9i cmFuY2gocGF0aCkKLSAgICAgICAgICAgIGlmIHJlcG9faWQgPT0gJ3dlYmtpdCcgYW5kIHN2bl9i cmFuY2g6Ci0gICAgICAgICAgICAgICAgdXNlZF9icmFuY2ggPSBzdm5fYnJhbmNoCi0gICAgICAg ICAgICBlbHNlOgotICAgICAgICAgICAgICAgIHVzZWRfYnJhbmNoID0gc2NtLm5hdGl2ZV9icmFu Y2gocGF0aCkKKyAgICAgICAgY29tbWl0cyA9IFtdCisgICAgICAgIGZvciByZXBvX2lkLCByZXBv IGluIHJlcG9zLml0ZW1zKCk6CisgICAgICAgICAgICBjb21taXQgPSByZXBvLmNvbW1pdChpbmNs dWRlX2xvZz1GYWxzZSwgaW5jbHVkZV9pZGVudGlmaWVyPUZhbHNlKQorCisgICAgICAgICAgICAj IFNwZWNpYWwgY2FzZSBmb3IgV2ViS2l0IHNpbmNlIHdlIGhhdmUgbXVsdGlwbGUgcmVwcmVzZW50 YXRpb25zIGF0IHRoZSBtb21lbnQKKyAgICAgICAgICAgIGJyYW5jaCA9IGNvbW1pdC5icmFuY2gK KyAgICAgICAgICAgIGlmIHJlcG9faWQgPT0gJ3dlYmtpdCcgYW5kIGJyYW5jaCBpbiByZXBvLkRF RkFVTFRfQlJBTkNIRVM6CisgICAgICAgICAgICAgICAgYnJhbmNoID0gJ3RydW5rJwogCiAgICAg ICAgICAgICBjb21taXRzLmFwcGVuZChVcGxvYWQuY3JlYXRlX2NvbW1pdCgKICAgICAgICAgICAg ICAgICByZXBvc2l0b3J5X2lkPXJlcG9faWQsCi0gICAgICAgICAgICAgICAgaWQ9dXNlZF9yZXZp c2lvbiwKLSAgICAgICAgICAgICAgICBicmFuY2g9dXNlZF9icmFuY2gsCisgICAgICAgICAgICAg ICAgaWQ9c3RyKGNvbW1pdC5yZXZpc2lvbiBvciBjb21taXQuaGFzaCksCisgICAgICAgICAgICAg ICAgYnJhbmNoPWJyYW5jaCwKICAgICAgICAgICAgICkpCiAgICAgICAgIHJldHVybiBjb21taXRz CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weQko cmV2aXNpb24gMjczNzUwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgZnJvbSB3ZWJraXRweS5w b3J0IGltcG9ydCBQb3J0CiBmcm9tIHdlYmtpdHB5LnBvcnQudGVzdCBpbXBvcnQgYWRkX3VuaXRf dGVzdHNfdG9fbW9ja19maWxlc3lzdGVtLCBUZXN0UG9ydAogCiBmcm9tIHdlYmtpdGNvcmVweSBp bXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbW9ja3MKIAogCiBk ZWYgY21wKGEsIGIpOgpAQCAtMzIzLDggKzMyNCwxNCBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgICkKIAogICAgIGRlZiB0ZXN0X2NvbW1pdHNfZm9yX3VwbG9h ZChzZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT0nZm9vJykK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbeydyZXBvc2l0b3J5X2lkJzogJ3dlYmtpdCcsICdp ZCc6ICcyNzM4NDk5JywgJ2JyYW5jaCc6ICd0cnVuayd9XSwgcG9ydC5jb21taXRzX2Zvcl91cGxv YWQoKSkKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4ocGF0aD0nLycpLCBtb2Nrcy5sb2Nh bC5HaXQoKToKKyAgICAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9J2Zv bycpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFt7J3JlcG9zaXRvcnlfaWQnOiAnd2Vi a2l0JywgJ2lkJzogJzYnLCAnYnJhbmNoJzogJ3RydW5rJ31dLCBwb3J0LmNvbW1pdHNfZm9yX3Vw bG9hZCgpKQorCisgICAgZGVmIHRlc3RfY29tbWl0c19mb3JfdXBsb2FkX2dpdF9zdm4oc2VsZik6 CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKCksIG1vY2tzLmxvY2FsLkdpdChwYXRoPScv JywgZ2l0X3N2bj1UcnVlKToKKyAgICAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0 X25hbWU9J2ZvbycpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFt7J3JlcG9zaXRvcnlf aWQnOiAnd2Via2l0JywgJ2lkJzogJzYnLCAnYnJhbmNoJzogJ3RydW5rJ31dLCBwb3J0LmNvbW1p dHNfZm9yX3VwbG9hZCgpKQogCiAKIGNsYXNzIE5hdHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6Cg== 421985 2021-03-02 13:33:20 -0800 2021-03-02 14:53:10 -0800 Patch bug-222432-20210302133319.patch text/plain 9016 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mzc1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIxLTAzLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gVXNlIHdlYmtpdHNjbXB5IHdoZW4gcmVw b3J0aW5nIHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyMjQzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ3NTU3NjU+CisKKyAgICAg ICAgUnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBCdW1w IHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0KTogVGhlIHJvb3QgZGlyZWN0 b3J5IHNob3VsZCBiZSB0cmVhdGVkIGFzIGlmIGl0IGRvZXMgbm90IGV4aXN0LgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3Vu aXR0ZXN0LnB5OgorICAgICAgICAoU3VtbWFyaXplZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3Jldmlz aW9uKTogVXNlIHdlYmtpdHNjbXB5J3MgbW9jayByZXBvc2l0b3J5LgorICAgICAgICAoU3VtbWFy aXplZFJlc3VsdHNUZXN0LnRlc3Rfc3ZuX3JldmlzaW9uX2dpdCk6IEFkZGVkLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zv cl91cGxvYWQpOiBVc2Ugd2Via2l0c2NtcHkgaW5zdGVhZCBvZiB3ZWJraXRweSBmb3IgcmVwb3Np dG9yeSBtYW5pcHVsYXRpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Vf dW5pdHRlc3QucHk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2NvbW1pdHNfZm9yX3VwbG9hZCk6 IFVzZSB3ZWJraXRzY21weSdzIG1vY2sgcmVwb3NpdG9yeS4KKyAgICAgICAgKFBvcnRUZXN0LnRl c3RfY29tbWl0c19mb3JfdXBsb2FkX2dpdF9zdm4pOiBBZGRlZC4KKwogMjAyMS0wMy0wMiAgQWFr YXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBidWlsZC53 ZWJraXQub3JnIGxvYWRjb25maWcgc2ltaWxhciB0byBFV1MKSW5kZXg6IFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CShyZXZpc2lvbiAyNzM3NTApCisrKyBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkod29ya2luZyBjb3B5 KQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dl YmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScwLjExLjMnLAorICAgIHZlcnNpb249JzAuMTEuNCcs CiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQg YW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAog ICAgIGNsYXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAy NzM3NTApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1w b3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlw IGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVS TD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMTEsIDMpCit2ZXJzaW9uID0gVmVy c2lvbigwLCAxMSwgNCkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJz JywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9u b3RvbmljJywgVmVyc2lvbigxLCA1KSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5CShyZXZpc2lvbiAyNzM3NTApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkK QEAgLTY0LDcgKzY0LDcgQEAgY2xhc3MgR2l0KG1vY2tzLlN1YnByb2Nlc3MpOgogICAgICAgICBz ZWxmLnRhZ3MgPSB7fQogCiAgICAgICAgICMgSWYgdGhlIGRpcmVjdG9yeSBwcm92aWRlZCBhY3R1 YWxseSBleGlzdHMsIHBvcHVsYXRlIGl0Ci0gICAgICAgIGlmIG9zLnBhdGguaXNkaXIoc2VsZi5w YXRoKToKKyAgICAgICAgaWYgc2VsZi5wYXRoICE9ICcvJyBhbmQgb3MucGF0aC5pc2RpcihzZWxm LnBhdGgpOgogICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIob3MucGF0aC5qb2luKHNl bGYucGF0aCwgJy5naXQnKSk6CiAgICAgICAgICAgICAgICAgb3MubWtkaXIob3MucGF0aC5qb2lu KHNlbGYucGF0aCwgJy5naXQnKSkKICAgICAgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4o c2VsZi5wYXRoLCAnLmdpdCcsICdjb25maWcnKSwgJ3cnKSBhcyBjb25maWc6CkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0c191 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0c191bml0dGVzdC5weQkocmV2aXNpb24gMjczNzUw KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVu X3Jlc3VsdHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDggQEAgZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydAogZnJvbSB3ZWJraXRweS5sYXlv dXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X3J1bl9yZXN1bHRzCiBmcm9tIHdlYmtpdHB5LnRv b2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0 IG1vY2tzCisKIAogZGVmIGdldF9yZXN1bHQodGVzdF9uYW1lLCByZXN1bHRfdHlwZT10ZXN0X2V4 cGVjdGF0aW9ucy5QQVNTLCBydW5fdGltZT0wKToKICAgICBmYWlsdXJlcyA9IFtdCkBAIC0xNjAs OSArMTYyLDE2IEBAIGNsYXNzIFN1bW1hcml6ZWRSZXN1bHRzVGVzdCh1bml0dGVzdC5UZXMKICAg ICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbHMoc3VtbWFyeVsncmV2aXNpb24nXSwgJycpCiAKICAg ICBkZWYgdGVzdF9zdm5fcmV2aXNpb24oc2VsZik6Ci0gICAgICAgIHNlbGYucG9ydC5fb3B0aW9u cy5idWlsZGVyX25hbWUgPSAnZHVtbXkgYnVpbGRlcicKLSAgICAgICAgc3VtbWFyeSA9IHN1bW1h cml6ZWRfcmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBm bGFreT1GYWxzZSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3VtbWFyeVsncmV2aXNpb24n XSwgJzI3Mzg0OTknKQorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bihwYXRoPScvJyksIG1v Y2tzLmxvY2FsLkdpdCgpOgorICAgICAgICAgICAgc2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJf bmFtZSA9ICdkdW1teSBidWlsZGVyJworICAgICAgICAgICAgc3VtbWFyeSA9IHN1bW1hcml6ZWRf cmVzdWx0cyhzZWxmLnBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1G YWxzZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHN1bW1hcnlbJ3JldmlzaW9uJ10s ICc2JykKKworICAgIGRlZiB0ZXN0X3N2bl9yZXZpc2lvbl9naXQoc2VsZik6CisgICAgICAgIHdp dGggbW9ja3MubG9jYWwuU3ZuKCksIG1vY2tzLmxvY2FsLkdpdChwYXRoPScvJywgZ2l0X3N2bj1U cnVlKToKKyAgICAgICAgICAgIHNlbGYucG9ydC5fb3B0aW9ucy5idWlsZGVyX25hbWUgPSAnZHVt bXkgYnVpbGRlcicKKyAgICAgICAgICAgIHN1bW1hcnkgPSBzdW1tYXJpemVkX3Jlc3VsdHMoc2Vs Zi5wb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCisgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzdW1tYXJ5WydyZXZpc2lvbiddLCAnOScpCiAKICAg ICBkZWYgdGVzdF9zdW1tYXJpemVkX3Jlc3VsdHNfd29udGZpeChzZWxmKToKICAgICAgICAgc2Vs Zi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVyJwpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDI3Mzc1MCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3 IEBAIGltcG9ydCBzeXMKIGZyb20gY29sbGVjdGlvbnMgaW1wb3J0IE9yZGVyZWREaWN0CiBmcm9t IGZ1bmN0b29scyBpbXBvcnQgcGFydGlhbAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHN0cmlu Z191dGlscywgZGVjb3JhdG9ycworZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogZnJv bSB3ZWJraXRweS5jb21tb24gaW1wb3J0IGZpbmRfZmlsZXMKIGZyb20gd2Via2l0cHkuY29tbW9u IGltcG9ydCByZWFkX2NoZWNrc3VtX2Zyb21fcG5nCkBAIC0xNTExLDMxICsxNTEyLDMxIEBAIGNs YXNzIFBvcnQob2JqZWN0KToKICAgICBkZWYgY29tbWl0c19mb3JfdXBsb2FkKHNlbGYpOgogICAg ICAgICBmcm9tIHdlYmtpdHB5LnJlc3VsdHMudXBsb2FkIGltcG9ydCBVcGxvYWQKIAotICAgICAg ICBzZWxmLmhvc3QuaW5pdGlhbGl6ZV9zY20oKQogICAgICAgICByZXBvcyA9IHt9CiAgICAgICAg IGlmIHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpIGFuZCBnZXRhdHRyKHBvcnRfY29uZmln LmFwcGxlX2FkZGl0aW9ucygpLCAncmVwb3MnLCBGYWxzZSk6Ci0gICAgICAgICAgICByZXBvcyA9 IHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpLnJlcG9zKCkKLSAgICAgICAgcmVwb3NbJ3dl YmtpdCddID0gc2VsZi5ob3N0LnNjbSgpLmNoZWNrb3V0X3Jvb3QKLSAgICAgICAgY29tbWl0cyA9 IFtdCi0gICAgICAgIGZvciByZXBvX2lkLCBwYXRoIGluIHJlcG9zLml0ZW1zKCk6Ci0gICAgICAg ICAgICBzY20gPSBTQ01EZXRlY3RvcihzZWxmLl9maWxlc3lzdGVtLCBzZWxmLl9leGVjdXRpdmUp LmRldGVjdF9zY21fc3lzdGVtKHBhdGgpCisgICAgICAgICAgICByZXBvcyA9IHsKKyAgICAgICAg ICAgICAgICBuYW1lOiBsb2NhbC5TY20uZnJvbV9wYXRoKHB0aCkKKyAgICAgICAgICAgICAgICBm b3IgbmFtZSwgcHRoIGluIHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpLnJlcG9zKCkuaXRl bXMoKQorICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAjIElmIHVzaW5nIGdpdC1zdm4gZm9y IFdlYktpdCwgcHJlZmVyIHRoZSBTVk4gYnJhbmNoL3JldmlzaW9uLgotICAgICAgICAgICAgc3Zu X3JldmlzaW9uID0gc2NtLnN2bl9yZXZpc2lvbihwYXRoKQotICAgICAgICAgICAgaWYgcmVwb19p ZCA9PSAnd2Via2l0JyBhbmQgc3ZuX3JldmlzaW9uOgotICAgICAgICAgICAgICAgIHVzZWRfcmV2 aXNpb24gPSBzdm5fcmV2aXNpb24KLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAg dXNlZF9yZXZpc2lvbiA9IHNjbS5uYXRpdmVfcmV2aXNpb24ocGF0aCkKKyAgICAgICAgaWYgJ3dl YmtpdCcgbm90IGluIHJlcG9zOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIHJl cG9zWyd3ZWJraXQnXSA9IGxvY2FsLlNjbS5mcm9tX3BhdGgoc2VsZi5ob3N0LmZpbGVzeXN0ZW0u Z2V0Y3dkKCkpCisgICAgICAgICAgICBleGNlcHQgT1NFcnJvcjoKKyAgICAgICAgICAgICAgICBy ZXBvc1snd2Via2l0J10gPSBsb2NhbC5TY20uZnJvbV9wYXRoKHNlbGYuaG9zdC5maWxlc3lzdGVt LmRpcm5hbWUoX19maWxlX18pKQogCi0gICAgICAgICAgICBzdm5fYnJhbmNoID0gc2NtLnN2bl9i cmFuY2gocGF0aCkKLSAgICAgICAgICAgIGlmIHJlcG9faWQgPT0gJ3dlYmtpdCcgYW5kIHN2bl9i cmFuY2g6Ci0gICAgICAgICAgICAgICAgdXNlZF9icmFuY2ggPSBzdm5fYnJhbmNoCi0gICAgICAg ICAgICBlbHNlOgotICAgICAgICAgICAgICAgIHVzZWRfYnJhbmNoID0gc2NtLm5hdGl2ZV9icmFu Y2gocGF0aCkKKyAgICAgICAgY29tbWl0cyA9IFtdCisgICAgICAgIGZvciByZXBvX2lkLCByZXBv IGluIHJlcG9zLml0ZW1zKCk6CisgICAgICAgICAgICBjb21taXQgPSByZXBvLmNvbW1pdChpbmNs dWRlX2xvZz1GYWxzZSwgaW5jbHVkZV9pZGVudGlmaWVyPUZhbHNlKQorCisgICAgICAgICAgICAj IFNwZWNpYWwgY2FzZSBmb3IgV2ViS2l0IHNpbmNlIHdlIGhhdmUgbXVsdGlwbGUgcmVwcmVzZW50 YXRpb25zIGF0IHRoZSBtb21lbnQKKyAgICAgICAgICAgIGJyYW5jaCA9IGNvbW1pdC5icmFuY2gK KyAgICAgICAgICAgIGlmIHJlcG9faWQgPT0gJ3dlYmtpdCcgYW5kIGJyYW5jaCBpbiByZXBvLkRF RkFVTFRfQlJBTkNIRVM6CisgICAgICAgICAgICAgICAgYnJhbmNoID0gJ3RydW5rJwogCiAgICAg ICAgICAgICBjb21taXRzLmFwcGVuZChVcGxvYWQuY3JlYXRlX2NvbW1pdCgKICAgICAgICAgICAg ICAgICByZXBvc2l0b3J5X2lkPXJlcG9faWQsCi0gICAgICAgICAgICAgICAgaWQ9dXNlZF9yZXZp c2lvbiwKLSAgICAgICAgICAgICAgICBicmFuY2g9dXNlZF9icmFuY2gsCisgICAgICAgICAgICAg ICAgaWQ9c3RyKGNvbW1pdC5yZXZpc2lvbiBvciBjb21taXQuaGFzaCksCisgICAgICAgICAgICAg ICAgYnJhbmNoPWJyYW5jaCwKICAgICAgICAgICAgICkpCiAgICAgICAgIHJldHVybiBjb21taXRz CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZV91bml0dGVzdC5weQko cmV2aXNpb24gMjczNzUwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgZnJvbSB3ZWJraXRweS5w b3J0IGltcG9ydCBQb3J0CiBmcm9tIHdlYmtpdHB5LnBvcnQudGVzdCBpbXBvcnQgYWRkX3VuaXRf dGVzdHNfdG9fbW9ja19maWxlc3lzdGVtLCBUZXN0UG9ydAogCiBmcm9tIHdlYmtpdGNvcmVweSBp bXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbW9ja3MKIAogCiBk ZWYgY21wKGEsIGIpOgpAQCAtMzIzLDggKzMyNCwxNCBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgICkKIAogICAgIGRlZiB0ZXN0X2NvbW1pdHNfZm9yX3VwbG9h ZChzZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT0nZm9vJykK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbeydyZXBvc2l0b3J5X2lkJzogJ3dlYmtpdCcsICdp ZCc6ICcyNzM4NDk5JywgJ2JyYW5jaCc6ICd0cnVuayd9XSwgcG9ydC5jb21taXRzX2Zvcl91cGxv YWQoKSkKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4ocGF0aD0nLycpLCBtb2Nrcy5sb2Nh bC5HaXQoKToKKyAgICAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9J2Zv bycpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFt7J3JlcG9zaXRvcnlfaWQnOiAnd2Vi a2l0JywgJ2lkJzogJzYnLCAnYnJhbmNoJzogJ3RydW5rJ31dLCBwb3J0LmNvbW1pdHNfZm9yX3Vw bG9hZCgpKQorCisgICAgZGVmIHRlc3RfY29tbWl0c19mb3JfdXBsb2FkX2dpdF9zdm4oc2VsZik6 CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKCksIG1vY2tzLmxvY2FsLkdpdChwYXRoPScv JywgZ2l0X3N2bj1UcnVlKToKKyAgICAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0 X25hbWU9J2ZvbycpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFt7J3JlcG9zaXRvcnlf aWQnOiAnd2Via2l0JywgJ2lkJzogJzknLCAnYnJhbmNoJzogJ3RydW5rJ31dLCBwb3J0LmNvbW1p dHNfZm9yX3VwbG9hZCgpKQogCiAKIGNsYXNzIE5hdHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6Cg==