155134 2016-03-07 14:13:25 -0800 Update perf bot configuration for Animometer 2016-03-07 17:51:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jonlee jonlee barraclough commit-queue dewei_zhu glenn lforschler rniwa sabouhallawa oldest_to_newest 1171745 0 jonlee 2016-03-07 14:13:25 -0800 SSIA 1171749 1 273210 jonlee 2016-03-07 14:21:51 -0800 Created attachment 273210 Patch 1171835 2 273210 dewei_zhu 2016-03-07 16:28:44 -0800 Comment on attachment 273210 Patch Looks good to me. And I've verified it locally. 1171867 3 273210 rniwa 2016-03-07 17:46:58 -0800 Comment on attachment 273210 Patch r=me, please increase the timeout and re-enable basic canvas tests as we discussed in person. 1171868 4 jonlee 2016-03-07 17:51:19 -0800 Committed r197719: <http://trac.webkit.org/changeset/197719> 273210 2016-03-07 14:21:51 -0800 2016-03-07 17:46:58 -0800 Patch bug-155134-20160307142138.patch text/plain 11303 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NzA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDIxNjAxZTAxODMzYjM0NzkzOTRkN2EwNmY0NjJjN2U5 NThmMjI0Zi4uZWRhOGI1MDFiYTQ0MDNmZjRmZmVkMWQxNzU0MWViY2JhZjk1ZDhmNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE2LTAzLTA3ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBV cGRhdGUgcGVyZiBib3QgY29uZmlndXJhdGlvbiBmb3IgQW5pbW9tZXRlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MTM0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Jl bmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2g6IFJlZmFjdG9yIHRo ZSBwYXRjaAorICAgICAgICB0byB3b3JrIHdpdGggdGhlIGxhdGVzdCB2ZXJzaW9uIG9mIHRoZSBo YXJuZXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRh L3BsYW5zL2FuaW1vbWV0ZXIucGxhbjogQnVtcCB1cCB0aGUgdGltZW91dCwKKyAgICAgICAgYW5k IHVzZSB0aGUgbGF0ZXN0IHZlcnNpb24gb2YgdGhlIGhhcm5lc3MuCisKIDIwMTYtMDMtMDcgIEFh a2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdHB5IHNo b3VsZCB2ZXJpZnkgdGltZXN0YW1wIGZyb20gQ3Jhc2hMb2dzIHdoaWxlIGNvbGxlY3RpbmcgYWxs IGNyYXNoIGxvZ3MKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9kYXRhL3BhdGNoZXMvQW5pbW9tZXRlci5wYXRjaCBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvQW5pbW9tZXRlci5wYXRjaAppbmRl eCA1NWU0ZjhkMDhhNzE0Y2Y0ZDI0NTUxYmQ1YTMyOTEwMzFiYjMxM2Q5Li4yMTM0OTVkODM4ODU3 NWY4Nzc4NWE5YTk3YWZjNTNlNTljMWFkNjI2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0FuaW1vbWV0ZXIucGF0Y2gKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9B bmltb21ldGVyLnBhdGNoCkBAIC0xLDExICsxLDEzIEBACi1kaWZmIC0tZ2l0IGEvcnVubmVyL3Jl c291cmNlcy9hbmltb21ldGVyLmpzIGIvcnVubmVyL3Jlc291cmNlcy9hbmltb21ldGVyLmpzCi1p bmRleCBkM2FjOGRiLi4yMzBhYzA1IDEwMDY0NAotLS0tIGEvcnVubmVyL3Jlc291cmNlcy9hbmlt b21ldGVyLmpzCi0rKysgYi9ydW5uZXIvcmVzb3VyY2VzL2FuaW1vbWV0ZXIuanMKLUBAIC00MSwx NCArNDEsNjIgQEAgd2luZG93LmJlbmNobWFya1J1bm5lckNsaWVudCA9IHsKLSAgICAgICAgIHRo aXMuX3Jlc3VsdHNEYXNoYm9hcmQucHVzaChzdWl0ZXNTYW1wbGVycyk7Ci0gICAgIH0sCi0gICAg IAorZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVi dWctcnVubmVyL2FuaW1vbWV0ZXIuanMgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVz b3VyY2VzL2RlYnVnLXJ1bm5lci9hbmltb21ldGVyLmpzCitpbmRleCBmZmM3MWJhLi4wMmE1ZDQ5 IDEwMDY0NAorLS0tIGEvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9hbmltb21ldGVyLmpzCisrKysg Yi9yZXNvdXJjZXMvZGVidWctcnVubmVyL2FuaW1vbWV0ZXIuanMKK0BAIC0xMTksNiArMTE5LDU3 IEBAIFV0aWxpdGllcy5leHRlbmRPYmplY3Qod2luZG93LmJlbmNobWFya1J1bm5lckNsaWVudCwg eworICAgICB7CisgICAgICAgICB0aGlzLnByb2dyZXNzQmFyLmluY3JlbWVudFJhbmdlKCk7Cisg ICAgICAgICB0aGlzLnJlc3VsdHMuY2FsY3VsYXRlU2NvcmUodGVzdERhdGEpOworKyAgICB9LAor KwogKyAgICBfY29tcHV0ZVRlc3RSZXBvcnQ6IGZ1bmN0aW9uKHRlc3ROYW1lLCB0ZXN0UmVzdWx0 cykKICsgICAgewogKyAgICAgICAgcmV0dXJuIFt0ZXN0UmVzdWx0c1tTdHJpbmdzLmpzb24uc2Nv cmVdXTsKQEAgLTE0LDUxICsxNiwzOSBAQCBpbmRleCBkM2FjOGRiLi4yMzBhYzA1IDEwMDY0NAog KyAgICBfY29tcHV0ZVN1aXRlUmVwb3J0czogZnVuY3Rpb24oc3VpdGVOYW1lLCBzdWl0ZVJlc3Vs dHMpCiArICAgIHsKICsgICAgICAgIHZhciB0ZXN0c1JlcG9ydHMgPSB7fTsKLSsKLSsgICAgICAg IGZvciAodmFyIHRlc3ROYW1lIGluIHN1aXRlUmVzdWx0c1tTdHJpbmdzLmpzb24ucmVzdWx0cy50 ZXN0c10pIHsKLSsgICAgICAgICAgICB2YXIgdGVzdFJlcG9ydHMgPSB0aGlzLl9jb21wdXRlVGVz dFJlcG9ydCh0ZXN0TmFtZSwgc3VpdGVSZXN1bHRzW1N0cmluZ3MuanNvbi5yZXN1bHRzLnRlc3Rz XVt0ZXN0TmFtZV0pOworKyAgICAgICAgZm9yICh2YXIgdGVzdE5hbWUgaW4gc3VpdGVSZXN1bHRz KSB7CisrICAgICAgICAgICAgdmFyIHRlc3RSZXBvcnRzID0gdGhpcy5fY29tcHV0ZVRlc3RSZXBv cnQodGVzdE5hbWUsIHN1aXRlUmVzdWx0c1t0ZXN0TmFtZV0pOwogKyAgICAgICAgICAgIHRlc3Rz UmVwb3J0c1t0ZXN0TmFtZV0gPSB7ICJtZXRyaWNzIjogeyAiU2NvcmUiOiB7ICJjdXJyZW50Ijog dGVzdFJlcG9ydHMgfSB9IH07CiArICAgICAgICB9Ci0rCiArICAgICAgICByZXR1cm4gdGVzdHNS ZXBvcnRzOwogKyAgICB9LAogKwogKyAgICBfY29tcHV0ZUl0ZXJhdGlvblJlcG9ydHM6IGZ1bmN0 aW9uKGl0ZXJhdGlvblJlc3VsdHMpCiArICAgIHsKICsgICAgICAgIHZhciBzdWl0ZXNSZXBvcnRz ID0ge307Ci0rCi0rICAgICAgICBmb3IgKHZhciBzdWl0ZU5hbWUgaW4gaXRlcmF0aW9uUmVzdWx0 c1tTdHJpbmdzLmpzb24ucmVzdWx0cy5zdWl0ZXNdKSB7Ci0rICAgICAgICAgICAgdmFyIHRlc3Rz UmVwb3J0cyA9IHRoaXMuX2NvbXB1dGVTdWl0ZVJlcG9ydHMoc3VpdGVOYW1lLCBpdGVyYXRpb25S ZXN1bHRzW1N0cmluZ3MuanNvbi5yZXN1bHRzLnN1aXRlc11bc3VpdGVOYW1lXSk7CisrICAgICAg ICBmb3IgKHZhciBzdWl0ZU5hbWUgaW4gaXRlcmF0aW9uUmVzdWx0c1tTdHJpbmdzLmpzb24ucmVz dWx0cy50ZXN0c10pIHsKKysgICAgICAgICAgICB2YXIgdGVzdHNSZXBvcnRzID0gdGhpcy5fY29t cHV0ZVN1aXRlUmVwb3J0cyhzdWl0ZU5hbWUsIGl0ZXJhdGlvblJlc3VsdHNbU3RyaW5ncy5qc29u LnJlc3VsdHMudGVzdHNdW3N1aXRlTmFtZV0pOwogKyAgICAgICAgICAgIHN1aXRlc1JlcG9ydHNb c3VpdGVOYW1lXSA9IHsgIm1ldHJpY3MiOiB7ICJTY29yZSI6IFsiR2VvbWV0cmljIl0gfSwgInRl c3RzIjogdGVzdHNSZXBvcnRzIH07CiArICAgICAgICB9Ci0rCiArICAgICAgICByZXR1cm4gc3Vp dGVzUmVwb3J0czsKICsgICAgfSwKICsKICsgICAgX2NvbXB1dGVSZXN1bHRzUmVwb3J0czogZnVu Y3Rpb24oKQogKyAgICB7Ci0rICAgICAgICB2YXIganNvbiA9IHRoaXMuX3Jlc3VsdHNEYXNoYm9h cmQudG9KU09OKGZhbHNlLCBmYWxzZSk7Ci0rICAgICAgICB2YXIgaXRlcmF0aW9uUmVwb3J0cyA9 IHRoaXMuX2NvbXB1dGVJdGVyYXRpb25SZXBvcnRzKGpzb25bU3RyaW5ncy5qc29uLnJlc3VsdHMu aXRlcmF0aW9uc11bMF0pCisrICAgICAgICB2YXIgcmVzdWx0cyA9IHRoaXMucmVzdWx0cy5yZXN1 bHRzWzBdOworKyAgICAgICAgdmFyIGl0ZXJhdGlvblJlcG9ydHMgPSB0aGlzLl9jb21wdXRlSXRl cmF0aW9uUmVwb3J0cyhyZXN1bHRzKTsKICsgICAgICAgIHJldHVybiB7IkFuaW1vbWV0ZXIiOiB7 Im1ldHJpY3MiIDogeyJTY29yZSIgOiBbIkdlb21ldHJpYyJdfSwgInRlc3RzIiA6IGl0ZXJhdGlv blJlcG9ydHMgfSB9OwogKyAgICB9LAogKwotICAgICBkaWRGaW5pc2hMYXN0SXRlcmF0aW9uOiBm dW5jdGlvbiAoKQotICAgICB7Ci0tICAgICAgICB2YXIganNvbiA9IHRoaXMuX3Jlc3VsdHNEYXNo Ym9hcmQudG9KU09OKHRydWUsIHRydWUpOwotLSAgICAgICAgdGhpcy5zY29yZSA9IGpzb25bU3Ry aW5ncy5qc29uLnNjb3JlXTsKLS0gICAgICAgIHRoaXMuX3Jlc3VsdHNUYWJsZS5zaG93SXRlcmF0 aW9ucyhqc29uW1N0cmluZ3MuanNvbi5yZXN1bHRzLml0ZXJhdGlvbnNdLCB0aGlzLm9wdGlvbnMp OwotLSAgICAgICAgc2VjdGlvbnNNYW5hZ2VyLnNob3dKU09OKCJqc29uIiwganNvbltTdHJpbmdz Lmpzb24ucmVzdWx0cy5pdGVyYXRpb25zXVswXSk7Ci0tICAgICAgICBzdWl0ZXNNYW5hZ2VyLnVw ZGF0ZUxvY2FsU3RvcmFnZUZyb21KU09OKGpzb25bU3RyaW5ncy5qc29uLnJlc3VsdHMuaXRlcmF0 aW9uc11bMF0pOwotLSAgICAgICAgYmVuY2htYXJrQ29udHJvbGxlci5zaG93UmVzdWx0cygpOwor KyAgICBkaWRGaW5pc2hMYXN0SXRlcmF0aW9uOiBmdW5jdGlvbigpCisrICAgIHsKICsgICAgICAg IC8vIHN1Ym1pdCByZXN1bHQgdG8gc2VydmVyCiArICAgICAgICB2YXIgcmVzdWx0cyA9IEpTT04u c3RyaW5naWZ5KHRoaXMuX2NvbXB1dGVSZXN1bHRzUmVwb3J0cygpKTsKICsgICAgICAgIHZhciB4 aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKICsgICAgICAgIHhoci5vcGVuKCJQT1NUIiwgIi9y ZXBvcnQiKTsKLSsKICsgICAgICAgIHhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb250ZW50LXR5cGUi LCAiYXBwbGljYXRpb24vanNvbiIpOwogKyAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNv bnRlbnQtbGVuZ3RoIiwgcmVzdWx0cy5sZW5ndGgpOwogKyAgICAgICAgeGhyLnNldFJlcXVlc3RI ZWFkZXIoIkNvbm5lY3Rpb24iLCAiY2xvc2UiKTsKLSsKICsgICAgICAgIHhoci5vbnJlYWR5c3Rh dGVjaGFuZ2UgPSBmdW5jdGlvbigpIHsKICsgICAgICAgICAgICBpZiAoeGhyLnJlYWR5U3RhdGUg PT0gWE1MSHR0cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3RhdHVzID09IDIwMCkgewogKyAgICAgICAg ICAgICAgICBjbG9zZVJlcXVlc3QgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKQEAgLTY2LDQzICs1 NiwxMDEgQEAgaW5kZXggZDNhYzhkYi4uMjMwYWMwNSAxMDA2NDQKICsgICAgICAgICAgICAgICAg Y2xvc2VSZXF1ZXN0LnNlbmQoKQogKyAgICAgICAgICAgIH0KICsgICAgICAgIH0KLSsKICsgICAg ICAgIHhoci5zZW5kKHJlc3VsdHMpOwogICAgICB9Ci0gfQotIAotQEAgLTI4Nyw3ICszMzUsMTMg QEAgd2luZG93LnN1aXRlc01hbmFnZXIgPQotIAotICAgICAgICAgICAgIHN1aXRlLnRlc3RzLmZv ckVhY2goZnVuY3Rpb24odGVzdCkgewotICAgICAgICAgICAgICAgICB2YXIgdGVzdEVsZW1lbnQg PSB0aGlzLl9jcmVhdGVUZXN0RWxlbWVudChsaXN0RWxlbWVudCwgdGVzdCwgc3VpdGVDaGVja2Jv eCk7Ci0rICAgICAgICAgICAgICAgIGlmIChpbmRleCA8IDQpIHsKLSsgICAgICAgICAgICAgICAg ICAgIHZhciB0ZXN0Q2hlY2tib3ggPSB0aGlzLl9jaGVja2JveEVsZW1lbnQodGVzdEVsZW1lbnQp OwotKyAgICAgICAgICAgICAgICAgICAgdGVzdENoZWNrYm94LmNoZWNrZWQgPSB0cnVlOwotKyAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgfSwgdGhpcyk7Ci0rICAgICAgICAgICAgCi0r ICAgICAgICAgICAgdGhpcy5fdXBkYXRlU3VpdGVDaGVja2JveFN0YXRlKHN1aXRlQ2hlY2tib3gp OwotICAgICAgICAgfSwgdGhpcyk7CisgfSk7CisKK0BAIC0yNTUsMTAgKzMwNywxMCBAQCB3aW5k b3cuc3VpdGVzTWFuYWdlciA9CisgICAgICAgICBzdGFydEJ1dHRvbi5kaXNhYmxlZCA9IHRydWU7 CiAgICAgIH0sCi0gICAgIAotQEAgLTM4NywxMCArNDQxLDggQEAgd2luZG93LmJlbmNobWFya0Nv bnRyb2xsZXIgPQotIHsKKworLSAgICBfb25DaGFuZ2VTdWl0ZUNoZWNrYm94OiBmdW5jdGlvbihl dmVudCkKKysgICAgX29uQ2hhbmdlU3VpdGVDaGVja2JveDogZnVuY3Rpb24oc3VpdGVDaGVja2Jv eCkKKyAgICAgeworLSAgICAgICAgdmFyIHNlbGVjdGVkID0gZXZlbnQudGFyZ2V0LmNoZWNrZWQ7 CistICAgICAgICBldmVudC50YXJnZXQudGVzdHNFbGVtZW50cy5mb3JFYWNoKGZ1bmN0aW9uKHRl c3RFbGVtZW50KSB7CisrICAgICAgICB2YXIgc2VsZWN0ZWQgPSBzdWl0ZUNoZWNrYm94LmNoZWNr ZWQ7CisrICAgICAgICBzdWl0ZUNoZWNrYm94LnRlc3RzRWxlbWVudHMuZm9yRWFjaChmdW5jdGlv bih0ZXN0RWxlbWVudCkgeworICAgICAgICAgICAgIHZhciB0ZXN0Q2hlY2tib3ggPSB0aGlzLl9j aGVja2JveEVsZW1lbnQodGVzdEVsZW1lbnQpOworICAgICAgICAgICAgIHRlc3RDaGVja2JveC5j aGVja2VkID0gc2VsZWN0ZWQ7CisgICAgICAgICB9LCB0aGlzKTsKK0BAIC0yNzksNyArMzMxLDkg QEAgd2luZG93LnN1aXRlc01hbmFnZXIgPQorCisgICAgICAgICB2YXIgc3VpdGVDaGVja2JveCA9 IFV0aWxpdGllcy5jcmVhdGVFbGVtZW50KCJpbnB1dCIsIHsgdHlwZTogImNoZWNrYm94IiB9LCBs YWJlbCk7CisgICAgICAgICBzdWl0ZUNoZWNrYm94LnN1aXRlID0gc3VpdGU7CistICAgICAgICBz dWl0ZUNoZWNrYm94Lm9uY2hhbmdlID0gdGhpcy5fb25DaGFuZ2VTdWl0ZUNoZWNrYm94LmJpbmQo dGhpcyk7CisrICAgICAgICBzdWl0ZUNoZWNrYm94Lm9uY2hhbmdlID0gZnVuY3Rpb24oZXZlbnQp IHsKKysgICAgICAgICAgICB0aGlzLl9vbkNoYW5nZVN1aXRlQ2hlY2tib3goZXZlbnQudGFyZ2V0 KTsKKysgICAgICAgIH0uYmluZCh0aGlzKTsKKyAgICAgICAgIHN1aXRlQ2hlY2tib3gudGVzdHNF bGVtZW50cyA9IFtdOworCisgICAgICAgICBsYWJlbC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVh dGVUZXh0Tm9kZSgiICIgKyBzdWl0ZS5uYW1lKSk7CitAQCAtNDI4LDQ1ICs0ODIsOCBAQCB3aW5k b3cuc3VpdGVzTWFuYWdlciA9CisgVXRpbGl0aWVzLmV4dGVuZE9iamVjdCh3aW5kb3cuYmVuY2ht YXJrQ29udHJvbGxlciwgewogICAgICBpbml0aWFsaXplOiBmdW5jdGlvbigpCiAgICAgIHsKKy0g ICAgICAgIGRvY3VtZW50LmZvcm1zWyJiZW5jaG1hcmstb3B0aW9ucyJdLmFkZEV2ZW50TGlzdGVu ZXIoImNoYW5nZSIsIGJlbmNobWFya0NvbnRyb2xsZXIub25CZW5jaG1hcmtPcHRpb25zQ2hhbmdl ZCwgdHJ1ZSk7CistICAgICAgICBkb2N1bWVudC5mb3Jtc1siZ3JhcGgtdHlwZSJdLmFkZEV2ZW50 TGlzdGVuZXIoImNoYW5nZSIsIGJlbmNobWFya0NvbnRyb2xsZXIub25HcmFwaFR5cGVDaGFuZ2Vk LCB0cnVlKTsKKy0gICAgICAgIGRvY3VtZW50LmZvcm1zWyJ0aW1lLWdyYXBoLW9wdGlvbnMiXS5h ZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBiZW5jaG1hcmtDb250cm9sbGVyLm9uVGltZUdyYXBo T3B0aW9uc0NoYW5nZWQsIHRydWUpOworLSAgICAgICAgZG9jdW1lbnQuZm9ybXNbImNvbXBsZXhp dHktZ3JhcGgtb3B0aW9ucyJdLmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIGJlbmNobWFya0Nv bnRyb2xsZXIub25Db21wbGV4aXR5R3JhcGhPcHRpb25zQ2hhbmdlZCwgdHJ1ZSk7CiAtICAgICAg ICBvcHRpb25zTWFuYWdlci51cGRhdGVVSUZyb21Mb2NhbFN0b3JhZ2UoKTsKICAgICAgICAgIHN1 aXRlc01hbmFnZXIuY3JlYXRlRWxlbWVudHMoKTsKIC0gICAgICAgIHN1aXRlc01hbmFnZXIudXBk YXRlVUlGcm9tTG9jYWxTdG9yYWdlKCk7CistICAgICAgICBzdWl0ZXNNYW5hZ2VyLnVwZGF0ZURp c3BsYXkoKTsKIC0gICAgICAgIHN1aXRlc01hbmFnZXIudXBkYXRlRWRpdHNFbGVtZW50c1N0YXRl KCk7Ci0rICAgICAgICBzZXRUaW1lb3V0KGJlbmNobWFya0NvbnRyb2xsZXIuc3RhcnRUZXN0LCAz MDAwKTsKKy0KKy0gICAgICAgIHZhciBkcm9wVGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImRyb3AtdGFyZ2V0Iik7CistICAgICAgICBmdW5jdGlvbiBzdG9wRXZlbnQoZSkgeworLSAg ICAgICAgICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7CistICAgICAgICAgICAgZS5wcmV2ZW50RGVm YXVsdCgpOworLSAgICAgICAgfQorLSAgICAgICAgZHJvcFRhcmdldC5hZGRFdmVudExpc3RlbmVy KCJkcmFnZW50ZXIiLCBzdG9wRXZlbnQsIGZhbHNlKTsKKy0gICAgICAgIGRyb3BUYXJnZXQuYWRk RXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIiLCBzdG9wRXZlbnQsIGZhbHNlKTsKKy0gICAgICAgIGRy b3BUYXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ2xlYXZlIiwgc3RvcEV2ZW50LCBmYWxzZSk7 CistICAgICAgICBkcm9wVGFyZ2V0LmFkZEV2ZW50TGlzdGVuZXIoImRyb3AiLCBmdW5jdGlvbiAo ZSkgeworLSAgICAgICAgICAgIGUuc3RvcFByb3BhZ2F0aW9uKCk7CistICAgICAgICAgICAgZS5w cmV2ZW50RGVmYXVsdCgpOworLQorLSAgICAgICAgICAgIGlmICghZS5kYXRhVHJhbnNmZXIuZmls ZXMubGVuZ3RoKQorLSAgICAgICAgICAgICAgICByZXR1cm47CistCistICAgICAgICAgICAgdmFy IGZpbGUgPSBlLmRhdGFUcmFuc2Zlci5maWxlc1swXTsKKy0KKy0gICAgICAgICAgICB2YXIgcmVh ZGVyID0gbmV3IEZpbGVSZWFkZXIoKTsKKy0gICAgICAgICAgICByZWFkZXIuZmlsZW5hbWUgPSBm aWxlLm5hbWU7CistICAgICAgICAgICAgcmVhZGVyLm9ubG9hZCA9IGZ1bmN0aW9uKGUpIHsKKy0g ICAgICAgICAgICAgICAgdmFyIHJ1biA9IEpTT04ucGFyc2UoZS50YXJnZXQucmVzdWx0KTsKKy0g ICAgICAgICAgICAgICAgYmVuY2htYXJrUnVubmVyQ2xpZW50LnJlc3VsdHMgPSBuZXcgUmVzdWx0 c0Rhc2hib2FyZChydW4ub3B0aW9ucywgcnVuLmRhdGEpOworLSAgICAgICAgICAgICAgICBiZW5j aG1hcmtDb250cm9sbGVyLnNob3dSZXN1bHRzKCk7CistICAgICAgICAgICAgfTsKKy0KKy0gICAg ICAgICAgICByZWFkZXIucmVhZEFzVGV4dChmaWxlKTsKKy0gICAgICAgICAgICBkb2N1bWVudC50 aXRsZSA9ICJGaWxlOiAiICsgcmVhZGVyLmZpbGVuYW1lOworLSAgICAgICAgfSwgZmFsc2UpOwor LQorKyAgICAgICAgc2V0VGltZW91dChiZW5jaG1hcmtDb250cm9sbGVyLnN0YXJ0QmVuY2htYXJr LmJpbmQoYmVuY2htYXJrQ29udHJvbGxlciksIDMwMDApOwogICAgICB9LAotIAotICAgICBvbkNo YW5nZUFkYXB0aXZlVGVzdENoZWNrYm94OiBmdW5jdGlvbigpCi1AQCAtNDExLDcgKzQ2Myw3IEBA IHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVyID0KLSAgICAgICAgIHZhciBvcHRpb25zID0gb3B0 aW9uc01hbmFnZXIudXBkYXRlTG9jYWxTdG9yYWdlRnJvbVVJKCk7CisKKyAgICAgb25CZW5jaG1h cmtPcHRpb25zQ2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCitAQCAtNDgyLDcgKzQ5OSwyMCBAQCBV dGlsaXRpZXMuZXh0ZW5kT2JqZWN0KHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVyLCB7CisKKyAg ICAgc3RhcnRCZW5jaG1hcms6IGZ1bmN0aW9uKCkKKyAgICAgeworLSAgICAgICAgdmFyIG9wdGlv bnMgPSBvcHRpb25zTWFuYWdlci51cGRhdGVMb2NhbFN0b3JhZ2VGcm9tVUkoKTsKKysgICAgICAg IHZhciBvcHRpb25zID0geworKyAgICAgICAgICAgICJ0ZXN0LWludGVydmFsIjogMjAsCisrICAg ICAgICAgICAgImRpc3BsYXkiOiAibWluaW1hbCIsCisrICAgICAgICAgICAgImNvbnRyb2xsZXIi OiAicmFtcCIsCisrICAgICAgICAgICAgImthbG1hbi1wcm9jZXNzLWVycm9yIjogMSwKKysgICAg ICAgICAgICAia2FsbWFuLW1lYXN1cmVtZW50LWVycm9yIjogNCwKKysgICAgICAgICAgICAidGlt ZS1tZWFzdXJlbWVudCI6ICJwZXJmb3JtYW5jZSIKKysgICAgICAgIH07CisrCisrICAgICAgICBm b3IgKHZhciBzdWl0ZUluZGV4ID0gMDsgc3VpdGVJbmRleCA8IDQ7ICsrc3VpdGVJbmRleCkgewor KyAgICAgICAgICAgIHZhciBzdWl0ZUNoZWNrYm94ID0gZG9jdW1lbnQucXVlcnlTZWxlY3Rvcigi bGFiZWxbZm9yPXN1aXRlLSIgKyBzdWl0ZUluZGV4ICsgIl0gaW5wdXRbdHlwZT1jaGVja2JveF0i KTsKKysgICAgICAgICAgICBzdWl0ZUNoZWNrYm94LmNoZWNrZWQgPSB0cnVlOworKyAgICAgICAg ICAgIHN1aXRlc01hbmFnZXIuX29uQ2hhbmdlU3VpdGVDaGVja2JveChzdWl0ZUNoZWNrYm94KTsK KysgICAgICAgIH0KICAgICAgICAgIHZhciBzdWl0ZXMgPSBzdWl0ZXNNYW5hZ2VyLnVwZGF0ZUxv Y2FsU3RvcmFnZUZyb21VSSgpOwotICAgICAgICAgc2VjdGlvbnNNYW5hZ2VyLnNldHVwUnVubmlu Z1NlY3Rpb25TdHlsZShvcHRpb25zKTsKLS0gICAgICAgIHRoaXMuX3J1bkJlbmNobWFyayhzdWl0 ZXMsIG9wdGlvbnMpOwotKyAgICAgICAgYmVuY2htYXJrQ29udHJvbGxlci5fcnVuQmVuY2htYXJr KHN1aXRlcywgb3B0aW9ucyk7Ci0gICAgICAgICBzZWN0aW9uc01hbmFnZXIuc2hvd1NlY3Rpb24o InJ1bm5pbmciKTsKKyAgICAgICAgIHRoaXMuX3N0YXJ0QmVuY2htYXJrKHN1aXRlcywgb3B0aW9u cywgInJ1bm5pbmctdGVzdCIpOwogICAgICB9LAotICAgICAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL2FuaW1vbWV0ZXIucGxh biBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL2Fu aW1vbWV0ZXIucGxhbgppbmRleCAxMGM0OWFiZWU3ODQ0YjEyN2U3YTUxODZjOGRiZDUzNjVlMDEz OWFmLi41MDllYmZiOGU1OTJkMmQxZWEyYmJjYjQ1YzJiODQ5MjM1NzE5ZDlmIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9hbmlt b21ldGVyLnBsYW4KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L2RhdGEvcGxhbnMvYW5pbW9tZXRlci5wbGFuCkBAIC0xLDggKzEsOCBAQAogewotICAgICJ0aW1l b3V0IjogNjAwLAorICAgICJ0aW1lb3V0IjogOTAwLAogICAgICJjb3VudCI6IDEsCi0gICAgInN2 bl9zb3VyY2UiOiAiaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVu ay9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvQHIxOTI2NjkiLAorICAgICJzdm5fc291cmNl IjogImh0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmsvUGVyZm9y bWFuY2VUZXN0cy9Bbmltb21ldGVyL0ByMTk3NjUyIiwKICAgICAiYmVuY2htYXJrX3BhdGNoIjog ImRhdGEvcGF0Y2hlcy9Bbmltb21ldGVyLnBhdGNoIiwKLSAgICAiZW50cnlfcG9pbnQiOiAicnVu bmVyL2FuaW1vbWV0ZXIuaHRtbCIsCisgICAgImVudHJ5X3BvaW50IjogImRldmVsb3Blci5odG1s IiwKICAgICAib3V0cHV0X2ZpbGUiOiAiYW5pbW9tZXRlci5yZXN1bHQiCiB9ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQo=