133438 2014-06-01 13:52:01 -0700 DYEBench: Move test states into benchmarkClient and remove the closure 2014-06-01 14:12:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133437 1 rniwa rniwa barraclough benjamin darin kling mjs oldest_to_newest 1012857 0 rniwa 2014-06-01 13:52:01 -0700 The local variables in the closure used to keep states for benchmarkClient is making the code less comprehensible. Move them onto benchmarkClient itself. 1012858 1 232355 rniwa 2014-06-01 13:54:36 -0700 Created attachment 232355 Cleanup 1012859 2 232356 rniwa 2014-06-01 13:57:41 -0700 Created attachment 232356 Reverted the erroneous change to the number of iterations 1012861 3 rniwa 2014-06-01 14:12:04 -0700 Thanks again! 1012862 4 rniwa 2014-06-01 14:12:27 -0700 Committed r169517: <http://trac.webkit.org/changeset/169517> 232355 2014-06-01 13:54:36 -0700 2014-06-01 13:57:38 -0700 Cleanup bug-133438-20140601135411.patch text/plain 6421 rniwa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjk1MTYpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA2LTAxICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERZRUJlbmNoOiBNb3Zl IHRlc3Qgc3RhdGVzIGludG8gYmVuY2htYXJrQ2xpZW50IGFuZCByZW1vdmUgdGhlIGNsb3N1cmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzQzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIGFs bCBsb2NhbCB2YXJpYWJsZXMgaW4gdGhlIGNsb3N1cmUgd3JhcHBpbmcgYmVuY2htYXJrQ2xpZW50 IG9udG8gdGhlIG9iamVjdCBpdHNlbGYKKyAgICAgICAgYW5kIHJlbW92ZWQgdGhlIGNsb3N1cmUg dG8gaW1wcm92ZSB0aGUgcmVhZGFiaWxpdHkgb2YgdGhlIGNvZGUuCisKKyAgICAgICAgKiBEb1lv dUV2ZW5CZW5jaC9GdWxsLmh0bWw6CisgICAgICAgICogRG9Zb3VFdmVuQmVuY2gvcmVzb3VyY2Vz L21haW4uanM6CisgICAgICAgICh3aW5kb3cuYmVuY2htYXJrQ2xpZW50LndpbGxSdW5UZXN0KToK KyAgICAgICAgKHdpbmRvdy5iZW5jaG1hcmtDbGllbnQuZGlkUnVuVGVzdCk6CisgICAgICAgICh3 aW5kb3cuYmVuY2htYXJrQ2xpZW50LmRpZFJ1blN1aXRlcyk6CisgICAgICAgICh3aW5kb3cuYmVu Y2htYXJrQ2xpZW50LndpbGxTdGFydEZpcnN0SXRlcmF0aW9uKToKKyAgICAgICAgKHdpbmRvdy5i ZW5jaG1hcmtDbGllbnQuZGlkRmluaXNoTGFzdEl0ZXJhdGlvbik6CisgICAgICAgICh3aW5kb3cu YmVuY2htYXJrQ2xpZW50Ll9hZGRSZXN1bHQpOiBNb3ZlZC4KKyAgICAgICAgKC4pOiBEZWxldGVk LgorCiAyMDE0LTA2LTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIERZRUJlbmNoOiBTcGxpdCBzdHlsZXNoZWV0cyBhbmQgc2NyaXB0cyBpbiBGdWxsLmh0bWwg aW50byBzZXBhcmF0ZSBmaWxlcwpJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9Eb1lvdUV2ZW5CZW5j aC9GdWxsLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9Eb1lvdUV2ZW5CZW5j aC9GdWxsLmh0bWwJKHJldmlzaW9uIDE2OTUxNikKKysrIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VF dmVuQmVuY2gvRnVsbC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yLDcgKzIsNyBAQAogPGh0bWw+ CiA8aGVhZD4KICAgICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRl eHQvaHRtbDsgY2hhcnNldD11dGYtOCI+Ci0gICAgPHRpdGxlPkRvWW91RXZlbkJlbmNoIHYwLjE2 PC90aXRsZT4KKyAgICA8dGl0bGU+RG9Zb3VFdmVuQmVuY2ggdjAuMTc8L3RpdGxlPgogICAgIDxs aW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0icmVzb3VyY2VzL21haW4uY3NzIj4KICAgICA8c2Ny aXB0IHNyYz0icmVzb3VyY2VzL21haW4uanMiIGRlZmVyPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg c3JjPSJyZXNvdXJjZXMvYmVuY2htYXJrLXJ1bm5lci5qcyIgZGVmZXI+PC9zY3JpcHQ+CkluZGV4 OiBQZXJmb3JtYW5jZVRlc3RzL0RvWW91RXZlbkJlbmNoL3Jlc291cmNlcy9tYWluLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VFdmVuQmVuY2gvcmVzb3VyY2VzL21haW4u anMJKHJldmlzaW9uIDE2OTUxNikKKysrIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VFdmVuQmVuY2gv cmVzb3VyY2VzL21haW4uanMJKHdvcmtpbmcgY29weSkKQEAgLTEsNTYgKzEsMzcgQEAKLShmdW5j dGlvbiAoKSB7Ci0KLXZhciB2YWx1ZXMgPSBbXTsKLXZhciByZXN1bHRDb250YWluZXIgPSBudWxs OwotdmFyIHRpdGxlOwotdmFyIHByb2dyZXNzQ29udGFpbmVyOwotdmFyIHByb2dyZXNzOwotdmFy IGl0ZXJhdGlvbk51bWJlciA9IDA7Ci12YXIgZmluaXNoZWRUZXN0Q291bnQgPSAwOwotCi1mdW5j dGlvbiBhZGRSZXN1bHQodGl0bGUsIHZhbHVlKSB7Ci0gICAgaWYgKCFyZXN1bHRDb250YWluZXIp IHsKLSAgICAgICAgcmVzdWx0Q29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgndGFi bGUnKTsKLSAgICAgICAgdmFyIGNhcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdjYXB0 aW9uJyk7Ci0gICAgICAgIGNhcHRpb24udGV4dENvbnRlbnQgPSBkb2N1bWVudC50aXRsZTsKLSAg ICAgICAgcmVzdWx0Q29udGFpbmVyLmFwcGVuZENoaWxkKGNhcHRpb24pOwotICAgICAgICBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKHJlc3VsdENvbnRhaW5lcik7Ci0gICAgfQotICAgIGlmICgh dGl0bGUpCi0gICAgICAgIHJldHVybjsKLSAgICB2YXIgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgndHInKTsKLSAgICB2YXIgdGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCd0aCcpOwot ICAgIHRoLnRleHRDb250ZW50ID0gdGl0bGU7Ci0gICAgdmFyIHRkID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgndGQnKTsKLSAgICB0ZC50ZXh0Q29udGVudCA9IHZhbHVlOwotICAgIHJvdy5hcHBl bmRDaGlsZCh0aCk7Ci0gICAgcm93LmFwcGVuZENoaWxkKHRkKTsKLSAgICByZXN1bHRDb250YWlu ZXIuYXBwZW5kQ2hpbGQocm93KTsKLX0KLQogd2luZG93LmJlbmNobWFya0NsaWVudCA9IHsKLSAg ICBpdGVyYXRpb25Db3VudDogMjAsCi0gICAgd2lsbFJ1blRlc3Q6IGZ1bmN0aW9uICgpIHsKLSAg ICAgICAgaWYgKCFwcm9ncmVzcykgewotICAgICAgICAgICAgLy8gV2UgZG9uJ3QgdXNlIHRoZSBy ZWFsIHByb2dyZXNzIGVsZW1lbnQgYXMgc29tZSBpbXBsZW1lbnRhdGlvbnMgYW5pbWF0ZSBpdC4K LSAgICAgICAgICAgIHByb2dyZXNzQ29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgn ZGl2Jyk7Ci0gICAgICAgICAgICBwcm9ncmVzc0NvbnRhaW5lci5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCdkaXYnKSk7Ci0gICAgICAgICAgICBwcm9ncmVzc0NvbnRhaW5lci5p ZCA9ICdwcm9ncmVzc0NvbnRhaW5lcic7Ci0gICAgICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKHByb2dyZXNzQ29udGFpbmVyKTsKLSAgICAgICAgICAgIHByb2dyZXNzID0gcHJvZ3Jl c3NDb250YWluZXIuZmlyc3RDaGlsZDsKLSAgICAgICAgfQotICAgICAgICBhZGRSZXN1bHQoKTsK LSAgICB9LAorICAgIGl0ZXJhdGlvbkNvdW50OiAyLAorICAgIF9maW5pc2hlZFRlc3RDb3VudDog MCwKKyAgICBfaXRlcmF0aW9uTnVtYmVyOiAwLAorICAgIF90aW1lVmFsdWVzOiBbXSwKKyAgICBf cHJvZ3Jlc3M6IG51bGwsCisgICAgX3Byb2dyZXNzQ29tcGxldGVkOiBudWxsLAorICAgIF9yZXN1 bHRDb250YWluZXI6IG51bGwsCisgICAgd2lsbFJ1blRlc3Q6IGZ1bmN0aW9uICgpIHsgfSwKICAg ICBkaWRSdW5UZXN0OiBmdW5jdGlvbiAoKSB7Ci0gICAgICAgIGZpbmlzaGVkVGVzdENvdW50Kys7 Ci0gICAgICAgIHByb2dyZXNzLnN0eWxlLndpZHRoID0gKGZpbmlzaGVkVGVzdENvdW50ICogMTAw IC8gdGhpcy50ZXN0c0NvdW50KSArICclJzsKKyAgICAgICAgdGhpcy5fZmluaXNoZWRUZXN0Q291 bnQrKzsKKyAgICAgICAgdGhpcy5fcHJvZ3Jlc3NDb21wbGV0ZWQuc3R5bGUud2lkdGggPSAodGhp cy5fZmluaXNoZWRUZXN0Q291bnQgKiAxMDAgLyB0aGlzLnRlc3RzQ291bnQpICsgJyUnOwogICAg IH0sCiAgICAgZGlkUnVuU3VpdGVzOiBmdW5jdGlvbiAobWVhc3VyZWRWYWx1ZXMpIHsKLSAgICAg ICAgdmFsdWVzLnB1c2gobWVhc3VyZWRWYWx1ZXMudG90YWwpOwotICAgICAgICBpdGVyYXRpb25O dW1iZXIrKzsKLSAgICAgICAgYWRkUmVzdWx0KCdJdGVyYXRpb24gJyArIGl0ZXJhdGlvbk51bWJl ciwgbWVhc3VyZWRWYWx1ZXMudG90YWwudG9GaXhlZCgyKSArICcgbXMnKTsKKyAgICAgICAgdGhp cy5fdGltZVZhbHVlcy5wdXNoKG1lYXN1cmVkVmFsdWVzLnRvdGFsKTsKKyAgICAgICAgdGhpcy5f aXRlcmF0aW9uTnVtYmVyKys7CisgICAgICAgIHRoaXMuX2FkZFJlc3VsdCgnSXRlcmF0aW9uICcg KyB0aGlzLl9pdGVyYXRpb25OdW1iZXIsIG1lYXN1cmVkVmFsdWVzLnRvdGFsLnRvRml4ZWQoMikg KyAnIG1zJyk7CisgICAgfSwKKyAgICB3aWxsU3RhcnRGaXJzdEl0ZXJhdGlvbjogZnVuY3Rpb24g KCkgeworICAgICAgICAvLyBXZSBkb24ndCB1c2UgdGhlIHJlYWwgcHJvZ3Jlc3MgZWxlbWVudCBh cyBzb21lIGltcGxlbWVudGF0aW9ucyBhbmltYXRlIGl0LgorICAgICAgICB0aGlzLl9wcm9ncmVz cyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOworICAgICAgICB0aGlzLl9wcm9ncmVz cy5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKSk7CisgICAgICAgIHRo aXMuX3Byb2dyZXNzLmlkID0gJ3Byb2dyZXNzQ29udGFpbmVyJzsKKyAgICAgICAgZG9jdW1lbnQu Ym9keS5hcHBlbmRDaGlsZCh0aGlzLl9wcm9ncmVzcyk7CisgICAgICAgIHRoaXMuX3Byb2dyZXNz Q29tcGxldGVkID0gdGhpcy5fcHJvZ3Jlc3MuZmlyc3RDaGlsZDsKKworICAgICAgICB0aGlzLl9y ZXN1bHRDb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCd0YWJsZScpOworICAgICAg ICB2YXIgY2FwdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2NhcHRpb24nKTsKKyAgICAg ICAgY2FwdGlvbi50ZXh0Q29udGVudCA9IGRvY3VtZW50LnRpdGxlOworICAgICAgICB0aGlzLl9y ZXN1bHRDb250YWluZXIuYXBwZW5kQ2hpbGQoY2FwdGlvbik7CisgICAgICAgIGRvY3VtZW50LmJv ZHkuYXBwZW5kQ2hpbGQodGhpcy5fcmVzdWx0Q29udGFpbmVyKTsKICAgICB9LAogICAgIGRpZEZp bmlzaExhc3RJdGVyYXRpb246IGZ1bmN0aW9uICgpIHsKKyAgICAgICAgdmFyIHZhbHVlcyA9IHRo aXMuX3RpbWVWYWx1ZXM7CiAgICAgICAgIHZhciBzdW0gPSB2YWx1ZXMucmVkdWNlKGZ1bmN0aW9u IChhLCBiKSB7IHJldHVybiBhICsgYjsgfSwgMCk7CiAgICAgICAgIHZhciBhcml0aG1ldGljTWVh biA9IHN1bSAvIHZhbHVlcy5sZW5ndGg7CiAgICAgICAgIHZhciBtZWFuTGFiZWwgPSBhcml0aG1l dGljTWVhbi50b0ZpeGVkKDIpICsgJyBtcyc7CkBAIC01OSwxMyArNDAsMjEgQEAgd2luZG93LmJl bmNobWFya0NsaWVudCA9IHsKICAgICAgICAgICAgIHZhciBwcmVjZW50RGVsdGEgPSBkZWx0YSAq IDEwMCAvIGFyaXRobWV0aWNNZWFuOwogICAgICAgICAgICAgbWVhbkxhYmVsICs9ICcgXHhiMSAn ICsgZGVsdGEudG9GaXhlZCgyKSArICcgbXMgKCcgKyBwcmVjZW50RGVsdGEudG9GaXhlZCgyKSAr ICclKSc7CiAgICAgICAgIH0KLSAgICAgICAgYWRkUmVzdWx0KCdBcml0aG1ldGljIE1lYW4nLCBt ZWFuTGFiZWwpOwotICAgICAgICBwcm9ncmVzc0NvbnRhaW5lci5wYXJlbnROb2RlLnJlbW92ZUNo aWxkKHByb2dyZXNzQ29udGFpbmVyKTsKKyAgICAgICAgdGhpcy5fYWRkUmVzdWx0KCdBcml0aG1l dGljIE1lYW4nLCBtZWFuTGFiZWwpOworICAgICAgICB0aGlzLl9wcm9ncmVzcy5wYXJlbnROb2Rl LnJlbW92ZUNoaWxkKHRoaXMuX3Byb2dyZXNzKTsKKyAgICB9LAorICAgIF9hZGRSZXN1bHQ6IGZ1 bmN0aW9uICh0aXRsZSwgdmFsdWUpIHsKKyAgICAgICAgdmFyIHJvdyA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoJ3RyJyk7CisgICAgICAgIHZhciB0aCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo J3RoJyk7CisgICAgICAgIHRoLnRleHRDb250ZW50ID0gdGl0bGU7CisgICAgICAgIHZhciB0ZCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3RkJyk7CisgICAgICAgIHRkLnRleHRDb250ZW50ID0g dmFsdWU7CisgICAgICAgIHJvdy5hcHBlbmRDaGlsZCh0aCk7CisgICAgICAgIHJvdy5hcHBlbmRD aGlsZCh0ZCk7CisgICAgICAgIHRoaXMuX3Jlc3VsdENvbnRhaW5lci5hcHBlbmRDaGlsZChyb3cp OwogICAgIH0KIH0KIAotfSkoKTsKLQogZnVuY3Rpb24gc3RhcnRCZW5jaG1hcmsoKSB7CiAgICAg dmFyIGVuYWJsZWRTdWl0ZXMgPSBTdWl0ZXMuZmlsdGVyKGZ1bmN0aW9uIChzdWl0ZSkgeyByZXR1 cm4gIXN1aXRlLmRpc2FibGVkIH0pOwogICAgIHZhciB0b3RhbFN1YnRlc3RDb3VudCA9IGVuYWJs ZWRTdWl0ZXMucmVkdWNlKGZ1bmN0aW9uICh0ZXN0c0NvdW50LCBzdWl0ZSkgeyByZXR1cm4gdGVz dHNDb3VudCArIHN1aXRlLnRlc3RzLmxlbmd0aDsgfSwgMCk7Cg== 232356 2014-06-01 13:57:41 -0700 2014-06-01 14:11:18 -0700 Reverted the erroneous change to the number of iterations bug-133438-20140601135717.patch text/plain 6397 rniwa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjk1MTYpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA2LTAxICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERZRUJlbmNoOiBNb3Zl IHRlc3Qgc3RhdGVzIGludG8gYmVuY2htYXJrQ2xpZW50IGFuZCByZW1vdmUgdGhlIGNsb3N1cmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzQzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIGFs bCBsb2NhbCB2YXJpYWJsZXMgaW4gdGhlIGNsb3N1cmUgd3JhcHBpbmcgYmVuY2htYXJrQ2xpZW50 IG9udG8gdGhlIG9iamVjdCBpdHNlbGYKKyAgICAgICAgYW5kIHJlbW92ZWQgdGhlIGNsb3N1cmUg dG8gaW1wcm92ZSB0aGUgcmVhZGFiaWxpdHkgb2YgdGhlIGNvZGUuCisKKyAgICAgICAgKiBEb1lv dUV2ZW5CZW5jaC9GdWxsLmh0bWw6CisgICAgICAgICogRG9Zb3VFdmVuQmVuY2gvcmVzb3VyY2Vz L21haW4uanM6CisgICAgICAgICh3aW5kb3cuYmVuY2htYXJrQ2xpZW50LndpbGxSdW5UZXN0KToK KyAgICAgICAgKHdpbmRvdy5iZW5jaG1hcmtDbGllbnQuZGlkUnVuVGVzdCk6CisgICAgICAgICh3 aW5kb3cuYmVuY2htYXJrQ2xpZW50LmRpZFJ1blN1aXRlcyk6CisgICAgICAgICh3aW5kb3cuYmVu Y2htYXJrQ2xpZW50LndpbGxTdGFydEZpcnN0SXRlcmF0aW9uKToKKyAgICAgICAgKHdpbmRvdy5i ZW5jaG1hcmtDbGllbnQuZGlkRmluaXNoTGFzdEl0ZXJhdGlvbik6CisgICAgICAgICh3aW5kb3cu YmVuY2htYXJrQ2xpZW50Ll9hZGRSZXN1bHQpOiBNb3ZlZC4KKyAgICAgICAgKC4pOiBEZWxldGVk LgorCiAyMDE0LTA2LTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIERZRUJlbmNoOiBTcGxpdCBzdHlsZXNoZWV0cyBhbmQgc2NyaXB0cyBpbiBGdWxsLmh0bWwg aW50byBzZXBhcmF0ZSBmaWxlcwpJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9Eb1lvdUV2ZW5CZW5j aC9GdWxsLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9Eb1lvdUV2ZW5CZW5j aC9GdWxsLmh0bWwJKHJldmlzaW9uIDE2OTUxNikKKysrIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VF dmVuQmVuY2gvRnVsbC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yLDcgKzIsNyBAQAogPGh0bWw+ CiA8aGVhZD4KICAgICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRl eHQvaHRtbDsgY2hhcnNldD11dGYtOCI+Ci0gICAgPHRpdGxlPkRvWW91RXZlbkJlbmNoIHYwLjE2 PC90aXRsZT4KKyAgICA8dGl0bGU+RG9Zb3VFdmVuQmVuY2ggdjAuMTc8L3RpdGxlPgogICAgIDxs aW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0icmVzb3VyY2VzL21haW4uY3NzIj4KICAgICA8c2Ny aXB0IHNyYz0icmVzb3VyY2VzL21haW4uanMiIGRlZmVyPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg c3JjPSJyZXNvdXJjZXMvYmVuY2htYXJrLXJ1bm5lci5qcyIgZGVmZXI+PC9zY3JpcHQ+CkluZGV4 OiBQZXJmb3JtYW5jZVRlc3RzL0RvWW91RXZlbkJlbmNoL3Jlc291cmNlcy9tYWluLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VFdmVuQmVuY2gvcmVzb3VyY2VzL21haW4u anMJKHJldmlzaW9uIDE2OTUxNikKKysrIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VFdmVuQmVuY2gv cmVzb3VyY2VzL21haW4uanMJKHdvcmtpbmcgY29weSkKQEAgLTEsNTYgKzEsMzcgQEAKLShmdW5j dGlvbiAoKSB7Ci0KLXZhciB2YWx1ZXMgPSBbXTsKLXZhciByZXN1bHRDb250YWluZXIgPSBudWxs OwotdmFyIHRpdGxlOwotdmFyIHByb2dyZXNzQ29udGFpbmVyOwotdmFyIHByb2dyZXNzOwotdmFy IGl0ZXJhdGlvbk51bWJlciA9IDA7Ci12YXIgZmluaXNoZWRUZXN0Q291bnQgPSAwOwotCi1mdW5j dGlvbiBhZGRSZXN1bHQodGl0bGUsIHZhbHVlKSB7Ci0gICAgaWYgKCFyZXN1bHRDb250YWluZXIp IHsKLSAgICAgICAgcmVzdWx0Q29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgndGFi bGUnKTsKLSAgICAgICAgdmFyIGNhcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdjYXB0 aW9uJyk7Ci0gICAgICAgIGNhcHRpb24udGV4dENvbnRlbnQgPSBkb2N1bWVudC50aXRsZTsKLSAg ICAgICAgcmVzdWx0Q29udGFpbmVyLmFwcGVuZENoaWxkKGNhcHRpb24pOwotICAgICAgICBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKHJlc3VsdENvbnRhaW5lcik7Ci0gICAgfQotICAgIGlmICgh dGl0bGUpCi0gICAgICAgIHJldHVybjsKLSAgICB2YXIgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgndHInKTsKLSAgICB2YXIgdGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCd0aCcpOwot ICAgIHRoLnRleHRDb250ZW50ID0gdGl0bGU7Ci0gICAgdmFyIHRkID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgndGQnKTsKLSAgICB0ZC50ZXh0Q29udGVudCA9IHZhbHVlOwotICAgIHJvdy5hcHBl bmRDaGlsZCh0aCk7Ci0gICAgcm93LmFwcGVuZENoaWxkKHRkKTsKLSAgICByZXN1bHRDb250YWlu ZXIuYXBwZW5kQ2hpbGQocm93KTsKLX0KLQogd2luZG93LmJlbmNobWFya0NsaWVudCA9IHsKICAg ICBpdGVyYXRpb25Db3VudDogMjAsCi0gICAgd2lsbFJ1blRlc3Q6IGZ1bmN0aW9uICgpIHsKLSAg ICAgICAgaWYgKCFwcm9ncmVzcykgewotICAgICAgICAgICAgLy8gV2UgZG9uJ3QgdXNlIHRoZSBy ZWFsIHByb2dyZXNzIGVsZW1lbnQgYXMgc29tZSBpbXBsZW1lbnRhdGlvbnMgYW5pbWF0ZSBpdC4K LSAgICAgICAgICAgIHByb2dyZXNzQ29udGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgn ZGl2Jyk7Ci0gICAgICAgICAgICBwcm9ncmVzc0NvbnRhaW5lci5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCdkaXYnKSk7Ci0gICAgICAgICAgICBwcm9ncmVzc0NvbnRhaW5lci5p ZCA9ICdwcm9ncmVzc0NvbnRhaW5lcic7Ci0gICAgICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKHByb2dyZXNzQ29udGFpbmVyKTsKLSAgICAgICAgICAgIHByb2dyZXNzID0gcHJvZ3Jl c3NDb250YWluZXIuZmlyc3RDaGlsZDsKLSAgICAgICAgfQotICAgICAgICBhZGRSZXN1bHQoKTsK LSAgICB9LAorICAgIF9maW5pc2hlZFRlc3RDb3VudDogMCwKKyAgICBfaXRlcmF0aW9uTnVtYmVy OiAwLAorICAgIF90aW1lVmFsdWVzOiBbXSwKKyAgICBfcHJvZ3Jlc3M6IG51bGwsCisgICAgX3By b2dyZXNzQ29tcGxldGVkOiBudWxsLAorICAgIF9yZXN1bHRDb250YWluZXI6IG51bGwsCisgICAg d2lsbFJ1blRlc3Q6IGZ1bmN0aW9uICgpIHsgfSwKICAgICBkaWRSdW5UZXN0OiBmdW5jdGlvbiAo KSB7Ci0gICAgICAgIGZpbmlzaGVkVGVzdENvdW50Kys7Ci0gICAgICAgIHByb2dyZXNzLnN0eWxl LndpZHRoID0gKGZpbmlzaGVkVGVzdENvdW50ICogMTAwIC8gdGhpcy50ZXN0c0NvdW50KSArICcl JzsKKyAgICAgICAgdGhpcy5fZmluaXNoZWRUZXN0Q291bnQrKzsKKyAgICAgICAgdGhpcy5fcHJv Z3Jlc3NDb21wbGV0ZWQuc3R5bGUud2lkdGggPSAodGhpcy5fZmluaXNoZWRUZXN0Q291bnQgKiAx MDAgLyB0aGlzLnRlc3RzQ291bnQpICsgJyUnOwogICAgIH0sCiAgICAgZGlkUnVuU3VpdGVzOiBm dW5jdGlvbiAobWVhc3VyZWRWYWx1ZXMpIHsKLSAgICAgICAgdmFsdWVzLnB1c2gobWVhc3VyZWRW YWx1ZXMudG90YWwpOwotICAgICAgICBpdGVyYXRpb25OdW1iZXIrKzsKLSAgICAgICAgYWRkUmVz dWx0KCdJdGVyYXRpb24gJyArIGl0ZXJhdGlvbk51bWJlciwgbWVhc3VyZWRWYWx1ZXMudG90YWwu dG9GaXhlZCgyKSArICcgbXMnKTsKKyAgICAgICAgdGhpcy5fdGltZVZhbHVlcy5wdXNoKG1lYXN1 cmVkVmFsdWVzLnRvdGFsKTsKKyAgICAgICAgdGhpcy5faXRlcmF0aW9uTnVtYmVyKys7CisgICAg ICAgIHRoaXMuX2FkZFJlc3VsdCgnSXRlcmF0aW9uICcgKyB0aGlzLl9pdGVyYXRpb25OdW1iZXIs IG1lYXN1cmVkVmFsdWVzLnRvdGFsLnRvRml4ZWQoMikgKyAnIG1zJyk7CisgICAgfSwKKyAgICB3 aWxsU3RhcnRGaXJzdEl0ZXJhdGlvbjogZnVuY3Rpb24gKCkgeworICAgICAgICAvLyBXZSBkb24n dCB1c2UgdGhlIHJlYWwgcHJvZ3Jlc3MgZWxlbWVudCBhcyBzb21lIGltcGxlbWVudGF0aW9ucyBh bmltYXRlIGl0LgorICAgICAgICB0aGlzLl9wcm9ncmVzcyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoJ2RpdicpOworICAgICAgICB0aGlzLl9wcm9ncmVzcy5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVFbGVtZW50KCdkaXYnKSk7CisgICAgICAgIHRoaXMuX3Byb2dyZXNzLmlkID0gJ3Byb2dy ZXNzQ29udGFpbmVyJzsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0aGlzLl9w cm9ncmVzcyk7CisgICAgICAgIHRoaXMuX3Byb2dyZXNzQ29tcGxldGVkID0gdGhpcy5fcHJvZ3Jl c3MuZmlyc3RDaGlsZDsKKworICAgICAgICB0aGlzLl9yZXN1bHRDb250YWluZXIgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCd0YWJsZScpOworICAgICAgICB2YXIgY2FwdGlvbiA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoJ2NhcHRpb24nKTsKKyAgICAgICAgY2FwdGlvbi50ZXh0Q29udGVudCA9 IGRvY3VtZW50LnRpdGxlOworICAgICAgICB0aGlzLl9yZXN1bHRDb250YWluZXIuYXBwZW5kQ2hp bGQoY2FwdGlvbik7CisgICAgICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodGhpcy5fcmVz dWx0Q29udGFpbmVyKTsKICAgICB9LAogICAgIGRpZEZpbmlzaExhc3RJdGVyYXRpb246IGZ1bmN0 aW9uICgpIHsKKyAgICAgICAgdmFyIHZhbHVlcyA9IHRoaXMuX3RpbWVWYWx1ZXM7CiAgICAgICAg IHZhciBzdW0gPSB2YWx1ZXMucmVkdWNlKGZ1bmN0aW9uIChhLCBiKSB7IHJldHVybiBhICsgYjsg fSwgMCk7CiAgICAgICAgIHZhciBhcml0aG1ldGljTWVhbiA9IHN1bSAvIHZhbHVlcy5sZW5ndGg7 CiAgICAgICAgIHZhciBtZWFuTGFiZWwgPSBhcml0aG1ldGljTWVhbi50b0ZpeGVkKDIpICsgJyBt cyc7CkBAIC01OSwxMyArNDAsMjEgQEAgd2luZG93LmJlbmNobWFya0NsaWVudCA9IHsKICAgICAg ICAgICAgIHZhciBwcmVjZW50RGVsdGEgPSBkZWx0YSAqIDEwMCAvIGFyaXRobWV0aWNNZWFuOwog ICAgICAgICAgICAgbWVhbkxhYmVsICs9ICcgXHhiMSAnICsgZGVsdGEudG9GaXhlZCgyKSArICcg bXMgKCcgKyBwcmVjZW50RGVsdGEudG9GaXhlZCgyKSArICclKSc7CiAgICAgICAgIH0KLSAgICAg ICAgYWRkUmVzdWx0KCdBcml0aG1ldGljIE1lYW4nLCBtZWFuTGFiZWwpOwotICAgICAgICBwcm9n cmVzc0NvbnRhaW5lci5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHByb2dyZXNzQ29udGFpbmVyKTsK KyAgICAgICAgdGhpcy5fYWRkUmVzdWx0KCdBcml0aG1ldGljIE1lYW4nLCBtZWFuTGFiZWwpOwor ICAgICAgICB0aGlzLl9wcm9ncmVzcy5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKHRoaXMuX3Byb2dy ZXNzKTsKKyAgICB9LAorICAgIF9hZGRSZXN1bHQ6IGZ1bmN0aW9uICh0aXRsZSwgdmFsdWUpIHsK KyAgICAgICAgdmFyIHJvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3RyJyk7CisgICAgICAg IHZhciB0aCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3RoJyk7CisgICAgICAgIHRoLnRleHRD b250ZW50ID0gdGl0bGU7CisgICAgICAgIHZhciB0ZCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo J3RkJyk7CisgICAgICAgIHRkLnRleHRDb250ZW50ID0gdmFsdWU7CisgICAgICAgIHJvdy5hcHBl bmRDaGlsZCh0aCk7CisgICAgICAgIHJvdy5hcHBlbmRDaGlsZCh0ZCk7CisgICAgICAgIHRoaXMu X3Jlc3VsdENvbnRhaW5lci5hcHBlbmRDaGlsZChyb3cpOwogICAgIH0KIH0KIAotfSkoKTsKLQog ZnVuY3Rpb24gc3RhcnRCZW5jaG1hcmsoKSB7CiAgICAgdmFyIGVuYWJsZWRTdWl0ZXMgPSBTdWl0 ZXMuZmlsdGVyKGZ1bmN0aW9uIChzdWl0ZSkgeyByZXR1cm4gIXN1aXRlLmRpc2FibGVkIH0pOwog ICAgIHZhciB0b3RhbFN1YnRlc3RDb3VudCA9IGVuYWJsZWRTdWl0ZXMucmVkdWNlKGZ1bmN0aW9u ICh0ZXN0c0NvdW50LCBzdWl0ZSkgeyByZXR1cm4gdGVzdHNDb3VudCArIHN1aXRlLnRlc3RzLmxl bmd0aDsgfSwgMCk7Cg==