238832 2022-04-05 13:53:41 -0700 Fix expected, actual links for variant-based imported wpt tests 2022-12-04 10:15:25 -0800 1 1 1 Unclassified WebKit WebKit Website WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=238862 https://bugs.webkit.org/show_bug.cgi?id=248745 InRadar P2 Normal --- 231544 239561 1 pascoe philn bfulgham ews-watchlist glenn jbedard jond pascoe simon.fraser webkit-bug-importer zimmermann oldest_to_newest 1858554 0 pascoe 2022-04-05 13:53:41 -0700 Appears these aren't working on ex: https://build.webkit.org/results/GTK-Linux-64-bit-Release-Tests/r292391%20(6950)/results.html 1858558 1 webkit-bug-importer 2022-04-05 13:57:52 -0700 <rdar://problem/91313891> 1858583 2 pascoe 2022-04-05 14:40:24 -0700 I wiped out the associated change in results.html from https://bugs.webkit.org/show_bug.cgi?id=231544 when preparing it for a patch. Will add in this bug. 1858612 3 456758 pascoe 2022-04-05 15:10:01 -0700 Created attachment 456758 Patch 1858857 4 456825 pascoe 2022-04-06 09:09:35 -0700 Created attachment 456825 Patch 1858873 5 456825 bfulgham 2022-04-06 09:45:14 -0700 Comment on attachment 456825 Patch r=me. Thanks for putting together a more complete/future-proof fix! 1859038 6 ews-feeder 2022-04-06 14:59:03 -0700 Committed r292508 (249351@main): <https://commits.webkit.org/249351@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456825. 1860625 7 zimmermann 2022-04-12 02:24:45 -0700 I can no longer open differences/expected/actual files for SVG files, if they fail. Since this is the only code that touches the "output_filename" function in a while, it must be guilty for this. 1860630 8 zimmermann 2022-04-12 02:37:03 -0700 (In reply to Nikolas Zimmermann from comment #7) > I can no longer open differences/expected/actual files for SVG files, if > they fail. > Since this is the only code that touches the "output_filename" function in a > while, it must be guilty for this. Some context: if e.g. svg/W3C-SVG-1.1/animate-elem-02-t.svg fails, the generated results.html now contains links to "file:///Users/nzimmermann/Software/GitRepositories/WebKitVanilla/WebKitBuild/Release/layout-test-results/svg/W3C-SVG-1.1/animate-elem-02-t.svg-diffs.html" The ".svg" is superfluous and thus the link points to nirvana now. 1860641 9 zimmermann 2022-04-12 02:56:38 -0700 (In reply to Nikolas Zimmermann from comment #8) > (In reply to Nikolas Zimmermann from comment #7) > > I can no longer open differences/expected/actual files for SVG files, if > > they fail. > > Since this is the only code that touches the "output_filename" function in a > > while, it must be guilty for this. > > Some context: if e.g. svg/W3C-SVG-1.1/animate-elem-02-t.svg fails, the > generated results.html now contains links to > "file:///Users/nzimmermann/Software/GitRepositories/WebKitVanilla/ > WebKitBuild/Release/layout-test-results/svg/W3C-SVG-1.1/animate-elem-02-t. > svg-diffs.html" > > The ".svg" is superfluous and thus the link points to nirvana now. The JS code in LayoutTests/fast/harness/results.html implements the 'static testPrefix' method, which contains following check: else if (Utils.splitExtension(parts[0])[1].length > 5) { Utils.splitExtension(parts[0]) returns "["svg/W3C-SVG-1", "1/shapes-rect-01-t"] in my case -- it treats the dot in the folder name as file extension. The implementation of Utils.splitExtension() needs to be reworked: static splitExtension(testName) { let index = testName.lastIndexOf('.'); if (index == -1) { return [testName, '']; } return [testName.substring(0, index), testName.substring(index + 1)]; } Ok, I'll revert it locally for now, so that I can proceed to do what I actually wanted :-) Feel free to proceed with a fix rather than a roll-out. I'm happy to cross check your patch. 1863029 10 zimmermann 2022-04-20 13:08:01 -0700 This is hitting other folks as well, heard the question now two times already in Igaia, why results.html pages are broken. 1910392 11 pnormand 2022-11-04 11:36:22 -0700 Pull request: https://github.com/WebKit/WebKit/pull/6143 1912672 12 ews-feeder 2022-11-15 11:22:28 -0800 Committed 256703@main (3be2c0d6c2ab): <https://commits.webkit.org/256703@main> Reviewed commits have been landed. Closing PR #6143 and removing active labels. 1916599 13 simon.fraser 2022-12-04 10:15:25 -0800 This is still broken: bug 248745 456758 2022-04-05 15:10:01 -0700 2022-04-06 09:09:34 -0700 Patch bug-238832-20220405151000.patch text/plain 8942 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMzkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYxMTY5ZjEyNTQzZTJkMjBkNDRjYWMxYWJiNTBkMDY2 YzZjOGUyNy4uM2VhNjNmNjA3OTA0MDE5MGNhNWRjMjljM2Y1ZDhjMGY5ZjE2ZDA0YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIyLTA0LTA1ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAg ICBGaXggZXhwZWN0ZWQsIGFjdHVhbCBsaW5rcyBmb3IgdmFyaWFudC1iYXNlZCBpbXBvcnRlZCB3 cHQgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzODgzMgorICAgICAgICByZGFyOi8vcHJvYmxlbS85MTMxMzg5MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB0aGF0IHRoZSB3b3JrYXJv dW5kIGludm9sdmluZyAibGVuKGZzLnNwbGl0ZXh0KG91dHB1dF9iYXNlbmFtZSlbMV0pIC0gMSA+ IDUiCisgICAgICAgIGRvZXMgbm90IGFmZmVjdCBpbXBvcnRlZCB0ZW1wbGF0ZWQgd3B0IHRlc3Rz IHRoYXQgbWF5IG1hdGNoIHRoYXQgY29uZGl0aW9uLCBzdWNoIGFzCisgICAgICAgICIuLi4vcGJr ZGYyLmh0dHBzLmFueS53b3JrZXIuaHRtbC4iCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHk6CisgICAgICAg IChUZXN0UmVzdWx0V3JpdGVyLm91dHB1dF9maWxlbmFtZSk6CisKIDIwMjItMDQtMDUgIEtpbW1v IEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBBTkdMRSBjaGFuZ2Vz LmRpZmYgY29udGFpbnMgZGlmZmVyZW5jZXMgdGhhdCBhcmUgZnJvbSBzdGFsZSBmaWxlcyBvciB1 bm5lZWRlZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5CmluZGV4IDU3 YTdkMmYxNTFmN2Y3NDM5NmQ2ZGM5ZTg2Y2IyNTJmNThjYjI1OGEuLjIxOTgzOWMxNGNlODI3ZGI4 YjkzMjhmNDc2OGRkNjA5MjI4M2JhYzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3Vs dF93cml0ZXIucHkKQEAgLTEwMiwxNiArMTAyLDE0IEBAIGNsYXNzIFRlc3RSZXN1bHRXcml0ZXIo b2JqZWN0KToKICAgICAgICAgb3V0cHV0X2Jhc2VuYW1lID0gZXh0X3BhcnRzWzBdCiAgICAgICAg IGlmIGxlbihleHRfcGFydHMpID4gMSBhbmQgJz8nIGluIGV4dF9wYXJ0c1sxXToKICAgICAgICAg ICAgIG91dHB1dF9iYXNlbmFtZSArPSAnXycgKyBleHRfcGFydHNbMV0uc3BsaXQoJz8nKVsxXQot ICAgICAgICBpZiBsZW4oZXh0X3BhcnRzKSA+IDEgYW5kICcjJyBpbiBleHRfcGFydHNbMV06Cisg ICAgICAgIGVsaWYgbGVuKGV4dF9wYXJ0cykgPiAxIGFuZCAnIycgaW4gZXh0X3BhcnRzWzFdOgog ICAgICAgICAgICAgb3V0cHV0X2Jhc2VuYW1lICs9ICdfJyArIGV4dF9wYXJ0c1sxXS5zcGxpdCgn IycpWzFdCisgICAgICAgIGVsaWYgbGVuKGZzLnNwbGl0ZXh0KG91dHB1dF9iYXNlbmFtZSlbMV0p IC0gMSA+IDU6CisgICAgICAgICAgICAjIFRlbXBvcmFyeSBmaXgsIGFsc28gaW4gTGF5b3V0VGVz dHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMuaHRtbCwgbGluZSAyNzUuCisgICAgICAgICAgICAjIEZJ WE1FOiBSZWZhY3RvciB0byBhdm9pZCBjb25mdXNpbmcgcmVmZXJlbmNlIHRvIGJvdGggdGVzdCBh bmQgcHJvY2VzcyBuYW1lcy4KKyAgICAgICAgICAgIHJldHVybiBmcy5qb2luKHNlbGYuX3Jvb3Rf b3V0cHV0X2Rpciwgb3V0cHV0X2Jhc2VuYW1lKSArIG1vZGlmaWVyCiAKLSAgICAgICAgb3V0cHV0 X2ZpbGVuYW1lID0gZnMuam9pbihzZWxmLl9yb290X291dHB1dF9kaXIsIG91dHB1dF9iYXNlbmFt ZSkKLQotICAgICAgICAjIFRlbXBvcmFyeSBmaXgsIGFsc28gaW4gTGF5b3V0VGVzdHMvZmFzdC9o YXJuZXNzL3Jlc3VsdHMuaHRtbCwgbGluZSAyNzUuCi0gICAgICAgICMgRklYTUU6IFJlZmFjdG9y IHRvIGF2b2lkIGNvbmZ1c2luZyByZWZlcmVuY2UgdG8gYm90aCB0ZXN0IGFuZCBwcm9jZXNzIG5h bWVzLgotICAgICAgICBpZiBsZW4oZnMuc3BsaXRleHQob3V0cHV0X2ZpbGVuYW1lKVsxXSkgLSAx ID4gNToKLSAgICAgICAgICAgIHJldHVybiBvdXRwdXRfZmlsZW5hbWUgKyBtb2RpZmllcgotICAg ICAgICByZXR1cm4gZnMuc3BsaXRleHQob3V0cHV0X2ZpbGVuYW1lKVswXSArIG1vZGlmaWVyCisg ICAgICAgIHJldHVybiBmcy5zcGxpdGV4dChmcy5qb2luKHNlbGYuX3Jvb3Rfb3V0cHV0X2Rpciwg b3V0cHV0X2Jhc2VuYW1lKSlbMF0gKyBtb2RpZmllcgogCiAgICAgZGVmIF93cml0ZV9iaW5hcnlf ZmlsZShzZWxmLCBwYXRoLCBjb250ZW50cyk6CiAgICAgICAgIGlmIGNvbnRlbnRzIGlzIG5vdCBO b25lOgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDI0YzQ2NzAzNTdjYmNlYzUzNjZhOGZlMTUwNTEyOGUzODUyZTNkYzAuLjYw ZGIwODE5NGJiMTM1M2NiNGYzNjA2NmU2NmJjYmUyZDE2NWY3ZmMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAyMi0wNC0wNSAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IGV4cGVjdGVkLCBhY3R1YWwgbGlua3MgZm9yIHZhcmlhbnQtYmFzZWQgaW1wb3J0ZWQg d3B0IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzg4MzIKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vOTEzMTM4OTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY2hhbmdlcyB0byBMYXlvdXRU ZXN0cy9mYXN0L2hhcm5lc3MvcmVzdWx0cy5odG1sIHdlcmUgd2lwZWQgd2hlbgorICAgICAgICBw cmVwYXJpbmcgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTU0NCwg Y2F1c2luZyB0aGUKKyAgICAgICAgbGlua3Mgbm90IHRvIG1hdGNoLiBUaGlzIHBhdGNoIGZpeGVz IGl0LgorCisgICAgICAgICogZmFzdC9oYXJuZXNzL3Jlc3VsdHMuaHRtbDoKKwogMjAyMi0wNC0w NSAgQ2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFNraXAg ZWRpdGluZy13b3JkLXdpdGgtbWFya2VyLTEuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9oYXJuZXNzL3Jlc3VsdHMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy9yZXN1 bHRzLmh0bWwKaW5kZXggNjFlOGIxMzIyNDAyZDcwZjU5NDUzMzhkYTE4MWRhNmFiNThjOTI4Yy4u MTRlY2JhYzM4MTFmNTkwNjc1NWE2N2NhNzA0MTIyNzYxYTIzZWU1OSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2hhcm5lc3MvcmVzdWx0cy5odG1sCkBAIC0yODAsMTMgKzI4MCwxOSBAQCBjbGFzcyBVdGlscwog ICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAKLSAgICBzdGF0aWMgc3RyaXBFeHRlbnNpb24o dGVzdE5hbWUpCisgICAgc3RhdGljIHRlc3RQcmVmaXgodGVzdE5hbWUpCiAgICAgewogICAgICAg ICAvLyBUZW1wb3JhcnkgZml4LCBhbHNvIGluIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnN0cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHksIGxpbmUgOTUuCiAgICAg ICAgIC8vIEZJWE1FOiBSZWZhY3RvciB0byBhdm9pZCBjb25mdXNpbmcgcmVmZXJlbmNlIHRvIGJv dGggdGVzdCBhbmQgcHJvY2VzcyBuYW1lcy4KLSAgICAgICAgaWYgKFV0aWxzLnNwbGl0RXh0ZW5z aW9uKHRlc3ROYW1lKVsxXS5sZW5ndGggPiA1KQorICAgICAgICBsZXQgcGFydHMgPSBVdGlscy5z cGxpdEV4dGVuc2lvbih0ZXN0TmFtZSk7CisgICAgICAgIGxldCBwcmVmaXggPSBwYXJ0c1swXTsK KyAgICAgICAgaWYgKHBhcnRzWzFdLmluY2x1ZGVzKCc/JykpCisgICAgICAgICAgICBwcmVmaXgg Kz0gJ18nICsgcGFydHNbMV0uc3BsaXQoJz8nKVsxXQorICAgICAgICBlbHNlIGlmIChwYXJ0c1sx XS5pbmNsdWRlcygnIycpKQorICAgICAgICAgICAgcHJlZml4ICs9ICdfJyArIHBhcnRzWzFdLnNw bGl0KCcjJylbMV0KKyAgICAgICAgZWxzZSBpZiAoVXRpbHMuc3BsaXRFeHRlbnNpb24ocGFydHNb MF0pWzFdLmxlbmd0aCA+IDUpCiAgICAgICAgICAgICByZXR1cm4gdGVzdE5hbWU7Ci0gICAgICAg IHJldHVybiBVdGlscy5zcGxpdEV4dGVuc2lvbih0ZXN0TmFtZSlbMF07CisgICAgICAgIHJldHVy biBwcmVmaXg7CiAgICAgfQogCiAgICAgc3RhdGljIHNwbGl0RXh0ZW5zaW9uKHRlc3ROYW1lKQpA QCAtMTE2OCw3ICsxMTc0LDcgQEAgY2xhc3MgVGVzdFJlc3VsdHNDb250cm9sbGVyCiAgICAgICAg ICAgICAgICAgVGVzdFJlc3VsdHNDb250cm9sbGVyLl9nZXRSZXN1bHRDb250YWluZXIobm9kZSku cmVtb3ZlKCk7CiAgICAgICAgICAgICBlbHNlIGlmICh1cmwubWF0Y2goJy1hY3R1YWwucG5nJCcp KSB7CiAgICAgICAgICAgICAgICAgbGV0IG5hbWUgPSBVdGlscy5wYXJlbnRPZlR5cGUobm9kZSwg J3Rib2R5JykucXVlcnlTZWxlY3RvcignLnRlc3QtbGluaycpLnRleHRDb250ZW50OwotICAgICAg ICAgICAgICAgIFRlc3RSZXN1bHRzQ29udHJvbGxlci5fZ2V0UmVzdWx0Q29udGFpbmVyKG5vZGUp Lm91dGVySFRNTCA9IHRvZ2dsaW5nSW1hZ2VGdW5jdGlvbihVdGlscy5zdHJpcEV4dGVuc2lvbihu YW1lKSk7CisgICAgICAgICAgICAgICAgVGVzdFJlc3VsdHNDb250cm9sbGVyLl9nZXRSZXN1bHRD b250YWluZXIobm9kZSkub3V0ZXJIVE1MID0gdG9nZ2xpbmdJbWFnZUZ1bmN0aW9uKFV0aWxzLnRl c3RQcmVmaXgobmFtZSkpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMTM0 NCw3ICsxMzUwLDcgQEAgY2xhc3MgRmFpbHVyZXNTZWN0aW9uQnVpbGRlciBleHRlbmRzIFNlY3Rp b25CdWlsZGVyIHsKIAogICAgICAgICBsZXQgYWN0dWFsVG9rZW5zID0gdGVzdFJlc3VsdC5pbmZv LmFjdHVhbC5zcGxpdCgvXHMrLyk7CiAKLSAgICAgICAgbGV0IHRlc3RQcmVmaXggPSBVdGlscy5z dHJpcEV4dGVuc2lvbih0ZXN0UmVzdWx0Lm5hbWUpOworICAgICAgICBsZXQgdGVzdFByZWZpeCA9 IFV0aWxzLnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1lKTsKICAgICAgICAgbGV0IGltYWdlUmVz dWx0cyA9IHRoaXMuaW1hZ2VSZXN1bHRMaW5rcyh0ZXN0UmVzdWx0LCB0ZXN0UHJlZml4LCBhY3R1 YWxUb2tlbnNbMF0pOwogICAgICAgICBpZiAoIWltYWdlUmVzdWx0cyAmJiBhY3R1YWxUb2tlbnMu bGVuZ3RoID4gMSkKICAgICAgICAgICAgIGltYWdlUmVzdWx0cyA9IHRoaXMuaW1hZ2VSZXN1bHRM aW5rcyh0ZXN0UmVzdWx0LCAncmV0cmllcy8nICsgdGVzdFByZWZpeCwgYWN0dWFsVG9rZW5zWzFd KTsKQEAgLTEzNzQsMTIgKzEzODAsMTIgQEAgY2xhc3MgRmFpbHVyZXNTZWN0aW9uQnVpbGRlciBl eHRlbmRzIFNlY3Rpb25CdWlsZGVyIHsKIAogICAgIGFwcGVuZFRleHRGYWlsdXJlTGlua3ModGVz dFJlc3VsdCwgY2VsbCkKICAgICB7Ci0gICAgICAgIGNlbGwuaW5uZXJIVE1MICs9IHRoaXMuX3Jl c3VsdHNDb250cm9sbGVyLnRleHRSZXN1bHRMaW5rcyhVdGlscy5zdHJpcEV4dGVuc2lvbih0ZXN0 UmVzdWx0Lm5hbWUpKTsKKyAgICAgICAgY2VsbC5pbm5lckhUTUwgKz0gdGhpcy5fcmVzdWx0c0Nv bnRyb2xsZXIudGV4dFJlc3VsdExpbmtzKFV0aWxzLnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1l KSk7CiAgICAgfQogICAgIAogICAgIGFwcGVuZEF1ZGlvRmFpbHVyZUxpbmtzKHRlc3RSZXN1bHQs IGNlbGwpCiAgICAgewotICAgICAgICBsZXQgcHJlZml4ID0gVXRpbHMuc3RyaXBFeHRlbnNpb24o dGVzdFJlc3VsdC5uYW1lKTsKKyAgICAgICAgbGV0IHByZWZpeCA9IFV0aWxzLnRlc3RQcmVmaXgo dGVzdFJlc3VsdC5uYW1lKTsKICAgICAgICAgY2VsbC5pbm5lckhUTUwgKz0gVGVzdFJlc3VsdHND b250cm9sbGVyLnJlc3VsdExpbmsocHJlZml4LCAnLWV4cGVjdGVkLndhdicsICdleHBlY3RlZCBh dWRpbycpCiAgICAgICAgICAgICArIFRlc3RSZXN1bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKHBy ZWZpeCwgJy1hY3R1YWwud2F2JywgJ2FjdHVhbCBhdWRpbycpCiAgICAgICAgICAgICArIFRlc3RS ZXN1bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKHByZWZpeCwgJy1kaWZmLnR4dCcsICd0ZXh0dWFs IGRpZmYnKTsKQEAgLTEzODcsNyArMTM5Myw3IEBAIGNsYXNzIEZhaWx1cmVzU2VjdGlvbkJ1aWxk ZXIgZXh0ZW5kcyBTZWN0aW9uQnVpbGRlciB7CiAgICAgCiAgICAgYXBwZW5kQWN0dWFsT25seUxp bmtzKHRlc3RSZXN1bHQsIGNlbGwpCiAgICAgewotICAgICAgICBsZXQgcHJlZml4ID0gVXRpbHMu c3RyaXBFeHRlbnNpb24odGVzdFJlc3VsdC5uYW1lKTsKKyAgICAgICAgbGV0IHByZWZpeCA9IFV0 aWxzLnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1lKTsKICAgICAgICAgaWYgKHRlc3RSZXN1bHQu aXNNaXNzaW5nQXVkaW8oKSkKICAgICAgICAgICAgIGNlbGwuaW5uZXJIVE1MICs9IFRlc3RSZXN1 bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKHByZWZpeCwgJy1hY3R1YWwud2F2JywgJ2F1ZGlvIHJl c3VsdCcpOwogCkBAIC0xNDcxLDcgKzE0NzcsNyBAQCBjbGFzcyBUZXN0c1dpdGhTdGRFcnJTZWN0 aW9uQnVpbGRlciBleHRlbmRzIFNlY3Rpb25CdWlsZGVyIHsKIAogICAgIGZpbGxUZXN0UmVzdWx0 Q2VsbCh0ZXN0UmVzdWx0LCBjZWxsKQogICAgIHsKLSAgICAgICAgY2VsbC5pbm5lckhUTUwgPSBU ZXN0UmVzdWx0c0NvbnRyb2xsZXIucmVzdWx0TGluayhVdGlscy5zdHJpcEV4dGVuc2lvbih0ZXN0 UmVzdWx0Lm5hbWUpLCAnLXN0ZGVyci50eHQnLCAnc3RkZXJyJyk7CisgICAgICAgIGNlbGwuaW5u ZXJIVE1MID0gVGVzdFJlc3VsdHNDb250cm9sbGVyLnJlc3VsdExpbmsoVXRpbHMudGVzdFByZWZp eCh0ZXN0UmVzdWx0Lm5hbWUpLCAnLXN0ZGVyci50eHQnLCAnc3RkZXJyJyk7CiAgICAgfQogfTsK IApAQCAtMTQ4MSw3ICsxNDg3LDcgQEAgY2xhc3MgVGltZWRPdXRUZXN0c1NlY3Rpb25CdWlsZGVy IGV4dGVuZHMgU2VjdGlvbkJ1aWxkZXIgewogICAgIGZpbGxUZXN0UmVzdWx0Q2VsbCh0ZXN0UmVz dWx0LCBjZWxsKQogICAgIHsKICAgICAgICAgLy8gRklYTUU6IG9ubHkgaW5jbHVkZSB0aW1lb3V0 IGFjdHVhbC9kaWZmIHJlc3VsdHMgaGVyZSBpZiB3ZSBhY3R1YWxseSBzcGl0IG91dCByZXN1bHRz IGZvciB0aW1lb3V0IHRlc3RzLgotICAgICAgICBjZWxsLmlubmVySFRNTCA9IHRoaXMuX3Jlc3Vs dHNDb250cm9sbGVyLnRleHRSZXN1bHRMaW5rcyhVdGlscy5zdHJpcEV4dGVuc2lvbih0ZXN0UmVz dWx0Lm5hbWUpKTsKKyAgICAgICAgY2VsbC5pbm5lckhUTUwgPSB0aGlzLl9yZXN1bHRzQ29udHJv bGxlci50ZXh0UmVzdWx0TGlua3MoVXRpbHMudGVzdFByZWZpeCh0ZXN0UmVzdWx0Lm5hbWUpKTsK ICAgICB9CiB9OwogCkBAIC0xNDkwLDggKzE0OTYsOCBAQCBjbGFzcyBDcmFzaGluZ1Rlc3RzU2Vj dGlvbkJ1aWxkZXIgZXh0ZW5kcyBTZWN0aW9uQnVpbGRlciB7CiAKICAgICBmaWxsVGVzdFJlc3Vs dENlbGwodGVzdFJlc3VsdCwgY2VsbCkKICAgICB7Ci0gICAgICAgIGNlbGwuaW5uZXJIVE1MID0g VGVzdFJlc3VsdHNDb250cm9sbGVyLnJlc3VsdExpbmsoVXRpbHMuc3RyaXBFeHRlbnNpb24odGVz dFJlc3VsdC5uYW1lKSwgJy1jcmFzaC1sb2cudHh0JywgJ2NyYXNoIGxvZycpCi0gICAgICAgICAg ICAgICAgICAgICAgICsgVGVzdFJlc3VsdHNDb250cm9sbGVyLnJlc3VsdExpbmsoVXRpbHMuc3Ry aXBFeHRlbnNpb24odGVzdFJlc3VsdC5uYW1lKSwgJy1zYW1wbGUudHh0JywgJ3NhbXBsZScpOwor ICAgICAgICBjZWxsLmlubmVySFRNTCA9IFRlc3RSZXN1bHRzQ29udHJvbGxlci5yZXN1bHRMaW5r KFV0aWxzLnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1lKSwgJy1jcmFzaC1sb2cudHh0JywgJ2Ny YXNoIGxvZycpCisgICAgICAgICAgICAgICAgICAgICAgICsgVGVzdFJlc3VsdHNDb250cm9sbGVy LnJlc3VsdExpbmsoVXRpbHMudGVzdFByZWZpeCh0ZXN0UmVzdWx0Lm5hbWUpLCAnLXNhbXBsZS50 eHQnLCAnc2FtcGxlJyk7CiAgICAgfQogfTsKIApAQCAtMTQ5OSw3ICsxNTA1LDcgQEAgY2xhc3Mg T3RoZXJDcmFzaGVzU2VjdGlvbkJ1aWxkZXIgZXh0ZW5kcyBTZWN0aW9uQnVpbGRlciB7CiAgICAg c2VjdGlvblRpdGxlKCkgeyByZXR1cm4gJ090aGVyIGNyYXNoZXMnOyB9CiAgICAgZmlsbFRlc3RS ZXN1bHRDZWxsKHRlc3RSZXN1bHQsIGNlbGwpCiAgICAgewotICAgICAgICBjZWxsLmlubmVySFRN TCA9IFRlc3RSZXN1bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKFV0aWxzLnN0cmlwRXh0ZW5zaW9u KHRlc3RSZXN1bHQubmFtZSksICctY3Jhc2gtbG9nLnR4dCcsICdjcmFzaCBsb2cnKTsKKyAgICAg ICAgY2VsbC5pbm5lckhUTUwgPSBUZXN0UmVzdWx0c0NvbnRyb2xsZXIucmVzdWx0TGluayhVdGls cy50ZXN0UHJlZml4KHRlc3RSZXN1bHQubmFtZSksICctY3Jhc2gtbG9nLnR4dCcsICdjcmFzaCBs b2cnKTsKICAgICB9CiAKICAgICBjcmVhdGVIaXN0b3J5Q2VsbCh0ZXN0UmVzdWx0KQo= 456825 2022-04-06 09:09:35 -0700 2022-04-06 14:59:04 -0700 Patch bug-238832-20220406090934.patch text/plain 10863 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDFlMGNhZTcxMTFkMTU0OWJlMTQ2NDFhYWJkYmY1M2Iz Yzk3ZTlhZi4uNzYyMDQzMDMzZGQ1N2E3MjRlNThiMTEyZTU0ZGFkOGNhNmZiZTUyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDIyLTA0LTA2ICBKIFBhc2NvZSAgPGpfcGFzY29lQGFwcGxlLmNvbT4KKworICAgICAg ICBGaXggZXhwZWN0ZWQsIGFjdHVhbCBsaW5rcyBmb3IgdmFyaWFudC1iYXNlZCBpbXBvcnRlZCB3 cHQgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzODgzMgorICAgICAgICByZGFyOi8vcHJvYmxlbS85MTMxMzg5MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB0aGF0IHRoZSB3b3JrYXJv dW5kIGludm9sdmluZyAibGVuKGZzLnNwbGl0ZXh0KG91dHB1dF9iYXNlbmFtZSlbMV0pIC0gMSA+ IDUiCisgICAgICAgIGRvZXMgbm90IGFmZmVjdCBpbXBvcnRlZCB0ZW1wbGF0ZWQgd3B0IHRlc3Rz IHRoYXQgbWF5IG1hdGNoIHRoYXQgY29uZGl0aW9uLCBzdWNoIGFzCisgICAgICAgICIuLi4vcGJr ZGYyLmh0dHBzLmFueS53b3JrZXIuaHRtbC4iCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHk6CisgICAgICAg IChUZXN0UmVzdWx0V3JpdGVyLm91dHB1dF9maWxlbmFtZSk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlclRlc3QudGVzdF9vdXRwdXRfZmlsZW5h bWUpOgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlclRlc3QpOgorICAgICAgICAoVGVzdFJlc3Vs dFdyaXRlclRlc3QudGVzdF9vdXRwdXRfZmlsZW5hbWVfdmFyaWFudCk6CisKIDIwMjItMDQtMDYg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgVW5pZnkg dGhlIHR3byBJbWFnZUJ1ZmZlcjo6Y3JlYXRlKCkgZnVuY3Rpb25zLCBwYXNzaW5nIFJlbmRlcmlu Z1B1cnBvc2UgZXZlcnl3aGVyZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVy LnB5CmluZGV4IDQ4NjgwMmM1YWU4MjIzZGY5ZDg0ZDZlM2M5YzIzNjdjZmIzODFmN2YuLjA1MGNh NWU5MTczZDQ1ZDQ0MDZkNWRkMWU4YjdhYjM1YjdkNTdhNzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy90ZXN0X3Jlc3VsdF93cml0ZXIucHkKQEAgLTEwMiwxNiArMTAyLDEzIEBAIGNsYXNzIFRlc3RS ZXN1bHRXcml0ZXIob2JqZWN0KToKICAgICAgICAgb3V0cHV0X2Jhc2VuYW1lID0gZXh0X3BhcnRz WzBdCiAgICAgICAgIGlmIGxlbihleHRfcGFydHMpID4gMSBhbmQgJz8nIGluIGV4dF9wYXJ0c1sx XToKICAgICAgICAgICAgIG91dHB1dF9iYXNlbmFtZSArPSAnXycgKyBleHRfcGFydHNbMV0uc3Bs aXQoJz8nKVsxXQotICAgICAgICBpZiBsZW4oZXh0X3BhcnRzKSA+IDEgYW5kICcjJyBpbiBleHRf cGFydHNbMV06CisgICAgICAgIGVsaWYgbGVuKGV4dF9wYXJ0cykgPiAxIGFuZCAnIycgaW4gZXh0 X3BhcnRzWzFdOgogICAgICAgICAgICAgb3V0cHV0X2Jhc2VuYW1lICs9ICdfJyArIGV4dF9wYXJ0 c1sxXS5zcGxpdCgnIycpWzFdCi0KLSAgICAgICAgb3V0cHV0X2ZpbGVuYW1lID0gZnMuam9pbihz ZWxmLl9yb290X291dHB1dF9kaXIsIG91dHB1dF9iYXNlbmFtZSArIGV4dF9wYXJ0c1sxXSkKLQot ICAgICAgICAjIFRlbXBvcmFyeSBmaXgsIGFsc28gaW4gTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNz L3Jlc3VsdHMuaHRtbCwgbGluZSAyNzUuCi0gICAgICAgICMgRklYTUU6IFJlZmFjdG9yIHRvIGF2 b2lkIGNvbmZ1c2luZyByZWZlcmVuY2UgdG8gYm90aCB0ZXN0IGFuZCBwcm9jZXNzIG5hbWVzLgot ICAgICAgICBpZiBsZW4oZnMuc3BsaXRleHQob3V0cHV0X2ZpbGVuYW1lKVsxXSkgLSAxID4gNToK LSAgICAgICAgICAgIHJldHVybiBvdXRwdXRfZmlsZW5hbWUgKyBtb2RpZmllcgotICAgICAgICBy ZXR1cm4gZnMuc3BsaXRleHQob3V0cHV0X2ZpbGVuYW1lKVswXSArIG1vZGlmaWVyCisgICAgICAg IGVsaWYgbGVuKGZzLnNwbGl0ZXh0KG91dHB1dF9iYXNlbmFtZSlbMV0pIC0gMSA+IDU6CisgICAg ICAgICAgICAjIFRlbXBvcmFyeSBmaXgsIGFsc28gaW4gTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNz L3Jlc3VsdHMuaHRtbCwgbGluZSAyNzUuCisgICAgICAgICAgICAjIEZJWE1FOiBSZWZhY3RvciB0 byBhdm9pZCBjb25mdXNpbmcgcmVmZXJlbmNlIHRvIGJvdGggdGVzdCBhbmQgcHJvY2VzcyBuYW1l cy4KKyAgICAgICAgICAgIHJldHVybiBmcy5qb2luKHNlbGYuX3Jvb3Rfb3V0cHV0X2Rpciwgc2Vs Zi5fdGVzdF9uYW1lKSArIG1vZGlmaWVyCisgICAgICAgIHJldHVybiBmcy5qb2luKHNlbGYuX3Jv b3Rfb3V0cHV0X2Rpciwgb3V0cHV0X2Jhc2VuYW1lKSArIG1vZGlmaWVyCiAKICAgICBkZWYgX3dy aXRlX2JpbmFyeV9maWxlKHNlbGYsIHBhdGgsIGNvbnRlbnRzKToKICAgICAgICAgaWYgY29udGVu dHMgaXMgbm90IE5vbmU6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXJfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93 cml0ZXJfdW5pdHRlc3QucHkKaW5kZXggY2EwZWFkZTgwMjBkZThjYTA1NzY4NjQ5OTdjYjliMDY4 NGQxNmE3Ny4uNTgzNmVjZjlhNmY1OGFlNTI1NGNjM2ZmMmZjYTIyNDA4NTdhNjE0YyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVz dF9yZXN1bHRfd3JpdGVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlcl91bml0dGVzdC5weQpA QCAtNjEsMyArNjEsMTcgQEAgY2xhc3MgVGVzdFJlc3VsdFdyaXRlclRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICBmcyA9IGhvc3QuZmlsZXN5c3RlbQogICAgICAgICB3cml0ZXIgPSB0 ZXN0X3Jlc3VsdF93cml0ZXIuVGVzdFJlc3VsdFdyaXRlcihmcywgcG9ydCwgcG9ydC5yZXN1bHRz X2RpcmVjdG9yeSgpLCAncmVxdWlyZS1jb3JwLXJldmFsaWRhdGVkLWltYWdlcy5odHRwcy5odG1s JykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh3cml0ZXIub3V0cHV0X2ZpbGVuYW1lKCctZGlm Zi50eHQnKSwgZnMuam9pbihwb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCksICdyZXF1aXJlLWNvcnAt cmV2YWxpZGF0ZWQtaW1hZ2VzLmh0dHBzLWRpZmYudHh0JykpCisKKyAgICBkZWYgdGVzdF9vdXRw dXRfZmlsZW5hbWVfdmFyaWFudChzZWxmKToKKyAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKKyAg ICAgICAgcG9ydCA9IFRlc3RQb3J0KGhvc3QpCisgICAgICAgIGZzID0gaG9zdC5maWxlc3lzdGVt CisgICAgICAgIHdyaXRlciA9IHRlc3RfcmVzdWx0X3dyaXRlci5UZXN0UmVzdWx0V3JpdGVyKGZz LCBwb3J0LCBwb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCksICd0ZW1wbGF0ZV90ZXN0L3Bia2RmMi5o dHRwcy5hbnkud29ya2VyLmh0bWw/MS0xMDAwJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChm cy5qb2luKHBvcnQucmVzdWx0c19kaXJlY3RvcnkoKSwgJ3RlbXBsYXRlX3Rlc3QvcGJrZGYyLmh0 dHBzLmFueS53b3JrZXJfMS0xMDAwLWRpZmYudHh0JyksIHdyaXRlci5vdXRwdXRfZmlsZW5hbWUo Jy1kaWZmLnR4dCcpKQorCisgICAgZGVmIHRlc3Rfb3V0cHV0X2ZpbGVuYW1lX3ZhcmlhbnQoc2Vs Zik6CisgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCisgICAgICAgIHBvcnQgPSBUZXN0UG9ydCho b3N0KQorICAgICAgICBmcyA9IGhvc3QuZmlsZXN5c3RlbQorICAgICAgICB3cml0ZXIgPSB0ZXN0 X3Jlc3VsdF93cml0ZXIuVGVzdFJlc3VsdFdyaXRlcihmcywgcG9ydCwgcG9ydC5yZXN1bHRzX2Rp cmVjdG9yeSgpLCAndGVtcGxhdGVfdGVzdDIvcGJrZGYyLmh0dHBzLmFueS5odG1sPzEtMTAwMCcp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZnMuam9pbihwb3J0LnJlc3VsdHNfZGlyZWN0b3J5 KCksICd0ZW1wbGF0ZV90ZXN0Mi9wYmtkZjIuaHR0cHMuYW55XzEtMTAwMC1kaWZmLnR4dCcpLCB3 cml0ZXIub3V0cHV0X2ZpbGVuYW1lKCctZGlmZi50eHQnKSkKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NzRiNDY3NmRjZGI1 ZDc0NDI5MWVjOTJhMjYzNDdjYjdiNGUwNGZjLi45NjZkZmIzM2Q5ZWU2MzkyODQ2ZjhiZjQzYzM1 NzZiMTJiZGYyZjA3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDQtMDYgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBleHBlY3RlZCwgYWN0dWFsIGxp bmtzIGZvciB2YXJpYW50LWJhc2VkIGltcG9ydGVkIHdwdCB0ZXN0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4ODMyCisgICAgICAgIHJkYXI6Ly9w cm9ibGVtLzkxMzEzODkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIGNoYW5nZXMgdG8gTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMu aHRtbCB3ZXJlIHdpcGVkIHdoZW4KKyAgICAgICAgcHJlcGFyaW5nIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE1NDQsIGNhdXNpbmcgdGhlCisgICAgICAgIGxpbmtz IG5vdCB0byBtYXRjaC4gVGhpcyBwYXRjaCBmaXhlcyBpdC4KKworICAgICAgICAqIGZhc3QvaGFy bmVzcy9yZXN1bHRzLmh0bWw6CisKIDIwMjItMDQtMDYgIE9yaW9sIEJydWZhdSAgPG9icnVmYXVA aWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzXSBUdXJuIC13ZWJraXQtYm9yZGVyLWltYWdlIGlu dG8gYSBzaG9ydGhhbmQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy9yZXN1 bHRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2hhcm5lc3MvcmVzdWx0cy5odG1sCmluZGV4IDYx ZThiMTMyMjQwMmQ3MGY1OTQ1MzM4ZGExODFkYTZhYjU4YzkyOGMuLjE0ZWNiYWMzODExZjU5MDY3 NTVhNjdjYTcwNDEyMjc2MWEyM2VlNTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvaGFy bmVzcy9yZXN1bHRzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMu aHRtbApAQCAtMjgwLDEzICsyODAsMTkgQEAgY2xhc3MgVXRpbHMKICAgICAgICAgcmV0dXJuIG51 bGw7CiAgICAgfQogCi0gICAgc3RhdGljIHN0cmlwRXh0ZW5zaW9uKHRlc3ROYW1lKQorICAgIHN0 YXRpYyB0ZXN0UHJlZml4KHRlc3ROYW1lKQogICAgIHsKICAgICAgICAgLy8gVGVtcG9yYXJ5IGZp eCwgYWxzbyBpbiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb25zdHJvbGxl cnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5LCBsaW5lIDk1LgogICAgICAgICAvLyBGSVhNRTogUmVm YWN0b3IgdG8gYXZvaWQgY29uZnVzaW5nIHJlZmVyZW5jZSB0byBib3RoIHRlc3QgYW5kIHByb2Nl c3MgbmFtZXMuCi0gICAgICAgIGlmIChVdGlscy5zcGxpdEV4dGVuc2lvbih0ZXN0TmFtZSlbMV0u bGVuZ3RoID4gNSkKKyAgICAgICAgbGV0IHBhcnRzID0gVXRpbHMuc3BsaXRFeHRlbnNpb24odGVz dE5hbWUpOworICAgICAgICBsZXQgcHJlZml4ID0gcGFydHNbMF07CisgICAgICAgIGlmIChwYXJ0 c1sxXS5pbmNsdWRlcygnPycpKQorICAgICAgICAgICAgcHJlZml4ICs9ICdfJyArIHBhcnRzWzFd LnNwbGl0KCc/JylbMV0KKyAgICAgICAgZWxzZSBpZiAocGFydHNbMV0uaW5jbHVkZXMoJyMnKSkK KyAgICAgICAgICAgIHByZWZpeCArPSAnXycgKyBwYXJ0c1sxXS5zcGxpdCgnIycpWzFdCisgICAg ICAgIGVsc2UgaWYgKFV0aWxzLnNwbGl0RXh0ZW5zaW9uKHBhcnRzWzBdKVsxXS5sZW5ndGggPiA1 KQogICAgICAgICAgICAgcmV0dXJuIHRlc3ROYW1lOwotICAgICAgICByZXR1cm4gVXRpbHMuc3Bs aXRFeHRlbnNpb24odGVzdE5hbWUpWzBdOworICAgICAgICByZXR1cm4gcHJlZml4OwogICAgIH0K IAogICAgIHN0YXRpYyBzcGxpdEV4dGVuc2lvbih0ZXN0TmFtZSkKQEAgLTExNjgsNyArMTE3NCw3 IEBAIGNsYXNzIFRlc3RSZXN1bHRzQ29udHJvbGxlcgogICAgICAgICAgICAgICAgIFRlc3RSZXN1 bHRzQ29udHJvbGxlci5fZ2V0UmVzdWx0Q29udGFpbmVyKG5vZGUpLnJlbW92ZSgpOwogICAgICAg ICAgICAgZWxzZSBpZiAodXJsLm1hdGNoKCctYWN0dWFsLnBuZyQnKSkgewogICAgICAgICAgICAg ICAgIGxldCBuYW1lID0gVXRpbHMucGFyZW50T2ZUeXBlKG5vZGUsICd0Ym9keScpLnF1ZXJ5U2Vs ZWN0b3IoJy50ZXN0LWxpbmsnKS50ZXh0Q29udGVudDsKLSAgICAgICAgICAgICAgICBUZXN0UmVz dWx0c0NvbnRyb2xsZXIuX2dldFJlc3VsdENvbnRhaW5lcihub2RlKS5vdXRlckhUTUwgPSB0b2dn bGluZ0ltYWdlRnVuY3Rpb24oVXRpbHMuc3RyaXBFeHRlbnNpb24obmFtZSkpOworICAgICAgICAg ICAgICAgIFRlc3RSZXN1bHRzQ29udHJvbGxlci5fZ2V0UmVzdWx0Q29udGFpbmVyKG5vZGUpLm91 dGVySFRNTCA9IHRvZ2dsaW5nSW1hZ2VGdW5jdGlvbihVdGlscy50ZXN0UHJlZml4KG5hbWUpKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAgLTEzNDQsNyArMTM1MCw3IEBAIGNs YXNzIEZhaWx1cmVzU2VjdGlvbkJ1aWxkZXIgZXh0ZW5kcyBTZWN0aW9uQnVpbGRlciB7CiAKICAg ICAgICAgbGV0IGFjdHVhbFRva2VucyA9IHRlc3RSZXN1bHQuaW5mby5hY3R1YWwuc3BsaXQoL1xz Ky8pOwogCi0gICAgICAgIGxldCB0ZXN0UHJlZml4ID0gVXRpbHMuc3RyaXBFeHRlbnNpb24odGVz dFJlc3VsdC5uYW1lKTsKKyAgICAgICAgbGV0IHRlc3RQcmVmaXggPSBVdGlscy50ZXN0UHJlZml4 KHRlc3RSZXN1bHQubmFtZSk7CiAgICAgICAgIGxldCBpbWFnZVJlc3VsdHMgPSB0aGlzLmltYWdl UmVzdWx0TGlua3ModGVzdFJlc3VsdCwgdGVzdFByZWZpeCwgYWN0dWFsVG9rZW5zWzBdKTsKICAg ICAgICAgaWYgKCFpbWFnZVJlc3VsdHMgJiYgYWN0dWFsVG9rZW5zLmxlbmd0aCA+IDEpCiAgICAg ICAgICAgICBpbWFnZVJlc3VsdHMgPSB0aGlzLmltYWdlUmVzdWx0TGlua3ModGVzdFJlc3VsdCwg J3JldHJpZXMvJyArIHRlc3RQcmVmaXgsIGFjdHVhbFRva2Vuc1sxXSk7CkBAIC0xMzc0LDEyICsx MzgwLDEyIEBAIGNsYXNzIEZhaWx1cmVzU2VjdGlvbkJ1aWxkZXIgZXh0ZW5kcyBTZWN0aW9uQnVp bGRlciB7CiAKICAgICBhcHBlbmRUZXh0RmFpbHVyZUxpbmtzKHRlc3RSZXN1bHQsIGNlbGwpCiAg ICAgewotICAgICAgICBjZWxsLmlubmVySFRNTCArPSB0aGlzLl9yZXN1bHRzQ29udHJvbGxlci50 ZXh0UmVzdWx0TGlua3MoVXRpbHMuc3RyaXBFeHRlbnNpb24odGVzdFJlc3VsdC5uYW1lKSk7Cisg ICAgICAgIGNlbGwuaW5uZXJIVE1MICs9IHRoaXMuX3Jlc3VsdHNDb250cm9sbGVyLnRleHRSZXN1 bHRMaW5rcyhVdGlscy50ZXN0UHJlZml4KHRlc3RSZXN1bHQubmFtZSkpOwogICAgIH0KICAgICAK ICAgICBhcHBlbmRBdWRpb0ZhaWx1cmVMaW5rcyh0ZXN0UmVzdWx0LCBjZWxsKQogICAgIHsKLSAg ICAgICAgbGV0IHByZWZpeCA9IFV0aWxzLnN0cmlwRXh0ZW5zaW9uKHRlc3RSZXN1bHQubmFtZSk7 CisgICAgICAgIGxldCBwcmVmaXggPSBVdGlscy50ZXN0UHJlZml4KHRlc3RSZXN1bHQubmFtZSk7 CiAgICAgICAgIGNlbGwuaW5uZXJIVE1MICs9IFRlc3RSZXN1bHRzQ29udHJvbGxlci5yZXN1bHRM aW5rKHByZWZpeCwgJy1leHBlY3RlZC53YXYnLCAnZXhwZWN0ZWQgYXVkaW8nKQogICAgICAgICAg ICAgKyBUZXN0UmVzdWx0c0NvbnRyb2xsZXIucmVzdWx0TGluayhwcmVmaXgsICctYWN0dWFsLndh dicsICdhY3R1YWwgYXVkaW8nKQogICAgICAgICAgICAgKyBUZXN0UmVzdWx0c0NvbnRyb2xsZXIu cmVzdWx0TGluayhwcmVmaXgsICctZGlmZi50eHQnLCAndGV4dHVhbCBkaWZmJyk7CkBAIC0xMzg3 LDcgKzEzOTMsNyBAQCBjbGFzcyBGYWlsdXJlc1NlY3Rpb25CdWlsZGVyIGV4dGVuZHMgU2VjdGlv bkJ1aWxkZXIgewogICAgIAogICAgIGFwcGVuZEFjdHVhbE9ubHlMaW5rcyh0ZXN0UmVzdWx0LCBj ZWxsKQogICAgIHsKLSAgICAgICAgbGV0IHByZWZpeCA9IFV0aWxzLnN0cmlwRXh0ZW5zaW9uKHRl c3RSZXN1bHQubmFtZSk7CisgICAgICAgIGxldCBwcmVmaXggPSBVdGlscy50ZXN0UHJlZml4KHRl c3RSZXN1bHQubmFtZSk7CiAgICAgICAgIGlmICh0ZXN0UmVzdWx0LmlzTWlzc2luZ0F1ZGlvKCkp CiAgICAgICAgICAgICBjZWxsLmlubmVySFRNTCArPSBUZXN0UmVzdWx0c0NvbnRyb2xsZXIucmVz dWx0TGluayhwcmVmaXgsICctYWN0dWFsLndhdicsICdhdWRpbyByZXN1bHQnKTsKIApAQCAtMTQ3 MSw3ICsxNDc3LDcgQEAgY2xhc3MgVGVzdHNXaXRoU3RkRXJyU2VjdGlvbkJ1aWxkZXIgZXh0ZW5k cyBTZWN0aW9uQnVpbGRlciB7CiAKICAgICBmaWxsVGVzdFJlc3VsdENlbGwodGVzdFJlc3VsdCwg Y2VsbCkKICAgICB7Ci0gICAgICAgIGNlbGwuaW5uZXJIVE1MID0gVGVzdFJlc3VsdHNDb250cm9s bGVyLnJlc3VsdExpbmsoVXRpbHMuc3RyaXBFeHRlbnNpb24odGVzdFJlc3VsdC5uYW1lKSwgJy1z dGRlcnIudHh0JywgJ3N0ZGVycicpOworICAgICAgICBjZWxsLmlubmVySFRNTCA9IFRlc3RSZXN1 bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKFV0aWxzLnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1l KSwgJy1zdGRlcnIudHh0JywgJ3N0ZGVycicpOwogICAgIH0KIH07CiAKQEAgLTE0ODEsNyArMTQ4 Nyw3IEBAIGNsYXNzIFRpbWVkT3V0VGVzdHNTZWN0aW9uQnVpbGRlciBleHRlbmRzIFNlY3Rpb25C dWlsZGVyIHsKICAgICBmaWxsVGVzdFJlc3VsdENlbGwodGVzdFJlc3VsdCwgY2VsbCkKICAgICB7 CiAgICAgICAgIC8vIEZJWE1FOiBvbmx5IGluY2x1ZGUgdGltZW91dCBhY3R1YWwvZGlmZiByZXN1 bHRzIGhlcmUgaWYgd2UgYWN0dWFsbHkgc3BpdCBvdXQgcmVzdWx0cyBmb3IgdGltZW91dCB0ZXN0 cy4KLSAgICAgICAgY2VsbC5pbm5lckhUTUwgPSB0aGlzLl9yZXN1bHRzQ29udHJvbGxlci50ZXh0 UmVzdWx0TGlua3MoVXRpbHMuc3RyaXBFeHRlbnNpb24odGVzdFJlc3VsdC5uYW1lKSk7CisgICAg ICAgIGNlbGwuaW5uZXJIVE1MID0gdGhpcy5fcmVzdWx0c0NvbnRyb2xsZXIudGV4dFJlc3VsdExp bmtzKFV0aWxzLnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1lKSk7CiAgICAgfQogfTsKIApAQCAt MTQ5MCw4ICsxNDk2LDggQEAgY2xhc3MgQ3Jhc2hpbmdUZXN0c1NlY3Rpb25CdWlsZGVyIGV4dGVu ZHMgU2VjdGlvbkJ1aWxkZXIgewogCiAgICAgZmlsbFRlc3RSZXN1bHRDZWxsKHRlc3RSZXN1bHQs IGNlbGwpCiAgICAgewotICAgICAgICBjZWxsLmlubmVySFRNTCA9IFRlc3RSZXN1bHRzQ29udHJv bGxlci5yZXN1bHRMaW5rKFV0aWxzLnN0cmlwRXh0ZW5zaW9uKHRlc3RSZXN1bHQubmFtZSksICct Y3Jhc2gtbG9nLnR4dCcsICdjcmFzaCBsb2cnKQotICAgICAgICAgICAgICAgICAgICAgICArIFRl c3RSZXN1bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKFV0aWxzLnN0cmlwRXh0ZW5zaW9uKHRlc3RS ZXN1bHQubmFtZSksICctc2FtcGxlLnR4dCcsICdzYW1wbGUnKTsKKyAgICAgICAgY2VsbC5pbm5l ckhUTUwgPSBUZXN0UmVzdWx0c0NvbnRyb2xsZXIucmVzdWx0TGluayhVdGlscy50ZXN0UHJlZml4 KHRlc3RSZXN1bHQubmFtZSksICctY3Jhc2gtbG9nLnR4dCcsICdjcmFzaCBsb2cnKQorICAgICAg ICAgICAgICAgICAgICAgICArIFRlc3RSZXN1bHRzQ29udHJvbGxlci5yZXN1bHRMaW5rKFV0aWxz LnRlc3RQcmVmaXgodGVzdFJlc3VsdC5uYW1lKSwgJy1zYW1wbGUudHh0JywgJ3NhbXBsZScpOwog ICAgIH0KIH07CiAKQEAgLTE0OTksNyArMTUwNSw3IEBAIGNsYXNzIE90aGVyQ3Jhc2hlc1NlY3Rp b25CdWlsZGVyIGV4dGVuZHMgU2VjdGlvbkJ1aWxkZXIgewogICAgIHNlY3Rpb25UaXRsZSgpIHsg cmV0dXJuICdPdGhlciBjcmFzaGVzJzsgfQogICAgIGZpbGxUZXN0UmVzdWx0Q2VsbCh0ZXN0UmVz dWx0LCBjZWxsKQogICAgIHsKLSAgICAgICAgY2VsbC5pbm5lckhUTUwgPSBUZXN0UmVzdWx0c0Nv bnRyb2xsZXIucmVzdWx0TGluayhVdGlscy5zdHJpcEV4dGVuc2lvbih0ZXN0UmVzdWx0Lm5hbWUp LCAnLWNyYXNoLWxvZy50eHQnLCAnY3Jhc2ggbG9nJyk7CisgICAgICAgIGNlbGwuaW5uZXJIVE1M ID0gVGVzdFJlc3VsdHNDb250cm9sbGVyLnJlc3VsdExpbmsoVXRpbHMudGVzdFByZWZpeCh0ZXN0 UmVzdWx0Lm5hbWUpLCAnLWNyYXNoLWxvZy50eHQnLCAnY3Jhc2ggbG9nJyk7CiAgICAgfQogCiAg ICAgY3JlYXRlSGlzdG9yeUNlbGwodGVzdFJlc3VsdCkK