204180 2019-11-13 16:36:01 -0800 Python 3: Add support in webkitpy.layout_tests.controllers 2019-11-13 18:10:16 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=203701 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue ews-watchlist glenn slewis webkit-bug-importer oldest_to_newest 1590109 0 jbedard 2019-11-13 16:36:01 -0800 This directory contains what are effectively integration tests, so I've exposed a few bugs in other converted directories by running the tests. 1590112 1 383517 jbedard 2019-11-13 16:48:23 -0800 Created attachment 383517 Patch 1590152 2 383517 commit-queue 2019-11-13 18:09:02 -0800 Comment on attachment 383517 Patch Clearing flags on attachment: 383517 Committed r252443: <https://trac.webkit.org/changeset/252443> 1590153 3 commit-queue 2019-11-13 18:09:04 -0800 All reviewed patches have been landed. Closing bug. 1590154 4 webkit-bug-importer 2019-11-13 18:10:16 -0800 <rdar://problem/57176448> 383517 2019-11-13 16:48:23 -0800 2019-11-13 18:09:02 -0800 Patch bug-204180-20191113164821.patch text/plain 18627 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MjM3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQwIEBACisyMDE5LTExLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkubGF5b3V0X3Rl c3RzLmNvbnRyb2xsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDQxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvdGVzdC13ZWJraXRweS1weXRob24zOiBBZGQgd2Via2l0cHkubGF5 b3V0X3Rlc3RzLmNvbnRyb2xsZXJzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L21lc3NhZ2VfcG9vbC5weToKKyAgICAgICAgKF9NZXNzYWdlUG9vbC5fX2luaXRfXyk6IFVzZSBQ eXRob24gMyBxdWV1ZSBzeW50YXguCisgICAgICAgIChfTWVzc2FnZVBvb2wuX2Nhbl9waWNrbGUp OiBVc2UgUHl0aG9uIDMgcGlja2xlIHN5bnRheC4KKyAgICAgICAgKF9NZXNzYWdlUG9vbC5fbG9v cCk6IFVzZSBQeXRob24gMyBxdWV1ZSBzeW50YXguCisgICAgICAgIChfV29ya2VyLnJ1bik6IFVz ZSBQeXRob24gMyBxdWV1ZSBzeW50YXguCisgICAgICAgIChfV29ya2VyLl9yYWlzZSk6IFB5dGhv biAyIGFuZCBQeXRob24gMyBoYXZlIGRpZmZlcmVudCBzZW1hbnRpY3MgZm9yIHJhaXNpbmcgYW4g ZXhjZXB0aW9uCisgICAgICAgIFdpdGggYSBzdGFjayB0cmFjZS4gSG93ZXZlciwgJ3JhaXNlJyB3 aWxsIHJhaXNlIHRoZSBleGNlcHRpb24gd2UgYXJlIGluIHRoZSBwcm9jZXNzIG9mIGNhcHR1cmlu ZywKKyAgICAgICAgV2hpY2ggaXMgZXhhY3RseSB3aGF0IHdlIHdhbnQgaW4gdGhpcyBjYXNlLgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3JlYWRfY2hlY2tzdW1fZnJvbV9wbmcu cHk6CisgICAgICAgIChyZWFkX2NoZWNrc3VtKTogU3RhbmRhcmRpemUgY2hlY2tzdW0gYXMgYSBz dHJpbmcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0 ZW0ucHk6CisgICAgICAgIChGaWxlU3lzdGVtLndyaXRlX2JpbmFyeV9maWxlKTogQmluYXJ5IGZp bGVzIHNob3VsZCBiZSB3cml0dGVuIHdpdGggYnl0ZXMsIG5vdCBzdHJpbmdzLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHk6CisgICAg ICAgIChNb2NrRmlsZVN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZSk6IEJpbmFyeSBmaWxlcyBzaG91 bGQgYmUgd3JpdHRlbiB3aXRoIGJ5dGVzLCBub3Qgc3RyaW5ncy4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9maW5kZXJfdW5p dHRlc3QucHk6IGFzc2VydEl0ZW1zRXF1YWwgaXMgbm90CisgICAgICAgIERlZmluZWQgaW4gUHl0 aG9uIDMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5OgorICAgICAgICAoV29ya2VyLl9kb19wb3N0X3Rlc3Rz X3dvcmspOiBVc2UgY29tcGF0aWJsZSBpdGVyaXRlbXMuCisgICAgICAgIChTaGFyZGVyLl9zaGFy ZF9ieV9kaXJlY3RvcnkpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5ydW4pOiBV c2UgY29tcGF0aWJsZSBpdGVydmFsdWVzLgorICAgICAgICAoTWFuYWdlci5fbG9va19mb3JfbmV3 X2NyYXNoX2xvZ3MpOiBVc2UgUHl0aG9uIDMgaXRlbSBpdGVyYXRpb24uCisgICAgICAgIChNYW5h Z2VyLl9yZXN1bHRzX3RvX3VwbG9hZF9qc29uX3RyaWUpOiBVc2UgY29tcGF0aWJsZSBpdGVydmFs dWVzLgorICAgICAgICAoTWFuYWdlci5fc3RhdHNfdHJpZSk6IFVzZSBjb21wYXRpYmxlIGl0ZXJp dGVtcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAg KFBvcnQuZXhwZWN0ZWRfdGV4dCk6IEJlIGV4cGxpY2l0IGFib3V0IGRlY29kaW5nIHRleHQgZXhw ZWN0YXRpb25zLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tb2NrX2RydC5weToK KyAgICAgICAgKE1vY2tEUlQud3JpdGVfdGVzdF9vdXRwdXQpOgorCiAyMDE5LTExLTEyICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFdLV2Vi VmlldyBkb2VzIG5vdCByZXNwZWN0IHN5c3RlbSBzcGVsbGNoZWNraW5nIHByZWZlcmVuY2UKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweS1weXRob24zCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweS1weXRob24zCShyZXZpc2lvbiAyNTIzNjkpCisrKyBU b29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwkod29ya2luZyBjb3B5KQpAQCAtMzUs NiArMzUsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uc2NtX3VuCiAKIFBZ VEhPTjNfQ09NUEFUSUJMRV9ESVJFQ1RPUklFUyA9IFsKICAgJ3dlYmtpdHB5LmNvbW1vbicsCisg ICd3ZWJraXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMnLAogICAnd2Via2l0cHkubGF5b3V0 X3Rlc3RzLm1vZGVscycsCiAgICd3ZWJraXRweS5wb3J0JywKICAgJ3dlYmtpdHB5LnJlc3VsdHMn LApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbWVzc2FnZV9wb29sLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL21lc3NhZ2VfcG9vbC5w eQkocmV2aXNpb24gMjUyMzY5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbWVz c2FnZV9wb29sLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MCwxNiArNDAsMjAgQEAgaW50ZWFkLgog CiAiIiIKIAotaW1wb3J0IGNQaWNrbGUKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgbXVsdGlwcm9j ZXNzaW5nCiBpbXBvcnQgb3MKLWltcG9ydCBRdWV1ZQogaW1wb3J0IHNpZ25hbAogaW1wb3J0IHN5 cwogaW1wb3J0IHRpbWUKIGltcG9ydCB0cmFjZWJhY2sKIAoraWYgc3lzLnZlcnNpb25faW5mbyA+ ICgzLCAwKToKKyAgICBpbXBvcnQgcGlja2xlCisgICAgaW1wb3J0IHF1ZXVlCitlbHNlOgorICAg IGltcG9ydCBjUGlja2xlIGFzIHBpY2tsZQorICAgIGltcG9ydCBRdWV1ZSBhcyBxdWV1ZQogCiBm cm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0gaW1wb3J0IHN0YWNrX3V0aWxzCkBAIC03Niw4ICs4MCw4IEBAIGNsYXNzIF9NZXNz YWdlUG9vbChvYmplY3QpOgogICAgICAgICBzZWxmLl9ydW5uaW5nX2lubGluZSA9IChzZWxmLl9u dW1fd29ya2VycyA9PSAxKQogICAgICAgICBzZWxmLl90aW1lb3V0ID0gdGltZW91dAogICAgICAg ICBpZiBzZWxmLl9ydW5uaW5nX2lubGluZToKLSAgICAgICAgICAgIHNlbGYuX21lc3NhZ2VzX3Rv X3dvcmtlciA9IFF1ZXVlLlF1ZXVlKCkKLSAgICAgICAgICAgIHNlbGYuX21lc3NhZ2VzX3RvX21h bmFnZXIgPSBRdWV1ZS5RdWV1ZSgpCisgICAgICAgICAgICBzZWxmLl9tZXNzYWdlc190b193b3Jr ZXIgPSBxdWV1ZS5RdWV1ZSgpCisgICAgICAgICAgICBzZWxmLl9tZXNzYWdlc190b19tYW5hZ2Vy ID0gcXVldWUuUXVldWUoKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fbWVzc2Fn ZXNfdG9fd29ya2VyID0gbXVsdGlwcm9jZXNzaW5nLlF1ZXVlKCkKICAgICAgICAgICAgIHNlbGYu X21lc3NhZ2VzX3RvX21hbmFnZXIgPSBtdWx0aXByb2Nlc3NpbmcuUXVldWUoKQpAQCAtMTc1LDcg KzE3OSw3IEBAIGNsYXNzIF9NZXNzYWdlUG9vbChvYmplY3QpOgogCiAgICAgZGVmIF9jYW5fcGlj a2xlKHNlbGYsIGhvc3QpOgogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBjUGlja2xlLmR1bXBz KGhvc3QpCisgICAgICAgICAgICBwaWNrbGUuZHVtcHMoaG9zdCkKICAgICAgICAgICAgIHJldHVy biBUcnVlCiAgICAgICAgIGV4Y2VwdCBUeXBlRXJyb3I6CiAgICAgICAgICAgICByZXR1cm4gRmFs c2UKQEAgLTE5Myw3ICsxOTcsNyBAQCBjbGFzcyBfTWVzc2FnZVBvb2wob2JqZWN0KToKICAgICAg ICAgICAgICAgICBtZXRob2QgPSBnZXRhdHRyKHNlbGYsICdfaGFuZGxlXycgKyBtZXNzYWdlLm5h bWUpCiAgICAgICAgICAgICAgICAgYXNzZXJ0IG1ldGhvZCwgJ2JhZCBtZXNzYWdlICVzJyAlIHJl cHIobWVzc2FnZSkKICAgICAgICAgICAgICAgICBtZXRob2QobWVzc2FnZS5zcmMsICptZXNzYWdl LmFyZ3MpCi0gICAgICAgIGV4Y2VwdCBRdWV1ZS5FbXB0eToKKyAgICAgICAgZXhjZXB0IHF1ZXVl LkVtcHR5OgogICAgICAgICAgICAgcGFzcwogCiAKQEAgLTI3Miw3ICsyNzYsNyBAQCBjbGFzcyBf V29ya2VyKG11bHRpcHJvY2Vzc2luZy5Qcm9jZXNzKToKICAgICAgICAgICAgICAgICAgICAgYnJl YWsKIAogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgZXhpdGluZyIgJSBzZWxmLm5hbWUpCi0g ICAgICAgIGV4Y2VwdCBRdWV1ZS5FbXB0eToKKyAgICAgICAgZXhjZXB0IHF1ZXVlLkVtcHR5Ogog ICAgICAgICAgICAgYXNzZXJ0IEZhbHNlLCAnJXM6IHJhbiBvdXQgb2YgbWVzc2FnZXMgaW4gd29y a2VyIHF1ZXVlLicgJSBzZWxmLm5hbWUKICAgICAgICAgZXhjZXB0IEtleWJvYXJkSW50ZXJydXB0 IGFzIGU6CiAgICAgICAgICAgICBzZWxmLl9yYWlzZShzeXMuZXhjX2luZm8oKSkKQEAgLTMwMiw3 ICszMDYsNyBAQCBjbGFzcyBfV29ya2VyKG11bHRpcHJvY2Vzc2luZy5Qcm9jZXNzKToKICAgICBk ZWYgX3JhaXNlKHNlbGYsIGV4Y19pbmZvKToKICAgICAgICAgZXhjZXB0aW9uX3R5cGUsIGV4Y2Vw dGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjayA9IGV4Y19pbmZvCiAgICAgICAgIGlmIHNl bGYuX3J1bm5pbmdfaW5saW5lOgotICAgICAgICAgICAgcmFpc2UgZXhjZXB0aW9uX3R5cGUsIGV4 Y2VwdGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjaworICAgICAgICAgICAgcmFpc2UKIAog ICAgICAgICBpZiBleGNlcHRpb25fdHlwZSA9PSBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAg ICAgIF9sb2cuZGVidWcoIiVzOiBpbnRlcnJ1cHRlZCwgZXhpdGluZyIgJSBzZWxmLm5hbWUpCklu ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9yZWFkX2NoZWNrc3VtX2Zyb21fcG5n LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3JlYWRfY2hl Y2tzdW1fZnJvbV9wbmcucHkJKHJldmlzaW9uIDI1MjM2OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3JlYWRfY2hlY2tzdW1fZnJvbV9wbmcucHkJKHdvcmtpbmcgY29weSkKQEAg LTI3LDEzICsyNywxNSBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0Yg VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiAKK2Zyb20gd2Via2l0cHkuY29tbW9u LnVuaWNvZGVfY29tcGF0aWJpbGl0eSBpbXBvcnQgZW5jb2RlX2lmX25lY2Vzc2FyeSwgZGVjb2Rl X2ZvcgorCiBkZWYgcmVhZF9jaGVja3N1bShmaWxlaGFuZGxlKToKICAgICAjIFdlIGV4cGVjdCB0 aGUgY29tbWVudCB0byBiZSBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBmaWxlLgotICAgIGRhdGEg PSBmaWxlaGFuZGxlLnJlYWQoMjA0OCkKLSAgICBjb21tZW50X2tleSA9ICd0RVh0Y2hlY2tzdW1c eDAwJworICAgIGRhdGEgPSBlbmNvZGVfaWZfbmVjZXNzYXJ5KGZpbGVoYW5kbGUucmVhZCgyMDQ4 KSkKKyAgICBjb21tZW50X2tleSA9IGIndEVYdGNoZWNrc3VtXHgwMCcKICAgICBjb21tZW50X3Bv cyA9IGRhdGEuZmluZChjb21tZW50X2tleSkKICAgICBpZiBjb21tZW50X3BvcyA9PSAtMToKICAg ICAgICAgcmV0dXJuCiAKICAgICBjaGVja3N1bV9wb3MgPSBjb21tZW50X3BvcyArIGxlbihjb21t ZW50X2tleSkKLSAgICByZXR1cm4gZGF0YVtjaGVja3N1bV9wb3M6Y2hlY2tzdW1fcG9zICsgMzJd CisgICAgcmV0dXJuIGRlY29kZV9mb3IoZGF0YVtjaGVja3N1bV9wb3M6Y2hlY2tzdW1fcG9zICsg MzJdLCBzdHIpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmls ZXN5c3RlbS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vZmlsZXN5c3RlbS5weQkocmV2aXNpb24gMjUyMzY5KQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkJKHdvcmtpbmcgY29weSkKQEAgLTM5 LDcgKzM5LDcgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHRlbXBmaWxlCiBpbXBvcnQgdGltZQogCi1m cm9tIHdlYmtpdHB5LmNvbW1vbi51bmljb2RlX2NvbXBhdGliaWxpdHkgaW1wb3J0IGRlY29kZV9p Zl9uZWNlc3NhcnkKK2Zyb20gd2Via2l0cHkuY29tbW9uLnVuaWNvZGVfY29tcGF0aWJpbGl0eSBp bXBvcnQgZGVjb2RlX2lmX25lY2Vzc2FyeSwgZW5jb2RlX2ZvcgogCiAKIGNsYXNzIEZpbGVTeXN0 ZW0ob2JqZWN0KToKQEAgLTIyNyw3ICsyMjcsNyBAQCBjbGFzcyBGaWxlU3lzdGVtKG9iamVjdCk6 CiAKICAgICBkZWYgd3JpdGVfYmluYXJ5X2ZpbGUoc2VsZiwgcGF0aCwgY29udGVudHMpOgogICAg ICAgICB3aXRoIG9wZW4ocGF0aCwgJ3diJykgYXMgZjoKLSAgICAgICAgICAgIGYud3JpdGUoY29u dGVudHMpCisgICAgICAgICAgICBmLndyaXRlKGVuY29kZV9mb3IoY29udGVudHMsIGJ5dGVzKSkK IAogICAgIGRlZiBvcGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyhzZWxmLCBwYXRoLCBlcnJvcnM9 J3N0cmljdCcpOgogICAgICAgICAjIE5vdGU6IFRoZXJlIGFwcGVhcnMgdG8gYmUgYW4gaXNzdWUg d2l0aCB0aGUgcmV0dXJuZWQgZmlsZSBvYmplY3RzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkJKHJldmlz aW9uIDI1MjM2OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxl c3lzdGVtX21vY2sucHkJKHdvcmtpbmcgY29weSkKQEAgLTMyOSw4ICszMjksOCBAQCBjbGFzcyBN b2NrRmlsZVN5c3RlbShvYmplY3QpOgogICAgIGRlZiB3cml0ZV9iaW5hcnlfZmlsZShzZWxmLCBw YXRoLCBjb250ZW50cyk6CiAgICAgICAgICMgRklYTUU6IHNob3VsZCB0aGlzIGFzc2VydCBpZiBk aXJuYW1lKHBhdGgpIGRvZXNuJ3QgZXhpc3Q/CiAgICAgICAgIHNlbGYubWF5YmVfbWFrZV9kaXJl Y3Rvcnkoc2VsZi5kaXJuYW1lKHBhdGgpKQotICAgICAgICBzZWxmLmZpbGVzW3BhdGhdID0gY29u dGVudHMKLSAgICAgICAgc2VsZi53cml0dGVuX2ZpbGVzW3BhdGhdID0gY29udGVudHMKKyAgICAg ICAgc2VsZi5maWxlc1twYXRoXSA9IHVuaWNvZGVfY29tcGF0aWJpbGl0eS5lbmNvZGVfZm9yKGNv bnRlbnRzLCBieXRlcykKKyAgICAgICAgc2VsZi53cml0dGVuX2ZpbGVzW3BhdGhdID0gdW5pY29k ZV9jb21wYXRpYmlsaXR5LmVuY29kZV9mb3IoY29udGVudHMsIGJ5dGVzKQogCiAgICAgZGVmIG9w ZW5fdGV4dF9maWxlX2Zvcl9yZWFkaW5nKHNlbGYsIHBhdGgsIGVycm9ycz0nc3RyaWN0Jyk6CiAg ICAgICAgIGlmIHNlbGYuZmlsZXNbcGF0aF0gaXMgTm9uZToKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X2ZpbmRlcl91bml0 dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9maW5kZXJfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI1 MjM2OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L2xheW91dF90ZXN0X2ZpbmRlcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNTUsMjgg KzU1LDI4IEBAIGNsYXNzIExheW91dFRlc3RGaW5kZXJUZXN0cyh1bml0dGVzdC5UZXMKICAgICBk ZWYgdGVzdF90b3VjaGVkX3Rlc3Qoc2VsZik6CiAgICAgICAgIHBhdGhzID0gWydMYXlvdXRUZXN0 cy90ZXN0Lmh0bWwnLCAnTGF5b3V0VGVzdHMvdGVzdCcsICd0ZXN0Mi5odG1sJywgJ1NvdXJjZS90 ZXN0MS5odG1sJ10KICAgICAgICAgZnMsIHRvdWNoZWRfdGVzdHMgPSBzZWxmLnRvdWNoZWRfZmls ZXMocGF0aHMpCi0gICAgICAgIHNlbGYuYXNzZXJ0SXRlbXNFcXVhbCh0b3VjaGVkX3Rlc3RzLCBb J3Rlc3QuaHRtbCddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRvdWNoZWRfdGVzdHMsIFsn dGVzdC5odG1sJ10pCiAKICAgICBkZWYgdGVzdF9leHBlY3RlZF90b3VjaGVkX3Rlc3Qoc2VsZik6 CiAgICAgICAgIHBhdGhzID0gWydMYXlvdXRUZXN0cy90ZXN0LWV4cGVjdGVkLnR4dCcsICdMYXlv dXRUZXN0cy9uby10ZXN0LWV4cGVjdGVkLnR4dCddCiAgICAgICAgIGZzID0gTW9ja0ZpbGVTeXN0 ZW0oKQogICAgICAgICBmcy53cml0ZV90ZXh0X2ZpbGUoJy90ZXN0LmNoZWNrb3V0L0xheW91dFRl c3RzL3Rlc3QuaHRtbCcsICdUaGlzIGlzIGEgdGVzdCcpCiAgICAgICAgIGZzLCB0b3VjaGVkX3Rl c3RzID0gc2VsZi50b3VjaGVkX2ZpbGVzKHBhdGhzLCBmcykKLSAgICAgICAgc2VsZi5hc3NlcnRJ dGVtc0VxdWFsKHRvdWNoZWRfdGVzdHMsIFsndGVzdC5odG1sJ10pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwodG91Y2hlZF90ZXN0cywgWyd0ZXN0Lmh0bWwnXSkKIAogICAgIGRlZiB0ZXN0X3Bs YXRmb3JtX2V4cGVjdGVkX3RvdWNoZWRfdGVzdChzZWxmKToKICAgICAgICAgcGF0aHMgPSBbJ0xh eW91dFRlc3RzL3BsYXRmb3JtL21vY2svdGVzdC1leHBlY3RlZC50eHQnLCAnTGF5b3V0VGVzdHMv cGxhdGZvcm0vbW9jay9uby10ZXN0LWV4cGVjdGVkLnR4dCddCiAgICAgICAgIGZzID0gTW9ja0Zp bGVTeXN0ZW0oKQogICAgICAgICBmcy53cml0ZV90ZXh0X2ZpbGUoJy90ZXN0LmNoZWNrb3V0L0xh eW91dFRlc3RzL3Rlc3QuaHRtbCcsICdUaGlzIGlzIGEgdGVzdCcpCiAgICAgICAgIGZzLCB0b3Vj aGVkX3Rlc3RzID0gc2VsZi50b3VjaGVkX2ZpbGVzKHBhdGhzLCBmcykKLSAgICAgICAgc2VsZi5h c3NlcnRJdGVtc0VxdWFsKHRvdWNoZWRfdGVzdHMsIFsndGVzdC5odG1sJ10pCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwodG91Y2hlZF90ZXN0cywgWyd0ZXN0Lmh0bWwnXSkKIAogICAgIGRlZiB0 ZXN0X3BsYXRmb3JtX2R1cGxpY2F0ZV90b3VjaGVkX3Rlc3Qoc2VsZik6CiAgICAgICAgIHBhdGhz ID0gWydMYXlvdXRUZXN0cy90ZXN0MS5odG1sJywgJ0xheW91dFRlc3RzL3Rlc3QxLmh0bWwnLCAn TGF5b3V0VGVzdHMvcGxhdGZvcm0vbW9jazEvdGVzdDItZXhwZWN0ZWQudHh0JywgJ0xheW91dFRl c3RzL3BsYXRmb3JtL21vY2syL3Rlc3QyLWV4cGVjdGVkLnR4dCddCiAgICAgICAgIGZzID0gTW9j a0ZpbGVTeXN0ZW0oKQogICAgICAgICBmcy53cml0ZV90ZXh0X2ZpbGUoJy90ZXN0LmNoZWNrb3V0 L0xheW91dFRlc3RzL3Rlc3QyLmh0bWwnLCAnVGhpcyBpcyBhIHRlc3QnKQogICAgICAgICBmcywg dG91Y2hlZF90ZXN0cyA9IHNlbGYudG91Y2hlZF9maWxlcyhwYXRocywgZnMpCi0gICAgICAgIHNl bGYuYXNzZXJ0SXRlbXNFcXVhbCh0b3VjaGVkX3Rlc3RzLCBbJ3Rlc3QxLmh0bWwnLCAndGVzdDIu aHRtbCddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNvcnRlZCh0b3VjaGVkX3Rlc3RzKSwg c29ydGVkKFsndGVzdDEuaHRtbCcsICd0ZXN0Mi5odG1sJ10pKQogCiAgICAgZGVmIHRlc3RfdG91 Y2hlZF9idXRfc2tpcHBlZF90ZXN0KHNlbGYpOgogICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQpA QCAtOTIsNCArOTIsNCBAQCBjbGFzcyBMYXlvdXRUZXN0RmluZGVyVGVzdHModW5pdHRlc3QuVGVz CiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoJy90ZXN0LmNoZWNrb3V0 L0xheW91dFRlc3RzL3Rlc3QzLmh0bWwnLCAnVGhpcyBpcyBhIHRlc3QgdG8gYmUgc2tpcHBlZCcp CiAKICAgICAgICAgdG91Y2hlZF90ZXN0cyA9IExheW91dFRlc3RGaW5kZXIocG9ydCwgb3B0cGFy c2UuVmFsdWVzKHsnc2tpcHBlZCc6ICdhbHdheXMnLCAnc2tpcF9mYWlsaW5nX3Rlc3RzJzogRmFs c2UsICdodHRwJzogVHJ1ZX0pKS5maW5kX3RvdWNoZWRfdGVzdHMocGF0aHMpCi0gICAgICAgIHNl bGYuYXNzZXJ0SXRlbXNFcXVhbCh0b3VjaGVkX3Rlc3RzLCBbJ3Rlc3QwLmh0bWwnLCAndGVzdDIu aHRtbCddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNvcnRlZCh0b3VjaGVkX3Rlc3RzKSwg c29ydGVkKFsndGVzdDAuaHRtbCcsICd0ZXN0Mi5odG1sJ10pKQpJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL2xheW91dF90ZXN0X3J1bm5lci5weQkocmV2aXNpb24gMjUyMzY5KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBAIGltcG9ydCB0aHJlYWRpbmcK IGltcG9ydCB0aW1lCiAKIGZyb20gd2Via2l0cHkuY29tbW9uIGltcG9ydCBtZXNzYWdlX3Bvb2wK K2Zyb20gd2Via2l0cHkuY29tbW9uLml0ZXJhdGlvbl9jb21wYXRpYmlsaXR5IGltcG9ydCBpdGVy aXRlbXMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNvbnRyb2xsZXJzIGltcG9ydCBzaW5n bGVfdGVzdF9ydW5uZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X3J1 bl9yZXN1bHRzIGltcG9ydCBUZXN0UnVuUmVzdWx0cwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVz dHMubW9kZWxzIGltcG9ydCB0ZXN0X2V4cGVjdGF0aW9ucwpAQCAtMzMxLDcgKzMzMiw3IEBAIGNs YXNzIFdvcmtlcihvYmplY3QpOgogCiAgICAgICAgIHBvc3RfdGVzdF9vdXRwdXQgPSBkcml2ZXIu ZG9fcG9zdF90ZXN0c193b3JrKCkKICAgICAgICAgaWYgcG9zdF90ZXN0X291dHB1dDoKLSAgICAg ICAgICAgIGZvciB0ZXN0X25hbWUsIGRvY19saXN0IGluIHBvc3RfdGVzdF9vdXRwdXQud29ybGRf bGVha3NfZGljdC5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgIGZvciB0ZXN0X25hbWUsIGRvY19s aXN0IGluIGl0ZXJpdGVtcyhwb3N0X3Rlc3Rfb3V0cHV0LndvcmxkX2xlYWtzX2RpY3QpOgogICAg ICAgICAgICAgICAgIGFkZGl0aW9uYWxfcmVzdWx0cy5hcHBlbmQodGVzdF9yZXN1bHRzLlRlc3RS ZXN1bHQodGVzdF9uYW1lLCBbdGVzdF9mYWlsdXJlcy5GYWlsdXJlRG9jdW1lbnRMZWFrKGRvY19s aXN0KV0pKQogICAgICAgICByZXR1cm4gYWRkaXRpb25hbF9yZXN1bHRzCiAKQEAgLTUzNiw3ICs1 MzcsNyBAQCBjbGFzcyBTaGFyZGVyKG9iamVjdCk6CiAgICAgICAgICAgICB0ZXN0c19ieV9kaXIu c2V0ZGVmYXVsdChkaXJlY3RvcnksIFtdKQogICAgICAgICAgICAgdGVzdHNfYnlfZGlyW2RpcmVj dG9yeV0uYXBwZW5kKHRlc3RfaW5wdXQpCiAKLSAgICAgICAgZm9yIGRpcmVjdG9yeSwgdGVzdF9p bnB1dHMgaW4gdGVzdHNfYnlfZGlyLml0ZXJpdGVtcygpOgorICAgICAgICBmb3IgZGlyZWN0b3J5 LCB0ZXN0X2lucHV0cyBpbiBpdGVyaXRlbXModGVzdHNfYnlfZGlyKToKICAgICAgICAgICAgIHNo YXJkID0gVGVzdFNoYXJkKGRpcmVjdG9yeSwgdGVzdF9pbnB1dHMpCiAgICAgICAgICAgICBzaGFy ZHMuYXBwZW5kKHNoYXJkKQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkJKHJldmlzaW9uIDI1 MjM2OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L21hbmFnZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDcgQEAgZnJvbSBjb2xsZWN0 aW9ucyBpbXBvcnQgZGVmYXVsdGRpY3QsIE9yZAogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVj a291dC5zY20uZGV0ZWN0aW9uIGltcG9ydCBTQ01EZXRlY3RvcgogZnJvbSB3ZWJraXRweS5jb21t b24ubmV0LmZpbGVfdXBsb2FkZXIgaW1wb3J0IEZpbGVVcGxvYWRlcgorZnJvbSB3ZWJraXRweS5j b21tb24uaXRlcmF0aW9uX2NvbXBhdGliaWxpdHkgaW1wb3J0IGl0ZXJpdGVtcywgaXRlcnZhbHVl cwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMubGF5b3V0X3Rlc3RfZmlu ZGVyIGltcG9ydCBMYXlvdXRUZXN0RmluZGVyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5j b250cm9sbGVycy5sYXlvdXRfdGVzdF9ydW5uZXIgaW1wb3J0IExheW91dFRlc3RSdW5uZXIKIGZy b20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNvbnRyb2xsZXJzLnRlc3RfcmVzdWx0X3dyaXRlciBp bXBvcnQgVGVzdFJlc3VsdFdyaXRlcgpAQCAtMjE4LDEzICsyMTksMTMgQEAgY2xhc3MgTWFuYWdl cihvYmplY3QpOgogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkKIAogICAgICAgICAj IENoZWNrIHRvIG1ha2Ugc3VyZSB3ZSdyZSBub3Qgc2tpcHBpbmcgZXZlcnkgdGVzdC4KLSAgICAg ICAgaWYgbm90IHN1bShbbGVuKHRlc3RzKSBmb3IgdGVzdHMgaW4gdGVzdHNfdG9fcnVuX2J5X2Rl dmljZS5pdGVydmFsdWVzKCldKToKKyAgICAgICAgaWYgbm90IHN1bShbbGVuKHRlc3RzKSBmb3Ig dGVzdHMgaW4gaXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNlKV0pOgogICAgICAgICAg ICAgX2xvZy5jcml0aWNhbCgnTm8gdGVzdHMgdG8gcnVuLicpCiAgICAgICAgICAgICByZXR1cm4g dGVzdF9ydW5fcmVzdWx0cy5SdW5EZXRhaWxzKGV4aXRfY29kZT0tMSkKIAotICAgICAgICBuZWVk c19odHRwID0gYW55KChzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkgYW5kIG5vdCBzZWxmLl9uZWVk c193ZWJfcGxhdGZvcm1fdGVzdCh0ZXN0KSkgZm9yIHRlc3RzIGluIHRlc3RzX3RvX3J1bl9ieV9k ZXZpY2UuaXRlcnZhbHVlcygpIGZvciB0ZXN0IGluIHRlc3RzKQotICAgICAgICBuZWVkc193ZWJf cGxhdGZvcm1fdGVzdF9zZXJ2ZXIgPSBhbnkoc2VsZi5fbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Qo dGVzdCkgZm9yIHRlc3RzIGluIHRlc3RzX3RvX3J1bl9ieV9kZXZpY2UuaXRlcnZhbHVlcygpIGZv ciB0ZXN0IGluIHRlc3RzKQotICAgICAgICBuZWVkc193ZWJzb2NrZXRzID0gYW55KHNlbGYuX2lz X3dlYnNvY2tldF90ZXN0KHRlc3QpIGZvciB0ZXN0cyBpbiB0ZXN0c190b19ydW5fYnlfZGV2aWNl Lml0ZXJ2YWx1ZXMoKSBmb3IgdGVzdCBpbiB0ZXN0cykKKyAgICAgICAgbmVlZHNfaHR0cCA9IGFu eSgoc2VsZi5faXNfaHR0cF90ZXN0KHRlc3QpIGFuZCBub3Qgc2VsZi5fbmVlZHNfd2ViX3BsYXRm b3JtX3Rlc3QodGVzdCkpIGZvciB0ZXN0cyBpbiBpdGVydmFsdWVzKHRlc3RzX3RvX3J1bl9ieV9k ZXZpY2UpIGZvciB0ZXN0IGluIHRlc3RzKQorICAgICAgICBuZWVkc193ZWJfcGxhdGZvcm1fdGVz dF9zZXJ2ZXIgPSBhbnkoc2VsZi5fbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3QodGVzdCkgZm9yIHRl c3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5X2RldmljZSkgZm9yIHRlc3QgaW4gdGVz dHMpCisgICAgICAgIG5lZWRzX3dlYnNvY2tldHMgPSBhbnkoc2VsZi5faXNfd2Vic29ja2V0X3Rl c3QodGVzdCkgZm9yIHRlc3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5X2RldmljZSkg Zm9yIHRlc3QgaW4gdGVzdHMpCiAgICAgICAgIHNlbGYuX3J1bm5lciA9IExheW91dFRlc3RSdW5u ZXIoc2VsZi5fb3B0aW9ucywgc2VsZi5fcG9ydCwgc2VsZi5fcHJpbnRlciwgc2VsZi5fcmVzdWx0 c19kaXJlY3RvcnksIHNlbGYuX3Rlc3RfaXNfc2xvdywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBuZWVkc19odHRwPW5lZWRzX2h0dHAsIG5lZWRzX3dlYl9wbGF0Zm9y bV90ZXN0X3NlcnZlcj1uZWVkc193ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIsIG5lZWRzX3dlYnNv Y2tldHM9bmVlZHNfd2Vic29ja2V0cykKIApAQCAtNDI3LDcgKzQyOCw3IEBAIGNsYXNzIE1hbmFn ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgIGxvZ3MgYWZ0ZXIgdGhhdCB0aW1lLgogICAgICAg ICAiIiIKICAgICAgICAgY3Jhc2hlZF9wcm9jZXNzZXMgPSBbXQotICAgICAgICBmb3IgdGVzdCwg cmVzdWx0IGluIHJ1bl9yZXN1bHRzLnVuZXhwZWN0ZWRfcmVzdWx0c19ieV9uYW1lLml0ZXJpdGVt cygpOgorICAgICAgICBmb3IgdGVzdCwgcmVzdWx0IGluIHJ1bl9yZXN1bHRzLnVuZXhwZWN0ZWRf cmVzdWx0c19ieV9uYW1lLml0ZW1zKCk6CiAgICAgICAgICAgICBpZiAocmVzdWx0LnR5cGUgIT0g dGVzdF9leHBlY3RhdGlvbnMuQ1JBU0gpOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAg ICAgICAgICBmb3IgZmFpbHVyZSBpbiByZXN1bHQuZmFpbHVyZXM6CkBAIC00MzcsMTMgKzQzOCwx MyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAKICAgICAgICAgc2FtcGxlX2ZpbGVzID0gc2Vs Zi5fcG9ydC5sb29rX2Zvcl9uZXdfc2FtcGxlcyhjcmFzaGVkX3Byb2Nlc3Nlcywgc3RhcnRfdGlt ZSkKICAgICAgICAgaWYgc2FtcGxlX2ZpbGVzOgotICAgICAgICAgICAgZm9yIHRlc3QsIHNhbXBs ZV9maWxlIGluIHNhbXBsZV9maWxlcy5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgIGZvciB0ZXN0 LCBzYW1wbGVfZmlsZSBpbiBzYW1wbGVfZmlsZXMuaXRlbXMoKToKICAgICAgICAgICAgICAgICB3 cml0ZXIgPSBUZXN0UmVzdWx0V3JpdGVyKHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0sIHNlbGYuX3Bv cnQsIHNlbGYuX3BvcnQucmVzdWx0c19kaXJlY3RvcnkoKSwgdGVzdCkKICAgICAgICAgICAgICAg ICB3cml0ZXIuY29weV9zYW1wbGVfZmlsZShzYW1wbGVfZmlsZSkKIAogICAgICAgICBjcmFzaF9s b2dzID0gc2VsZi5fcG9ydC5sb29rX2Zvcl9uZXdfY3Jhc2hfbG9ncyhjcmFzaGVkX3Byb2Nlc3Nl cywgc3RhcnRfdGltZSkKICAgICAgICAgaWYgY3Jhc2hfbG9nczoKLSAgICAgICAgICAgIGZvciB0 ZXN0LCBjcmFzaF9sb2cgaW4gY3Jhc2hfbG9ncy5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgIGZv ciB0ZXN0LCBjcmFzaF9sb2cgaW4gY3Jhc2hfbG9ncy5pdGVtcygpOgogICAgICAgICAgICAgICAg IHdyaXRlciA9IFRlc3RSZXN1bHRXcml0ZXIoc2VsZi5fcG9ydC5fZmlsZXN5c3RlbSwgc2VsZi5f cG9ydCwgc2VsZi5fcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpLCB0ZXN0KQogICAgICAgICAgICAg ICAgIHdyaXRlci53cml0ZV9jcmFzaF9sb2coY3Jhc2hfbG9nKQogCkBAIC00OTEsNyArNDkyLDcg QEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICB9CiAKICAgICAgICAgcmVzdWx0c190 cmllID0ge30KLSAgICAgICAgZm9yIHJlc3VsdCBpbiByZXN1bHRzLnJlc3VsdHNfYnlfbmFtZS5p dGVydmFsdWVzKCk6CisgICAgICAgIGZvciByZXN1bHQgaW4gaXRlcnZhbHVlcyhyZXN1bHRzLnJl c3VsdHNfYnlfbmFtZSk6CiAgICAgICAgICAgICBpZiByZXN1bHQudHlwZSA9PSB0ZXN0X2V4cGVj dGF0aW9ucy5TS0lQOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKQEAgLTY0NSw3ICs2NDYs NyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBpZiByZXN1bHQudHlwZSAh PSB0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQOgogICAgICAgICAgICAgICAgIHN0YXRzW3Jlc3VsdC50 ZXN0X25hbWVdID0geydyZXN1bHRzJzogKF93b3JrZXJfbnVtYmVyKHJlc3VsdC53b3JrZXJfbmFt ZSksIHJlc3VsdC50ZXN0X251bWJlciwgcmVzdWx0LnBpZCwgaW50KHJlc3VsdC50ZXN0X3J1bl90 aW1lICogMTAwMCksIGludChyZXN1bHQudG90YWxfcnVuX3RpbWUgKiAxMDAwKSl9CiAgICAgICAg IHN0YXRzX3RyaWUgPSB7fQotICAgICAgICBmb3IgbmFtZSwgdmFsdWUgaW4gc3RhdHMuaXRlcml0 ZW1zKCk6CisgICAgICAgIGZvciBuYW1lLCB2YWx1ZSBpbiBpdGVyaXRlbXMoc3RhdHMpOgogICAg ICAgICAgICAganNvbl9yZXN1bHRzX2dlbmVyYXRvci5hZGRfcGF0aF90b190cmllKG5hbWUsIHZh bHVlLCBzdGF0c190cmllKQogICAgICAgICByZXR1cm4gc3RhdHNfdHJpZQogCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkocmV2aXNpb24gMjUyMzY5KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTUwMCw3ICs1MDAs NyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICAgICBiYXNlbGluZV9wYXRoID0gc2Vs Zi5leHBlY3RlZF9maWxlbmFtZSh0ZXN0X25hbWUsICcud2ViYXJjaGl2ZScsIGRldmljZV90eXBl PWRldmljZV90eXBlKQogICAgICAgICAgICAgaWYgbm90IHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3Rz KGJhc2VsaW5lX3BhdGgpOgogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgIHRl eHQgPSBzZWxmLl9maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUoYmFzZWxpbmVfcGF0aCkKKyAg ICAgICAgdGV4dCA9IGRlY29kZV9mb3Ioc2VsZi5fZmlsZXN5c3RlbS5yZWFkX2JpbmFyeV9maWxl KGJhc2VsaW5lX3BhdGgpLCBzdHIpCiAgICAgICAgIHJldHVybiB0ZXh0LnJlcGxhY2UoIlxyXG4i LCAiXG4iKQogCiAgICAgZGVmIF9nZXRfcmVmdGVzdF9saXN0KHNlbGYsIHRlc3RfbmFtZSk6Cklu ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbW9ja19kcnQucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21vY2tfZHJ0LnB5CShyZXZpc2lvbiAyNTIz NjkpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbW9ja19kcnQucHkJKHdvcmtpbmcg Y29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAgc2NyaXB0X2RpciA9IG9zLnBhdGguZGlybmFtZShvcy5w YXRoLmRpcgogaWYgc2NyaXB0X2RpciBub3QgaW4gc3lzLnBhdGg6CiAgICAgc3lzLnBhdGguYXBw ZW5kKHNjcmlwdF9kaXIpCiAKK2Zyb20gd2Via2l0cHkuY29tbW9uLnVuaWNvZGVfY29tcGF0aWJp bGl0eSBpbXBvcnQgZGVjb2RlX2ZvcgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3Rl bWhvc3QgaW1wb3J0IFN5c3RlbUhvc3QKIGZyb20gd2Via2l0cHkucG9ydC5kcml2ZXIgaW1wb3J0 IERyaXZlcklucHV0LCBEcml2ZXJPdXRwdXQsIERyaXZlclByb3h5CiBmcm9tIHdlYmtpdHB5LnBv cnQuZmFjdG9yeSBpbXBvcnQgUG9ydEZhY3RvcnkKQEAgLTIzMCw3ICsyMzEsNyBAQCBjbGFzcyBN b2NrRFJUKG9iamVjdCk6CiAgICAgICAgICAgICBpZiBvdXRwdXQuaW1hZ2VfaGFzaCAhPSB0ZXN0 X2lucHV0LmltYWdlX2hhc2g6CiAgICAgICAgICAgICAgICAgc2VsZi5fc3Rkb3V0LndyaXRlKCdD b250ZW50LVR5cGU6IGltYWdlL3BuZ1xuJykKICAgICAgICAgICAgICAgICBzZWxmLl9zdGRvdXQu d3JpdGUoJ0NvbnRlbnQtTGVuZ3RoOiAlc1xuJyAlIGxlbihvdXRwdXQuaW1hZ2UpKQotICAgICAg ICAgICAgICAgIHNlbGYuX3N0ZG91dC53cml0ZShvdXRwdXQuaW1hZ2UpCisgICAgICAgICAgICAg ICAgc2VsZi5fc3Rkb3V0LndyaXRlKGRlY29kZV9mb3Iob3V0cHV0LmltYWdlLCBzdHIpKQogICAg ICAgICBzZWxmLl9zdGRvdXQud3JpdGUoJyNFT0ZcbicpCiAgICAgICAgIHNlbGYuX3N0ZG91dC5m bHVzaCgpCiAgICAgICAgIHNlbGYuX3N0ZGVyci53cml0ZSgnI0VPRlxuJykK