156263 2016-04-05 16:54:14 -0700 Update the Animometer patch and plan files 2016-04-06 20:57:07 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sabouhallawa sabouhallawa commit-queue dewei_zhu dino glenn jonlee simon.fraser webkit-bug-importer oldest_to_newest 1181062 0 sabouhallawa 2016-04-05 16:54:14 -0700 The CSS text boxes is not a reliable test and it has been deleted. We need to update the patch and the plan files of the Animometer so the performance bots measures the current test suites. 1181063 1 webkit-bug-importer 2016-04-05 16:55:34 -0700 <rdar://problem/25565932> 1181116 2 275737 sabouhallawa 2016-04-05 18:34:17 -0700 Created attachment 275737 Patch 1181130 3 275737 jonlee 2016-04-05 19:22:53 -0700 Comment on attachment 275737 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=275737&action=review > Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan:4 > + "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animometer/@r199085", Can we wait just a bit until bug 156273 is in? 1181522 4 jonlee 2016-04-06 18:49:19 -0700 Can we update this to r199134 and have only the master suite running? We're going to forgo the other suites for now. 1181554 5 275852 jonlee 2016-04-06 20:19:02 -0700 Created attachment 275852 Patch 1181567 6 275857 jonlee 2016-04-06 20:45:46 -0700 Created attachment 275857 Patch 1181570 7 275859 jonlee 2016-04-06 20:47:16 -0700 Created attachment 275859 Patch 1181574 8 jonlee 2016-04-06 20:57:07 -0700 Committed r199146: <http://trac.webkit.org/changeset/199146> 275737 2016-04-05 18:34:17 -0700 2016-04-06 20:18:59 -0700 Patch bug-156263-20160405183418.patch text/plain 5925 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MDg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmZlNmFjNzQ0Yjg5MDM1ZTk3ZDBmZjQzMzRlOGU4Y2E3 YmFmZGNiYS4uYmUyMTMzYzYxZmZmZGEzNmQ3YjBmNGQ1NTgyZDFhMjNiMzE0YWUyOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE2LTA0LTA1ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZSxj b20+CisKKyAgICAgICAgVXBkYXRlIHRoZSBBbmltb21ldGVyIHBhdGNoIGFuZCBwbGFuIGZpbGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTYyNjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNZWFzdXJl IHRoZSBsYXRlc3Qgc2V0IG9mIHRlc3RzIGJ5IHVwZGF0aW5nIHRoZSBwbGFuIHJldmlzaW9uIHRv IHIxOTkwODUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv ZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2g6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuOgorCiAyMDE2LTA0 LTA1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAg ICAgW0ZldGNoIEFQSV0gQWRkIGEgcnVudGltZSBmbGFnIHRvIGZldGNoIEFQSSBhbmQgcmVsYXRl ZCBjb25zdHJ1Y3RzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2ggYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2gKaW5k ZXggZGRjMDQ4N2ZkNDNlM2Y0MjA5NDRiNTc5NTg5MTY1OWU5ODE1MWMyZS4uNDU1NGI4OTlhNjAx MjViNjc3ZDZkMjBhOTc4NzVmMjhhMDgwZDhiMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoCisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMv QW5pbW9tZXRlci5wYXRjaApAQCAtMSw1ICsxLDUgQEAKLWRpZmYgLS1naXQgYS9QZXJmb3JtYW5j ZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9hbmltb21ldGVyLmpzIGIv UGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9t ZXRlci5qcwotaW5kZXggZmZjNzFiYS4uMDJhNWQ0OSAxMDA2NDQKK2RpZmYgLS1naXQgYS9yZXNv dXJjZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMgYi9yZXNvdXJjZXMvZGVidWctcnVubmVy L2FuaW1vbWV0ZXIuanMKK2luZGV4IDg0MzBiODQuLjI0YzZkNWIgMTAwNjQ0CiAtLS0gYS9yZXNv dXJjZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMKICsrKyBiL3Jlc291cmNlcy9kZWJ1Zy1y dW5uZXIvYW5pbW9tZXRlci5qcwogQEAgLTExOSw2ICsxMTksNTcgQEAgVXRpbGl0aWVzLmV4dGVu ZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrUnVubmVyQ2xpZW50LCB7CkBAIC01OSwxMSArNTksMTEg QEAgaW5kZXggZmZjNzFiYS4uMDJhNWQ0OSAxMDA2NDQKICsgICAgICAgIHhoci5zZW5kKHJlc3Vs dHMpOwogICAgICB9CiAgfSk7Ci0KLUBAIC0yNTUsMTAgKzMwNywxMCBAQCB3aW5kb3cuc3VpdGVz TWFuYWdlciA9Ci0gICAgICAgICBzdGFydEJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7CisgCitAQCAt Mjc2LDEwICszMjcsMTAgQEAgd2luZG93LnN1aXRlc01hbmFnZXIgPQorICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgICB9LAotCisgCiAtICAgIF9vbkNoYW5nZVN1aXRlQ2hlY2tib3g6IGZ1bmN0 aW9uKGV2ZW50KQogKyAgICBfb25DaGFuZ2VTdWl0ZUNoZWNrYm94OiBmdW5jdGlvbihzdWl0ZUNo ZWNrYm94KQogICAgICB7CkBAIC03NCw4ICs3NCw4IEBAIGluZGV4IGZmYzcxYmEuLjAyYTVkNDkg MTAwNjQ0CiAgICAgICAgICAgICAgdmFyIHRlc3RDaGVja2JveCA9IHRoaXMuX2NoZWNrYm94RWxl bWVudCh0ZXN0RWxlbWVudCk7CiAgICAgICAgICAgICAgdGVzdENoZWNrYm94LmNoZWNrZWQgPSBz ZWxlY3RlZDsKICAgICAgICAgIH0sIHRoaXMpOwotQEAgLTI3OSw3ICszMzEsOSBAQCB3aW5kb3cu c3VpdGVzTWFuYWdlciA9Ci0KK0BAIC0zMDAsNyArMzUxLDkgQEAgd2luZG93LnN1aXRlc01hbmFn ZXIgPQorIAogICAgICAgICAgdmFyIHN1aXRlQ2hlY2tib3ggPSBVdGlsaXRpZXMuY3JlYXRlRWxl bWVudCgiaW5wdXQiLCB7IHR5cGU6ICJjaGVja2JveCIgfSwgbGFiZWwpOwogICAgICAgICAgc3Vp dGVDaGVja2JveC5zdWl0ZSA9IHN1aXRlOwogLSAgICAgICAgc3VpdGVDaGVja2JveC5vbmNoYW5n ZSA9IHRoaXMuX29uQ2hhbmdlU3VpdGVDaGVja2JveC5iaW5kKHRoaXMpOwpAQCAtODMsOSArODMs OSBAQCBpbmRleCBmZmM3MWJhLi4wMmE1ZDQ5IDEwMDY0NAogKyAgICAgICAgICAgIHRoaXMuX29u Q2hhbmdlU3VpdGVDaGVja2JveChldmVudC50YXJnZXQpOwogKyAgICAgICAgfS5iaW5kKHRoaXMp OwogICAgICAgICAgc3VpdGVDaGVja2JveC50ZXN0c0VsZW1lbnRzID0gW107Ci0KKyAKICAgICAg ICAgIGxhYmVsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIgIiArIHN1aXRl Lm5hbWUpKTsKLUBAIC00MjgsNDUgKzQ4Miw4IEBAIHdpbmRvdy5zdWl0ZXNNYW5hZ2VyID0KK0BA IC00OTUsNDkgKzU0OCw4IEBAIHdpbmRvdy5zdWl0ZXNNYW5hZ2VyID0KICBVdGlsaXRpZXMuZXh0 ZW5kT2JqZWN0KHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVyLCB7CiAgICAgIGluaXRpYWxpemU6 IGZ1bmN0aW9uKCkKICAgICAgewpAQCAtOTQsOSArOTQsMTQgQEAgaW5kZXggZmZjNzFiYS4uMDJh NWQ0OSAxMDA2NDQKIC0gICAgICAgIGRvY3VtZW50LmZvcm1zWyJ0aW1lLWdyYXBoLW9wdGlvbnMi XS5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBiZW5jaG1hcmtDb250cm9sbGVyLm9uVGltZUdy YXBoT3B0aW9uc0NoYW5nZWQsIHRydWUpOwogLSAgICAgICAgZG9jdW1lbnQuZm9ybXNbImNvbXBs ZXhpdHktZ3JhcGgtb3B0aW9ucyJdLmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIGJlbmNobWFy a0NvbnRyb2xsZXIub25Db21wbGV4aXR5R3JhcGhPcHRpb25zQ2hhbmdlZCwgdHJ1ZSk7CiAtICAg ICAgICBvcHRpb25zTWFuYWdlci51cGRhdGVVSUZyb21Mb2NhbFN0b3JhZ2UoKTsKKy0gICAgICAg IG9wdGlvbnNNYW5hZ2VyLnVwZGF0ZURpc3BsYXkoKTsKKy0KKy0gICAgICAgIGlmIChiZW5jaG1h cmtDb250cm9sbGVyLnN0YXJ0QmVuY2htYXJrSW1tZWRpYXRlbHlJZkVuY29kZWQoKSkKKy0gICAg ICAgICAgICByZXR1cm47CistCistICAgICAgICBiZW5jaG1hcmtDb250cm9sbGVyLmFkZE9yaWVu dGF0aW9uTGlzdGVuZXJJZk5lY2Vzc2FyeSgpOwogICAgICAgICAgc3VpdGVzTWFuYWdlci5jcmVh dGVFbGVtZW50cygpOwogLSAgICAgICAgc3VpdGVzTWFuYWdlci51cGRhdGVVSUZyb21Mb2NhbFN0 b3JhZ2UoKTsKLS0gICAgICAgIHN1aXRlc01hbmFnZXIudXBkYXRlRGlzcGxheSgpOwogLSAgICAg ICAgc3VpdGVzTWFuYWdlci51cGRhdGVFZGl0c0VsZW1lbnRzU3RhdGUoKTsKIC0KIC0gICAgICAg IHZhciBkcm9wVGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImRyb3AtdGFyZ2V0Iik7 CkBAIC0xMjcsMTYgKzEzMiwxNCBAQCBpbmRleCBmZmM3MWJhLi4wMmE1ZDQ5IDEwMDY0NAogLSAg ICAgICAgICAgIHJlYWRlci5yZWFkQXNUZXh0KGZpbGUpOwogLSAgICAgICAgICAgIGRvY3VtZW50 LnRpdGxlID0gIkZpbGU6ICIgKyByZWFkZXIuZmlsZW5hbWU7CiAtICAgICAgICB9LCBmYWxzZSk7 Ci0tCiArICAgICAgICBzZXRUaW1lb3V0KGJlbmNobWFya0NvbnRyb2xsZXIuc3RhcnRCZW5jaG1h cmsuYmluZChiZW5jaG1hcmtDb250cm9sbGVyKSwgMzAwMCk7CiAgICAgIH0sCi0KLSAgICAgb25C ZW5jaG1hcmtPcHRpb25zQ2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCi1AQCAtNDgyLDcgKzQ5OSwy MCBAQCBVdGlsaXRpZXMuZXh0ZW5kT2JqZWN0KHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVyLCB7 Ci0KKyAKKyAgICAgdXBkYXRlU3RhcnRCdXR0b25TdGF0ZTogZnVuY3Rpb24oKQorQEAgLTU2NCw2 ICs1NzYsMjEgQEAgVXRpbGl0aWVzLmV4dGVuZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrQ29udHJv bGxlciwgewogICAgICBzdGFydEJlbmNobWFyazogZnVuY3Rpb24oKQogICAgICB7Ci0tICAgICAg ICB2YXIgb3B0aW9ucyA9IG9wdGlvbnNNYW5hZ2VyLnVwZGF0ZUxvY2FsU3RvcmFnZUZyb21VSSgp OworICAgICAgICAgYmVuY2htYXJrQ29udHJvbGxlci5vcHRpb25zID0gb3B0aW9uc01hbmFnZXIu dXBkYXRlTG9jYWxTdG9yYWdlRnJvbVVJKCk7CiArICAgICAgICB2YXIgb3B0aW9ucyA9IHsKICsg ICAgICAgICAgICAidGVzdC1pbnRlcnZhbCI6IDIwLAogKyAgICAgICAgICAgICJkaXNwbGF5Ijog Im1pbmltYWwiLApAQCAtMTUxLDYgKzE1NCw3IEBAIGluZGV4IGZmYzcxYmEuLjAyYTVkNDkgMTAw NjQ0CiArICAgICAgICAgICAgc3VpdGVDaGVja2JveC5jaGVja2VkID0gdHJ1ZTsKICsgICAgICAg ICAgICBzdWl0ZXNNYW5hZ2VyLl9vbkNoYW5nZVN1aXRlQ2hlY2tib3goc3VpdGVDaGVja2JveCk7 CiArICAgICAgICB9Ci0gICAgICAgICB2YXIgc3VpdGVzID0gc3VpdGVzTWFuYWdlci51cGRhdGVM b2NhbFN0b3JhZ2VGcm9tVUkoKTsKLSAgICAgICAgIHRoaXMuX3N0YXJ0QmVuY2htYXJrKHN1aXRl cywgb3B0aW9ucywgInJ1bm5pbmctdGVzdCIpOworKworICAgICAgICAgYmVuY2htYXJrQ29udHJv bGxlci5zdWl0ZXMgPSBzdWl0ZXNNYW5hZ2VyLnVwZGF0ZUxvY2FsU3RvcmFnZUZyb21VSSgpOwor ICAgICAgICAgdGhpcy5fc3RhcnRCZW5jaG1hcmsoYmVuY2htYXJrQ29udHJvbGxlci5zdWl0ZXMs IGJlbmNobWFya0NvbnRyb2xsZXIub3B0aW9ucywgInJ1bm5pbmctdGVzdCIpOwogICAgICB9LApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEv cGxhbnMvYW5pbW9tZXRlci5wbGFuIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuCmluZGV4IDQ5MGZhNjU3ODA1MjdiYjJk MjI3MmZjZWFhZWIyNjZhNjAwMTIxZjMuLmRiYzlhZmQ3OWNlMGY0NGUwYjhjN2YyYWY1MDcxNDJk ZjE1YTFhY2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9kYXRhL3BsYW5zL2FuaW1vbWV0ZXIucGxhbgorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9hbmltb21ldGVyLnBsYW4KQEAgLTEsNyAr MSw3IEBACiB7CiAgICAgInRpbWVvdXQiOiAxODAwLAogICAgICJjb3VudCI6IDEsCi0gICAgInN2 bl9zb3VyY2UiOiAiaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVu ay9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvQHIxOTc2NTIiLAorICAgICJzdm5fc291cmNl IjogImh0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmsvUGVyZm9y bWFuY2VUZXN0cy9Bbmltb21ldGVyL0ByMTk5MDg1IiwKICAgICAiYmVuY2htYXJrX3BhdGNoIjog ImRhdGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoIiwKICAgICAiZW50cnlfcG9pbnQiOiAiZGV2 ZWxvcGVyLmh0bWwiLAogICAgICJvdXRwdXRfZmlsZSI6ICJhbmltb21ldGVyLnJlc3VsdCIK 275852 2016-04-06 20:19:02 -0700 2016-04-06 20:45:44 -0700 Patch bug-156263-20160406201903.patch text/plain 5976 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MTMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFiNDUzZDU0YzExODc4MzEwZDM4MjQyZjUyMDM2YWUz MWRiNWUyMy4uMzg4NmU4YWJlNmJmODBkNDI5ZGFlZWEyNjAwNDYxYWUyOWRkM2Q4YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE2LTA0LTA2ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBV cGRhdGUgdGhlIEFuaW1vbWV0ZXIgcGF0Y2ggYW5kIHBsYW4gZmlsZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjI2MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lYXN1cmUgdGhlIGxhdGVzdCBzZXQg b2YgdGVzdHMgYnkgdXBkYXRpbmcgdGhlIHBsYW4gcmV2aXNpb24gdG8gcjE5OTEzNC4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5p bW9tZXRlci5wYXRjaDogVXBkYXRlIHRvIHJ1biB0aGUgbWFzdGVyIHN1aXRlIG9ubHkuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvYW5pbW9t ZXRlci5wbGFuOgorCiAyMDE2LTA0LTA2ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ29tcGlsZSBXZWJLaXRUZXN0UnVubmVyIHdpdGggQ01h a2Ugb24gTWFjCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2ggYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2gKaW5kZXgg ZGRjMDQ4N2ZkNDNlM2Y0MjA5NDRiNTc5NTg5MTY1OWU5ODE1MWMyZS4uNmYwYzA2YjFjOGMxYzA0 YzEwMmQ0NDUxMjAwOTdiYWYwNTc4YWI1YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoCisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5p bW9tZXRlci5wYXRjaApAQCAtMSw1ICsxLDUgQEAKLWRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRl c3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9hbmltb21ldGVyLmpzIGIvUGVy Zm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9tZXRl ci5qcwotaW5kZXggZmZjNzFiYS4uMDJhNWQ0OSAxMDA2NDQKK2RpZmYgLS1naXQgYS9yZXNvdXJj ZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMgYi9yZXNvdXJjZXMvZGVidWctcnVubmVyL2Fu aW1vbWV0ZXIuanMKK2luZGV4IDg0MzBiODQuLjI0YzZkNWIgMTAwNjQ0CiAtLS0gYS9yZXNvdXJj ZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMKICsrKyBiL3Jlc291cmNlcy9kZWJ1Zy1ydW5u ZXIvYW5pbW9tZXRlci5qcwogQEAgLTExOSw2ICsxMTksNTcgQEAgVXRpbGl0aWVzLmV4dGVuZE9i amVjdCh3aW5kb3cuYmVuY2htYXJrUnVubmVyQ2xpZW50LCB7CkBAIC02MCw4ICs2MCw4IEBAIGlu ZGV4IGZmYzcxYmEuLjAyYTVkNDkgMTAwNjQ0CiAgICAgIH0KICB9KTsKIAotQEAgLTI1NSwxMCAr MzA3LDEwIEBAIHdpbmRvdy5zdWl0ZXNNYW5hZ2VyID0KLSAgICAgICAgIHN0YXJ0QnV0dG9uLmRp c2FibGVkID0gdHJ1ZTsKK0BAIC0yNzYsMTAgKzMyNywxMCBAQCB3aW5kb3cuc3VpdGVzTWFuYWdl ciA9CisgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgIH0sCiAKIC0gICAgX29uQ2hhbmdlU3Vp dGVDaGVja2JveDogZnVuY3Rpb24oZXZlbnQpCkBAIC03NCw3ICs3NCw3IEBAIGluZGV4IGZmYzcx YmEuLjAyYTVkNDkgMTAwNjQ0CiAgICAgICAgICAgICAgdmFyIHRlc3RDaGVja2JveCA9IHRoaXMu X2NoZWNrYm94RWxlbWVudCh0ZXN0RWxlbWVudCk7CiAgICAgICAgICAgICAgdGVzdENoZWNrYm94 LmNoZWNrZWQgPSBzZWxlY3RlZDsKICAgICAgICAgIH0sIHRoaXMpOwotQEAgLTI3OSw3ICszMzEs OSBAQCB3aW5kb3cuc3VpdGVzTWFuYWdlciA9CitAQCAtMzAwLDcgKzM1MSw5IEBAIHdpbmRvdy5z dWl0ZXNNYW5hZ2VyID0KIAogICAgICAgICAgdmFyIHN1aXRlQ2hlY2tib3ggPSBVdGlsaXRpZXMu Y3JlYXRlRWxlbWVudCgiaW5wdXQiLCB7IHR5cGU6ICJjaGVja2JveCIgfSwgbGFiZWwpOwogICAg ICAgICAgc3VpdGVDaGVja2JveC5zdWl0ZSA9IHN1aXRlOwpAQCAtODUsNyArODUsNyBAQCBpbmRl eCBmZmM3MWJhLi4wMmE1ZDQ5IDEwMDY0NAogICAgICAgICAgc3VpdGVDaGVja2JveC50ZXN0c0Vs ZW1lbnRzID0gW107CiAKICAgICAgICAgIGxhYmVsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZVRleHROb2RlKCIgIiArIHN1aXRlLm5hbWUpKTsKLUBAIC00MjgsNDUgKzQ4Miw4IEBAIHdpbmRv dy5zdWl0ZXNNYW5hZ2VyID0KK0BAIC00OTUsNDkgKzU0OCw4IEBAIHdpbmRvdy5zdWl0ZXNNYW5h Z2VyID0KICBVdGlsaXRpZXMuZXh0ZW5kT2JqZWN0KHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVy LCB7CiAgICAgIGluaXRpYWxpemU6IGZ1bmN0aW9uKCkKICAgICAgewpAQCAtOTQsOSArOTQsMTQg QEAgaW5kZXggZmZjNzFiYS4uMDJhNWQ0OSAxMDA2NDQKIC0gICAgICAgIGRvY3VtZW50LmZvcm1z WyJ0aW1lLWdyYXBoLW9wdGlvbnMiXS5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBiZW5jaG1h cmtDb250cm9sbGVyLm9uVGltZUdyYXBoT3B0aW9uc0NoYW5nZWQsIHRydWUpOwogLSAgICAgICAg ZG9jdW1lbnQuZm9ybXNbImNvbXBsZXhpdHktZ3JhcGgtb3B0aW9ucyJdLmFkZEV2ZW50TGlzdGVu ZXIoImNoYW5nZSIsIGJlbmNobWFya0NvbnRyb2xsZXIub25Db21wbGV4aXR5R3JhcGhPcHRpb25z Q2hhbmdlZCwgdHJ1ZSk7CiAtICAgICAgICBvcHRpb25zTWFuYWdlci51cGRhdGVVSUZyb21Mb2Nh bFN0b3JhZ2UoKTsKKy0gICAgICAgIG9wdGlvbnNNYW5hZ2VyLnVwZGF0ZURpc3BsYXkoKTsKKy0K Ky0gICAgICAgIGlmIChiZW5jaG1hcmtDb250cm9sbGVyLnN0YXJ0QmVuY2htYXJrSW1tZWRpYXRl bHlJZkVuY29kZWQoKSkKKy0gICAgICAgICAgICByZXR1cm47CistCistICAgICAgICBiZW5jaG1h cmtDb250cm9sbGVyLmFkZE9yaWVudGF0aW9uTGlzdGVuZXJJZk5lY2Vzc2FyeSgpOwogICAgICAg ICAgc3VpdGVzTWFuYWdlci5jcmVhdGVFbGVtZW50cygpOwogLSAgICAgICAgc3VpdGVzTWFuYWdl ci51cGRhdGVVSUZyb21Mb2NhbFN0b3JhZ2UoKTsKLS0gICAgICAgIHN1aXRlc01hbmFnZXIudXBk YXRlRGlzcGxheSgpOwogLSAgICAgICAgc3VpdGVzTWFuYWdlci51cGRhdGVFZGl0c0VsZW1lbnRz U3RhdGUoKTsKIC0KIC0gICAgICAgIHZhciBkcm9wVGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImRyb3AtdGFyZ2V0Iik7CkBAIC0xMjcsMTYgKzEzMiwxNCBAQCBpbmRleCBmZmM3MWJh Li4wMmE1ZDQ5IDEwMDY0NAogLSAgICAgICAgICAgIHJlYWRlci5yZWFkQXNUZXh0KGZpbGUpOwog LSAgICAgICAgICAgIGRvY3VtZW50LnRpdGxlID0gIkZpbGU6ICIgKyByZWFkZXIuZmlsZW5hbWU7 CiAtICAgICAgICB9LCBmYWxzZSk7Ci0tCiArICAgICAgICBzZXRUaW1lb3V0KGJlbmNobWFya0Nv bnRyb2xsZXIuc3RhcnRCZW5jaG1hcmsuYmluZChiZW5jaG1hcmtDb250cm9sbGVyKSwgMzAwMCk7 CiAgICAgIH0sCiAKLSAgICAgb25CZW5jaG1hcmtPcHRpb25zQ2hhbmdlZDogZnVuY3Rpb24oZXZl bnQpCi1AQCAtNDgyLDcgKzQ5OSwyMCBAQCBVdGlsaXRpZXMuZXh0ZW5kT2JqZWN0KHdpbmRvdy5i ZW5jaG1hcmtDb250cm9sbGVyLCB7Ci0KKyAgICAgdXBkYXRlU3RhcnRCdXR0b25TdGF0ZTogZnVu Y3Rpb24oKQorQEAgLTU2NCw2ICs1NzYsMjEgQEAgVXRpbGl0aWVzLmV4dGVuZE9iamVjdCh3aW5k b3cuYmVuY2htYXJrQ29udHJvbGxlciwgewogICAgICBzdGFydEJlbmNobWFyazogZnVuY3Rpb24o KQogICAgICB7Ci0tICAgICAgICB2YXIgb3B0aW9ucyA9IG9wdGlvbnNNYW5hZ2VyLnVwZGF0ZUxv Y2FsU3RvcmFnZUZyb21VSSgpOworICAgICAgICAgYmVuY2htYXJrQ29udHJvbGxlci5vcHRpb25z ID0gb3B0aW9uc01hbmFnZXIudXBkYXRlTG9jYWxTdG9yYWdlRnJvbVVJKCk7CiArICAgICAgICB2 YXIgb3B0aW9ucyA9IHsKICsgICAgICAgICAgICAidGVzdC1pbnRlcnZhbCI6IDIwLAogKyAgICAg ICAgICAgICJkaXNwbGF5IjogIm1pbmltYWwiLApAQCAtMTQ2LDExICsxNDksMTIgQEAgaW5kZXgg ZmZjNzFiYS4uMDJhNWQ0OSAxMDA2NDQKICsgICAgICAgICAgICAidGltZS1tZWFzdXJlbWVudCI6 ICJwZXJmb3JtYW5jZSIKICsgICAgICAgIH07CiArCi0rICAgICAgICBmb3IgKHZhciBzdWl0ZUlu ZGV4ID0gMDsgc3VpdGVJbmRleCA8IDU7ICsrc3VpdGVJbmRleCkgeworKyAgICAgICAgZm9yICh2 YXIgc3VpdGVJbmRleCA9IDA7IHN1aXRlSW5kZXggPCAxOyArK3N1aXRlSW5kZXgpIHsKICsgICAg ICAgICAgICB2YXIgc3VpdGVDaGVja2JveCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoImxhYmVs W2Zvcj1zdWl0ZS0iICsgc3VpdGVJbmRleCArICJdIGlucHV0W3R5cGU9Y2hlY2tib3hdIik7CiAr ICAgICAgICAgICAgc3VpdGVDaGVja2JveC5jaGVja2VkID0gdHJ1ZTsKICsgICAgICAgICAgICBz dWl0ZXNNYW5hZ2VyLl9vbkNoYW5nZVN1aXRlQ2hlY2tib3goc3VpdGVDaGVja2JveCk7CiArICAg ICAgICB9Ci0gICAgICAgICB2YXIgc3VpdGVzID0gc3VpdGVzTWFuYWdlci51cGRhdGVMb2NhbFN0 b3JhZ2VGcm9tVUkoKTsKLSAgICAgICAgIHRoaXMuX3N0YXJ0QmVuY2htYXJrKHN1aXRlcywgb3B0 aW9ucywgInJ1bm5pbmctdGVzdCIpOworKworICAgICAgICAgYmVuY2htYXJrQ29udHJvbGxlci5z dWl0ZXMgPSBzdWl0ZXNNYW5hZ2VyLnVwZGF0ZUxvY2FsU3RvcmFnZUZyb21VSSgpOworICAgICAg ICAgdGhpcy5fc3RhcnRCZW5jaG1hcmsoYmVuY2htYXJrQ29udHJvbGxlci5zdWl0ZXMsIGJlbmNo bWFya0NvbnRyb2xsZXIub3B0aW9ucywgInJ1bm5pbmctdGVzdCIpOwogICAgICB9LApkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMv YW5pbW9tZXRlci5wbGFuIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuCmluZGV4IDQ5MGZhNjU3ODA1MjdiYjJkMjI3MmZj ZWFhZWIyNjZhNjAwMTIxZjMuLmRmYzlhNzU0MmU4YWVhM2YzY2Q2ZDE0M2ZmMjdkNDE3NGM2ZjBh ZjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9k YXRhL3BsYW5zL2FuaW1vbWV0ZXIucGxhbgorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jl bmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9hbmltb21ldGVyLnBsYW4KQEAgLTEsNyArMSw3IEBA CiB7CiAgICAgInRpbWVvdXQiOiAxODAwLAogICAgICJjb3VudCI6IDEsCi0gICAgInN2bl9zb3Vy Y2UiOiAiaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVuay9QZXJm b3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvQHIxOTc2NTIiLAorICAgICJzdm5fc291cmNlIjogImh0 dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmsvUGVyZm9ybWFuY2VU ZXN0cy9Bbmltb21ldGVyL0ByMTk5MTM0IiwKICAgICAiYmVuY2htYXJrX3BhdGNoIjogImRhdGEv cGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoIiwKICAgICAiZW50cnlfcG9pbnQiOiAiZGV2ZWxvcGVy Lmh0bWwiLAogICAgICJvdXRwdXRfZmlsZSI6ICJhbmltb21ldGVyLnJlc3VsdCIK 275857 2016-04-06 20:45:46 -0700 2016-04-06 20:47:13 -0700 Patch bug-156263-20160406204548.patch text/plain 7562 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MTMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFiNDUzZDU0YzExODc4MzEwZDM4MjQyZjUyMDM2YWUz MWRiNWUyMy4uMTFmM2RhNmZlZmZhMDM0MjE5OThlZmRkZDU4ZTAwMmI4NWJkNDkzNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE2LTA0LTA2ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBV cGRhdGUgdGhlIEFuaW1vbWV0ZXIgcGF0Y2ggYW5kIHBsYW4gZmlsZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjI2MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lYXN1cmUgdGhlIGxhdGVzdCBzZXQg b2YgdGVzdHMgYnkgdXBkYXRpbmcgdGhlIHBsYW4gcmV2aXNpb24gdG8gcjE5OTEzNC4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5p bW9tZXRlci5wYXRjaDogVXBkYXRlIHRvIHJ1biB0aGUgbWFzdGVyIHN1aXRlIG9ubHkuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvYW5pbW9t ZXRlci5wbGFuOiBVcGRhdGUgdG8gdXNlIHRoZSByZWxlYXNlIHBhZ2UgaW5zdGVhZAorICAgICAg ICBvZiB0aGUgZGV2ZWxvcGVyIHBhZ2UuCisKIDIwMTYtMDQtMDYgIEFsZXggQ2hyaXN0ZW5zZW4g IDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDb21waWxlIFdlYktpdFRlc3RS dW5uZXIgd2l0aCBDTWFrZSBvbiBNYWMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5pbW9tZXRlci5wYXRjaCBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5pbW9tZXRl ci5wYXRjaAppbmRleCBkZGMwNDg3ZmQ0M2UzZjQyMDk0NGI1Nzk1ODkxNjU5ZTk4MTUxYzJlLi41 YjIzNjE4ODFlMDdlNDE3NTk2YjZlNWFlOTRhMTA5YjhhOGJiY2JkIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0 ZXIucGF0Y2gKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoCkBAIC0xLDExICsxLDExIEBACi1kaWZmIC0tZ2l0 IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5p bW9tZXRlci5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVidWct cnVubmVyL2FuaW1vbWV0ZXIuanMKLWluZGV4IGZmYzcxYmEuLjAyYTVkNDkgMTAwNjQ0Ci0tLS0g YS9yZXNvdXJjZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMKLSsrKyBiL3Jlc291cmNlcy9k ZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5qcwotQEAgLTExOSw2ICsxMTksNTcgQEAgVXRpbGl0aWVz LmV4dGVuZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrUnVubmVyQ2xpZW50LCB7CitkaWZmIC0tZ2l0 IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9ydW5uZXIvYW5pbW9tZXRl ci5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvcnVubmVyL2FuaW1v bWV0ZXIuanMKK2luZGV4IGIyMGExYzkuLmU0MzRlODkgMTAwNjQ0CistLS0gYS9QZXJmb3JtYW5j ZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVyLmpzCisrKysgYi9Q ZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVyLmpz CitAQCAtMzIwLDYgKzMyMCw1NyBAQCB3aW5kb3cuYmVuY2htYXJrUnVubmVyQ2xpZW50ID0gewor ICAgICBkaWRGaW5pc2hMYXN0SXRlcmF0aW9uOiBmdW5jdGlvbigpCiAgICAgIHsKLSAgICAgICAg IHRoaXMucHJvZ3Jlc3NCYXIuaW5jcmVtZW50UmFuZ2UoKTsKLSAgICAgICAgIHRoaXMucmVzdWx0 cy5jYWxjdWxhdGVTY29yZSh0ZXN0RGF0YSk7CisgICAgICAgICBiZW5jaG1hcmtDb250cm9sbGVy LnNob3dSZXN1bHRzKCk7CiArICAgIH0sCiArCiArICAgIF9jb21wdXRlVGVzdFJlcG9ydDogZnVu Y3Rpb24odGVzdE5hbWUsIHRlc3RSZXN1bHRzKQpAQCAtNTgsOTkgKzU4LDE0IEBAIGluZGV4IGZm YzcxYmEuLjAyYTVkNDkgMTAwNjQ0CiArICAgICAgICB9CiArICAgICAgICB4aHIuc2VuZChyZXN1 bHRzKTsKICAgICAgfQotIH0pOworIH07CiAKLUBAIC0yNTUsMTAgKzMwNywxMCBAQCB3aW5kb3cu c3VpdGVzTWFuYWdlciA9Ci0gICAgICAgICBzdGFydEJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7Ci0g ICAgIH0sCi0KLS0gICAgX29uQ2hhbmdlU3VpdGVDaGVja2JveDogZnVuY3Rpb24oZXZlbnQpCi0r ICAgIF9vbkNoYW5nZVN1aXRlQ2hlY2tib3g6IGZ1bmN0aW9uKHN1aXRlQ2hlY2tib3gpCi0gICAg IHsKLS0gICAgICAgIHZhciBzZWxlY3RlZCA9IGV2ZW50LnRhcmdldC5jaGVja2VkOwotLSAgICAg ICAgZXZlbnQudGFyZ2V0LnRlc3RzRWxlbWVudHMuZm9yRWFjaChmdW5jdGlvbih0ZXN0RWxlbWVu dCkgewotKyAgICAgICAgdmFyIHNlbGVjdGVkID0gc3VpdGVDaGVja2JveC5jaGVja2VkOwotKyAg ICAgICAgc3VpdGVDaGVja2JveC50ZXN0c0VsZW1lbnRzLmZvckVhY2goZnVuY3Rpb24odGVzdEVs ZW1lbnQpIHsKLSAgICAgICAgICAgICB2YXIgdGVzdENoZWNrYm94ID0gdGhpcy5fY2hlY2tib3hF bGVtZW50KHRlc3RFbGVtZW50KTsKLSAgICAgICAgICAgICB0ZXN0Q2hlY2tib3guY2hlY2tlZCA9 IHNlbGVjdGVkOwotICAgICAgICAgfSwgdGhpcyk7Ci1AQCAtMjc5LDcgKzMzMSw5IEBAIHdpbmRv dy5zdWl0ZXNNYW5hZ2VyID0KLQotICAgICAgICAgdmFyIHN1aXRlQ2hlY2tib3ggPSBVdGlsaXRp ZXMuY3JlYXRlRWxlbWVudCgiaW5wdXQiLCB7IHR5cGU6ICJjaGVja2JveCIgfSwgbGFiZWwpOwot ICAgICAgICAgc3VpdGVDaGVja2JveC5zdWl0ZSA9IHN1aXRlOwotLSAgICAgICAgc3VpdGVDaGVj a2JveC5vbmNoYW5nZSA9IHRoaXMuX29uQ2hhbmdlU3VpdGVDaGVja2JveC5iaW5kKHRoaXMpOwot KyAgICAgICAgc3VpdGVDaGVja2JveC5vbmNoYW5nZSA9IGZ1bmN0aW9uKGV2ZW50KSB7Ci0rICAg ICAgICAgICAgdGhpcy5fb25DaGFuZ2VTdWl0ZUNoZWNrYm94KGV2ZW50LnRhcmdldCk7Ci0rICAg ICAgICB9LmJpbmQodGhpcyk7Ci0gICAgICAgICBzdWl0ZUNoZWNrYm94LnRlc3RzRWxlbWVudHMg PSBbXTsKLQotICAgICAgICAgbGFiZWwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5v ZGUoIiAiICsgc3VpdGUubmFtZSkpOwotQEAgLTQyOCw0NSArNDgyLDggQEAgd2luZG93LnN1aXRl c01hbmFnZXIgPQotIFV0aWxpdGllcy5leHRlbmRPYmplY3Qod2luZG93LmJlbmNobWFya0NvbnRy b2xsZXIsIHsKK0BAIC0zNTcsNyArNDA4LDcgQEAgd2luZG93LnNlY3Rpb25zTWFuYWdlciA9Cisg d2luZG93LmJlbmNobWFya0NvbnRyb2xsZXIgPSB7CiAgICAgIGluaXRpYWxpemU6IGZ1bmN0aW9u KCkKICAgICAgewotLSAgICAgICAgZG9jdW1lbnQuZm9ybXNbImJlbmNobWFyay1vcHRpb25zIl0u YWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgYmVuY2htYXJrQ29udHJvbGxlci5vbkJlbmNobWFy a09wdGlvbnNDaGFuZ2VkLCB0cnVlKTsKLS0gICAgICAgIGRvY3VtZW50LmZvcm1zWyJncmFwaC10 eXBlIl0uYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgYmVuY2htYXJrQ29udHJvbGxlci5vbkdy YXBoVHlwZUNoYW5nZWQsIHRydWUpOwotLSAgICAgICAgZG9jdW1lbnQuZm9ybXNbInRpbWUtZ3Jh cGgtb3B0aW9ucyJdLmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIGJlbmNobWFya0NvbnRyb2xs ZXIub25UaW1lR3JhcGhPcHRpb25zQ2hhbmdlZCwgdHJ1ZSk7Ci0tICAgICAgICBkb2N1bWVudC5m b3Jtc1siY29tcGxleGl0eS1ncmFwaC1vcHRpb25zIl0uYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdl IiwgYmVuY2htYXJrQ29udHJvbGxlci5vbkNvbXBsZXhpdHlHcmFwaE9wdGlvbnNDaGFuZ2VkLCB0 cnVlKTsKLS0gICAgICAgIG9wdGlvbnNNYW5hZ2VyLnVwZGF0ZVVJRnJvbUxvY2FsU3RvcmFnZSgp OwotICAgICAgICAgc3VpdGVzTWFuYWdlci5jcmVhdGVFbGVtZW50cygpOwotLSAgICAgICAgc3Vp dGVzTWFuYWdlci51cGRhdGVVSUZyb21Mb2NhbFN0b3JhZ2UoKTsKLS0gICAgICAgIHN1aXRlc01h bmFnZXIudXBkYXRlRGlzcGxheSgpOwotLSAgICAgICAgc3VpdGVzTWFuYWdlci51cGRhdGVFZGl0 c0VsZW1lbnRzU3RhdGUoKTsKLS0KLS0gICAgICAgIHZhciBkcm9wVGFyZ2V0ID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImRyb3AtdGFyZ2V0Iik7Ci0tICAgICAgICBmdW5jdGlvbiBzdG9wRXZl bnQoZSkgewotLSAgICAgICAgICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7Ci0tICAgICAgICAgICAg ZS5wcmV2ZW50RGVmYXVsdCgpOwotLSAgICAgICAgfQotLSAgICAgICAgZHJvcFRhcmdldC5hZGRF dmVudExpc3RlbmVyKCJkcmFnZW50ZXIiLCBzdG9wRXZlbnQsIGZhbHNlKTsKLS0gICAgICAgIGRy b3BUYXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIiLCBzdG9wRXZlbnQsIGZhbHNlKTsK LS0gICAgICAgIGRyb3BUYXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ2xlYXZlIiwgc3RvcEV2 ZW50LCBmYWxzZSk7Ci0tICAgICAgICBkcm9wVGFyZ2V0LmFkZEV2ZW50TGlzdGVuZXIoImRyb3Ai LCBmdW5jdGlvbiAoZSkgewotLSAgICAgICAgICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7Ci0tICAg ICAgICAgICAgZS5wcmV2ZW50RGVmYXVsdCgpOwotLQotLSAgICAgICAgICAgIGlmICghZS5kYXRh VHJhbnNmZXIuZmlsZXMubGVuZ3RoKQotLSAgICAgICAgICAgICAgICByZXR1cm47Ci0tCi0tICAg ICAgICAgICAgdmFyIGZpbGUgPSBlLmRhdGFUcmFuc2Zlci5maWxlc1swXTsKLS0KLS0gICAgICAg ICAgICB2YXIgcmVhZGVyID0gbmV3IEZpbGVSZWFkZXIoKTsKLS0gICAgICAgICAgICByZWFkZXIu ZmlsZW5hbWUgPSBmaWxlLm5hbWU7Ci0tICAgICAgICAgICAgcmVhZGVyLm9ubG9hZCA9IGZ1bmN0 aW9uKGUpIHsKLS0gICAgICAgICAgICAgICAgdmFyIHJ1biA9IEpTT04ucGFyc2UoZS50YXJnZXQu cmVzdWx0KTsKLS0gICAgICAgICAgICAgICAgYmVuY2htYXJrUnVubmVyQ2xpZW50LnJlc3VsdHMg PSBuZXcgUmVzdWx0c0Rhc2hib2FyZChydW4ub3B0aW9ucywgcnVuLmRhdGEpOwotLSAgICAgICAg ICAgICAgICBiZW5jaG1hcmtDb250cm9sbGVyLnNob3dSZXN1bHRzKCk7Ci0tICAgICAgICAgICAg fTsKLS0KLS0gICAgICAgICAgICByZWFkZXIucmVhZEFzVGV4dChmaWxlKTsKLS0gICAgICAgICAg ICBkb2N1bWVudC50aXRsZSA9ICJGaWxlOiAiICsgcmVhZGVyLmZpbGVuYW1lOwotLSAgICAgICAg fSwgZmFsc2UpOwotLQorLSAgICAgICAgYmVuY2htYXJrQ29udHJvbGxlci5hZGRPcmllbnRhdGlv bkxpc3RlbmVySWZOZWNlc3NhcnkoKTsKICsgICAgICAgIHNldFRpbWVvdXQoYmVuY2htYXJrQ29u dHJvbGxlci5zdGFydEJlbmNobWFyay5iaW5kKGJlbmNobWFya0NvbnRyb2xsZXIpLCAzMDAwKTsK ICAgICAgfSwKIAotICAgICBvbkJlbmNobWFya09wdGlvbnNDaGFuZ2VkOiBmdW5jdGlvbihldmVu dCkKLUBAIC00ODIsNyArNDk5LDIwIEBAIFV0aWxpdGllcy5leHRlbmRPYmplY3Qod2luZG93LmJl bmNobWFya0NvbnRyb2xsZXIsIHsKLQotICAgICBzdGFydEJlbmNobWFyazogZnVuY3Rpb24oKQot ICAgICB7Ci0tICAgICAgICB2YXIgb3B0aW9ucyA9IG9wdGlvbnNNYW5hZ2VyLnVwZGF0ZUxvY2Fs U3RvcmFnZUZyb21VSSgpOwotKyAgICAgICAgdmFyIG9wdGlvbnMgPSB7Ci0rICAgICAgICAgICAg InRlc3QtaW50ZXJ2YWwiOiAyMCwKLSsgICAgICAgICAgICAiZGlzcGxheSI6ICJtaW5pbWFsIiwK LSsgICAgICAgICAgICAiY29udHJvbGxlciI6ICJyYW1wIiwKLSsgICAgICAgICAgICAia2FsbWFu LXByb2Nlc3MtZXJyb3IiOiAxLAotKyAgICAgICAgICAgICJrYWxtYW4tbWVhc3VyZW1lbnQtZXJy b3IiOiA0LAotKyAgICAgICAgICAgICJ0aW1lLW1lYXN1cmVtZW50IjogInBlcmZvcm1hbmNlIgot KyAgICAgICAgfTsKLSsKLSsgICAgICAgIGZvciAodmFyIHN1aXRlSW5kZXggPSAwOyBzdWl0ZUlu ZGV4IDwgNTsgKytzdWl0ZUluZGV4KSB7Ci0rICAgICAgICAgICAgdmFyIHN1aXRlQ2hlY2tib3gg PSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJsYWJlbFtmb3I9c3VpdGUtIiArIHN1aXRlSW5kZXgg KyAiXSBpbnB1dFt0eXBlPWNoZWNrYm94XSIpOwotKyAgICAgICAgICAgIHN1aXRlQ2hlY2tib3gu Y2hlY2tlZCA9IHRydWU7Ci0rICAgICAgICAgICAgc3VpdGVzTWFuYWdlci5fb25DaGFuZ2VTdWl0 ZUNoZWNrYm94KHN1aXRlQ2hlY2tib3gpOwotKyAgICAgICAgfQotICAgICAgICAgdmFyIHN1aXRl cyA9IHN1aXRlc01hbmFnZXIudXBkYXRlTG9jYWxTdG9yYWdlRnJvbVVJKCk7Ci0gICAgICAgICB0 aGlzLl9zdGFydEJlbmNobWFyayhzdWl0ZXMsIG9wdGlvbnMsICJydW5uaW5nLXRlc3QiKTsKLSAg ICAgfSwKKyAgICAgYWRkT3JpZW50YXRpb25MaXN0ZW5lcklmTmVjZXNzYXJ5OiBmdW5jdGlvbigp IHsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9k YXRhL3BsYW5zL2FuaW1vbWV0ZXIucGxhbiBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9kYXRhL3BsYW5zL2FuaW1vbWV0ZXIucGxhbgppbmRleCA0OTBmYTY1NzgwNTI3 YmIyZDIyNzJmY2VhYWViMjY2YTYwMDEyMWYzLi5kOGM2NjExOTQ1ZjRmMGJlYTM1MTBiMmQ5ZTE0 NTBlNTE3ZjhhZTc2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvZGF0YS9wbGFucy9hbmltb21ldGVyLnBsYW4KKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuCkBAIC0x LDggKzEsOCBAQAogewogICAgICJ0aW1lb3V0IjogMTgwMCwKICAgICAiY291bnQiOiAxLAotICAg ICJzdm5fc291cmNlIjogImh0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQv dHJ1bmsvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL0ByMTk3NjUyIiwKKyAgICAic3ZuX3Nv dXJjZSI6ICJodHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rL1Bl cmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9AcjE5OTEzNCIsCiAgICAgImJlbmNobWFya19wYXRj aCI6ICJkYXRhL3BhdGNoZXMvQW5pbW9tZXRlci5wYXRjaCIsCi0gICAgImVudHJ5X3BvaW50Ijog ImRldmVsb3Blci5odG1sIiwKKyAgICAiZW50cnlfcG9pbnQiOiAiaW5kZXguaHRtbCIsCiAgICAg Im91dHB1dF9maWxlIjogImFuaW1vbWV0ZXIucmVzdWx0IgogfQo= 275859 2016-04-06 20:47:16 -0700 2016-04-06 20:53:55 -0700 Patch bug-156263-20160406204718.patch text/plain 7450 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MTMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFiNDUzZDU0YzExODc4MzEwZDM4MjQyZjUyMDM2YWUz MWRiNWUyMy4uMTFmM2RhNmZlZmZhMDM0MjE5OThlZmRkZDU4ZTAwMmI4NWJkNDkzNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE2LTA0LTA2ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBV cGRhdGUgdGhlIEFuaW1vbWV0ZXIgcGF0Y2ggYW5kIHBsYW4gZmlsZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjI2MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lYXN1cmUgdGhlIGxhdGVzdCBzZXQg b2YgdGVzdHMgYnkgdXBkYXRpbmcgdGhlIHBsYW4gcmV2aXNpb24gdG8gcjE5OTEzNC4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5p bW9tZXRlci5wYXRjaDogVXBkYXRlIHRvIHJ1biB0aGUgbWFzdGVyIHN1aXRlIG9ubHkuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvYW5pbW9t ZXRlci5wbGFuOiBVcGRhdGUgdG8gdXNlIHRoZSByZWxlYXNlIHBhZ2UgaW5zdGVhZAorICAgICAg ICBvZiB0aGUgZGV2ZWxvcGVyIHBhZ2UuCisKIDIwMTYtMDQtMDYgIEFsZXggQ2hyaXN0ZW5zZW4g IDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDb21waWxlIFdlYktpdFRlc3RS dW5uZXIgd2l0aCBDTWFrZSBvbiBNYWMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5pbW9tZXRlci5wYXRjaCBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5pbW9tZXRl ci5wYXRjaAppbmRleCBkZGMwNDg3ZmQ0M2UzZjQyMDk0NGI1Nzk1ODkxNjU5ZTk4MTUxYzJlLi41 OTJjYzg1YTJkNDA4NWIzMmViOTVjY2U3OTFkYmMzNDMxYjA4NDY1IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0 ZXIucGF0Y2gKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Rh dGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoCkBAIC0xLDExICsxLDExIEBACi1kaWZmIC0tZ2l0 IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5p bW9tZXRlci5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVidWct cnVubmVyL2FuaW1vbWV0ZXIuanMKLWluZGV4IGZmYzcxYmEuLjAyYTVkNDkgMTAwNjQ0Ci0tLS0g YS9yZXNvdXJjZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMKLSsrKyBiL3Jlc291cmNlcy9k ZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5qcwotQEAgLTExOSw2ICsxMTksNTcgQEAgVXRpbGl0aWVz LmV4dGVuZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrUnVubmVyQ2xpZW50LCB7CitkaWZmIC0tZ2l0 IGEvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVyLmpzIGIvcmVzb3VyY2VzL3J1bm5lci9hbmlt b21ldGVyLmpzCitpbmRleCBiMjBhMWM5Li5lNDM0ZTg5IDEwMDY0NAorLS0tIGEvcmVzb3VyY2Vz L3J1bm5lci9hbmltb21ldGVyLmpzCisrKysgYi9yZXNvdXJjZXMvcnVubmVyL2FuaW1vbWV0ZXIu anMKK0BAIC0zMjAsNiArMzIwLDU3IEBAIHdpbmRvdy5iZW5jaG1hcmtSdW5uZXJDbGllbnQgPSB7 CisgICAgIGRpZEZpbmlzaExhc3RJdGVyYXRpb246IGZ1bmN0aW9uKCkKICAgICAgewotICAgICAg ICAgdGhpcy5wcm9ncmVzc0Jhci5pbmNyZW1lbnRSYW5nZSgpOwotICAgICAgICAgdGhpcy5yZXN1 bHRzLmNhbGN1bGF0ZVNjb3JlKHRlc3REYXRhKTsKKyAgICAgICAgIGJlbmNobWFya0NvbnRyb2xs ZXIuc2hvd1Jlc3VsdHMoKTsKICsgICAgfSwKICsKICsgICAgX2NvbXB1dGVUZXN0UmVwb3J0OiBm dW5jdGlvbih0ZXN0TmFtZSwgdGVzdFJlc3VsdHMpCkBAIC01OCw5OSArNTgsMTQgQEAgaW5kZXgg ZmZjNzFiYS4uMDJhNWQ0OSAxMDA2NDQKICsgICAgICAgIH0KICsgICAgICAgIHhoci5zZW5kKHJl c3VsdHMpOwogICAgICB9Ci0gfSk7CisgfTsKIAotQEAgLTI1NSwxMCArMzA3LDEwIEBAIHdpbmRv dy5zdWl0ZXNNYW5hZ2VyID0KLSAgICAgICAgIHN0YXJ0QnV0dG9uLmRpc2FibGVkID0gdHJ1ZTsK LSAgICAgfSwKLQotLSAgICBfb25DaGFuZ2VTdWl0ZUNoZWNrYm94OiBmdW5jdGlvbihldmVudCkK LSsgICAgX29uQ2hhbmdlU3VpdGVDaGVja2JveDogZnVuY3Rpb24oc3VpdGVDaGVja2JveCkKLSAg ICAgewotLSAgICAgICAgdmFyIHNlbGVjdGVkID0gZXZlbnQudGFyZ2V0LmNoZWNrZWQ7Ci0tICAg ICAgICBldmVudC50YXJnZXQudGVzdHNFbGVtZW50cy5mb3JFYWNoKGZ1bmN0aW9uKHRlc3RFbGVt ZW50KSB7Ci0rICAgICAgICB2YXIgc2VsZWN0ZWQgPSBzdWl0ZUNoZWNrYm94LmNoZWNrZWQ7Ci0r ICAgICAgICBzdWl0ZUNoZWNrYm94LnRlc3RzRWxlbWVudHMuZm9yRWFjaChmdW5jdGlvbih0ZXN0 RWxlbWVudCkgewotICAgICAgICAgICAgIHZhciB0ZXN0Q2hlY2tib3ggPSB0aGlzLl9jaGVja2Jv eEVsZW1lbnQodGVzdEVsZW1lbnQpOwotICAgICAgICAgICAgIHRlc3RDaGVja2JveC5jaGVja2Vk ID0gc2VsZWN0ZWQ7Ci0gICAgICAgICB9LCB0aGlzKTsKLUBAIC0yNzksNyArMzMxLDkgQEAgd2lu ZG93LnN1aXRlc01hbmFnZXIgPQotCi0gICAgICAgICB2YXIgc3VpdGVDaGVja2JveCA9IFV0aWxp dGllcy5jcmVhdGVFbGVtZW50KCJpbnB1dCIsIHsgdHlwZTogImNoZWNrYm94IiB9LCBsYWJlbCk7 Ci0gICAgICAgICBzdWl0ZUNoZWNrYm94LnN1aXRlID0gc3VpdGU7Ci0tICAgICAgICBzdWl0ZUNo ZWNrYm94Lm9uY2hhbmdlID0gdGhpcy5fb25DaGFuZ2VTdWl0ZUNoZWNrYm94LmJpbmQodGhpcyk7 Ci0rICAgICAgICBzdWl0ZUNoZWNrYm94Lm9uY2hhbmdlID0gZnVuY3Rpb24oZXZlbnQpIHsKLSsg ICAgICAgICAgICB0aGlzLl9vbkNoYW5nZVN1aXRlQ2hlY2tib3goZXZlbnQudGFyZ2V0KTsKLSsg ICAgICAgIH0uYmluZCh0aGlzKTsKLSAgICAgICAgIHN1aXRlQ2hlY2tib3gudGVzdHNFbGVtZW50 cyA9IFtdOwotCi0gICAgICAgICBsYWJlbC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0 Tm9kZSgiICIgKyBzdWl0ZS5uYW1lKSk7Ci1AQCAtNDI4LDQ1ICs0ODIsOCBAQCB3aW5kb3cuc3Vp dGVzTWFuYWdlciA9Ci0gVXRpbGl0aWVzLmV4dGVuZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrQ29u dHJvbGxlciwgeworQEAgLTM1Nyw3ICs0MDgsNyBAQCB3aW5kb3cuc2VjdGlvbnNNYW5hZ2VyID0K KyB3aW5kb3cuYmVuY2htYXJrQ29udHJvbGxlciA9IHsKICAgICAgaW5pdGlhbGl6ZTogZnVuY3Rp b24oKQogICAgICB7Ci0tICAgICAgICBkb2N1bWVudC5mb3Jtc1siYmVuY2htYXJrLW9wdGlvbnMi XS5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBiZW5jaG1hcmtDb250cm9sbGVyLm9uQmVuY2ht YXJrT3B0aW9uc0NoYW5nZWQsIHRydWUpOwotLSAgICAgICAgZG9jdW1lbnQuZm9ybXNbImdyYXBo LXR5cGUiXS5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBiZW5jaG1hcmtDb250cm9sbGVyLm9u R3JhcGhUeXBlQ2hhbmdlZCwgdHJ1ZSk7Ci0tICAgICAgICBkb2N1bWVudC5mb3Jtc1sidGltZS1n cmFwaC1vcHRpb25zIl0uYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgYmVuY2htYXJrQ29udHJv bGxlci5vblRpbWVHcmFwaE9wdGlvbnNDaGFuZ2VkLCB0cnVlKTsKLS0gICAgICAgIGRvY3VtZW50 LmZvcm1zWyJjb21wbGV4aXR5LWdyYXBoLW9wdGlvbnMiXS5hZGRFdmVudExpc3RlbmVyKCJjaGFu Z2UiLCBiZW5jaG1hcmtDb250cm9sbGVyLm9uQ29tcGxleGl0eUdyYXBoT3B0aW9uc0NoYW5nZWQs IHRydWUpOwotLSAgICAgICAgb3B0aW9uc01hbmFnZXIudXBkYXRlVUlGcm9tTG9jYWxTdG9yYWdl KCk7Ci0gICAgICAgICBzdWl0ZXNNYW5hZ2VyLmNyZWF0ZUVsZW1lbnRzKCk7Ci0tICAgICAgICBz dWl0ZXNNYW5hZ2VyLnVwZGF0ZVVJRnJvbUxvY2FsU3RvcmFnZSgpOwotLSAgICAgICAgc3VpdGVz TWFuYWdlci51cGRhdGVEaXNwbGF5KCk7Ci0tICAgICAgICBzdWl0ZXNNYW5hZ2VyLnVwZGF0ZUVk aXRzRWxlbWVudHNTdGF0ZSgpOwotLQotLSAgICAgICAgdmFyIGRyb3BUYXJnZXQgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiZHJvcC10YXJnZXQiKTsKLS0gICAgICAgIGZ1bmN0aW9uIHN0b3BF dmVudChlKSB7Ci0tICAgICAgICAgICAgZS5zdG9wUHJvcGFnYXRpb24oKTsKLS0gICAgICAgICAg ICBlLnByZXZlbnREZWZhdWx0KCk7Ci0tICAgICAgICB9Ci0tICAgICAgICBkcm9wVGFyZ2V0LmFk ZEV2ZW50TGlzdGVuZXIoImRyYWdlbnRlciIsIHN0b3BFdmVudCwgZmFsc2UpOwotLSAgICAgICAg ZHJvcFRhcmdldC5hZGRFdmVudExpc3RlbmVyKCJkcmFnb3ZlciIsIHN0b3BFdmVudCwgZmFsc2Up OwotLSAgICAgICAgZHJvcFRhcmdldC5hZGRFdmVudExpc3RlbmVyKCJkcmFnbGVhdmUiLCBzdG9w RXZlbnQsIGZhbHNlKTsKLS0gICAgICAgIGRyb3BUYXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiZHJv cCIsIGZ1bmN0aW9uIChlKSB7Ci0tICAgICAgICAgICAgZS5zdG9wUHJvcGFnYXRpb24oKTsKLS0g ICAgICAgICAgICBlLnByZXZlbnREZWZhdWx0KCk7Ci0tCi0tICAgICAgICAgICAgaWYgKCFlLmRh dGFUcmFuc2Zlci5maWxlcy5sZW5ndGgpCi0tICAgICAgICAgICAgICAgIHJldHVybjsKLS0KLS0g ICAgICAgICAgICB2YXIgZmlsZSA9IGUuZGF0YVRyYW5zZmVyLmZpbGVzWzBdOwotLQotLSAgICAg ICAgICAgIHZhciByZWFkZXIgPSBuZXcgRmlsZVJlYWRlcigpOwotLSAgICAgICAgICAgIHJlYWRl ci5maWxlbmFtZSA9IGZpbGUubmFtZTsKLS0gICAgICAgICAgICByZWFkZXIub25sb2FkID0gZnVu Y3Rpb24oZSkgewotLSAgICAgICAgICAgICAgICB2YXIgcnVuID0gSlNPTi5wYXJzZShlLnRhcmdl dC5yZXN1bHQpOwotLSAgICAgICAgICAgICAgICBiZW5jaG1hcmtSdW5uZXJDbGllbnQucmVzdWx0 cyA9IG5ldyBSZXN1bHRzRGFzaGJvYXJkKHJ1bi5vcHRpb25zLCBydW4uZGF0YSk7Ci0tICAgICAg ICAgICAgICAgIGJlbmNobWFya0NvbnRyb2xsZXIuc2hvd1Jlc3VsdHMoKTsKLS0gICAgICAgICAg ICB9OwotLQotLSAgICAgICAgICAgIHJlYWRlci5yZWFkQXNUZXh0KGZpbGUpOwotLSAgICAgICAg ICAgIGRvY3VtZW50LnRpdGxlID0gIkZpbGU6ICIgKyByZWFkZXIuZmlsZW5hbWU7Ci0tICAgICAg ICB9LCBmYWxzZSk7Ci0tCistICAgICAgICBiZW5jaG1hcmtDb250cm9sbGVyLmFkZE9yaWVudGF0 aW9uTGlzdGVuZXJJZk5lY2Vzc2FyeSgpOwogKyAgICAgICAgc2V0VGltZW91dChiZW5jaG1hcmtD b250cm9sbGVyLnN0YXJ0QmVuY2htYXJrLmJpbmQoYmVuY2htYXJrQ29udHJvbGxlciksIDMwMDAp OwogICAgICB9LAogCi0gICAgIG9uQmVuY2htYXJrT3B0aW9uc0NoYW5nZWQ6IGZ1bmN0aW9uKGV2 ZW50KQotQEAgLTQ4Miw3ICs0OTksMjAgQEAgVXRpbGl0aWVzLmV4dGVuZE9iamVjdCh3aW5kb3cu YmVuY2htYXJrQ29udHJvbGxlciwgewotCi0gICAgIHN0YXJ0QmVuY2htYXJrOiBmdW5jdGlvbigp Ci0gICAgIHsKLS0gICAgICAgIHZhciBvcHRpb25zID0gb3B0aW9uc01hbmFnZXIudXBkYXRlTG9j YWxTdG9yYWdlRnJvbVVJKCk7Ci0rICAgICAgICB2YXIgb3B0aW9ucyA9IHsKLSsgICAgICAgICAg ICAidGVzdC1pbnRlcnZhbCI6IDIwLAotKyAgICAgICAgICAgICJkaXNwbGF5IjogIm1pbmltYWwi LAotKyAgICAgICAgICAgICJjb250cm9sbGVyIjogInJhbXAiLAotKyAgICAgICAgICAgICJrYWxt YW4tcHJvY2Vzcy1lcnJvciI6IDEsCi0rICAgICAgICAgICAgImthbG1hbi1tZWFzdXJlbWVudC1l cnJvciI6IDQsCi0rICAgICAgICAgICAgInRpbWUtbWVhc3VyZW1lbnQiOiAicGVyZm9ybWFuY2Ui Ci0rICAgICAgICB9OwotKwotKyAgICAgICAgZm9yICh2YXIgc3VpdGVJbmRleCA9IDA7IHN1aXRl SW5kZXggPCA1OyArK3N1aXRlSW5kZXgpIHsKLSsgICAgICAgICAgICB2YXIgc3VpdGVDaGVja2Jv eCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoImxhYmVsW2Zvcj1zdWl0ZS0iICsgc3VpdGVJbmRl eCArICJdIGlucHV0W3R5cGU9Y2hlY2tib3hdIik7Ci0rICAgICAgICAgICAgc3VpdGVDaGVja2Jv eC5jaGVja2VkID0gdHJ1ZTsKLSsgICAgICAgICAgICBzdWl0ZXNNYW5hZ2VyLl9vbkNoYW5nZVN1 aXRlQ2hlY2tib3goc3VpdGVDaGVja2JveCk7Ci0rICAgICAgICB9Ci0gICAgICAgICB2YXIgc3Vp dGVzID0gc3VpdGVzTWFuYWdlci51cGRhdGVMb2NhbFN0b3JhZ2VGcm9tVUkoKTsKLSAgICAgICAg IHRoaXMuX3N0YXJ0QmVuY2htYXJrKHN1aXRlcywgb3B0aW9ucywgInJ1bm5pbmctdGVzdCIpOwot ICAgICB9LAorICAgICBhZGRPcmllbnRhdGlvbkxpc3RlbmVySWZOZWNlc3Nhcnk6IGZ1bmN0aW9u KCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuCmluZGV4IDQ5MGZhNjU3ODA1 MjdiYjJkMjI3MmZjZWFhZWIyNjZhNjAwMTIxZjMuLmQ4YzY2MTE5NDVmNGYwYmVhMzUxMGIyZDll MTQ1MGU1MTdmOGFlNzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9kYXRhL3BsYW5zL2FuaW1vbWV0ZXIucGxhbgorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9hbmltb21ldGVyLnBsYW4KQEAg LTEsOCArMSw4IEBACiB7CiAgICAgInRpbWVvdXQiOiAxODAwLAogICAgICJjb3VudCI6IDEsCi0g ICAgInN2bl9zb3VyY2UiOiAiaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtp dC90cnVuay9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvQHIxOTc2NTIiLAorICAgICJzdm5f c291cmNlIjogImh0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmsv UGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL0ByMTk5MTM0IiwKICAgICAiYmVuY2htYXJrX3Bh dGNoIjogImRhdGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoIiwKLSAgICAiZW50cnlfcG9pbnQi OiAiZGV2ZWxvcGVyLmh0bWwiLAorICAgICJlbnRyeV9wb2ludCI6ICJpbmRleC5odG1sIiwKICAg ICAib3V0cHV0X2ZpbGUiOiAiYW5pbW9tZXRlci5yZXN1bHQiCiB9Cg==