98305 2012-10-03 14:50:00 -0700 Simplify the magnitude-perf test harness 2012-10-03 15:59:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth eric pdr rniwa tony oldest_to_newest 734056 0 ojan 2012-10-03 14:50:00 -0700 Simplify the magnitude-perf test harness 734098 1 166973 ojan 2012-10-03 15:34:13 -0700 Created attachment 166973 Patch 734115 2 166973 rniwa 2012-10-03 15:51:05 -0700 Comment on attachment 166973 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166973&action=review > LayoutTests/ChangeLog:11 > + -Remove the chromium.Interval stuff. This API no longer exists. > + -Reduce the number of iterations to 8. > + -Start magnitude at 1 instead of 0. > + -Remove all the iterationsPerRun junk. This complexity was not achieving the goal of Nit: insert a space after "-". 734126 3 ojan 2012-10-03 15:59:03 -0700 Committed r130337: <http://trac.webkit.org/changeset/130337> 166973 2012-10-03 15:34:13 -0700 2012-10-03 15:51:04 -0700 Patch bug-98305-20121003153325.patch text/plain 12828 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzE3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzViZjVlOWM3OTdjMmYzOWI1NzAx ODAxYTNhZWRhNDMwMjllN2NjZi4uNGE5Y2Q4OTQ4YjQyMzA5NzZmOTk5ODNmMTBjMjdjYTMxNTIx ZjQyNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDEyLTEwLTAzICBPamFuIFZhZmFpICA8b2ph bkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgU2ltcGxpZnkgdGhlIG1hZ25pdHVkZS1wZXJmIHRl c3QgaGFybmVzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTgzMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAtUmVtb3ZlIHRoZSBjaHJvbWl1bS5JbnRlcnZhbCBzdHVmZi4gVGhpcyBBUEkgbm8gbG9uZ2Vy IGV4aXN0cy4KKyAgICAgICAgLVJlZHVjZSB0aGUgbnVtYmVyIG9mIGl0ZXJhdGlvbnMgdG8gOC4K KyAgICAgICAgLVN0YXJ0IG1hZ25pdHVkZSBhdCAxIGluc3RlYWQgb2YgMC4KKyAgICAgICAgLVJl bW92ZSBhbGwgdGhlIGl0ZXJhdGlvbnNQZXJSdW4ganVuay4gVGhpcyBjb21wbGV4aXR5IHdhcyBu b3QgYWNoaWV2aW5nIHRoZSBnb2FsIG9mCisgICAgICAgIHJlZHVjaW5nIGZsYWtpbmVzcy4KKwor ICAgICAgICBXaXRoIHRoZXNlIGNoYW5nZXMsIHRoZSBwZXJmIHRlc3RzIGFyZSBub3QgZmxha3kg Zm9yIG1lIGxvY2FsbHkuCisgICAgICAgIEkgcmFuIGFsbCB0aGUgcGVyZiB0ZXN0cyB3aXRoIC0t aXRlcmF0aW9ucz0xMDAgYW5kIGhhZCBubyBmYWlsdXJlcywKKyAgICAgICAgQWxsIHRoZSBjb21w bGV4aXR5IHdhcyBpbmNyZWFzaW5nIGZsYWtpbmVzcy4KKworICAgICAgICBUaGlzIGFsc28gcmVk dWNlcyB0aGUgcnVudGltZSBvZiB0aGUgdGVzdHMgYnkgPjJ4LgorCisgICAgICAgICogcGVyZi9h ZGRpbmctcmFkaW8tYnV0dG9ucy5odG1sOgorICAgICAgICBUaGlzIHRlc3QgaXMgY2xlYXJseSBs aW5lYXIuIEl0IHNob3VsZCBuZXZlciBoYXZlIGJlZW4gbWFya2VkIGNvbnN0YW50LgorICAgICAg ICBUaGUgcGF0Y2ggdGhhdCBsYW5kZWQgaXQgd2FzIGZpeGluZyBhbiBuXjIgYmVoYXZpb3IuCisK KyAgICAgICAgKiBwZXJmL2FycmF5LWJpbmFyeS1zZWFyY2guaHRtbDoKKyAgICAgICAgU2VhcmNo IGZvciB0aGUgZmlyc3QgaXRlbSBpbiB0aGUgYXJyYXkgc28gdGhhdCB0aGUgc2VhcmNoIGlzIGFs d2F5cyBhY3R1YWxseSBsb2cgbi4KKworICAgICAgICAqIHBlcmYvbmVzdGVkLWNvbWJpbmVkLXNl bGVjdG9ycy5odG1sOgorICAgICAgICBOb3cgdGhhdCB3ZSBydW4gZmV3ZXIgaXRlcmF0aW9ucywg d2UgZG9uJ3QgbmVlZCB0byBhcnRpZmljaWFsbHkgbGltaXQgdGhpcyB0ZXN0LgorCisgICAgICAg ICogcmVzb3VyY2VzL21hZ25pdHVkZS1wZXJmLmpzOgorICAgICAgICAoTWFnbml0dWRlLnJ1bik6 CisgICAgICAgIChNYWduaXR1ZGUuX3J1bik6CisgICAgICAgIChNYWduaXR1ZGUuX3JTcXVhcmVk KToKKyAgICAgICAgKE1hZ25pdHVkZS5fbG9nSXRlcmF0aW9uSW5mbyk6CisgICAgICAgIChNYWdu aXR1ZGUuX2JpZ09HdWVzcyk6CisgICAgICAgIChNYWduaXR1ZGUuX3J1bkl0ZXJhdGlvbik6Cisg ICAgICAgIChNYWduaXR1ZGUpOgorCisyMDEyLTEwLTAzICBPamFuIFZhZmFpICA8b2phbkBjaHJv bWl1bS5vcmc+CisKICAgICAgICAgRml4IHNvbWUgc3R5bGUgdmlvbGF0aW9ucyBpbiBwZXJwYXJh dGlvbiBmb3IgY2hhbmdpbmcgdGhpcyBjb2RlLgogICAgICAgICAqIHJlc291cmNlcy9tYWduaXR1 ZGUtcGVyZi5qczoKICAgICAgICAgKE1hZ25pdHVkZS5ydW4pOgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGVyZi9hZGRpbmctcmFkaW8tYnV0dG9ucy5odG1sIGIvTGF5b3V0VGVzdHMvcGVyZi9h ZGRpbmctcmFkaW8tYnV0dG9ucy5odG1sCmluZGV4IDFhYmFlZjQ5MTA5OTAxY2UyN2M3MjhhZGJj MGM1ODljMzllYzUxN2IuLjFkZTlhNjY1YTk5ZTViMjhkMjRiY2M2MzAwMGI4YzVjZjBlYTJkMzYg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BlcmYvYWRkaW5nLXJhZGlvLWJ1dHRvbnMuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9wZXJmL2FkZGluZy1yYWRpby1idXR0b25zLmh0bWwKQEAgLTMwLDgg KzMwLDggQEAgZnVuY3Rpb24gdGVzdChtYWduaXR1ZGUpIHsKICAgICBwYXJlbnRGb3JtLnJlbW92 ZUNoaWxkKHJhZGlvKTsKIH0KIAotTWFnbml0dWRlLmRlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IGFk ZGluZyBhIHJhZGlvIGJ1dHRvbiB0byBhIHJhZGlvIGJ1dHRvbiBncm91cCBpcyBjb25zdGFudCBp biB0aGUgbnVtYmVyIG9mIHJhZGlvIGJ1dHRvbnMuIik7Ci1NYWduaXR1ZGUucnVuKHNldHVwLCB0 ZXN0LCBNYWduaXR1ZGUuQ09OU1RBTlQpOworTWFnbml0dWRlLmRlc2NyaXB0aW9uKCJUZXN0cyB0 aGF0IGFkZGluZyBhIHJhZGlvIGJ1dHRvbiB0byBhIHJhZGlvIGJ1dHRvbiBncm91cCBpcyBsaW5l YXIgaW4gdGhlIG51bWJlciBvZiByYWRpbyBidXR0b25zLiIpOworTWFnbml0dWRlLnJ1bihzZXR1 cCwgdGVzdCwgTWFnbml0dWRlLkxJTkVBUik7CiA8L3NjcmlwdD4KIDwvYm9keT4KIDwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BlcmYvYXJyYXktYmluYXJ5LXNlYXJjaC5odG1sIGIv TGF5b3V0VGVzdHMvcGVyZi9hcnJheS1iaW5hcnktc2VhcmNoLmh0bWwKaW5kZXggMzNmNDdmMTYz OWUwOWJlN2JlMjFlMWYxZDE1ODQ0ZTU5YTQ5YzAwZS4uZDQwNmIzMjhiNTA4YmQ2ZTZjNDdiN2E4 YjQ4NjgzMTMyY2UwNjQxNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGVyZi9hcnJheS1iaW5h cnktc2VhcmNoLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvcGVyZi9hcnJheS1iaW5hcnktc2VhcmNo Lmh0bWwKQEAgLTQwLDcgKzQwLDcgQEAgZnVuY3Rpb24gaGVscChhcnJ5LCB2YWwsIHN0YXJ0LCBl bmQpIHsKIAogZnVuY3Rpb24gdGVzdChtYWduaXR1ZGUpCiB7Ci0gICAgYmluYXJ5U2VhcmNoKGFy cmF5LCA1KTsKKyAgICBiaW5hcnlTZWFyY2goYXJyYXksIDApOwogfQogCiBNYWduaXR1ZGUuZGVz Y3JpcHRpb24oIlRlc3RzIHRoYXQgYmluYXJ5IHNlYXJjaCBvdmVyIGFuIGFycmF5IGlzIGxvZ2Fy aXRobWljLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGVyZi9uZXN0ZWQtY29tYmluZWQt c2VsZWN0b3JzLmh0bWwgYi9MYXlvdXRUZXN0cy9wZXJmL25lc3RlZC1jb21iaW5lZC1zZWxlY3Rv cnMuaHRtbAppbmRleCA0Nzc2OWE2ZWI0YmYxOThiZjc1ZmVhMzZlNmE4YjI3MWZkMmNmNzk5Li45 NWE2YzEwNjBiYmJkNTRkZWRiYjNmNmNlNmRkMTY4NTc5MWExZjIxIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wZXJmL25lc3RlZC1jb21iaW5lZC1zZWxlY3RvcnMuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9wZXJmL25lc3RlZC1jb21iaW5lZC1zZWxlY3RvcnMuaHRtbApAQCAtNTgsNyArNTgsNiBA QCBmdW5jdGlvbiB0ZXN0U3RhY2tTdHlsaW5nKG1hZ25pdHVkZSkKIE1hZ25pdHVkZS5kZXNjcmlw dGlvbignVGVzdHMgc3R5bGluZyBtdWx0aXBsZSBjb21iaW5hdG9ycyBoYXZlIGxpbmVhciBwZXJm b3JtYW5jZScpOwogTWFnbml0dWRlLnJ1bihzZXR1cFN0YWNrLCB0ZXN0U3RhY2tTdHlsaW5nLCBN YWduaXR1ZGUuTElORUFSKTsKIHNhbmRib3gucmVtb3ZlQ2hpbGQoc2FuZGJveC5maXJzdENoaWxk KTsKLU1hZ25pdHVkZS5fbnVtUG9pbnRzPTk7IC8vIExpbWl0IHRoZSBtYXggdGVzdCBtYWduaXR1 ZGUgc2luY2UgaXQgdHJpZ2dlcnMgYSB0ZXN0IHRpbWVvdXQKIE1hZ25pdHVkZS5ydW4oc2V0dXBM aXN0LCB0ZXN0TGlzdFN0eWxpbmcsIE1hZ25pdHVkZS5MSU5FQVIpOwogc2FuZGJveC5yZW1vdmVD aGlsZChzYW5kYm94LmZpcnN0Q2hpbGQpOwogPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wZXJmL3Nob3ctaGlkZS10YWJsZS1yb3dzLmh0bWwgYi9MYXlvdXRUZXN0cy9wZXJmL3No b3ctaGlkZS10YWJsZS1yb3dzLmh0bWwKaW5kZXggMmEwYmI5NjRmMzlhMDQ5NWZlZTk2ZWFlYzI5 ZWUxYjQzMjgxNDZlMS4uYzA2OTdlMDIxMzNiMWE1ZDFiOTYxNzM5ZTBjYzNjZTdlNWRlM2U5MyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGVyZi9zaG93LWhpZGUtdGFibGUtcm93cy5odG1sCisr KyBiL0xheW91dFRlc3RzL3BlcmYvc2hvdy1oaWRlLXRhYmxlLXJvd3MuaHRtbApAQCAtMzMsNiAr MzMsNyBAQCBmdW5jdGlvbiB0ZXN0KG1hZ25pdHVkZSkKIH0KIAogTWFnbml0dWRlLmRlc2NyaXB0 aW9uKCJUZXN0cyB0aGF0IGhpZGluZy9zaG93aW5nIG9mIHRhYmxlIHJvd3MgaXMgbGluZWFyLiIp OworTWFnbml0dWRlLm1pbGxpc2Vjb25kc1Blckl0ZXJhdGlvbiA9IDEwMDsKIE1hZ25pdHVkZS5y dW4oc2V0dXBGdW5jdGlvbiwgdGVzdCwgTWFnbml0dWRlLkxJTkVBUik7CiBkb2N1bWVudC5xdWVy eVNlbGVjdG9yKCdkaXYnKS50ZXh0Q29udGVudCA9ICcnOwogPC9zY3JpcHQ+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvbWFnbml0dWRlLXBlcmYuanMgYi9MYXlvdXRUZXN0cy9y ZXNvdXJjZXMvbWFnbml0dWRlLXBlcmYuanMKaW5kZXggYWRmOGZhZGQwZWYyOTQ3MDllYTEzYjBl YzM2YzJlYTM2YmQ4N2QyZS4uNmQyN2YzYzdhNzMxZmM3MTNlMzQxY2Q1YTBiNjVmY2UwMjYyZjE5 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL21hZ25pdHVkZS1wZXJmLmpzCisr KyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy9tYWduaXR1ZGUtcGVyZi5qcwpAQCAtMjUsOSArMjUs OSBAQCBNYWduaXR1ZGUuZGVzY3JpcHRpb24gPSBmdW5jdGlvbihkZXNjcmlwdGlvbikKICAgICBN YWduaXR1ZGUuX2xvZyhkZXNjcmlwdGlvbik7CiB9CiAKLU1hZ25pdHVkZS5fbnVtUG9pbnRzID0g MTA7Ci1NYWduaXR1ZGUuX21pbkl0ZXJhdGlvbnMgPSA1OwotTWFnbml0dWRlLl9tYXhJdGVyYXRp b25zID0gMTAwMDsKK01hZ25pdHVkZS5udW1Qb2ludHMgPSA4OworTWFnbml0dWRlLm1pbGxpc2Vj b25kc1Blckl0ZXJhdGlvbiA9IDI1OworTWFnbml0dWRlLmluaXRpYWxNYWduaXR1ZGUgPSAxOwog CiBNYWduaXR1ZGUuQ09OU1RBTlQgPSAiTygxKSI7CiBNYWduaXR1ZGUuTElORUFSID0gIk8obiki OwpAQCAtNTIsNDggKzUyLDI1IEBAIE1hZ25pdHVkZS5ydW4gPSBmdW5jdGlvbihzZXR1cCwgdGVz dCwgZXhwZWN0ZWQpCiAgICAgTWFnbml0dWRlLl9kZWJ1Z0xvZyA9ICJcbkRFQlVHIExPRzpcbiI7 CiAKICAgICBNYWduaXR1ZGUuX21hZ25pdHVkZXMgPSBbXTsKLSAgICBmb3IgKHZhciBpID0gMDsg aSA8IE1hZ25pdHVkZS5fbnVtUG9pbnRzOyBpKyspCisgICAgZm9yICh2YXIgaSA9IE1hZ25pdHVk ZS5pbml0aWFsTWFnbml0dWRlOyBpIDwgTWFnbml0dWRlLm51bVBvaW50cyArIE1hZ25pdHVkZS5p bml0aWFsTWFnbml0dWRlOyBpKyspCiAgICAgICAgIE1hZ25pdHVkZS5fbWFnbml0dWRlcy5wdXNo KE1hdGgucG93KDIsIGkpKTsKIAotICAgIHZhciBtaWxsaXNlY29uZHMgPSA1MDsKLSAgICB2YXIg cnVuc1Blckl0ZXJhdGlvbiA9IDE7CiAgICAgdmFyIG51bVRyaWVzID0gMzsKLSAgICBNYWduaXR1 ZGUuX3J1bihzZXR1cCwgdGVzdCwgZXhwZWN0ZWQsIG1pbGxpc2Vjb25kcywgcnVuc1Blckl0ZXJh dGlvbiwgbnVtVHJpZXMpOworICAgIE1hZ25pdHVkZS5fcnVuKHNldHVwLCB0ZXN0LCBleHBlY3Rl ZCwgbnVtVHJpZXMpOwogfQogCi1NYWduaXR1ZGUuX3J1biA9IGZ1bmN0aW9uKHNldHVwLCB0ZXN0 LCBleHBlY3RlZCwgbWlsbGlzZWNvbmRzLCBydW5zUGVySXRlcmF0aW9uLCBudW1Ucmllc0xlZnQp CitNYWduaXR1ZGUuX3J1biA9IGZ1bmN0aW9uKHNldHVwLCB0ZXN0LCBleHBlY3RlZCwgbnVtVHJp ZXNMZWZ0KQogewogICAgIE1hZ25pdHVkZS5faXRlcmF0aW9ucyA9IHt9OwotICAgIHZhciBtYXhN YWduaXR1ZGUgPSBNYWduaXR1ZGUuX21hZ25pdHVkZXNbTWFnbml0dWRlLl9tYWduaXR1ZGVzLmxl bmd0aCAtIDFdOwotCi0gICAgLy8gV2Ugd2FudCB0aGUgbGFyZ2VzdCBtYWduaXR1ZGUgdG8gZG8g YmV0d2VlbiBNYWduaXR1ZGUuX21pbkl0ZXJhdGlvbnMgYW5kIE1hZ25pdHVkZS5fbWF4SXRlcmF0 aW9ucyBpdGVyYXRpb25zLgotICAgIC8vIElmIGl0J3MgdG9vIGZhc3QsIHdlIGluY3JlYXNlIHRo ZSBydW5zUGVySXRlcmF0aW9uIHRvIGRvIG1vcmUgcnVucyBwZXIgaXRlcmF0aW9uLgotICAgIC8v IElmIGl0J3MgdG9vIHNsb3csIHdlIGluY3JlYXNlIG1pbGxpc2Vjb25kcyB0byBnaXZlIGVhY2gg aXRlcmF0aW9uIG1vcmUgdGltZS4KLSAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICB2YXIgaXRl cmF0aW9ucyA9IE1hZ25pdHVkZS5fcnVuSXRlcmF0aW9uKHNldHVwLCB0ZXN0LCBtYXhNYWduaXR1 ZGUsIG1pbGxpc2Vjb25kcywgcnVuc1Blckl0ZXJhdGlvbik7Ci0gICAgICAgIE1hZ25pdHVkZS5f ZGVidWcoIml0ZXJhdGlvbnMgIiArIGl0ZXJhdGlvbnMpOwotCi0gICAgICAgIC8vIElmIHdlIGdl dCB0b28gZmV3IG9yIHRvbyBtYW55IG9uIHRoZSBsYXJnZXN0IG1hZ25pdHVkZSBpdGVyYXRpb25z LCB0aGVuIHdlIGNhbid0IHRydXN0IHRoaXMgcnVuLgotICAgICAgICAvLyBUb28gbWFueSBydW5z IG1lYW5zIHRoZSB0aGUgdGVzdCBsb29wIGl0c2VsZiBtYXkgYmUgdGFraW5nIG1vcmUgdGltZSB0 aGFuIHJ1bm5pbmcgdGhlIHRlc3QuCi0gICAgICAgIGlmIChpdGVyYXRpb25zIDw9IE1hZ25pdHVk ZS5fbWluSXRlcmF0aW9ucykKLSAgICAgICAgICAgIG1pbGxpc2Vjb25kcyA9IE1hdGgubWF4KDIs IE1hdGguZmxvb3IoTWFnbml0dWRlLl9taW5JdGVyYXRpb25zIC8gaXRlcmF0aW9ucykpICogbWls bGlzZWNvbmRzOwotICAgICAgICBlbHNlIGlmIChpdGVyYXRpb25zID4gTWFnbml0dWRlLl9tYXhJ dGVyYXRpb25zKQotICAgICAgICAgICAgcnVuc1Blckl0ZXJhdGlvbiA9IE1hdGgubWF4KDIsIE1h dGguZmxvb3IoaXRlcmF0aW9ucyAvIE1hZ25pdHVkZS5fbWF4SXRlcmF0aW9ucykpICogcnVuc1Bl ckl0ZXJhdGlvbjsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBNYWduaXR1ZGUuX2l0ZXJh dGlvbnNbbWF4TWFnbml0dWRlXSA9IGl0ZXJhdGlvbnM7Ci0gICAgICAgICAgICBicmVhazsKLSAg ICAgICAgfQotICAgIH0KLQotICAgIGZvciAodmFyIGkgPSAwOyBpIDwgTWFnbml0dWRlLl9tYWdu aXR1ZGVzLmxlbmd0aCAtIDE7IGkrKykgeworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgTWFnbml0 dWRlLl9tYWduaXR1ZGVzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgIHZhciBtYWduaXR1ZGUgPSBN YWduaXR1ZGUuX21hZ25pdHVkZXNbaV07Ci0gICAgICAgIE1hZ25pdHVkZS5faXRlcmF0aW9uc1tt YWduaXR1ZGVdID0gTWFnbml0dWRlLl9ydW5JdGVyYXRpb24oc2V0dXAsIHRlc3QsIG1hZ25pdHVk ZSwgbWlsbGlzZWNvbmRzLCBydW5zUGVySXRlcmF0aW9uKTsKKyAgICAgICAgTWFnbml0dWRlLl9p dGVyYXRpb25zW21hZ25pdHVkZV0gPSBNYWduaXR1ZGUuX3J1bkl0ZXJhdGlvbihzZXR1cCwgdGVz dCwgbWFnbml0dWRlKTsKICAgICB9CiAKLSAgICBNYWduaXR1ZGUuX2xvZ0l0ZXJhdGlvbkluZm8o bWlsbGlzZWNvbmRzLCBydW5zUGVySXRlcmF0aW9uKTsKKyAgICBNYWduaXR1ZGUuX2xvZ0l0ZXJh dGlvbkluZm8oKTsKIAogICAgIG51bVRyaWVzTGVmdC0tOwotICAgIHZhciBiaWdPID0gTWFnbml0 dWRlLl9iaWdPR3Vlc3MobWlsbGlzZWNvbmRzKTsKKyAgICB2YXIgYmlnTyA9IE1hZ25pdHVkZS5f YmlnT0d1ZXNzKCk7CiAgICAgaWYgKGJpZ08gPT0gZXhwZWN0ZWQgfHwgbnVtVHJpZXNMZWZ0IDwg MSkgewogICAgICAgICBNYWduaXR1ZGUuX2xvZyhiaWdPID09IGV4cGVjdGVkID8gIlBBU1MiIDog IkZBSUw6IGdvdCAiICsgYmlnTyArICIgZXhwZWN0ZWQgIiArIGV4cGVjdGVkKTsKIApAQCAtMTAz LDExICs4MCwxMSBAQCBNYWduaXR1ZGUuX3J1biA9IGZ1bmN0aW9uKHNldHVwLCB0ZXN0LCBleHBl Y3RlZCwgbWlsbGlzZWNvbmRzLCBydW5zUGVySXRlcmF0aW9uLAogICAgICAgICAgICAgTWFnbml0 dWRlLl9sb2coTWFnbml0dWRlLl9kZWJ1Z0xvZyk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgTWFn bml0dWRlLl9kZWJ1ZygibnVtVHJpZXNMZWZ0OiAiICsgbnVtVHJpZXNMZWZ0KTsKLSAgICAgICAg YXJndW1lbnRzLmNhbGxlZShzZXR1cCwgdGVzdCwgZXhwZWN0ZWQsIG1pbGxpc2Vjb25kcywgcnVu c1Blckl0ZXJhdGlvbiwgbnVtVHJpZXNMZWZ0KTsKKyAgICAgICAgYXJndW1lbnRzLmNhbGxlZShz ZXR1cCwgdGVzdCwgZXhwZWN0ZWQsIG51bVRyaWVzTGVmdCk7CiAgICAgfQogfQogCi1NYWduaXR1 ZGUuX3JTcXVhcmVkID0gZnVuY3Rpb24obWlsbGlzZWNvbmRzLCBvcHRfeFRyYW5zZm9ybSwgb3B0 X3lUcmFuc2Zvcm0pCitNYWduaXR1ZGUuX3JTcXVhcmVkID0gZnVuY3Rpb24ob3B0X3hUcmFuc2Zv cm0sIG9wdF95VHJhbnNmb3JtKQogewogICAgIC8vIEltcGxlbWVudCBodHRwOi8vd3d3LmVhc3lj YWxjdWxhdGlvbi5jb20vc3RhdGlzdGljcy9sZWFybi1jb3JyZWxhdGlvbi5waHAuCiAgICAgLy8g eCA9IG1hZ25pdHVkZQpAQCAtMTI1LDcgKzEwMiw3IEBAIE1hZ25pdHVkZS5fclNxdWFyZWQgPSBm dW5jdGlvbihtaWxsaXNlY29uZHMsIG9wdF94VHJhbnNmb3JtLCBvcHRfeVRyYW5zZm9ybSkKICAg ICAgICAgaWYgKG9wdF94VHJhbnNmb3JtKQogICAgICAgICAgICAgeCA9IG9wdF94VHJhbnNmb3Jt KHgpOwogCi0gICAgICAgIHZhciB5ID0gbWlsbGlzZWNvbmRzIC8gTWFnbml0dWRlLl9pdGVyYXRp b25zW01hZ25pdHVkZS5fbWFnbml0dWRlc1tpXV07CisgICAgICAgIHZhciB5ID0gTWFnbml0dWRl Lm1pbGxpc2Vjb25kc1Blckl0ZXJhdGlvbiAvIE1hZ25pdHVkZS5faXRlcmF0aW9uc1tNYWduaXR1 ZGUuX21hZ25pdHVkZXNbaV1dOwogICAgICAgICBpZiAob3B0X3lUcmFuc2Zvcm0pCiAgICAgICAg ICAgICB5ID0gb3B0X3lUcmFuc2Zvcm0oeSk7CiAKQEAgLTE1MywyOCArMTMwLDI1IEBAIE1hZ25p dHVkZS5fclNxdWFyZWQgPSBmdW5jdGlvbihtaWxsaXNlY29uZHMsIG9wdF94VHJhbnNmb3JtLCBv cHRfeVRyYW5zZm9ybSkKICAgICByZXR1cm4gclNxdWFyZWQ7CiB9CiAKLU1hZ25pdHVkZS5fbG9n SXRlcmF0aW9uSW5mbyA9IGZ1bmN0aW9uKG1pbGxpc2Vjb25kcywgcnVuc1Blckl0ZXJhdGlvbikK K01hZ25pdHVkZS5fbG9nSXRlcmF0aW9uSW5mbyA9IGZ1bmN0aW9uKCkKIHsKICAgICB2YXIgaXRl cmF0aW9uc0FycmF5ID0gW107CiAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBNYWduaXR1ZGUuX21h Z25pdHVkZXMubGVuZ3RoOyBpKyspIHsKICAgICAgICAgdmFyIG1hZ25pdHVkZSA9IE1hZ25pdHVk ZS5fbWFnbml0dWRlc1tpXTsKICAgICAgICAgdmFyIGl0ZXJhdGlvbnMgPSBNYWduaXR1ZGUuX2l0 ZXJhdGlvbnNbbWFnbml0dWRlXTsKICAgICAgICAgaXRlcmF0aW9uc0FycmF5LnB1c2goaXRlcmF0 aW9ucyk7Ci0gICAgICAgIE1hZ25pdHVkZS5fZGVidWcoIm1hZ25pdHVkZTogIiArIG1hZ25pdHVk ZSArICIgaXRlcmF0aW9uczogIiArIGl0ZXJhdGlvbnMgKyAiIHJ1bnNQZXJJdGVyYXRpb24gIiAr IHJ1bnNQZXJJdGVyYXRpb24gKwotICAgICAgICAgICAgIiBsb29wLXRpbWUgIiArIG1pbGxpc2Vj b25kcyArICIgdGltZS9pdGVyYXRpb24obXMpOiAiICsgbWlsbGlzZWNvbmRzIC8gaXRlcmF0aW9u cyk7CiAgICAgfQogCiAgICAgLy8gUHJpbnQgb3V0IHRoZSBtYWduaXR1ZGVzL2FycmF5cyBpbiBD U1YgdG8gYWZmb3JkIGVhc3kgY29weS1wYXN0ZSB0byBhIGNoYXJ0aW5nIGFwcGxpY2F0aW9uLgog ICAgIE1hZ25pdHVkZS5fZGVidWcoIm1hZ25pdHVkZXM6ICIgKyBNYWduaXR1ZGUuX21hZ25pdHVk ZXMuam9pbignLCcpKTsKICAgICBNYWduaXR1ZGUuX2RlYnVnKCJpdGVyYXRpb25zOiAiICsgaXRl cmF0aW9uc0FycmF5LmpvaW4oJywnKSk7Ci0gICAgTWFnbml0dWRlLl9kZWJ1ZygibWlsbGlzZWNv bmRzL2l0ZXJhdGlvbjogIiArIGl0ZXJhdGlvbnNBcnJheS5tYXAoZnVuY3Rpb24oaXRlcmF0aW9u cykge3JldHVybiBtaWxsaXNlY29uZHMgLyBpdGVyYXRpb25zfSkuam9pbignLCcpKTsKIH0KIAot TWFnbml0dWRlLl9iaWdPR3Vlc3MgPSBmdW5jdGlvbihtaWxsaXNlY29uZHMpCitNYWduaXR1ZGUu X2JpZ09HdWVzcyA9IGZ1bmN0aW9uKCkKIHsKLSAgICB2YXIgclNxdWFyZWQgPSBNYWduaXR1ZGUu X3JTcXVhcmVkKG1pbGxpc2Vjb25kcyk7Ci0gICAgdmFyIHJTcXVhcmVkWExvZyA9IE1hZ25pdHVk ZS5fclNxdWFyZWQobWlsbGlzZWNvbmRzLCBNYXRoLmxvZyk7Ci0gICAgdmFyIHJTcXVhcmVkWFlM b2cgPSBNYWduaXR1ZGUuX3JTcXVhcmVkKG1pbGxpc2Vjb25kcywgTWF0aC5sb2csIE1hdGgubG9n KTsKKyAgICB2YXIgclNxdWFyZWQgPSBNYWduaXR1ZGUuX3JTcXVhcmVkKCk7CisgICAgdmFyIHJT cXVhcmVkWExvZyA9IE1hZ25pdHVkZS5fclNxdWFyZWQoTWF0aC5sb2cpOworICAgIHZhciByU3F1 YXJlZFhZTG9nID0gTWFnbml0dWRlLl9yU3F1YXJlZChNYXRoLmxvZywgTWF0aC5sb2cpOwogICAg IE1hZ25pdHVkZS5fZGVidWcoInJTcXVhcmVkICIgKyByU3F1YXJlZCArICIgclNxdWFyZWRYTG9n ICIgKyByU3F1YXJlZFhMb2cgKyAiIHJTcXVhcmVkWFlMb2cgIiArIHJTcXVhcmVkWFlMb2cpOwog CiAgICAgdmFyIHJTcXVhcmVkTWF4ID0gTWF0aC5tYXgoclNxdWFyZWQsIHJTcXVhcmVkWExvZywg clNxdWFyZWRYWUxvZyk7CkBAIC0xOTcsMTEgKzE3MSwxMSBAQCBNYWduaXR1ZGUuX2JpZ09HdWVz cyA9IGZ1bmN0aW9uKG1pbGxpc2Vjb25kcykKICAgICByZXR1cm4gYmlnTzsKIH0KIAotTWFnbml0 dWRlLl9ydW5JdGVyYXRpb24gPSBmdW5jdGlvbihzZXR1cCwgdGVzdCwgbWFnbml0dWRlLCBtaWxs aXNlY29uZHMsIHJ1bnNQZXJJdGVyYXRpb24pCitNYWduaXR1ZGUuX3J1bkl0ZXJhdGlvbiA9IGZ1 bmN0aW9uKHNldHVwLCB0ZXN0LCBtYWduaXR1ZGUpCiB7CiAgICAgc2V0dXAobWFnbml0dWRlKTsK IAotICAgIHZhciBkZWJ1Z1N0ciA9ICdydW4gaXRlcmF0aW9uLiBtYWduaXR1ZGUgJyArIG1hZ25p dHVkZSArICIgbWlsbGlzZWNvbmRzICIgKyBtaWxsaXNlY29uZHMgKyAiIHJ1bnNQZXJJdGVyYXRp b24gIiArIHJ1bnNQZXJJdGVyYXRpb247CisgICAgdmFyIGRlYnVnU3RyID0gJ3J1biBpdGVyYXRp b24uIG1hZ25pdHVkZSAnICsgbWFnbml0dWRlOwogICAgIGlmICh3aW5kb3cuR0NDb250cm9sbGVy KSB7CiAgICAgICAgIGlmIChHQ0NvbnRyb2xsZXIuZ2V0SlNPYmplY3RDb3VudCkKICAgICAgICAg ICAgIGRlYnVnU3RyICs9ICIganNPYmplY3RDb3VudEJlZm9yZSAiICsgR0NDb250cm9sbGVyLmdl dEpTT2JqZWN0Q291bnQoKTsKQEAgLTIxOSwyNyArMTkzLDExIEBAIE1hZ25pdHVkZS5fcnVuSXRl cmF0aW9uID0gZnVuY3Rpb24oc2V0dXAsIHRlc3QsIG1hZ25pdHVkZSwgbWlsbGlzZWNvbmRzLCBy dW5zUGVyCiAgICAgTWFnbml0dWRlLl9kZWJ1ZyhkZWJ1Z1N0cik7CiAKICAgICB2YXIgaXRlcmF0 aW9ucyA9IDA7Ci0gICAgaWYgKHdpbmRvdy5jaHJvbWl1bSkgewotICAgICAgICAvLyBGSVhNRTog SWYgdXNpbmcgbWljcm9zZWNvbmRzIHR1cm5zIG91dCB0byBiZSBsZXNzIGZsYWt5LCBleHBvc2Ug bWljcm9zZWNvbmRzCi0gICAgICAgIC8vIGZyb20gSlNDIG9yIHRlc3RSdW5uZXIgYW5kIHVzZSB0 aGVtLiBPdGhlcndpc2UsIGdldCByaWQgb2YgdGhpcyBibG9jay4KLSAgICAgICAgdmFyIG1pY3Jv c2Vjb25kcyA9IG1pbGxpc2Vjb25kcyAqIDEwMDA7Ci0gICAgICAgIHZhciBpbnRlcnZhbCA9IG5l dyBjaHJvbWl1bS5JbnRlcnZhbCgpOwotICAgICAgICBpbnRlcnZhbC5zdGFydCgpOwotICAgICAg ICB3aGlsZSAoaW50ZXJ2YWwubWljcm9zZWNvbmRzKCkgPCBtaWNyb3NlY29uZHMpIHsKLSAgICAg ICAgICAgIC8vIExvb3AgcnVuc1Blckl0ZXJhdGlvbiB0aW1lcyB0byByZWR1Y2UgZXJyb3JzIGR1 ZSB0byB0aGUgb3ZlcmhlYWQgYW5kIGdyYW51bGFyaXR5IG9mIHRoZSBEYXRlIG9iamVjdC4KLSAg ICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcnVuc1Blckl0ZXJhdGlvbjsgaSsrKQotICAg ICAgICAgICAgICAgIHRlc3QobWFnbml0dWRlKTsKLSAgICAgICAgICAgIGl0ZXJhdGlvbnMrKzsK LSAgICAgICAgfQotICAgICAgICBpbnRlcnZhbC5zdG9wKCk7Ci0gICAgfSBlbHNlIHsKLSAgICAg ICAgdmFyIHN0YXJ0ID0gRGF0ZS5ub3coKTsKLSAgICAgICAgd2hpbGUgKERhdGUubm93KCkgLSBz dGFydCA8IG1pbGxpc2Vjb25kcykgewotICAgICAgICAgICAgLy8gTG9vcCBydW5zUGVySXRlcmF0 aW9uIHRpbWVzIHRvIHJlZHVjZSBlcnJvcnMgZHVlIHRvIHRoZSBvdmVyaGVhZCBhbmQgZ3JhbnVs YXJpdHkgb2YgdGhlIERhdGUgb2JqZWN0LgotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBydW5zUGVySXRlcmF0aW9uOyBpKyspCi0gICAgICAgICAgICAgICAgdGVzdChtYWduaXR1ZGUp OwotICAgICAgICAgICAgaXRlcmF0aW9ucysrOwotICAgICAgICB9CisgICAgdmFyIG5vd0Z1bmN0 aW9uID0gd2luZG93LnBlcmZvcm1hbmNlLm5vdyB8fCBEYXRlLm5vdzsKKyAgICB2YXIgc3RhcnQg PSBub3dGdW5jdGlvbigpOworICAgIHdoaWxlIChub3dGdW5jdGlvbigpIC0gc3RhcnQgPCBNYWdu aXR1ZGUubWlsbGlzZWNvbmRzUGVySXRlcmF0aW9uKSB7CisgICAgICAgIHRlc3QobWFnbml0dWRl KTsKKyAgICAgICAgaXRlcmF0aW9ucysrOwogICAgIH0KICAgICByZXR1cm4gaXRlcmF0aW9uczsK IH0K