212943 2020-06-08 17:56:55 -0700 [Intl] Update tests to support ICU 67 2020-06-08 19:20:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling webkit-bug-importer ysuzuki oldest_to_newest 1660521 0 ross.kirsling 2020-06-08 17:56:55 -0700 [Intl] Update tests to support ICU 67 1660522 1 401403 ross.kirsling 2020-06-08 17:59:40 -0700 Created attachment 401403 Patch 1660524 2 401403 ross.kirsling 2020-06-08 18:07:09 -0700 Comment on attachment 401403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401403&action=review > JSTests/stress/intl-collator.js:106 > // Ignores irrelevant extension keys. > -shouldBe(testCollator(Intl.Collator('en-u-aa-aaaa-kn-true-bb-bbbb-co-eor-cc-cccc-y-yyd'), [{locale: 'en-u-co-eor-kn-true', collation: 'eor', numeric: true}, {locale: 'en-u-kn-true', numeric: true}]), true); > +shouldBe(testCollator(Intl.Collator('en-u-aa-aaaa-kf-upper-bb-bbbb-co-eor-cc-cccc-y-yyd'), [{locale: 'en-u-co-eor-kf-upper', collation: 'eor', caseFirst: 'upper'}, {locale: 'en-u-kf-upper', caseFirst: 'upper'}]), true); > > // Ignores other extensions. > -shouldBe(testCollator(Intl.Collator('en-u-kn-true-a-aa'), [{locale: 'en-u-kn-true', numeric: true}]), true); > -shouldBe(testCollator(Intl.Collator('en-a-aa-u-kn-true'), [{locale: 'en-u-kn-true', numeric: true}]), true); > -shouldBe(testCollator(Intl.Collator('en-a-aa-u-kn-true-b-bb'), [{locale: 'en-u-kn-true', numeric: true}]), true); > +shouldBe(testCollator(Intl.Collator('en-u-kf-upper-a-aa'), [{locale: 'en-u-kf-upper', caseFirst: 'upper'}]), true); > +shouldBe(testCollator(Intl.Collator('en-a-aa-u-kf-upper'), [{locale: 'en-u-kf-upper', caseFirst: 'upper'}]), true); > +shouldBe(testCollator(Intl.Collator('en-a-aa-u-kf-upper-b-bb'), [{locale: 'en-u-kf-upper', caseFirst: 'upper'}]), true); FWIW: I switched these particular cases to be version-independent instead, but could've gone either way. 1660545 3 ews-feeder 2020-06-08 19:19:23 -0700 Committed r262763: <https://trac.webkit.org/changeset/262763> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401403. 1660546 4 webkit-bug-importer 2020-06-08 19:20:16 -0700 <rdar://problem/64145730> 401403 2020-06-08 17:59:40 -0700 2020-06-08 19:19:23 -0700 Patch bug-212943-20200608175939.patch text/plain 13505 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzMzCmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxv ZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQ2NTE2ZjliN2M2ZTIzOTE5ZTg5YmVhMjNmZjhi MmU1ZTdlMDYyM2EuLmY4Zjc5Y2ZiNTE0NTQyMDRjZDcyMjU5YzQ2MmM2ZTE3NGI2ZThhOTcgMTAw NjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMjAtMDYtMDggIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNv bnkuY29tPgorCisgICAgICAgIFtJbnRsXSBVcGRhdGUgdGVzdHMgdG8gc3VwcG9ydCBJQ1UgNjcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjk0Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE91ciB0ZXN0 cyBoYXZlIGJlZW4gYXNzdW1pbmcgSUNVIDYwLTY0IHJlc3VsdHMgYnV0IFdpbkNhaXJvIGFuZCBQ bGF5U3RhdGlvbiBhcmUgbm93IG9uIElDVSA2NywKKyAgICAgICAgd2hpY2ggaW5jbHVkZXMgZml4 ZXMgZm9yIHZhcmlhbnQgYWxwaGFiZXRpemF0aW9uIGFuZCBub24tZXhwbGljaXQgIi10cnVlIiB2 YWx1ZXMgaW4gbG9jYWxlIHN0cmluZ3MuCisKKyAgICAgICAgKiBzdHJlc3MvaW50bC1jb2xsYXRv ci5qczoKKyAgICAgICAgKGV4cGxpY2l0VHJ1ZUJlZm9yZUlDVTY3KToKKyAgICAgICAgKHNob3Vs ZEJlLnRlc3RDb2xsYXRvci5JbnRsLkNvbGxhdG9yKToKKyAgICAgICAgKiBzdHJlc3MvaW50bC1k YXRldGltZWZvcm1hdC5qczoKKyAgICAgICAgKiBzdHJlc3MvaW50bC1sb2NhbGUuanM6CisgICAg ICAgICogc3RyZXNzL2ludGwtbnVtYmVyZm9ybWF0LmpzOgorICAgICAgICAqIHN0cmVzcy9pbnRs LW9iamVjdC5qczoKKyAgICAgICAgKiBzdHJlc3MvaW50bC1wbHVyYWxydWxlcy5qczoKKyAgICAg ICAgKiBzdHJlc3MvaW50bC1yZWxhdGl2ZXRpbWVmb3JtYXQuanM6CisKIDIwMjAtMDYtMDggIEFs ZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIEpTT04uc3Ry aW5naWZ5IHNob3VsZCB0aHJvdyBzdGFjayBvdmVyZmxvdyBlcnJvcgpkaWZmIC0tZ2l0IGEvSlNU ZXN0cy9zdHJlc3MvaW50bC1jb2xsYXRvci5qcyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtY29sbGF0 b3IuanMKaW5kZXggNTViNzQwZWYwOWFiZjMxOWE5OGE5NjU5YTFkZGY0ODNkMTI3ZGQ2Mi4uOTk5 MGRiZDYwZDQ2MzFmMmIzMzI0OGFiMDA1MmM5MzNjYjIyOTkxYSAxMDA2NDQKLS0tIGEvSlNUZXN0 cy9zdHJlc3MvaW50bC1jb2xsYXRvci5qcworKysgYi9KU1Rlc3RzL3N0cmVzcy9pbnRsLWNvbGxh dG9yLmpzCkBAIC0xOSw2ICsxOSwxMCBAQCBmdW5jdGlvbiBzaG91bGRUaHJvdyhmdW5jLCBlcnJv clR5cGUpIHsKICAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBFeHBlY3RlZCAke2Vycm9yVHlwZS5u YW1lfSFgKTsKIH0KIAorZnVuY3Rpb24gZXhwbGljaXRUcnVlQmVmb3JlSUNVNjcoKSB7CisgICAg cmV0dXJuICR2bS5pY3VWZXJzaW9uKCkgPCA2NyA/ICctdHJ1ZScgOiAnJzsKK30KKwogLy8gMTAu MSBUaGUgSW50bC5Db2xsYXRvciBDb25zdHJ1Y3RvcgogCiAvLyBUaGUgSW50bC5Db2xsYXRvciBj b25zdHJ1Y3RvciBpcyBhIHN0YW5kYXJkIGJ1aWx0LWluIHByb3BlcnR5IG9mIHRoZSBJbnRsIG9i amVjdC4KQEAgLTgxLDggKzg1LDggQEAgc2hvdWxkQmUodGVzdENvbGxhdG9yKEludGwuQ29sbGF0 b3IoJ2VuLXUtY28tYWJjZCcpLCBbe2xvY2FsZTogJ2VuJ31dKSwgdHJ1ZSk7CiBzaG91bGRCZSh0 ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZGUtdS1jby1waG9uZWJrJyksIFt7bG9jYWxlOiAn ZGUtdS1jby1waG9uZWJrJywgY29sbGF0aW9uOiAncGhvbmViayd9LCB7bG9jYWxlOiAnZGUnfV0p LCB0cnVlKTsKIAogLy8gVGhlICdrbicga2V5IGlzIHByb2Nlc3NlZCBjb3JyZWN0bHkuCi1zaG91 bGRCZSh0ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZW4tdS1rbicpLCBbe2xvY2FsZTogJ2Vu LXUta24tdHJ1ZScsIG51bWVyaWM6IHRydWV9XSksIHRydWUpOwotc2hvdWxkQmUodGVzdENvbGxh dG9yKEludGwuQ29sbGF0b3IoJ2VuLXUta24tdHJ1ZScpLCBbe2xvY2FsZTogJ2VuLXUta24tdHJ1 ZScsIG51bWVyaWM6IHRydWV9XSksIHRydWUpOworc2hvdWxkQmUodGVzdENvbGxhdG9yKEludGwu Q29sbGF0b3IoJ2VuLXUta24nKSwgW3tsb2NhbGU6ICdlbi11LWtuJyArIGV4cGxpY2l0VHJ1ZUJl Zm9yZUlDVTY3KCksIG51bWVyaWM6IHRydWV9XSksIHRydWUpOworc2hvdWxkQmUodGVzdENvbGxh dG9yKEludGwuQ29sbGF0b3IoJ2VuLXUta24tdHJ1ZScpLCBbe2xvY2FsZTogJ2VuLXUta24nICsg ZXhwbGljaXRUcnVlQmVmb3JlSUNVNjcoKSwgbnVtZXJpYzogdHJ1ZX1dKSwgdHJ1ZSk7CiBzaG91 bGRCZSh0ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZW4tdS1rbi1mYWxzZScpLCBbe2xvY2Fs ZTogJ2VuLXUta24tZmFsc2UnLCBudW1lcmljOiBmYWxzZX1dKSwgdHJ1ZSk7CiBzaG91bGRCZSh0 ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZW4tdS1rbi1hYmNkJyksIFt7bG9jYWxlOiAnZW4n fV0pLCB0cnVlKTsKIApAQCAtOTQsMTIgKzk4LDEyIEBAIHNob3VsZEJlKHRlc3RDb2xsYXRvcihJ bnRsLkNvbGxhdG9yKCdlbi11LWtmLWZhbHNlJyksIFt7bG9jYWxlOiAnZW4tdS1rZi1mYWxzZScs CiBzaG91bGRCZSh0ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZW4tdS1rZi10cnVlJyksIFt7 bG9jYWxlOiAnZW4nfV0pLCB0cnVlKTsKIAogLy8gSWdub3JlcyBpcnJlbGV2YW50IGV4dGVuc2lv biBrZXlzLgotc2hvdWxkQmUodGVzdENvbGxhdG9yKEludGwuQ29sbGF0b3IoJ2VuLXUtYWEtYWFh YS1rbi10cnVlLWJiLWJiYmItY28tZW9yLWNjLWNjY2MteS15eWQnKSwgW3tsb2NhbGU6ICdlbi11 LWNvLWVvci1rbi10cnVlJywgY29sbGF0aW9uOiAnZW9yJywgbnVtZXJpYzogdHJ1ZX0sIHtsb2Nh bGU6ICdlbi11LWtuLXRydWUnLCBudW1lcmljOiB0cnVlfV0pLCB0cnVlKTsKK3Nob3VsZEJlKHRl c3RDb2xsYXRvcihJbnRsLkNvbGxhdG9yKCdlbi11LWFhLWFhYWEta2YtdXBwZXItYmItYmJiYi1j by1lb3ItY2MtY2NjYy15LXl5ZCcpLCBbe2xvY2FsZTogJ2VuLXUtY28tZW9yLWtmLXVwcGVyJywg Y29sbGF0aW9uOiAnZW9yJywgY2FzZUZpcnN0OiAndXBwZXInfSwge2xvY2FsZTogJ2VuLXUta2Yt dXBwZXInLCBjYXNlRmlyc3Q6ICd1cHBlcid9XSksIHRydWUpOwogCiAvLyBJZ25vcmVzIG90aGVy IGV4dGVuc2lvbnMuCi1zaG91bGRCZSh0ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZW4tdS1r bi10cnVlLWEtYWEnKSwgW3tsb2NhbGU6ICdlbi11LWtuLXRydWUnLCBudW1lcmljOiB0cnVlfV0p LCB0cnVlKTsKLXNob3VsZEJlKHRlc3RDb2xsYXRvcihJbnRsLkNvbGxhdG9yKCdlbi1hLWFhLXUt a24tdHJ1ZScpLCBbe2xvY2FsZTogJ2VuLXUta24tdHJ1ZScsIG51bWVyaWM6IHRydWV9XSksIHRy dWUpOwotc2hvdWxkQmUodGVzdENvbGxhdG9yKEludGwuQ29sbGF0b3IoJ2VuLWEtYWEtdS1rbi10 cnVlLWItYmInKSwgW3tsb2NhbGU6ICdlbi11LWtuLXRydWUnLCBudW1lcmljOiB0cnVlfV0pLCB0 cnVlKTsKK3Nob3VsZEJlKHRlc3RDb2xsYXRvcihJbnRsLkNvbGxhdG9yKCdlbi11LWtmLXVwcGVy LWEtYWEnKSwgW3tsb2NhbGU6ICdlbi11LWtmLXVwcGVyJywgY2FzZUZpcnN0OiAndXBwZXInfV0p LCB0cnVlKTsKK3Nob3VsZEJlKHRlc3RDb2xsYXRvcihJbnRsLkNvbGxhdG9yKCdlbi1hLWFhLXUt a2YtdXBwZXInKSwgW3tsb2NhbGU6ICdlbi11LWtmLXVwcGVyJywgY2FzZUZpcnN0OiAndXBwZXIn fV0pLCB0cnVlKTsKK3Nob3VsZEJlKHRlc3RDb2xsYXRvcihJbnRsLkNvbGxhdG9yKCdlbi1hLWFh LXUta2YtdXBwZXItYi1iYicpLCBbe2xvY2FsZTogJ2VuLXUta2YtdXBwZXInLCBjYXNlRmlyc3Q6 ICd1cHBlcid9XSksIHRydWUpOwogCiAvLyBUaGUgb3B0aW9uIHVzYWdlIGlzIHByb2Nlc3NlZCBj b3JyZWN0bHkuCiBzaG91bGRCZSh0ZXN0Q29sbGF0b3IoSW50bC5Db2xsYXRvcignZW4nLCB7dXNh Z2U6ICdzb3J0J30pLCBbe2xvY2FsZTogJ2VuJywgdXNhZ2U6ICdzb3J0J31dKSwgdHJ1ZSk7CkBA IC0xNDYsNyArMTUwLDcgQEAgc2hvdWxkVGhyb3coKCkgPT4gSW50bC5Db2xsYXRvcignZW4nLCB7 IGdldCBpZ25vcmVQdW5jdHVhdGlvbigpIHsgdGhyb3cgbmV3IEVycm8KIC8vIE9wdGlvbnMgb3Zl cnJpZGUgdGhlIGxhbmd1YWdlIHRhZy4KIHNob3VsZEJlKHRlc3RDb2xsYXRvcihJbnRsLkNvbGxh dG9yKCdlbi11LWtuLXRydWUnLCB7bnVtZXJpYzogZmFsc2V9KSwgW3tsb2NhbGU6ICdlbicsIG51 bWVyaWM6IGZhbHNlfV0pLCB0cnVlKTsKIHNob3VsZEJlKHRlc3RDb2xsYXRvcihJbnRsLkNvbGxh dG9yKCdlbi11LWtuLWZhbHNlJywge251bWVyaWM6IHRydWV9KSwgW3tsb2NhbGU6ICdlbicsIG51 bWVyaWM6IHRydWV9XSksIHRydWUpOwotc2hvdWxkQmUodGVzdENvbGxhdG9yKEludGwuQ29sbGF0 b3IoJ2VuLXUta24tdHJ1ZScsIHtudW1lcmljOiB0cnVlfSksIFt7bG9jYWxlOiAnZW4tdS1rbi10 cnVlJywgbnVtZXJpYzogdHJ1ZX1dKSwgdHJ1ZSk7CitzaG91bGRCZSh0ZXN0Q29sbGF0b3IoSW50 bC5Db2xsYXRvcignZW4tdS1rbi10cnVlJywge251bWVyaWM6IHRydWV9KSwgW3tsb2NhbGU6ICdl bi11LWtuJyArIGV4cGxpY2l0VHJ1ZUJlZm9yZUlDVTY3KCksIG51bWVyaWM6IHRydWV9XSksIHRy dWUpOwogc2hvdWxkQmUodGVzdENvbGxhdG9yKEludGwuQ29sbGF0b3IoJ2VuLXUta24tZmFsc2Un LCB7bnVtZXJpYzogZmFsc2V9KSwgW3tsb2NhbGU6ICdlbi11LWtuLWZhbHNlJywgbnVtZXJpYzog ZmFsc2V9XSksIHRydWUpOwogCiAvLyBPcHRpb25zIGFuZCBleHRlbnNpb24ga2V5cyBhcmUgcHJv Y2Vzc2VkIGNvcnJlY3RseS4KQEAgLTE4NCw3ICsxODgsMTIgQEAgc2hvdWxkQmUoSlNPTi5zdHJp bmdpZnkoSW50bC5Db2xsYXRvci5zdXBwb3J0ZWRMb2NhbGVzT2YoeyBsZW5ndGg6IDQsIDE6ICdl bicsIDAKIC8vIERlZHVwbGljYXRlcyB0YWdzLgogc2hvdWxkQmUoSlNPTi5zdHJpbmdpZnkoSW50 bC5Db2xsYXRvci5zdXBwb3J0ZWRMb2NhbGVzT2YoWydlbicsICdwdCcsICdlbicsICdlcyddKSks ICdbImVuIiwicHQiLCJlcyJdJyk7CiAvLyBDYW5vbmljYWxpemVzIHRhZ3MuCi1zaG91bGRCZShK U09OLnN0cmluZ2lmeShJbnRsLkNvbGxhdG9yLnN1cHBvcnRlZExvY2FsZXNPZignRW4tbGFUbi11 cy12YXJpQW50LWZPT2Jhci0xYWJjLVUta24tdFJ1ZS1BLWFhLWFhYS14LVJFU0VSVkVEJykpLCAn WyJlbi1MYXRuLVVTLXZhcmlhbnQtZm9vYmFyLTFhYmMtYS1hYS1hYWEtdS1rbi10cnVlLXgtcmVz ZXJ2ZWQiXScpOworc2hvdWxkQmUoCisgICAgSlNPTi5zdHJpbmdpZnkoSW50bC5Db2xsYXRvci5z dXBwb3J0ZWRMb2NhbGVzT2YoJ0VuLWxhVG4tdXMtdmFyaUFudC1mT09iYXItMWFiYy1VLWtuLXRS dWUtQS1hYS1hYWEteC1SRVNFUlZFRCcpKSwKKyAgICAkdm0uaWN1VmVyc2lvbigpID49IDY3Cisg ICAgICAgID8gJ1siZW4tTGF0bi1VUy0xYWJjLWZvb2Jhci12YXJpYW50LWEtYWEtYWFhLXUta24t eC1yZXNlcnZlZCJdJworICAgICAgICA6ICdbImVuLUxhdG4tVVMtdmFyaWFudC1mb29iYXItMWFi Yy1hLWFhLWFhYS11LWtuLXRydWUteC1yZXNlcnZlZCJdJworKTsKIC8vIFJlcGxhY2VzIG91dGRh dGVkIHRhZ3MuCiBzaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLkNvbGxhdG9yLnN1cHBvcnRl ZExvY2FsZXNPZignbm8tYm9rJykpLCAnWyJuYiJdJyk7CiAvLyBEb2Vzbid0IHRocm93LCBidXQg aWdub3JlcyBwcml2YXRlIHRhZ3MuCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9pbnRsLWRh dGV0aW1lZm9ybWF0LmpzIGIvSlNUZXN0cy9zdHJlc3MvaW50bC1kYXRldGltZWZvcm1hdC5qcwpp bmRleCAzNTFlMGYzMDEzMTg4ZjZlNmJjMjdmOGI2MGIxYmE2YjU3YWIzMDhiLi5mN2M1YTA3MDA2 NjQzNjI1OWQ2YTA2NGJkZDk3ODJlODcxMzM2YTZhIDEwMDY0NAotLS0gYS9KU1Rlc3RzL3N0cmVz cy9pbnRsLWRhdGV0aW1lZm9ybWF0LmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtZGF0ZXRp bWVmb3JtYXQuanMKQEAgLTgwLDcgKzgwLDEyIEBAIHNob3VsZEJlKEpTT04uc3RyaW5naWZ5KElu dGwuRGF0ZVRpbWVGb3JtYXQuc3VwcG9ydGVkTG9jYWxlc09mKHsgbGVuZ3RoOiA0LCAxOiAnCiAv LyBEZWR1cGxpY2F0ZXMgdGFncy4KIHNob3VsZEJlKEpTT04uc3RyaW5naWZ5KEludGwuRGF0ZVRp bWVGb3JtYXQuc3VwcG9ydGVkTG9jYWxlc09mKFsgJ2VuJywgJ3B0JywgJ2VuJywgJ2VzJyBdKSks ICdbImVuIiwicHQiLCJlcyJdJyk7CiAvLyBDYW5vbmljYWxpemVzIHRhZ3MuCi1zaG91bGRCZShK U09OLnN0cmluZ2lmeShJbnRsLkRhdGVUaW1lRm9ybWF0LnN1cHBvcnRlZExvY2FsZXNPZignRW4t bGFUbi11cy12YXJpQW50LWZPT2Jhci0xYWJjLVUta24tdFJ1ZS1BLWFhLWFhYS14LVJFU0VSVkVE JykpLCAnWyJlbi1MYXRuLVVTLXZhcmlhbnQtZm9vYmFyLTFhYmMtYS1hYS1hYWEtdS1rbi10cnVl LXgtcmVzZXJ2ZWQiXScpOworc2hvdWxkQmUoCisgICAgSlNPTi5zdHJpbmdpZnkoSW50bC5EYXRl VGltZUZvcm1hdC5zdXBwb3J0ZWRMb2NhbGVzT2YoJ0VuLWxhVG4tdXMtdmFyaUFudC1mT09iYXIt MWFiYy1VLWtuLXRSdWUtQS1hYS1hYWEteC1SRVNFUlZFRCcpKSwKKyAgICAkdm0uaWN1VmVyc2lv bigpID49IDY3CisgICAgICAgID8gJ1siZW4tTGF0bi1VUy0xYWJjLWZvb2Jhci12YXJpYW50LWEt YWEtYWFhLXUta24teC1yZXNlcnZlZCJdJworICAgICAgICA6ICdbImVuLUxhdG4tVVMtdmFyaWFu dC1mb29iYXItMWFiYy1hLWFhLWFhYS11LWtuLXRydWUteC1yZXNlcnZlZCJdJworKTsKIC8vIFJl cGxhY2VzIG91dGRhdGVkIHRhZ3MuCiBzaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLkRhdGVU aW1lRm9ybWF0LnN1cHBvcnRlZExvY2FsZXNPZignbm8tYm9rJykpLCAnWyJuYiJdJyk7CiAvLyBE b2Vzbid0IHRocm93LCBidXQgaWdub3JlcyBwcml2YXRlIHRhZ3MuCmRpZmYgLS1naXQgYS9KU1Rl c3RzL3N0cmVzcy9pbnRsLWxvY2FsZS5qcyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtbG9jYWxlLmpz CmluZGV4IDY3NjM1OTlkMWU1YmY4ZjU0NTU2ZGYwMmE0YzUzMzRhNmFkN2ExMDIuLmI1MTc2ZDJj MGI0NjFkZjJkNmY2ZGZmMWY2MjlhYTgzNmQ0N2JhOTcgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3Ry ZXNzL2ludGwtbG9jYWxlLmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtbG9jYWxlLmpzCkBA IC0xMzEsOSArMTMxLDE0IEBAIHNob3VsZEJlKG5ldyBJbnRsLkxvY2FsZSgnemgtSGFudC1UVycp Lm1pbmltaXplKCksICd6aC1UVycpOwogc2hvdWxkQmUobmV3IEludGwuTG9jYWxlKCd6aCcsIHsg c2NyaXB0OiAnSGFudCcsIHJlZ2lvbjogJ1RXJyB9KS5taW5pbWl6ZSgpLCAnemgtVFcnKTsKIAog c2hvdWxkQmUobmV3IEludGwuTG9jYWxlKCdlbicpLnRvU3RyaW5nKCksICdlbicpOwotc2hvdWxk QmUobmV3IEludGwuTG9jYWxlKCdFbi1sYVRuLXVzLXZhcmlBbnQtZk9PYmFyLTFhYmMtVS1rbi10 UnVlLUEtYWEtYWFhLXgtUkVTRVJWRUQnKS50b1N0cmluZygpLCAnZW4tTGF0bi1VUy12YXJpYW50 LWZvb2Jhci0xYWJjLWEtYWEtYWFhLXUta24tdHJ1ZS14LXJlc2VydmVkJyk7CitzaG91bGRCZSgK KyAgICBuZXcgSW50bC5Mb2NhbGUoJ0VuLWxhVG4tdXMtdmFyaUFudC1mT09iYXItMWFiYy1VLWtu LXRSdWUtQS1hYS1hYWEteC1SRVNFUlZFRCcpLnRvU3RyaW5nKCksCisgICAgJHZtLmljdVZlcnNp b24oKSA+PSA2NworICAgICAgICA/ICdlbi1MYXRuLVVTLTFhYmMtZm9vYmFyLXZhcmlhbnQtYS1h YS1hYWEtdS1rbi14LXJlc2VydmVkJworICAgICAgICA6ICdlbi1MYXRuLVVTLXZhcmlhbnQtZm9v YmFyLTFhYmMtYS1hYS1hYWEtdS1rbi10cnVlLXgtcmVzZXJ2ZWQnCispOwogc2hvdWxkQmUobmV3 IEludGwuTG9jYWxlKCdjZWwtZ2F1bGlzaCcsIHsgc2NyaXB0OiAnQXJhYicsIG51bWJlcmluZ1N5 c3RlbTogJ2d1anInIH0pLnRvU3RyaW5nKCksICd4dGctQXJhYi11LW51LWd1anIteC1jZWwtZ2F1 bGlzaCcpOwotc2hvdWxkQmUobmV3IEludGwuTG9jYWxlKCdlbi1MYXRuLVVTLXUtY2EtZ3JlZ29y eS1jby1waG9uZWJrLWhjLWgxMi1rZi11cHBlci1rbi1udS1sYXRuJykudG9TdHJpbmcoKSwgJ2Vu LUxhdG4tVVMtdS1jYS1ncmVnb3J5LWNvLXBob25lYmstaGMtaDEyLWtmLXVwcGVyLWtuLXRydWUt bnUtbGF0bicpOworc2hvdWxkQmUobmV3IEludGwuTG9jYWxlKCdlbi1MYXRuLVVTLXUtY2EtZ3Jl Z29yeS1jby1waG9uZWJrLWhjLWgxMi1rZi11cHBlci1rbi1mYWxzZS1udS1sYXRuJykudG9TdHJp bmcoKSwgJ2VuLUxhdG4tVVMtdS1jYS1ncmVnb3J5LWNvLXBob25lYmstaGMtaDEyLWtmLXVwcGVy LWtuLWZhbHNlLW51LWxhdG4nKTsKIAogY29uc3Qgb3B0aW9ucyA9IHsKICAgICBjYWxlbmRhcjog J2J1ZGRoaXN0JywKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL2ludGwtbnVtYmVyZm9ybWF0 LmpzIGIvSlNUZXN0cy9zdHJlc3MvaW50bC1udW1iZXJmb3JtYXQuanMKaW5kZXggMmFkZWUxYjM2 ZDAwMDRlNmI3MjY5N2I5YWFiMjg5OTk3MjFlMGY5ZS4uMzFiYmM0YTI1YzM0YTFiZDQ3YTVmM2Yw MDA1MzE3NjkxOGMxZTU2MSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9zdHJlc3MvaW50bC1udW1iZXJm b3JtYXQuanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvaW50bC1udW1iZXJmb3JtYXQuanMKQEAgLTIy MCw3ICsyMjAsMTIgQEAgc2hvdWxkQmUoSlNPTi5zdHJpbmdpZnkoSW50bC5OdW1iZXJGb3JtYXQu c3VwcG9ydGVkTG9jYWxlc09mKHsgbGVuZ3RoOiA0LCAxOiAnZW4KIC8vIERlZHVwbGljYXRlcyB0 YWdzLgogc2hvdWxkQmUoSlNPTi5zdHJpbmdpZnkoSW50bC5OdW1iZXJGb3JtYXQuc3VwcG9ydGVk TG9jYWxlc09mKFsgJ2VuJywgJ3B0JywgJ2VuJywgJ2VzJyBdKSksICdbImVuIiwicHQiLCJlcyJd Jyk7CiAvLyBDYW5vbmljYWxpemVzIHRhZ3MuCi1zaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRs Lk51bWJlckZvcm1hdC5zdXBwb3J0ZWRMb2NhbGVzT2YoJ0VuLWxhVG4tdXMtdmFyaUFudC1mT09i YXItMWFiYy1VLWtuLXRSdWUtQS1hYS1hYWEteC1SRVNFUlZFRCcpKSwgJ1siZW4tTGF0bi1VUy12 YXJpYW50LWZvb2Jhci0xYWJjLWEtYWEtYWFhLXUta24tdHJ1ZS14LXJlc2VydmVkIl0nKTsKK3No b3VsZEJlKAorICAgIEpTT04uc3RyaW5naWZ5KEludGwuTnVtYmVyRm9ybWF0LnN1cHBvcnRlZExv Y2FsZXNPZignRW4tbGFUbi11cy12YXJpQW50LWZPT2Jhci0xYWJjLVUta24tdFJ1ZS1BLWFhLWFh YS14LVJFU0VSVkVEJykpLAorICAgICR2bS5pY3VWZXJzaW9uKCkgPj0gNjcKKyAgICAgICAgPyAn WyJlbi1MYXRuLVVTLTFhYmMtZm9vYmFyLXZhcmlhbnQtYS1hYS1hYWEtdS1rbi14LXJlc2VydmVk Il0nCisgICAgICAgIDogJ1siZW4tTGF0bi1VUy12YXJpYW50LWZvb2Jhci0xYWJjLWEtYWEtYWFh LXUta24tdHJ1ZS14LXJlc2VydmVkIl0nCispOwogLy8gUmVwbGFjZXMgb3V0ZGF0ZWQgdGFncy4K IHNob3VsZEJlKEpTT04uc3RyaW5naWZ5KEludGwuTnVtYmVyRm9ybWF0LnN1cHBvcnRlZExvY2Fs ZXNPZignbm8tYm9rJykpLCAnWyJuYiJdJyk7CiAvLyBEb2Vzbid0IHRocm93LCBidXQgaWdub3Jl cyBwcml2YXRlIHRhZ3MuCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9pbnRsLW9iamVjdC5q cyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtb2JqZWN0LmpzCmluZGV4IDczNjEwYzE0Mzg1NTZhOTA2 NTU4YzRiMjVlOTgzNzc1ZTVkM2ExYmEuLmE2NzExNjg1YTFiMWY3YzZmNDM2MTVkNThjMDAxOWQ3 YWVmODRhMzQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2ludGwtb2JqZWN0LmpzCisrKyBi L0pTVGVzdHMvc3RyZXNzL2ludGwtb2JqZWN0LmpzCkBAIC02OCw3ICs2OCwxMiBAQCBzaG91bGRC ZShKU09OLnN0cmluZ2lmeShJbnRsLmdldENhbm9uaWNhbExvY2FsZXMoeyBsZW5ndGg6IDQsIDE6 ICdlbicsIDA6ICdlcycsCiAvLyBEZWR1cGxpY2F0ZXMgdGFncy4KIHNob3VsZEJlKEpTT04uc3Ry aW5naWZ5KEludGwuZ2V0Q2Fub25pY2FsTG9jYWxlcyhbICdlbicsICdwdCcsICdlbicsICdlcycg XSkpLCAnWyJlbiIsInB0IiwiZXMiXScpOwogLy8gQ2Fub25pY2FsaXplcyB0YWdzLgotc2hvdWxk QmUoSlNPTi5zdHJpbmdpZnkoSW50bC5nZXRDYW5vbmljYWxMb2NhbGVzKCdFbi1sYVRuLXVzLXZh cmlBbnQtZk9PYmFyLTFhYmMtVS1rbi10UnVlLUEtYWEtYWFhLXgtUkVTRVJWRUQnKSksICdbImVu LUxhdG4tVVMtdmFyaWFudC1mb29iYXItMWFiYy1hLWFhLWFhYS11LWtuLXRydWUteC1yZXNlcnZl ZCJdJyk7CitzaG91bGRCZSgKKyAgICBKU09OLnN0cmluZ2lmeShJbnRsLmdldENhbm9uaWNhbExv Y2FsZXMoJ0VuLWxhVG4tdXMtdmFyaUFudC1mT09iYXItMWFiYy1VLWtuLXRSdWUtQS1hYS1hYWEt eC1SRVNFUlZFRCcpKSwKKyAgICAkdm0uaWN1VmVyc2lvbigpID49IDY3CisgICAgICAgID8gJ1si ZW4tTGF0bi1VUy0xYWJjLWZvb2Jhci12YXJpYW50LWEtYWEtYWFhLXUta24teC1yZXNlcnZlZCJd JworICAgICAgICA6ICdbImVuLUxhdG4tVVMtdmFyaWFudC1mb29iYXItMWFiYy1hLWFhLWFhYS11 LWtuLXRydWUteC1yZXNlcnZlZCJdJworKTsKIC8vIFJlcGxhY2VzIG91dGRhdGVkIHRhZ3MuCiBz aG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLmdldENhbm9uaWNhbExvY2FsZXMoJ25vLWJvaycp KSwgJ1sibmIiXScpOwogLy8gQ2Fub25pY2FsaXplcyBwcml2YXRlIHRhZ3MuCmRpZmYgLS1naXQg YS9KU1Rlc3RzL3N0cmVzcy9pbnRsLXBsdXJhbHJ1bGVzLmpzIGIvSlNUZXN0cy9zdHJlc3MvaW50 bC1wbHVyYWxydWxlcy5qcwppbmRleCBkOGVkMDFmYWRhMDMwNjkxYWVmOGFhMmJmYzRmOTlhZTg1 NjQ0ZDQ0Li44NGQ2ODY4YTcxNjZlYjRmNTZmMWZmN2QyNjcxNjIyNGJiNjRkMjk5IDEwMDY0NAot LS0gYS9KU1Rlc3RzL3N0cmVzcy9pbnRsLXBsdXJhbHJ1bGVzLmpzCisrKyBiL0pTVGVzdHMvc3Ry ZXNzL2ludGwtcGx1cmFscnVsZXMuanMKQEAgLTc5LDcgKzc5LDEyIEBAIHNob3VsZEJlKEpTT04u c3RyaW5naWZ5KEludGwuUGx1cmFsUnVsZXMuc3VwcG9ydGVkTG9jYWxlc09mKHsgbGVuZ3RoOiA0 LCAxOiAnZW4nCiAvLyBEZWR1cGxpY2F0ZXMgdGFncy4KIHNob3VsZEJlKEpTT04uc3RyaW5naWZ5 KEludGwuUGx1cmFsUnVsZXMuc3VwcG9ydGVkTG9jYWxlc09mKFsgJ2VuJywgJ3B0JywgJ2VuJywg J2VzJyBdKSksICdbImVuIiwicHQiLCJlcyJdJyk7CiAvLyBDYW5vbmljYWxpemVzIHRhZ3MuCi1z aG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLlBsdXJhbFJ1bGVzLnN1cHBvcnRlZExvY2FsZXNP ZignRW4tbGFUbi11cy12YXJpQW50LWZPT2Jhci0xYWJjLVUta24tdFJ1ZS1BLWFhLWFhYS14LVJF U0VSVkVEJykpLCAnWyJlbi1MYXRuLVVTLXZhcmlhbnQtZm9vYmFyLTFhYmMtYS1hYS1hYWEtdS1r bi10cnVlLXgtcmVzZXJ2ZWQiXScpOworc2hvdWxkQmUoCisgICAgSlNPTi5zdHJpbmdpZnkoSW50 bC5QbHVyYWxSdWxlcy5zdXBwb3J0ZWRMb2NhbGVzT2YoJ0VuLWxhVG4tdXMtdmFyaUFudC1mT09i YXItMWFiYy1VLWtuLXRSdWUtQS1hYS1hYWEteC1SRVNFUlZFRCcpKSwKKyAgICAkdm0uaWN1VmVy c2lvbigpID49IDY3CisgICAgICAgID8gJ1siZW4tTGF0bi1VUy0xYWJjLWZvb2Jhci12YXJpYW50 LWEtYWEtYWFhLXUta24teC1yZXNlcnZlZCJdJworICAgICAgICA6ICdbImVuLUxhdG4tVVMtdmFy aWFudC1mb29iYXItMWFiYy1hLWFhLWFhYS11LWtuLXRydWUteC1yZXNlcnZlZCJdJworKTsKIC8v IFJlcGxhY2VzIG91dGRhdGVkIHRhZ3MuCiBzaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLlBs dXJhbFJ1bGVzLnN1cHBvcnRlZExvY2FsZXNPZignbm8tYm9rJykpLCAnWyJuYiJdJyk7CiAvLyBE b2Vzbid0IHRocm93LCBidXQgaWdub3JlcyBwcml2YXRlIHRhZ3MuCmRpZmYgLS1naXQgYS9KU1Rl c3RzL3N0cmVzcy9pbnRsLXJlbGF0aXZldGltZWZvcm1hdC5qcyBiL0pTVGVzdHMvc3RyZXNzL2lu dGwtcmVsYXRpdmV0aW1lZm9ybWF0LmpzCmluZGV4IDVkNmVlOTJjZjhiZWQ5NjU0ZWVjY2ZjYjM4 NWMyZjAxYTZjZjg1ZjAuLmUzYmIzODg5NDY1NTA2N2FmMzdkZGNmZTRmYzgzZjM4MTQ0NWUwNzUg MTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2ludGwtcmVsYXRpdmV0aW1lZm9ybWF0LmpzCisr KyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtcmVsYXRpdmV0aW1lZm9ybWF0LmpzCkBAIC02NSw3ICs2 NSwxMiBAQCBzaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLlJlbGF0aXZlVGltZUZvcm1hdC5z dXBwb3J0ZWRMb2NhbGVzT2YoOSkpLCAnW10nKTsKIHNob3VsZEJlKEpTT04uc3RyaW5naWZ5KElu dGwuUmVsYXRpdmVUaW1lRm9ybWF0LnN1cHBvcnRlZExvY2FsZXNPZignZW4nKSksICdbImVuIl0n KTsKIHNob3VsZEJlKEpTT04uc3RyaW5naWZ5KEludGwuUmVsYXRpdmVUaW1lRm9ybWF0LnN1cHBv cnRlZExvY2FsZXNPZih7IGxlbmd0aDogNCwgMTogJ2VuJywgMDogJ2VzJywgMzogJ2RlJyB9KSks ICdbImVzIiwiZW4iLCJkZSJdJyk7CiBzaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLlJlbGF0 aXZlVGltZUZvcm1hdC5zdXBwb3J0ZWRMb2NhbGVzT2YoWydlbicsICdwdCcsICdlbicsICdlcydd KSksICdbImVuIiwicHQiLCJlcyJdJyk7Ci1zaG91bGRCZShKU09OLnN0cmluZ2lmeShJbnRsLlJl bGF0aXZlVGltZUZvcm1hdC5zdXBwb3J0ZWRMb2NhbGVzT2YoJ0VuLWxhVG4tdXMtdmFyaUFudC1m T09iYXItMWFiYy1VLWtuLXRSdWUtQS1hYS1hYWEteC1SRVNFUlZFRCcpKSwgJ1siZW4tTGF0bi1V Uy12YXJpYW50LWZvb2Jhci0xYWJjLWEtYWEtYWFhLXUta24tdHJ1ZS14LXJlc2VydmVkIl0nKTsK K3Nob3VsZEJlKAorICAgIEpTT04uc3RyaW5naWZ5KEludGwuUmVsYXRpdmVUaW1lRm9ybWF0LnN1 cHBvcnRlZExvY2FsZXNPZignRW4tbGFUbi11cy12YXJpQW50LWZPT2Jhci0xYWJjLVUta24tdFJ1 ZS1BLWFhLWFhYS14LVJFU0VSVkVEJykpLAorICAgICR2bS5pY3VWZXJzaW9uKCkgPj0gNjcKKyAg ICAgICAgPyAnWyJlbi1MYXRuLVVTLTFhYmMtZm9vYmFyLXZhcmlhbnQtYS1hYS1hYWEtdS1rbi14 LXJlc2VydmVkIl0nCisgICAgICAgIDogJ1siZW4tTGF0bi1VUy12YXJpYW50LWZvb2Jhci0xYWJj LWEtYWEtYWFhLXUta24tdHJ1ZS14LXJlc2VydmVkIl0nCispOwogc2hvdWxkQmUoSlNPTi5zdHJp bmdpZnkoSW50bC5SZWxhdGl2ZVRpbWVGb3JtYXQuc3VwcG9ydGVkTG9jYWxlc09mKCduby1ib2sn KSksICdbIm5iIl0nKTsKIHNob3VsZEJlKEpTT04uc3RyaW5naWZ5KEludGwuUmVsYXRpdmVUaW1l Rm9ybWF0LnN1cHBvcnRlZExvY2FsZXNPZigneC1zb21lLXRoaW5nJykpLCAnW10nKTsKIAo=