150053 2015-10-12 15:17:07 -0700 Refactor test suites to a separate class 2015-10-12 16:23:08 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 149053 1 jonlee jonlee commit-queue dino rniwa sabouhallawa webkit-bug-importer oldest_to_newest 1132507 0 jonlee 2015-10-12 15:17:07 -0700 Refactor test suites to a separate class 1132508 1 webkit-bug-importer 2015-10-12 15:17:39 -0700 <rdar://problem/23078645> 1132509 2 262927 jonlee 2015-10-12 15:20:11 -0700 Created attachment 262927 Patch 1132521 3 262927 dino 2015-10-12 15:33:08 -0700 Comment on attachment 262927 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262927&action=review > PerformanceTests/Animometer/runner/resources/animometer.js:120 > + var suiteDiv = document.createDocumentFragment(); Is there a reason you didn't create a "div"? 1132540 4 262927 sabouhallawa 2015-10-12 15:51:53 -0700 Comment on attachment 262927 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262927&action=review > PerformanceTests/Animometer/runner/resources/animometer.js:67 > + enabledSuites.push(checkbox.suite); Is there a reason why we can not use enabledSuites.push(Suites[i])? > PerformanceTests/Animometer/runner/resources/animometer.js:125 > + checkbox.suite = suite; I am not sure about the cost of this assignment. Do we make a copy of the suite structure and assign it in the suite member of the checkbox variable? > PerformanceTests/ChangeLog:30 > + informal r=me 1132562 5 jonlee 2015-10-12 16:22:56 -0700 Committed r190902: <http://trac.webkit.org/changeset/190902> 262927 2015-10-12 15:20:11 -0700 2015-10-12 16:23:08 -0700 Patch bug-150053-20151012151935.patch text/plain 10725 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwODMyCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0FuaW1vbWV0ZXIvcnVubmVyL2FuaW1vbWV0ZXIuaHRtbCBiL1BlcmZvcm1hbmNlVGVzdHMvQW5p bW9tZXRlci9ydW5uZXIvYW5pbW9tZXRlci5odG1sCmluZGV4IDZlYTc4YWNkN2UxZmRkY2ViMGQx YzkxZjcwNDAwYzc1OTAyMzBkNWEuLmQ4ZDU4NmMzZjEzNmJiODBjNTQ2MDk4NzJiNjJhMzdmNTBi ZWFhNzggMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9ydW5uZXIvYW5p bW9tZXRlci5odG1sCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9ydW5uZXIvYW5p bW9tZXRlci5odG1sCkBAIC0xOSwxMiArMTksNyBAQAogICAgICAgICAgICAgICAgIHRvIHR1bmUg dGhlaXIgY29tcGxleGl0aWVzIHRvIHN0YXkgY2xvc2UgdG8gNTAgRlBTLgogICAgICAgICAgICAg PC9wPgogICAgICAgICAgICAgPGRpdiBjbGFzcz0ib3B0aW9ucyI+Ci0gICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0iY29sdW1uIj4KLSAgICAgICAgICAgICAgICAgICAgPGxhYmVsPjxpbnB1dCBp ZD0iaHRtbC1zdWl0ZSIgdHlwZT0iY2hlY2tib3giIGNoZWNrZWQ+IEhUTUwgZWxlbWVudHMgc3Vp dGU8L2xhYmVsPjxicj4KLSAgICAgICAgICAgICAgICAgICAgPGxhYmVsPjxpbnB1dCBpZD0iY2Fu dmFzLXN1aXRlIiB0eXBlPSJjaGVja2JveCIgY2hlY2tlZD4gQ2FudmFzIGRyYXdpbmdzIHN1aXRl PC9sYWJlbD48YnI+Ci0gICAgICAgICAgICAgICAgICAgIDxsYWJlbD48aW5wdXQgaWQ9InN2Zy1z dWl0ZSIgdHlwZT0iY2hlY2tib3giIGNoZWNrZWQ+IFNWRyBlbGVtZW50cyBzdWl0ZTwvbGFiZWw+ PGJyPgotICAgICAgICAgICAgICAgICAgICA8bGFiZWw+PGlucHV0IGlkPSJleGFtcGxlcy1zdWl0 ZSIgdHlwZT0iY2hlY2tib3giPiBFeGFtcGxlcyBzdWl0ZTwvbGFiZWw+PGJyPgotICAgICAgICAg ICAgICAgICAgICA8bGFiZWw+PGlucHV0IGlkPSJ0ZW1wbGF0ZS1zdWl0ZSIgdHlwZT0iY2hlY2ti b3giPiBUZW1wbGF0ZSBzdWl0ZTwvbGFiZWw+CisgICAgICAgICAgICAgICAgPGRpdiBpZD0ic3Vp dGVzIiBjbGFzcz0iY29sdW1uIj4KICAgICAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAg ICAgICA8ZGl2PgogICAgICAgICAgICAgICAgICAgICA8bGFiZWw+VGVzdCBpbnRlcnZhbDogPGlu cHV0IGlkPSJ0ZXN0LWludGVydmFsIiB0eXBlPSJudW1iZXIiIHZhbHVlPSIzMCI+IHNlY29uZHM8 L2xhYmVsPjxicj4KZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9ydW5u ZXIvcmVzb3VyY2VzL2FuaW1vbWV0ZXIuanMgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIv cnVubmVyL3Jlc291cmNlcy9hbmltb21ldGVyLmpzCmluZGV4IDQyYzEwMmZlMzU1NDY1NmQyMzkz ZTQxZTcyNzJhMWQ3NDM1MjZiNjcuLmI4OTNiODY5MTRkMWZhNzQ5OTIxYWZmZTgyOTk5ZDk1MmFl MDIzM2MgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9ydW5uZXIvcmVz b3VyY2VzL2FuaW1vbWV0ZXIuanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3J1 bm5lci9yZXNvdXJjZXMvYW5pbW9tZXRlci5qcwpAQCAtNTksMTMgKzU5LDE2IEBAIGZ1bmN0aW9u IHNob3dTZWN0aW9uKHNlY3Rpb25JZGVudGlmaWVyLCBwdXNoU3RhdGUpCiAKIGZ1bmN0aW9uIHN0 YXJ0QmVuY2htYXJrKCkKIHsKLSAgICB2YXIgY2hlY2tib3hlcyA9IFsgCi0gICAgICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJodG1sLXN1aXRlIiksIAotICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiY2FudmFzLXN1aXRlIiksIAotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgic3ZnLXN1aXRlIiksCi0gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJleGFt cGxlcy1zdWl0ZSIpLAotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVtcGxhdGUt c3VpdGUiKSwKLSAgICBdOworICAgIHZhciBlbmFibGVkU3VpdGVzID0gW107CisgICAgdmFyIGNo ZWNrYm94ZXMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCIjc3VpdGVzIGlucHV0Iik7Cisg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjaGVja2JveGVzLmxlbmd0aDsgKytpKSB7CisgICAgICAg IHZhciBjaGVja2JveCA9IGNoZWNrYm94ZXNbaV07CisgICAgICAgIGlmIChjaGVja2JveC5jaGVj a2VkKSB7CisgICAgICAgICAgICBlbmFibGVkU3VpdGVzLnB1c2goY2hlY2tib3guc3VpdGUpOwor ICAgICAgICB9CisgICAgICAgIGxvY2FsU3RvcmFnZS5zZXRJdGVtKGNoZWNrYm94LnN1aXRlLm5h bWUsICtjaGVja2JveC5jaGVja2VkKTsKKyAgICB9CisKICAgICB2YXIgZW5hYmxlZFN1aXRlcyA9 IFN1aXRlcy5maWx0ZXIoZnVuY3Rpb24gKHN1aXRlLCBpbmRleCkgeyByZXR1cm4gIXN1aXRlLmRp c2FibGVkICYmIGNoZWNrYm94ZXNbaW5kZXhdLmNoZWNrZWQ7IH0pOwogICAgIHZhciB0ZXN0c0Nv dW50ID0gZW5hYmxlZFN1aXRlcy5yZWR1Y2UoZnVuY3Rpb24gKHRlc3RzQ291bnQsIHN1aXRlKSB7 IHJldHVybiB0ZXN0c0NvdW50ICsgc3VpdGUudGVzdHMubGVuZ3RoOyB9LCAwKTsKICAgICBiZW5j aG1hcmtSdW5uZXJDbGllbnQudGVzdHNDb3VudCA9IGJlbmNobWFya1J1bm5lckNsaWVudC5pdGVy YXRpb25Db3VudCAqIHRlc3RzQ291bnQ7CkBAIC0xMTAsMyArMTEzLDI1IEBAIGZ1bmN0aW9uIHNo b3dHcmFwaCh0ZXN0TmFtZSwgYXhlcywgc2FtcGxlcywgc2FtcGxpbmdUaW1lT2Zmc2V0KQogICAg IGdyYXBoKCIjZ3JhcGhDb250YWluZXIiLCBuZXcgUG9pbnQoNzAwLCA0MDApLCBuZXcgSW5zZXRz KDIwLCA1MCwgMjAsIDUwKSwgYXhlcywgc2FtcGxlcywgc2FtcGxpbmdUaW1lT2Zmc2V0KTsKICAg ICBzaG93U2VjdGlvbigiZ3JhcGgiLCB0cnVlKTsgICAgCiB9CisKK2Z1bmN0aW9uIHBvcHVsYXRl U2V0dGluZ3MoKSB7CisgICAgdmFyIHN1aXRlc0RpdiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJzdWl0ZXMiKTsKKyAgICBTdWl0ZXMuZm9yRWFjaChmdW5jdGlvbihzdWl0ZSkgeworICAgICAg ICB2YXIgc3VpdGVEaXYgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CisKKyAg ICAgICAgdmFyIGxhYmVsID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGFiZWwiKTsKKyAgICAg ICAgdmFyIGNoZWNrYm94ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQiKTsKKyAgICAg ICAgY2hlY2tib3guc2V0QXR0cmlidXRlKCJ0eXBlIiwgImNoZWNrYm94Iik7CisgICAgICAgIGNo ZWNrYm94LnN1aXRlID0gc3VpdGU7CisgICAgICAgIGlmICgrbG9jYWxTdG9yYWdlLmdldEl0ZW0o c3VpdGUubmFtZSkpIHsKKyAgICAgICAgICAgIGNoZWNrYm94LmNoZWNrZWQgPSB0cnVlOworICAg ICAgICB9CisgICAgICAgIGxhYmVsLmFwcGVuZENoaWxkKGNoZWNrYm94KTsKKyAgICAgICAgbGFi ZWwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiAiICsgc3VpdGUubmFtZSkp OworCisgICAgICAgIHN1aXRlRGl2LmFwcGVuZENoaWxkKGxhYmVsKTsKKyAgICAgICAgc3VpdGVE aXYuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnIiKSk7CisgICAgICAgIHN1 aXRlc0Rpdi5hcHBlbmRDaGlsZChzdWl0ZURpdik7CisgICAgfSk7Cit9Citkb2N1bWVudC5hZGRF dmVudExpc3RlbmVyKCJET01Db250ZW50TG9hZGVkIiwgcG9wdWxhdGVTZXR0aW5ncyk7ClwgTm8g bmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmlt b21ldGVyL3J1bm5lci9yZXNvdXJjZXMvdGVzdHMuanMgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1v bWV0ZXIvcnVubmVyL3Jlc291cmNlcy90ZXN0cy5qcwppbmRleCA2Zjc3ZGQ3MWFjNTY4ZGI3YzU2 NWIwNTQzMTgwNTFmZDBiMTFmNGQyLi5kNzIyYWY4ZjU1MTU2NmNhZjNjMDU4YWNkMzhmYzlkMTg0 YWI5OTU0IDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcnVubmVyL3Jl c291cmNlcy90ZXN0cy5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcnVubmVy L3Jlc291cmNlcy90ZXN0cy5qcwpAQCAtMzgsMjQgKzM4LDI3IEBAIHZhciBUaXRsZXMgPSBbCiAg ICAgfQogXTsKIAotdmFyIFN1aXRlcyA9IFtdOwordmFyIFN1aXRlID0gZnVuY3Rpb24obmFtZSwg dGVzdHMpIHsKKyAgICB0aGlzLm5hbWUgPSBuYW1lOworICAgIHRoaXMudGl0bGVzID0gVGl0bGVz OworICAgIHRoaXMudGVzdHMgPSB0ZXN0czsKK307CitTdWl0ZS5wcm90b3R5cGUucHJlcGFyZSA9 IGZ1bmN0aW9uKHJ1bm5lciwgY29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50KQoreworICAg IHJldHVybiBydW5uZXIud2FpdEZvckVsZW1lbnQoIiNzdGFnZSIpLnRoZW4oZnVuY3Rpb24gKGVs ZW1lbnQpIHsKKyAgICAgICAgcmV0dXJuIGVsZW1lbnQ7CisgICAgfSk7Cit9OworU3VpdGUucHJv dG90eXBlLnJ1biA9IGZ1bmN0aW9uKGNvbnRlbnRXaW5kb3csIHRlc3QsIG9wdGlvbnMsIHJlY29y ZFRhYmxlLCBwcm9ncmVzc0JhcikKK3sKKyAgICByZXR1cm4gY29udGVudFdpbmRvdy5ydW5CZW5j aG1hcmsodGhpcywgdGVzdCwgb3B0aW9ucywgcmVjb3JkVGFibGUsIHByb2dyZXNzQmFyKTsKK307 CiAKLVN1aXRlcy5wdXNoKHsKLSAgICBuYW1lOiAiSFRNTCBCb3VuY2luZyBQYXJ0aWNsZXMiLAot ICAgIHByZXBhcmU6IGZ1bmN0aW9uKHJ1bm5lciwgY29udGVudFdpbmRvdywgY29udGVudERvY3Vt ZW50KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHJ1bm5lci53YWl0Rm9yRWxlbWVudCgiI3N0YWdl IikudGhlbihmdW5jdGlvbiAoZWxlbWVudCkgewotICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7 Ci0gICAgICAgIH0pOwotICAgIH0sCi0gICAgCi0gICAgcnVuOiBmdW5jdGlvbihjb250ZW50V2lu ZG93LCB0ZXN0LCBvcHRpb25zLCByZWNvcmRUYWJsZSwgcHJvZ3Jlc3NCYXIpCi0gICAgewotICAg ICAgICByZXR1cm4gY29udGVudFdpbmRvdy5ydW5CZW5jaG1hcmsodGhpcywgdGVzdCwgb3B0aW9u cywgcmVjb3JkVGFibGUsIHByb2dyZXNzQmFyKTsKLSAgICB9LAogCi0gICAgdGl0bGVzOiBUaXRs ZXMsCi0gICAgdGVzdHM6IFsKK3ZhciBTdWl0ZXMgPSBbXTsKKworU3VpdGVzLnB1c2gobmV3IFN1 aXRlKCJIVE1MIHN1aXRlIiwKKyAgICBbCiAgICAgICAgIHsgCiAgICAgICAgICAgICB1cmw6ICIu Li90ZXN0cy9ib3VuY2luZy1wYXJ0aWNsZXMvYm91bmNpbmctY3NzLXNoYXBlcy5odG1sP2dhaW49 MSZhZGRMaW1pdD0xMDAmcmVtb3ZlTGltaXQ9NSZwYXJ0aWNsZVdpZHRoPTEyJnBhcnRpY2xlSGVp Z2h0PTEyJnNoYXBlPWNpcmNsZSIsCiAgICAgICAgICAgICBuYW1lOiAiQ1NTIGJvdW5jaW5nIGNp cmNsZXMiCkBAIC04MSwyNCArODQsMTAgQEAgU3VpdGVzLnB1c2goewogICAgICAgICAgICAgbmFt ZTogIkNTUyBsYXllcmluZyB0ZXh0IgogICAgICAgICB9LAogICAgIF0KLX0pOworKSk7CiAKLVN1 aXRlcy5wdXNoKHsKLSAgICBuYW1lOiAiQ2FudmFzIEJvdW5jaW5nIFBhcnRpY2xlcyIsCi0gICAg cHJlcGFyZTogZnVuY3Rpb24ocnVubmVyLCBjb250ZW50V2luZG93LCBjb250ZW50RG9jdW1lbnQp Ci0gICAgewotICAgICAgICByZXR1cm4gcnVubmVyLndhaXRGb3JFbGVtZW50KCIjc3RhZ2UiKS50 aGVuKGZ1bmN0aW9uIChlbGVtZW50KSB7Ci0gICAgICAgICAgICByZXR1cm4gZWxlbWVudDsKLSAg ICAgICAgfSk7Ci0gICAgfSwgIAotICAgIAotICAgIHJ1bjogZnVuY3Rpb24oY29udGVudFdpbmRv dywgdGVzdCwgb3B0aW9ucywgcmVjb3JkVGFibGUsIHByb2dyZXNzQmFyKQotICAgIHsKLSAgICAg ICAgcmV0dXJuIGNvbnRlbnRXaW5kb3cucnVuQmVuY2htYXJrKHRoaXMsIHRlc3QsIG9wdGlvbnMs IHJlY29yZFRhYmxlLCBwcm9ncmVzc0Jhcik7Ci0gICAgfSwKLSAgICAKLSAgICB0aXRsZXM6IFRp dGxlcywKLSAgICB0ZXN0czogWworU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJDYW52YXMgc3VpdGUi LAorICAgIFsKICAgICAgICAgeyAKICAgICAgICAgICAgIHVybDogIi4uL3Rlc3RzL2JvdW5jaW5n LXBhcnRpY2xlcy9ib3VuY2luZy1jYW52YXMtc2hhcGVzLmh0bWw/Z2Fpbj00JmFkZExpbWl0PTEw MCZyZW1vdmVMaW1pdD0xMDAwJnBhcnRpY2xlV2lkdGg9MTImcGFydGljbGVIZWlnaHQ9MTImc2hh cGU9Y2lyY2xlIiwKICAgICAgICAgICAgIG5hbWU6ICJjYW52YXMgYm91bmNpbmcgY2lyY2xlcyIK QEAgLTEyMCwyNCArMTA5LDEwIEBAIFN1aXRlcy5wdXNoKHsKICAgICAgICAgICAgIG5hbWU6ICJj YW52YXMgYm91bmNpbmcgUE5HIGltYWdlcyIKICAgICAgICAgfSwKICAgICBdCi19KTsKKykpOwog Ci1TdWl0ZXMucHVzaCh7Ci0gICAgbmFtZTogIlNWRyBCb3VuY2luZyBQYXJ0aWNsZXMiLAotICAg IHByZXBhcmU6IGZ1bmN0aW9uKHJ1bm5lciwgY29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50 KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHJ1bm5lci53YWl0Rm9yRWxlbWVudCgiI3N0YWdlIiku dGhlbihmdW5jdGlvbiAoZWxlbWVudCkgewotICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7Ci0g ICAgICAgIH0pOwotICAgIH0sCi0gICAgCi0gICAgcnVuOiBmdW5jdGlvbihjb250ZW50V2luZG93 LCB0ZXN0LCBvcHRpb25zLCByZWNvcmRUYWJsZSwgcHJvZ3Jlc3NCYXIpCi0gICAgewotICAgICAg ICByZXR1cm4gY29udGVudFdpbmRvdy5ydW5CZW5jaG1hcmsodGhpcywgdGVzdCwgb3B0aW9ucywg cmVjb3JkVGFibGUsIHByb2dyZXNzQmFyKTsKLSAgICB9LAotICAgIAotICAgIHRpdGxlczogVGl0 bGVzLAotICAgIHRlc3RzOiBbCitTdWl0ZXMucHVzaChuZXcgU3VpdGUoIlNWRyBzdWl0ZSIsCisg ICAgWwogICAgICAgICB7CiAgICAgICAgICAgICB1cmw6ICIuLi90ZXN0cy9ib3VuY2luZy1wYXJ0 aWNsZXMvYm91bmNpbmctc3ZnLXNoYXBlcy5odG1sP2dhaW49NiZhZGRMaW1pdD0xMDAmcmVtb3Zl TGltaXQ9MTAwMCZwYXJ0aWNsZVdpZHRoPTEyJnBhcnRpY2xlSGVpZ2h0PTEyJnNoYXBlPWNpcmNs ZSIsCiAgICAgICAgICAgICBuYW1lOiAiU1ZHIGJvdW5jaW5nIGNpcmNsZXMiLApAQCAtMTU5LDI0 ICsxMzQsMTAgQEAgU3VpdGVzLnB1c2goewogICAgICAgICAgICAgbmFtZTogIlNWRyBib3VuY2lu ZyBQTkcgaW1hZ2VzIgogICAgICAgICB9LAogICAgIF0KLX0pOworKSk7CiAKLVN1aXRlcy5wdXNo KHsKLSAgICBuYW1lOiAiTW9yZSBjb21wbGV4IGV4YW1wbGVzIiwKLSAgICBwcmVwYXJlOiBmdW5j dGlvbihydW5uZXIsIGNvbnRlbnRXaW5kb3csIGNvbnRlbnREb2N1bWVudCkKLSAgICB7Ci0gICAg ICAgIHJldHVybiBydW5uZXIud2FpdEZvckVsZW1lbnQoIiNzdGFnZSIpLnRoZW4oZnVuY3Rpb24g KGVsZW1lbnQpIHsKLSAgICAgICAgICAgIHJldHVybiBlbGVtZW50OwotICAgICAgICB9KTsKLSAg ICB9LAotICAgIAotICAgIHJ1bjogZnVuY3Rpb24oY29udGVudFdpbmRvdywgdGVzdCwgb3B0aW9u cywgcmVjb3JkVGFibGUsIHByb2dyZXNzQmFyKQotICAgIHsKLSAgICAgICAgcmV0dXJuIGNvbnRl bnRXaW5kb3cucnVuQmVuY2htYXJrKHRoaXMsIHRlc3QsIG9wdGlvbnMsIHJlY29yZFRhYmxlLCBw cm9ncmVzc0Jhcik7Ci0gICAgfSwKLSAgICAKLSAgICB0aXRsZXM6IFRpdGxlcywKLSAgICB0ZXN0 czogWworU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJDb21wbGV4IGV4YW1wbGVzIiwKKyAgICBbCiAg ICAgICAgIHsKICAgICAgICAgICAgIHVybDogIi4uL3Rlc3RzL2V4YW1wbGVzL2NhbnZhcy1lbGVj dHJvbnMuaHRtbD9nYWluPTEmYWRkTGltaXQ9MTAwJnJlbW92ZUxpbWl0PTEwIiwKICAgICAgICAg ICAgIG5hbWU6ICJjYW52YXMgZWxlY3Ryb25zIgpAQCAtMTg2LDI0ICsxNDcsMTAgQEAgU3VpdGVz LnB1c2goewogICAgICAgICAgICAgbmFtZTogImNhbnZhcyBzdGFycyIKICAgICAgICAgfSwKICAg ICBdCi19KTsKKykpOwogCi1TdWl0ZXMucHVzaCh7Ci0gICAgbmFtZTogIlN0YWdlIFRlbXBsYXRl cyAoQ2FuIGJlIHVzZWQgZm9yIG5ldyB0ZXN0cykiLAotICAgIHByZXBhcmU6IGZ1bmN0aW9uKHJ1 bm5lciwgY29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50KQotICAgIHsKLSAgICAgICAgcmV0 dXJuIHJ1bm5lci53YWl0Rm9yRWxlbWVudCgiI3N0YWdlIikudGhlbihmdW5jdGlvbiAoZWxlbWVu dCkgewotICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7Ci0gICAgICAgIH0pOwotICAgIH0sCi0g ICAgCi0gICAgcnVuOiBmdW5jdGlvbihjb250ZW50V2luZG93LCB0ZXN0LCBvcHRpb25zLCByZWNv cmRUYWJsZSwgcHJvZ3Jlc3NCYXIpCi0gICAgewotICAgICAgICByZXR1cm4gY29udGVudFdpbmRv dy5ydW5CZW5jaG1hcmsodGhpcywgdGVzdCwgb3B0aW9ucywgcmVjb3JkVGFibGUsIHByb2dyZXNz QmFyKTsKLSAgICB9LAotICAgIAotICAgIHRpdGxlczogVGl0bGVzLAotICAgIHRlc3RzOiBbCitT dWl0ZXMucHVzaChuZXcgU3VpdGUoIlRlc3QgVGVtcGxhdGVzIiwKKyAgICBbCiAgICAgICAgIHsK ICAgICAgICAgICAgIHVybDogIi4uL3Rlc3RzL3RlbXBsYXRlL3RlbXBsYXRlLWNzcy5odG1sP2dh aW49MSZhZGRMaW1pdD0xMDAmcmVtb3ZlTGltaXQ9NSIsCiAgICAgICAgICAgICBuYW1lOiAiQ1NT IHRlbXBsYXRlIgpAQCAtMjE3LDcgKzE2NCw3IEBAIFN1aXRlcy5wdXNoKHsKICAgICAgICAgICAg IG5hbWU6ICJTVkcgdGVtcGxhdGUiCiAgICAgICAgIH0sCiAgICAgXQotfSk7CispKTsKIAogZnVu Y3Rpb24gc3VpdGVGcm9tTmFtZShuYW1lKQogewpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0 cy9DaGFuZ2VMb2cgYi9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZwppbmRleCAxYmQ0MDBiMGFl MzUyOTA5MjhhZTcyMjQzNDIzYTdlZmRhYTRhYjg2Li5lMTZlMTc0YTA5NjhhZDA4NzQxMTRmNzRh N2NlY2VhYzhmODBhMDU3IDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZwor KysgYi9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE1LTEw LTEyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAorICAgICAgICBSZWZhY3RvciB0ZXN0 IHN1aXRlcyB0byBhIHNlcGFyYXRlIGNsYXNzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDUzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMzA3 ODY0NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD cmVhdGUgYSBTdWl0ZSBjbGFzcyB0byByZWZhY3RvciBvdXQgcHJlcGFyZSgpIGFuZCBydW4oKS4K KyAgICAgICAgR2VuZXJhdGUgdGhlIGNoZWNrYm94ZXMgcmVwcmVzZW50aW5nIHRoZSBzdWl0ZXMg dXNpbmcgU3VpdGVzCisgICAgICAgIGluc3RlYWQgb2YgbWFpbnRhaW5pbmcgYSBzZXBhcmF0ZSBs aXN0LiBBbHNvLCBzYXZlIHRoZQorICAgICAgICBzZWxlY3Rpb25zIG91dCB0byBsb2NhbFN0b3Jh Z2UuCisKKyAgICAgICAgKiBBbmltb21ldGVyL3J1bm5lci9hbmltb21ldGVyLmh0bWw6IFJlbW92 ZSB0aGUgZXhwbGljaXRseSBsaXN0ZWQKKyAgICAgICAgc3VpdGVzLiBUaGVzZSB3aWxsIGJlIGdl bmVyYXRlZCBmcm9tIFN1aXRlcyBpbnN0ZWFkLgorICAgICAgICAqIEFuaW1vbWV0ZXIvcnVubmVy L3Jlc291cmNlcy9hbmltb21ldGVyLmpzOgorICAgICAgICAocG9wdWxhdGVTZXR0aW5ncyk6IEl0 ZXJhdGUgdGhyb3VnaCBTdWl0ZXMsIGFuZCBjcmVhdGUgdGhlCisgICAgICAgIGxhYmVsIGFuZCBj aGVja2JveC4gQXR0YWNoIHRoZSBTdWl0ZSBvYmplY3QgdG8gdGhlIGNoZWNrYm94IHNvCisgICAg ICAgIHdoZW4gdGhlIGJlbmNobWFyayBpcyBzdGFydGVkLCB3ZSBnZXQgZGlyZWN0IGFjY2Vzcy4g SW5pdGlhbGl6ZQorICAgICAgICB0aGUgY2hlY2ttYXJrIGJhc2VkIG9uIGl0cyB2YWx1ZSBpbiBs b2NhbFN0b3JhZ2UuIFNldCB0aGlzIHRvCisgICAgICAgIHJ1biB3aGVuIERPTUNvbnRlbnRMb2Fk ZWQgaXMgZGlzcGF0Y2hlZC4KKyAgICAgICAgKHN0YXJ0QmVuY2htYXJrKTogR3JhYiBhbGwgb2Yg dGhlIGNoZWNrYm94ZXMsIGluc3BlY3QgdGhlaXIKKyAgICAgICAgdmFsdWVzLCBhZGQgaXQgdG8g ZW5hYmxlZFN1aXRlcyBpZiBzZWxlY3RlZC4gUmVtZW1iZXIgd2hldGhlcgorICAgICAgICB0aGUg c3VpdGUgd2FzIGVuYWJsZWQgaW4gbG9jYWxTdG9yYWdlLCBzbyB0aGF0IGl0J3MgZWFzeSB0byBk bworICAgICAgICByZXBlYXRlZCBydW5zLgorICAgICAgICAqIEFuaW1vbWV0ZXIvcnVubmVyL3Jl c291cmNlcy90ZXN0cy5qczoKKyAgICAgICAgKFN1aXRlKTogQ3JlYXRlIGEgbmV3IFN1aXRlIGNs YXNzLiBSZWZhY3RvciBvdXQgcHJlcGFyZSgpIGFuZAorICAgICAgICBydW4oKSwgc2luY2UgYWxs IG9mIHRoZW0gaGF2ZSB0aGUgc2FtZSBpbXBsZW1lbnRhdGlvbi4gUG9wdWxhdGUKKyAgICAgICAg U3VpdGVzIHdpdGggU3VpdGUgaW5zdGFuY2VzIGluc3RlYWQgb2YgZ2VuZXJpYyBvYmplY3RzLgor CisyMDE1LTEwLTEyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKwogICAgICAgICBVcGRh dGUgZ3JhcGggc3R5bGVzIGZvciBsZWdpYmlsaXR5LgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDUyCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8y MzA3ODUwMz4K