147716 2015-08-05 19:04:32 -0700 Automate JSBench with run-benchmark 2015-08-06 15:23:42 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa barraclough benjamin cdumez commit-queue dewei_zhu fpizlo ggaren glenn kling oldest_to_newest 1115233 0 rniwa 2015-08-05 19:04:32 -0700 run-benchmark should support JSBench. 1115234 1 258336 rniwa 2015-08-05 19:09:39 -0700 Created attachment 258336 Added jsbench.plan 1115428 2 258336 cdumez 2015-08-06 13:39:09 -0700 Comment on attachment 258336 Added jsbench.plan View in context: https://bugs.webkit.org/attachment.cgi?id=258336&action=review r=me with a suggestion. > Tools/Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-jslib.plan:7 > + "remote_archive_type": "zip", It seems like we could detect the archive type based on the file extension of the remote_archive after it was downloaded. This would avoid adding an extra field to the plan.. 1115478 3 rniwa 2015-08-06 15:23:42 -0700 Committed r188065: <http://trac.webkit.org/changeset/188065> 258336 2015-08-05 19:09:39 -0700 2015-08-06 13:39:09 -0700 Added jsbench.plan bug-147716-20150805190930.patch text/plain 15416 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4ODAxNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI5IEBACisyMDE1LTA4LTA1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIEF1dG9tYXRlIEpTQmVuY2ggd2l0aCBydW4tYmVuY2htYXJrCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc3MTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBKU0JlbmNoIHBsYW4g dG8gcnVuLWJlbmNobWFyay4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9iZW5jaG1hcmtfYnVpbGRlci9nZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5Ogor ICAgICAgICAoR2VuZXJpY0JlbmNobWFya0J1aWxkZXIucHJlcGFyZSk6IFBhc3MgaW4gdGhlIGFy Y2hpdmUgdHlwZSB0byBfZmV0Y2hfcmVtb3RlX2FyY2hpdmUuCisgICAgICAgIChHZW5lcmljQmVu Y2htYXJrQnVpbGRlci5fZmV0Y2hfcmVtb3RlX2FyY2hpdmUpOiBBZGRlZCB0aGUgc3VwcG9ydCBm b3IgZXh0cmFjdGluZyBmaWxlcyBmcm9tIHRhci5neiBpbiBhZGRpdGlvbiB0byB6aXAuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9Ecm9t YWVvLnBhdGNoOiBGaXhlZCB0aGUgY29kaW5nIHN0eWxlLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvSlNCZW5jaC5wYXRjaDogQWRkZWQu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hl cy9KZXRTdHJlYW0ucGF0Y2g6IEZpeGVkIHRoZSBjb2Rpbmcgc3R5bGUuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9LcmFrZW4ucGF0Y2g6 IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRh L3BhdGNoZXMvT2N0YW5lLnBhdGNoOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1N1blNwaWRlci5wYXRjaDogRGl0dG8uCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvZHJv bWFlby1jc3NxdWVyeS5wbGFuOiBTcGVjaWZpZWQgdGhlIGFyY2hpdmUgdHlwZS4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9kcm9tYWVvLWRv bS5wbGFuOiBTcGVjaWZpZWQgdGhlIGFyY2hpdmUgdHlwZS4KKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9kcm9tYWVvLWpzbGliLnBsYW46IERp dHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3Bs YW5zL2pldHN0cmVhbS5wbGFuOiBGaXhlZCB0aGUgY29kaW5nIHN0eWxlLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL2pzYmVuY2gucGxhbjog QWRkZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEv cGxhbnMva3Jha2VuLnBsYW46IFNwZWNpZmllZCB0aGUgYXJjaGl2ZSB0eXBlLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL29jdGFuZS5wbGFu OiBEaXR0by4KKwogMjAxNS0wOC0wNSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgb3V0IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzE4Nzk3Mi4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9iZW5jaG1hcmtfYnVpbGRlci9nZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1h cmtfYnVpbGRlci9nZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5CShyZXZpc2lvbiAxODc5OTAp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX2J1 aWxkZXIvZ2VuZXJpY19iZW5jaG1hcmtfYnVpbGRlci5weQkod29ya2luZyBjb3B5KQpAQCAtNiw2 ICs2LDcgQEAgaW1wb3J0IG9zCiBpbXBvcnQgdXJsbGliCiBpbXBvcnQgc2h1dGlsCiBpbXBvcnQg c3VicHJvY2VzcworaW1wb3J0IHRhcmZpbGUKIAogZnJvbSB6aXBmaWxlIGltcG9ydCBaaXBGaWxl CiBmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIudXRpbHMgaW1wb3J0IGdldF9wYXRoX2Zy b21fcHJvamVjdF9yb290LCBmb3JjZV9yZW1vdmUKQEAgLTI1LDcgKzI2LDcgQEAgY2xhc3MgR2Vu ZXJpY0JlbmNobWFya0J1aWxkZXIob2JqZWN0KToKICAgICAgICAgaWYgJ2xvY2FsX2NvcHknIGlu IHBsYW46CiAgICAgICAgICAgICBzZWxmLl9jb3B5X2JlbmNobWFya190b190ZW1wX2RpcihwbGFu Wydsb2NhbF9jb3B5J10pCiAgICAgICAgIGVsaWYgJ3JlbW90ZV9hcmNoaXZlJyBpbiBwbGFuOgot ICAgICAgICAgICAgc2VsZi5fZmV0Y2hfcmVtb3RlX2FyY2hpdmUocGxhblsncmVtb3RlX2FyY2hp dmUnXSkKKyAgICAgICAgICAgIHNlbGYuX2ZldGNoX3JlbW90ZV9hcmNoaXZlKHBsYW5bJ3JlbW90 ZV9hcmNoaXZlJ10sIHBsYW5bJ3JlbW90ZV9hcmNoaXZlX3R5cGUnXSkKICAgICAgICAgZWxpZiAn c3ZuX3NvdXJjZScgaW4gcGxhbjoKICAgICAgICAgICAgIHNlbGYuX2NoZWNrb3V0X3dpdGhfc3Vi dmVyc2lvbihwbGFuWydzdm5fc291cmNlJ10pCiAgICAgICAgIGVsc2U6CkBAIC01NCwxMyArNTUs MTkgQEAgY2xhc3MgR2VuZXJpY0JlbmNobWFya0J1aWxkZXIob2JqZWN0KToKICAgICBkZWYgX2Nv cHlfYmVuY2htYXJrX3RvX3RlbXBfZGlyKHNlbGYsIGJlbmNobWFya19wYXRoKToKICAgICAgICAg c2h1dGlsLmNvcHl0cmVlKGdldF9wYXRoX2Zyb21fcHJvamVjdF9yb290KGJlbmNobWFya19wYXRo KSwgc2VsZi5fZGVzdCkKIAotICAgIGRlZiBfZmV0Y2hfcmVtb3RlX2FyY2hpdmUoc2VsZiwgYXJj aGl2ZV91cmwpOgotICAgICAgICBhcmNoaXZlX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5fd2Vi X3Jvb3QsICdhcmNoaXZlLnppcCcpCisgICAgZGVmIF9mZXRjaF9yZW1vdGVfYXJjaGl2ZShzZWxm LCBhcmNoaXZlX3VybCwgYXJjaGl2ZV90eXBlKToKKyAgICAgICAgYXNzZXJ0KGFyY2hpdmVfdHlw ZSA9PSAnemlwJyBvciBhcmNoaXZlX3R5cGUgPT0gJ3Rhci5neicpCisKKyAgICAgICAgYXJjaGl2 ZV9wYXRoID0gb3MucGF0aC5qb2luKHNlbGYuX3dlYl9yb290LCAnYXJjaGl2ZS4nICsgYXJjaGl2 ZV90eXBlKQogICAgICAgICBfbG9nLmluZm8oJ0Rvd25sb2FkaW5nICVzIHRvICVzJyAlIChhcmNo aXZlX3VybCwgYXJjaGl2ZV9wYXRoKSkKICAgICAgICAgdXJsbGliLnVybHJldHJpZXZlKGFyY2hp dmVfdXJsLCBhcmNoaXZlX3BhdGgpCiAKLSAgICAgICAgd2l0aCBaaXBGaWxlKGFyY2hpdmVfcGF0 aCwgJ3InKSBhcyBhcmNoaXZlOgotICAgICAgICAgICAgYXJjaGl2ZS5leHRyYWN0YWxsKHNlbGYu X2Rlc3QpCisgICAgICAgIGlmIGFyY2hpdmVfdHlwZSA9PSAnemlwJzoKKyAgICAgICAgICAgIHdp dGggWmlwRmlsZShhcmNoaXZlX3BhdGgsICdyJykgYXMgYXJjaGl2ZToKKyAgICAgICAgICAgICAg ICBhcmNoaXZlLmV4dHJhY3RhbGwoc2VsZi5fZGVzdCkKKyAgICAgICAgZWxpZiBhcmNoaXZlX3R5 cGUgPT0gJ3Rhci5neic6CisgICAgICAgICAgICB3aXRoIHRhcmZpbGUub3BlbihhcmNoaXZlX3Bh dGgsICdyOmd6JykgYXMgYXJjaGl2ZToKKyAgICAgICAgICAgICAgICBhcmNoaXZlLmV4dHJhY3Rh bGwoc2VsZi5fZGVzdCkKIAogICAgICAgICB1bmFyY2hpdmVkX2ZpbGVzID0gZmlsdGVyKGxhbWJk YSBuYW1lOiBub3QgbmFtZS5zdGFydHN3aXRoKCcuJyksIG9zLmxpc3RkaXIoc2VsZi5fZGVzdCkp CiAgICAgICAgIGlmIGxlbih1bmFyY2hpdmVkX2ZpbGVzKSA9PSAxOgpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9Ecm9tYWVvLnBhdGNo Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9k YXRhL3BhdGNoZXMvRHJvbWFlby5wYXRjaAkocmV2aXNpb24gMTg3OTkwKQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9Ecm9tYWVvLnBhdGNo CSh3b3JraW5nIGNvcHkpCkBAIC00MCw3ICs0MCw3IEBAIGluZGV4IDYzZDc3N2IuLjk1M2MwMjYg MTAwNzU1CiArCQkJeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtTGVuZ3RoIiwgcmVzdWx0 cy5sZW5ndGgpOwogKwkJCXhoci5zZXRSZXF1ZXN0SGVhZGVyKCJDb25uZWN0aW9uIiwgImNsb3Nl Iik7CiArCQkJeGhyLm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGZ1bmN0aW9uKCkgewotKwkJCWlmKHho ci5yZWFkeVN0YXRlID09IFhNTEh0dHBSZXF1ZXN0LkRPTkUgJiYgeGhyLnN0YXR1cyA9PSAyMDAp IHsKKysJCQlpZiAoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0cFJlcXVlc3QuRE9ORSAmJiB4aHIu c3RhdHVzID09IDIwMCkgewogKwkJCQkJY2xvc2VSZXF1ZXN0ID0gbmV3IFhNTEh0dHBSZXF1ZXN0 KCk7CiArCQkJCQljbG9zZVJlcXVlc3Qub3BlbigiR0VUIiwgIi9zaHV0ZG93biIpOwogKwkJCQkJ Y2xvc2VSZXF1ZXN0LnNlbmQoKTsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvSlNCZW5jaC5wYXRjaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0pTQmVuY2gu cGF0Y2gJKHJldmlzaW9uIDApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvZGF0YS9wYXRjaGVzL0pTQmVuY2gucGF0Y2gJKHdvcmtpbmcgY29weSkKQEAgLTAsMCAr MSw1NSBAQAorZGlmZiAtLWdpdCBhL2hhcm5lc3MuanMgYi9oYXJuZXNzLmpzCitpbmRleCA0Yjlk MjY5Li5mM2YxMjg1IDEwMDY0NAorLS0tIGEvaGFybmVzcy5qcworKysrIGIvaGFybmVzcy5qcwor QEAgLTEwNCw2ICsxMDQsNyBAQAorICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgfQorICAgICAgICAgfSBjYXRjaCAoZXgpIHt9CisrICAgICAgICBzZXRUaW1lb3V0KHJ1bkJl bmNobWFyaywgMjAwKTsKKyAgICAgICAgIGdvYi5vbmNsaWNrID0gZnVuY3Rpb24oKSB7CisgICAg ICAgICAgICAgZ29iLnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7CisgICAgICAgICAgICAgc2V0VGlt ZW91dChydW5CZW5jaG1hcmssIDIwMCk7CitAQCAtMjA3LDYgKzIwOCw4IEBACisgICAgICAgICB2 YXIgc3BjID0gIlx1MDBhMFx1MDBhMCI7CisgICAgICAgICB2YXIgc3BjMiA9IHNwYyArIHNwYzsK KyAKKysgICAgICAgIHZhciB0ZXN0cyA9IHt9OworKworICAgICAgICAgLy8gY2FsY3VsYXRlIGFs bCB0aGUgcmVhbCByZXN1bHRzCisgICAgICAgICBmb3IgKHZhciBiID0gMDsgYiA8IGJlbmNobWFy a3MubGVuZ3RoOyBiKyspIHsKKyAgICAgICAgICAgICB2YXIgYmVuY2htYXJrID0gYmVuY2htYXJr c1tiXTsKK0BAIC0yMjEsNiArMjI0LDkgQEAKKyAgICAgICAgICAgICAgICAgdmFyIGJtcmVzdWx0 cyA9IHJlc3VsdHNbYmVuY2htYXJrXVttb2RlXS5zbGljZSgta2VlcFJ1bnMpOworICAgICAgICAg ICAgICAgICBpZiAoYm1yZXN1bHRzLmxlbmd0aCA9PSAwKSBjb250aW51ZTsKKyAKKysgICAgICAg ICAgICAgICAgaWYgKHByKQorKyAgICAgICAgICAgICAgICAgICAgdGVzdHNbYmVuY2htYXJrXSA9 IHsnbWV0cmljcyc6IHsnVGltZSc6IHsnY3VycmVudCc6IGJtcmVzdWx0c319fTsKKysKKyAgICAg ICAgICAgICAgICAgLy8gZ2V0IHRoZSByYXcgcmVzdWx0cworICAgICAgICAgICAgICAgICB2YXIg cnIgPSBzcGMyICsgbW9kZSArICI6IFsiOworICAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGJtcmVzdWx0cy5sZW5ndGg7IGkrKykgeworQEAgLTI3Miw2ICsyNzgsMjMgQEAKKyAg ICAgICAgICAgICBwdG90YWxzLnB1c2goc3BjICsgY3VyUnVuICsgIiBydW5zIik7CisgICAgICAg ICBwdG90YWxzLnB1c2goIiIpOworIAorKyAgICAgICAgaWYgKHByKSB7CisrICAgICAgICAgICAg dmFyIGpzb25SZXN1bHRzID0gSlNPTi5zdHJpbmdpZnkoeyJKU0JlbmNoIjogeyJtZXRyaWNzIjog eyJUaW1lIjogWyJHZW9tZXRyaWMiXX0sICJ0ZXN0cyI6IHRlc3RzfX0pOworKyAgICAgICAgICAg IHZhciB4aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKKysgICAgICAgICAgICB4aHIub3Blbigi UE9TVCIsICIvcmVwb3J0Iik7CisrICAgICAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNv bnRlbnQtVHlwZSIsICJhcHBsaWNhdGlvbi9qc29uIik7CisrICAgICAgICAgICAgeGhyLnNldFJl cXVlc3RIZWFkZXIoIkNvbnRlbnQtTGVuZ3RoIiwganNvblJlc3VsdHMubGVuZ3RoKTsKKysgICAg ICAgICAgICB4aHIuc2V0UmVxdWVzdEhlYWRlcigiQ29ubmVjdGlvbiIsICJjbG9zZSIpOworKyAg ICAgICAgICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBmdW5jdGlvbigpIHsKKysgICAgICAg ICAgICBpZiAoeGhyLnJlYWR5U3RhdGUgPT0gWE1MSHR0cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3Rh dHVzID09IDIwMCkgeworKyAgICAgICAgICAgICAgICAgICAgY2xvc2VSZXF1ZXN0ID0gbmV3IFhN TEh0dHBSZXF1ZXN0KCk7CisrICAgICAgICAgICAgICAgICAgICBjbG9zZVJlcXVlc3Qub3Blbigi R0VUIiwgIi9zaHV0ZG93biIpOworKyAgICAgICAgICAgICAgICAgICAgY2xvc2VSZXF1ZXN0LnNl bmQoKTsKKysgICAgICAgICAgICAgICAgfQorKyAgICAgICAgICAgIH0KKysgICAgICAgICAgICB4 aHIuc2VuZChqc29uUmVzdWx0cyk7CisrICAgICAgICB9CisrCisgICAgICAgICAvLyBpZiB0aGVy ZSBhcmUgZXJyb3JzLCBtYXJrIHRob3NlIHRvbworICAgICAgICAgaWYgKCJlcnJvcnMiIGluIHJl c3VsdHMpIHsKKyAgICAgICAgICAgICBwdG90YWxzLnB1c2goIkVSUk9SUzoiKTsKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvSmV0U3Ry ZWFtLnBhdGNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9kYXRhL3BhdGNoZXMvSmV0U3RyZWFtLnBhdGNoCShyZXZpc2lvbiAxODc5OTApCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL0pl dFN0cmVhbS5wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEsNyBAQCBpbmRleCA3M2Vl NDIwLi42MGY1ODdjIDEwMDY0NAogKyAgICAgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbm5l Y3Rpb24iLCAiY2xvc2UiKTsKICsgCiArICAgICAgICB4aHIub25yZWFkeXN0YXRlY2hhbmdlID0g ZnVuY3Rpb24oKSB7Ci0rICAgICAgICBpZih4aHIucmVhZHlTdGF0ZSA9PSBYTUxIdHRwUmVxdWVz dC5ET05FICYmIHhoci5zdGF0dXMgPT0gMjAwKSB7CisrICAgICAgICBpZiAoeGhyLnJlYWR5U3Rh dGUgPT0gWE1MSHR0cFJlcXVlc3QuRE9ORSAmJiB4aHIuc3RhdHVzID09IDIwMCkgewogKyAgICAg ICAgICAgICAgICBjbG9zZVJlcXVlc3QgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKICsgICAgICAg ICAgICAgICAgY2xvc2VSZXF1ZXN0Lm9wZW4oIkdFVCIsICIvc2h1dGRvd24iKTsKICsgICAgICAg ICAgICAgICAgY2xvc2VSZXF1ZXN0LnNlbmQoKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9LcmFrZW4ucGF0Y2gKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9L cmFrZW4ucGF0Y2gJKHJldmlzaW9uIDE4Nzk5MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvS3Jha2VuLnBhdGNoCSh3b3JraW5nIGNvcHkp CkBAIC0zMiw3ICszMiw3IEBAIGluZGV4IGJmYjJjOTQuLjVhZDE3MDQgMTAwNjQ0CiArICAgIHho ci5zZXRSZXF1ZXN0SGVhZGVyKCJDb250ZW50LUxlbmd0aCIsIHJlc3VsdHMubGVuZ3RoKTsKICsg ICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbm5lY3Rpb24iLCAiY2xvc2UiKTsKICsgICAgeGhy Lm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGZ1bmN0aW9uKCkgewotKyAgICBpZih4aHIucmVhZHlTdGF0 ZSA9PSBYTUxIdHRwUmVxdWVzdC5ET05FICYmIHhoci5zdGF0dXMgPT0gMjAwKSB7CisrICAgIGlm ICh4aHIucmVhZHlTdGF0ZSA9PSBYTUxIdHRwUmVxdWVzdC5ET05FICYmIHhoci5zdGF0dXMgPT0g MjAwKSB7CiArICAgICAgICAgICAgY2xvc2VSZXF1ZXN0ID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7 CiArICAgICAgICAgICAgY2xvc2VSZXF1ZXN0Lm9wZW4oIkdFVCIsICIvc2h1dGRvd24iKTsKICsg ICAgICAgICAgICBjbG9zZVJlcXVlc3Quc2VuZCgpOwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9PY3RhbmUucGF0Y2gKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hl cy9PY3RhbmUucGF0Y2gJKHJldmlzaW9uIDE4Nzk5MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BhdGNoZXMvT2N0YW5lLnBhdGNoCSh3b3JraW5nIGNv cHkpCkBAIC01Niw3ICs1Niw3IEBAIGluZGV4IDc3Y2JkZmIuLmZlNTZmYzQKICsgICAgeGhyLnNl dFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtTGVuZ3RoIiwgcmVzdWx0cy5sZW5ndGgpOwogKyAgICB4 aHIuc2V0UmVxdWVzdEhlYWRlcigiQ29ubmVjdGlvbiIsICJjbG9zZSIpOwogKyAgICB4aHIub25y ZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24oKSB7Ci0rICAgIGlmKHhoci5yZWFkeVN0YXRlID09 IFhNTEh0dHBSZXF1ZXN0LkRPTkUgJiYgeGhyLnN0YXR1cyA9PSAyMDApIHsKKysgICAgaWYgKHho ci5yZWFkeVN0YXRlID09IFhNTEh0dHBSZXF1ZXN0LkRPTkUgJiYgeGhyLnN0YXR1cyA9PSAyMDAp IHsKICsgICAgICAgICAgICBjbG9zZVJlcXVlc3QgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKICsg ICAgICAgICAgICBjbG9zZVJlcXVlc3Qub3BlbigiR0VUIiwgIi9zaHV0ZG93biIpOwogKyAgICAg ICAgICAgIGNsb3NlUmVxdWVzdC5zZW5kKCk7CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVzL1N1blNwaWRlci5wYXRjaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wYXRjaGVz L1N1blNwaWRlci5wYXRjaAkocmV2aXNpb24gMTg3OTkwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGF0Y2hlcy9TdW5TcGlkZXIucGF0Y2gJKHdvcmtp bmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgaW5kZXggMDcwMGJiMi4uMmRkZTAxYSAxMDA2NDQK ICsgICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtTGVuZ3RoIiwgcmVzdWx0cy5sZW5n dGgpOwogKyAgICB4aHIuc2V0UmVxdWVzdEhlYWRlcigiQ29ubmVjdGlvbiIsICJjbG9zZSIpOwog KyAgICB4aHIub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24oKSB7Ci0rICAgIGlmKHhoci5y ZWFkeVN0YXRlID09IFhNTEh0dHBSZXF1ZXN0LkRPTkUgJiYgeGhyLnN0YXR1cyA9PSAyMDApIHsK KysgICAgaWYgKHhoci5yZWFkeVN0YXRlID09IFhNTEh0dHBSZXF1ZXN0LkRPTkUgJiYgeGhyLnN0 YXR1cyA9PSAyMDApIHsKICsgICAgICAgICAgICBjbG9zZVJlcXVlc3QgPSBuZXcgWE1MSHR0cFJl cXVlc3QoKTsKICsgICAgICAgICAgICBjbG9zZVJlcXVlc3Qub3BlbigiR0VUIiwgIi9zaHV0ZG93 biIpOwogKyAgICAgICAgICAgIGNsb3NlUmVxdWVzdC5zZW5kKCk7CkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9kcm9tYWVvLWNzc3F1ZXJ5 LnBsYW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2RhdGEvcGxhbnMvZHJvbWFlby1jc3NxdWVyeS5wbGFuCShyZXZpc2lvbiAxODc5OTApCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9kcm9t YWVvLWNzc3F1ZXJ5LnBsYW4JKHdvcmtpbmcgY29weSkKQEAgLTQsNiArNCw3IEBACiAgICAgImNv dW50IjogMSwKICAgICAiYmVuY2htYXJrX2J1aWxkZXIiOiAiR2VuZXJpY0JlbmNobWFya0J1aWxk ZXIiLAogICAgICJyZW1vdGVfYXJjaGl2ZSI6ICJodHRwczovL2dpdGh1Yi5jb20vamVyZXNpZy9k cm9tYWVvL2FyY2hpdmUvZWQ3ZTZhOGYyNWVhNzJmNDVjMTkxZjM0YTY4NzIyZjgwZGMzYzUxMy56 aXAiLAorICAgICJyZW1vdGVfYXJjaGl2ZV90eXBlIjogInppcCIsCiAgICAgImJlbmNobWFya19w YXRjaCI6ICJkYXRhL3BhdGNoZXMvRHJvbWFlby5wYXRjaCIsCiAgICAgImNyZWF0ZV9zY3JpcHQi OiBbIm1ha2UiLCAid2ViIl0sCiAgICAgImVudHJ5X3BvaW50IjogIndlYi9pbmRleC5odG1sP2Nz c3F1ZXJ5IiwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9k YXRhL3BsYW5zL2Ryb21hZW8tZG9tLnBsYW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvZHJvbWFlby1kb20ucGxhbgkocmV2 aXNpb24gMTg3OTkwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L2RhdGEvcGxhbnMvZHJvbWFlby1kb20ucGxhbgkod29ya2luZyBjb3B5KQpAQCAtNCw2ICs0LDcg QEAKICAgICAiY291bnQiOiAxLAogICAgICJiZW5jaG1hcmtfYnVpbGRlciI6ICJHZW5lcmljQmVu Y2htYXJrQnVpbGRlciIsCiAgICAgInJlbW90ZV9hcmNoaXZlIjogImh0dHBzOi8vZ2l0aHViLmNv bS9qZXJlc2lnL2Ryb21hZW8vYXJjaGl2ZS9lZDdlNmE4ZjI1ZWE3MmY0NWMxOTFmMzRhNjg3MjJm ODBkYzNjNTEzLnppcCIsCisgICAgInJlbW90ZV9hcmNoaXZlX3R5cGUiOiAiemlwIiwKICAgICAi YmVuY2htYXJrX3BhdGNoIjogImRhdGEvcGF0Y2hlcy9Ecm9tYWVvLnBhdGNoIiwKICAgICAiY3Jl YXRlX3NjcmlwdCI6IFsibWFrZSIsICJ3ZWIiXSwKICAgICAiZW50cnlfcG9pbnQiOiAid2ViL2lu ZGV4Lmh0bWw/ZG9tIiwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9kYXRhL3BsYW5zL2Ryb21hZW8tanNsaWIucGxhbgo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0YS9wbGFucy9kcm9tYWVvLWpzbGli LnBsYW4JKHJldmlzaW9uIDE4Nzk5MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9kYXRhL3BsYW5zL2Ryb21hZW8tanNsaWIucGxhbgkod29ya2luZyBjb3B5KQpA QCAtNCw2ICs0LDcgQEAKICAgICAiY291bnQiOiAxLAogICAgICJiZW5jaG1hcmtfYnVpbGRlciI6 ICJHZW5lcmljQmVuY2htYXJrQnVpbGRlciIsCiAgICAgInJlbW90ZV9hcmNoaXZlIjogImh0dHBz Oi8vZ2l0aHViLmNvbS9qZXJlc2lnL2Ryb21hZW8vYXJjaGl2ZS9lZDdlNmE4ZjI1ZWE3MmY0NWMx OTFmMzRhNjg3MjJmODBkYzNjNTEzLnppcCIsCisgICAgInJlbW90ZV9hcmNoaXZlX3R5cGUiOiAi emlwIiwKICAgICAiYmVuY2htYXJrX3BhdGNoIjogImRhdGEvcGF0Y2hlcy9Ecm9tYWVvLnBhdGNo IiwKICAgICAiY3JlYXRlX3NjcmlwdCI6IFsibWFrZSIsICJ3ZWIiXSwKICAgICAiZW50cnlfcG9p bnQiOiAid2ViL2luZGV4Lmh0bWw/anNsaWIiLApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvamV0c3RyZWFtLnBsYW4KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvamV0 c3RyZWFtLnBsYW4JKHJldmlzaW9uIDE4Nzk5MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL2pldHN0cmVhbS5wbGFuCSh3b3JraW5nIGNvcHkp CkBAIC0xLDYgKzEsNiBAQAogewogICAgICJodHRwX3NlcnZlcl9kcml2ZXIiOiAiU2ltcGxlSFRU UFNlcnZlckRyaXZlciIsIAotICAgICJ0aW1lb3V0IiA6IDYwMCwKKyAgICAidGltZW91dCI6IDYw MCwKICAgICAiY291bnQiOiA1LAogICAgICJiZW5jaG1hcmtfYnVpbGRlciI6ICJHZW5lcmljQmVu Y2htYXJrQnVpbGRlciIsCiAgICAgInN2bl9zb3VyY2UiOiAiaHR0cHM6Ly9zdm4ud2Via2l0Lm9y Zy9yZXBvc2l0b3J5L3dlYmtpdC90cnVuay9QZXJmb3JtYW5jZVRlc3RzL0pldFN0cmVhbS9AcjE4 MzA5MSIsCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZGF0 YS9wbGFucy9qc2JlbmNoLnBsYW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvanNiZW5jaC5wbGFuCShyZXZpc2lvbiAwKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMvanNi ZW5jaC5wbGFuCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTEgQEAKK3sKKyAgICAiaHR0cF9z ZXJ2ZXJfZHJpdmVyIjogIlNpbXBsZUhUVFBTZXJ2ZXJEcml2ZXIiLCAKKyAgICAidGltZW91dCI6 IDYwMCwKKyAgICAiY291bnQiOiAxLAorICAgICJiZW5jaG1hcmtfYnVpbGRlciI6ICJHZW5lcmlj QmVuY2htYXJrQnVpbGRlciIsCisgICAgInJlbW90ZV9hcmNoaXZlIjogImh0dHA6Ly9wbGcudXdh dGVybG9vLmNhL35keW5qcy9qc2JlbmNoL3N1aXRlL2pzYmVuY2gtMjAxMy4xLnRhci5neiIsCisg ICAgInJlbW90ZV9hcmNoaXZlX3R5cGUiOiAidGFyLmd6IiwKKyAgICAiYmVuY2htYXJrX3BhdGNo IjogImRhdGEvcGF0Y2hlcy9KU0JlbmNoLnBhdGNoIiwKKyAgICAiZW50cnlfcG9pbnQiOiAiaW5k ZXguaHRtbCIsCisgICAgIm91dHB1dF9maWxlIjogImpzYmVuY2gucmVzdWx0IgorfQpJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvcGxhbnMva3Jha2Vu LnBsYW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2RhdGEvcGxhbnMva3Jha2VuLnBsYW4JKHJldmlzaW9uIDE4Nzk5MCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL2tyYWtlbi5wbGFuCSh3 b3JraW5nIGNvcHkpCkBAIC00LDYgKzQsNyBAQAogICAgICJjb3VudCI6IDUsCiAgICAgImJlbmNo bWFya19idWlsZGVyIjogIkdlbmVyaWNCZW5jaG1hcmtCdWlsZGVyIiwKICAgICAicmVtb3RlX2Fy Y2hpdmUiOiAiaHR0cDovL2hnLm1vemlsbGEub3JnL3Byb2plY3RzL2tyYWtlbi9hcmNoaXZlL3Rp cC56aXAiLAorICAgICJyZW1vdGVfYXJjaGl2ZV90eXBlIjogInppcCIsCiAgICAgImJlbmNobWFy a19wYXRjaCI6ICJkYXRhL3BhdGNoZXMvS3Jha2VuLnBhdGNoIiwKICAgICAiY3JlYXRlX3Njcmlw dCI6IFsicHl0aG9uIiwgIm1ha2UtaG9zdGVkLnB5Il0sCiAgICAgImVudHJ5X3BvaW50IjogImhv c3RlZC9rcmFrZW4tMS4xL2RyaXZlci5odG1sIiwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL29jdGFuZS5wbGFuCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL29jdGFu ZS5wbGFuCShyZXZpc2lvbiAxODc5OTApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvZGF0YS9wbGFucy9vY3RhbmUucGxhbgkod29ya2luZyBjb3B5KQpAQCAtNCw2 ICs0LDcgQEAKICAgICAiY291bnQiOiA1LAogICAgICJiZW5jaG1hcmtfYnVpbGRlciI6ICJHZW5l cmljQmVuY2htYXJrQnVpbGRlciIsCiAgICAgInJlbW90ZV9hcmNoaXZlIjogImh0dHBzOi8vZ2l0 aHViLmNvbS9jaHJvbWl1bS9vY3RhbmUtYmVuY2htYXJrL2FyY2hpdmUvZmFiMDlhZWYwMWMyYTU1 NjBjMjJjZGMxYzFhMjQ1MWMwZDBmNGNkYy56aXAiLAorICAgICJyZW1vdGVfYXJjaGl2ZV90eXBl IjogInppcCIsCiAgICAgImJlbmNobWFya19wYXRjaCI6ICJkYXRhL3BhdGNoZXMvT2N0YW5lLnBh dGNoIiwKICAgICAiZW50cnlfcG9pbnQiOiAiaW5kZXguaHRtbD9hdXRvPTEiLAogICAgICJvdXRw dXRfZmlsZSI6ICJvY3RhbmUucmVzdWx0Igo=