191347 2018-11-06 22:24:41 -0800 Custom test group form should use commit set map before customization as the behavior of radio buttons. 2018-11-07 16:31:50 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dewei_zhu dewei_zhu dewei_zhu rniwa oldest_to_newest 1475884 0 dewei_zhu 2018-11-06 22:24:41 -0800 Custom test group form should use commit set map before customization as the behavior of radio buttons. 1475887 1 354064 dewei_zhu 2018-11-06 22:28:28 -0800 Created attachment 354064 Patch 1475889 2 354064 dewei_zhu 2018-11-06 22:35:09 -0800 Comment on attachment 354064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354064&action=review > Websites/perf.webkit.org/browser-tests/customizable-test-group-form-tests.js:143 > + > + Will remove those two extra blank lines. 1475890 3 dewei_zhu 2018-11-06 22:40:09 -0800 Tracked in <rdar://problem/4586649> 1476284 4 354064 rniwa 2018-11-07 15:31:24 -0800 Comment on attachment 354064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354064&action=review > Websites/perf.webkit.org/public/v3/components/customizable-test-group-form.js:353 > -ComponentBase.defineElement('customizable-test-group-form', CustomizableTestGroupForm); > +ComponentBase.defineElement('customizable-test-group-form', CustomizableTestGroupForm); What happened here? Adding a new line?? 1476318 5 354064 dewei_zhu 2018-11-07 16:22:18 -0800 Comment on attachment 354064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354064&action=review >> Websites/perf.webkit.org/public/v3/components/customizable-test-group-form.js:353 >> +ComponentBase.defineElement('customizable-test-group-form', CustomizableTestGroupForm); > > What happened here? Adding a new line?? I removed a blank line after this line. 1476322 6 dewei_zhu 2018-11-07 16:30:48 -0800 Landed in r237950 1476323 7 dewei_zhu 2018-11-07 16:31:50 -0800 (In reply to dewei_zhu from comment #3) > Tracked in <rdar://problem/4586649> Missing one digit. The actual tracking radar is <rdar://problem/45866496> 354064 2018-11-06 22:28:28 -0800 2018-11-07 15:31:24 -0800 Patch bug-191347-20181106222827.patch text/plain 15206 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3OTE1CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBiYzI5MjE3M2NiYzY5YzA3ZTJkYzI4MWFhZWI0NTNkYTc2YTMzOWJiLi40ZmRiYjQyMjBj ODdmMWI5NTg0Y2YwN2I1NzgyMTNhMzI3NWNhMDcyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxOC0xMS0wNiAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBDdXN0b20gdGVzdCBncm91cCBmb3JtIHNob3VsZCB1c2Ug Y29tbWl0IHNldCBtYXAgYmVmb3JlIGN1c3RvbWl6YXRpb24gYXMgdGhlIGJlaGF2aW9yIG9mIHJh ZGlvIGJ1dHRvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTEzNDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGUgcmFkaW8gYnV0dG9uIGJlaGF2aW9yIHNob3VsZCBhbHdheXMgc2V0IHRoZSBzYW1l IHJldmlzaW9uIHdoaWxlIGVkaXRpbmcgdGhlIHJldmlzaW9uIGlucHV0LgorICAgICAgICBUaGF0 IG1lYW5zIHdlIHNob3VsZCBub3QgdXNlIHRoZSBpbnRlcm1lZGlhdGUgY29tbWl0IHNldCBtYXAg YnV0IHVzZSB0aGUgY29tbWl0IHNldCBtYXAgYmVmb3JlCisgICAgICAgICJDdXN0b21pemUiIGxp bmsgaXMgY2xpY2tlZC4KKworICAgICAgICAqIGJyb3dzZXItdGVzdHMvY3VzdG9taXphYmxlLXRl c3QtZ3JvdXAtZm9ybS10ZXN0cy5qczogQWRkZWQgYSB1bml0IHRlc3QgZm9yIHRoaXMgYnVnLgor ICAgICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL2N1c3RvbWl6YWJsZS10ZXN0LWdyb3VwLWZv cm0uanM6IFBhc3MgdW5jdXN0b21pemVkIGNvbW1pdCBzZXQgc28gdGhhdCB0aGUgcmFkaW8gYnV0 dG9uCisgICAgICAgIGJlaGF2b2lyIHByZXNlcnZlcy4KKyAgICAgICAgKEN1c3RvbWl6YWJsZVRl c3RHcm91cEZvcm0pOgorICAgICAgICAoQ3VzdG9taXphYmxlVGVzdEdyb3VwRm9ybS5wcm90b3R5 cGUuc2V0Q29tbWl0U2V0TWFwKToKKyAgICAgICAgKEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0u cHJvdG90eXBlLmRpZENvbnN0cnVjdFNoYWRvd1RyZWUpOgorICAgICAgICAoQ3VzdG9taXphYmxl VGVzdEdyb3VwRm9ybS5wcm90b3R5cGUucmVuZGVyKToKKyAgICAgICAgKEN1c3RvbWl6YWJsZVRl c3RHcm91cEZvcm0ucHJvdG90eXBlLl9yZW5kZXJDdXN0b21SZXZpc2lvblRhYmxlKToKKyAgICAg ICAgKEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0ucHJvdG90eXBlLl9jb25zdHJ1Y3RUYWJsZUJv ZHlMaXN0KToKKyAgICAgICAgKEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0ucHJvdG90eXBlLl9j b25zdHJ1Y3RUYWJsZVJvd0ZvckNvbW1pdHNXaXRob3V0T3duZXIpOgorICAgICAgICAoQ3VzdG9t aXphYmxlVGVzdEdyb3VwRm9ybS5wcm90b3R5cGUuX2NvbnN0cnVjdFRhYmxlUm93Rm9yQ29tbWl0 c1dpdGhPd25lcik6CisgICAgICAgIChDdXN0b21pemFibGVUZXN0R3JvdXBGb3JtLnByb3RvdHlw ZS5fY29uc3RydWN0UmV2aXNpb25SYWRpb0J1dHRvbnMpOgorCiAyMDE4LTExLTA2ICBEZXdlaSBa aHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgogCiAgICAgICAgIEN1c3RvbWl6YWJsZSB0ZXN0IGdy b3VwIGZvcm0gc2hvdWxkIG5vdCByZXNldCBtYW51YWxseSBlZGl0ZWQgY29tbWl0IHZhbHVlIHNv bWV0aW1lcy4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9icm93c2VyLXRl c3RzL2N1c3RvbWl6YWJsZS10ZXN0LWdyb3VwLWZvcm0tdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvYnJvd3Nlci10ZXN0cy9jdXN0b21pemFibGUtdGVzdC1ncm91cC1mb3JtLXRl c3RzLmpzCmluZGV4IDNjNWNhNWM3ZTE2MmZjMTU0MzQ0ZWJiNjJiMWU1ZGQ0Y2Y3NmI3ZDYuLjc2 MzA3YWVkN2I1NzhhMWZkZDUyNGZkMjRmM2ZmYzRmZDBiYjIxYmQgMTAwNjQ0Ci0tLSBhL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9icm93c2VyLXRlc3RzL2N1c3RvbWl6YWJsZS10ZXN0LWdyb3Vw LWZvcm0tdGVzdHMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL2Jyb3dzZXItdGVz dHMvY3VzdG9taXphYmxlLXRlc3QtZ3JvdXAtZm9ybS10ZXN0cy5qcwpAQCAtODksNCArODksNTYg QEAgZGVzY3JpYmUoJ0N1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm1UZXN0cycsICgpID0+IHsKICAg ICAgICAgcmV2aXNpb25FZGl0b3IgPSByZXZpc2lvbkVkaXRvcnNbMF07CiAgICAgICAgIGV4cGVj dChyZXZpc2lvbkVkaXRvci52YWx1ZSkudG8uYmUoJzIxMDk0OCcpOwogICAgIH0pOworCisgICAg aXQoJ1Nob3VsZCB1c2UgdGhlIGNvbW1pdCBzZXQgbWFwIHdoZW4gY3VzdG9taXplIGJ1dHRvbiBp cyBjbGlja2VkIGFzIHRoZSBiZWhhdmlvciBvZiByYWRpbyBidXR0b25zJywgYXN5bmMgKCkgPT4g eworICAgICAgICBjb25zdCBjb250ZXh0ID0gbmV3IEJyb3dzaW5nQ29udGV4dCgpOworICAgICAg ICBjb25zdCBjdXN0b21pemFibGVUZXN0R3JvdXBGb3JtID0gYXdhaXQgY3JlYXRlQ3VzdG9taXph YmxlVGVzdEdyb3VwRm9ybVdpdGhDb250ZXh0KGNvbnRleHQpOworICAgICAgICBjb25zdCByZXBv c2l0b3J5ID0gY29udGV4dC5zeW1ib2xzLlJlcG9zaXRvcnkuZW5zdXJlU2luZ2xldG9uKDEsIHtu YW1lOiAnV2ViS2l0J30pOworCisgICAgICAgIGNvbnN0IGNvbW1pdEEgPSBjbG9uZU9iamVjdChj b21taXRPYmplY3RBKTsKKyAgICAgICAgY29uc3QgY29tbWl0QiA9IGNsb25lT2JqZWN0KGNvbW1p dE9iamVjdEIpOworICAgICAgICBjb21taXRBLnJlcG9zaXRvcnkgPSByZXBvc2l0b3J5OworICAg ICAgICBjb21taXRCLnJlcG9zaXRvcnkgPSByZXBvc2l0b3J5OworICAgICAgICBjb25zdCB3ZWJr aXRDb21taXRBID0gY29udGV4dC5zeW1ib2xzLkNvbW1pdExvZy5lbnN1cmVTaW5nbGV0b24oMTg1 MzI2LCBjb21taXRBKTsKKyAgICAgICAgY29uc3Qgd2Via2l0Q29tbWl0QiA9IGNvbnRleHQuc3lt Ym9scy5Db21taXRMb2cuZW5zdXJlU2luZ2xldG9uKDE4NTMzNCwgY29tbWl0Qik7CisgICAgICAg IGNvbnN0IGNvbW1pdFNldEEgPSBjb250ZXh0LnN5bWJvbHMuQ29tbWl0U2V0LmVuc3VyZVNpbmds ZXRvbigxLCB7cmV2aXNpb25JdGVtczogW3tjb21taXQ6IHdlYmtpdENvbW1pdEF9XX0pOworICAg ICAgICBjb25zdCBjb21taXRTZXRCID0gY29udGV4dC5zeW1ib2xzLkNvbW1pdFNldC5lbnN1cmVT aW5nbGV0b24oMiwge3JldmlzaW9uSXRlbXM6IFt7Y29tbWl0OiB3ZWJraXRDb21taXRCfV19KTsK KworICAgICAgICBjdXN0b21pemFibGVUZXN0R3JvdXBGb3JtLnNldENvbW1pdFNldE1hcCh7QTog Y29tbWl0U2V0QSwgQjogY29tbWl0U2V0Qn0pOworICAgICAgICBjdXN0b21pemFibGVUZXN0R3Jv dXBGb3JtLmNvbnRlbnQoJ2N1c3RvbWl6ZS1saW5rJykuY2xpY2soKTsKKworICAgICAgICBjb25z dCByZXF1ZXN0cyA9IGNvbnRleHQuc3ltYm9scy5Nb2NrUmVtb3RlQVBJLnJlcXVlc3RzOworICAg ICAgICBleHBlY3QocmVxdWVzdHMubGVuZ3RoKS50by5iZSgyKTsKKyAgICAgICAgZXhwZWN0KHJl cXVlc3RzWzBdLnVybCkudG8uYmUoJy9hcGkvY29tbWl0cy8xLzIxMDk0OCcpOworICAgICAgICBl eHBlY3QocmVxdWVzdHNbMV0udXJsKS50by5iZSgnL2FwaS9jb21taXRzLzEvMjEwOTQ5Jyk7Cisg ICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoe2NvbW1pdHM6IFtjb21taXRPYmplY3RBXX0pOwor ICAgICAgICByZXF1ZXN0c1sxXS5yZXNvbHZlKHtjb21taXRzOiBbY29tbWl0T2JqZWN0Ql19KTsK KworICAgICAgICBhd2FpdCB3YWl0Rm9yQ29tcG9uZW50c1RvUmVuZGVyKGNvbnRleHQpOworCisg ICAgICAgIGxldCByZXZpc2lvbkVkaXRvcnMgPSBjdXN0b21pemFibGVUZXN0R3JvdXBGb3JtLmNv bnRlbnQoJ2N1c3RvbS10YWJsZScpLnF1ZXJ5U2VsZWN0b3JBbGwoJ2lucHV0Om5vdChbdHlwZT0i cmFkaW8iXSknKTsKKyAgICAgICAgZXhwZWN0KHJldmlzaW9uRWRpdG9ycy5sZW5ndGgpLnRvLmJl KDIpOworICAgICAgICBsZXQgcmV2aXNpb25FZGl0b3IgPSByZXZpc2lvbkVkaXRvcnNbMF07Cisg ICAgICAgIGV4cGVjdChyZXZpc2lvbkVkaXRvci52YWx1ZSkudG8uYmUoJzIxMDk0OCcpOworICAg ICAgICByZXZpc2lvbkVkaXRvci52YWx1ZSA9ICcyMTA5NDknOworICAgICAgICByZXZpc2lvbkVk aXRvci5kaXNwYXRjaEV2ZW50KG5ldyBFdmVudCgnY2hhbmdlJykpOworCisgICAgICAgIGN1c3Rv bWl6YWJsZVRlc3RHcm91cEZvcm0uY29udGVudCgnbmFtZScpLnZhbHVlID0gJ2EvYiB0ZXN0JzsK KyAgICAgICAgY3VzdG9taXphYmxlVGVzdEdyb3VwRm9ybS5jb250ZW50KCduYW1lJykuZGlzcGF0 Y2hFdmVudChuZXcgRXZlbnQoJ2lucHV0JykpOworCisgICAgICAgIGF3YWl0IHdhaXRGb3JDb21w b25lbnRzVG9SZW5kZXIoY29udGV4dCk7CisKKyAgICAgICAgbGV0IHJhZGlvQnV0dG9uID0gY3Vz dG9taXphYmxlVGVzdEdyb3VwRm9ybS5jb250ZW50KCdjdXN0b20tdGFibGUnKS5xdWVyeVNlbGVj dG9yKCdpbnB1dFt0eXBlPSJyYWRpbyJdW25hbWU9IkEtMS1yYWRpbyJdOm5vdCg6Y2hlY2tlZCkn KTsKKyAgICAgICAgcmFkaW9CdXR0b24uY2xpY2soKTsKKyAgICAgICAgZXhwZWN0KHJhZGlvQnV0 dG9uLmNoZWNrZWQpLnRvLmJlKHRydWUpOworICAgICAgICByYWRpb0J1dHRvbiA9IGN1c3RvbWl6 YWJsZVRlc3RHcm91cEZvcm0uY29udGVudCgnY3VzdG9tLXRhYmxlJykucXVlcnlTZWxlY3Rvcign aW5wdXRbdHlwZT0icmFkaW8iXVtuYW1lPSJBLTEtcmFkaW8iXTpub3QoOmNoZWNrZWQpJyk7Cisg ICAgICAgIHJhZGlvQnV0dG9uLmNsaWNrKCk7CisgICAgICAgIGV4cGVjdChyYWRpb0J1dHRvbi5j aGVja2VkKS50by5iZSh0cnVlKTsKKworICAgICAgICByZXZpc2lvbkVkaXRvcnMgPSBjdXN0b21p emFibGVUZXN0R3JvdXBGb3JtLmNvbnRlbnQoJ2N1c3RvbS10YWJsZScpLnF1ZXJ5U2VsZWN0b3JB bGwoJ2lucHV0Om5vdChbdHlwZT0icmFkaW8iXSknKTsKKyAgICAgICAgcmV2aXNpb25FZGl0b3Ig PSByZXZpc2lvbkVkaXRvcnNbMF07CisgICAgICAgIGV4cGVjdChyZXZpc2lvbkVkaXRvci52YWx1 ZSkudG8uYmUoJzIxMDk0OCcpOworICAgIH0pOworCisKIH0pOwpkaWZmIC0tZ2l0IGEvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL2N1c3RvbWl6YWJsZS10ZXN0 LWdyb3VwLWZvcm0uanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBv bmVudHMvY3VzdG9taXphYmxlLXRlc3QtZ3JvdXAtZm9ybS5qcwppbmRleCBmNDNhYzkzNzFiZmMz NDU0ZWMwYzQ4YjQyYzRlNGY4MWM3ZTdlZDI2Li4wOTJiZDU1YTQ5Y2IwYTY2MjY5OTMyMGJlY2Zk OGNkN2Y1YzY2ODY2IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YzL2NvbXBvbmVudHMvY3VzdG9taXphYmxlLXRlc3QtZ3JvdXAtZm9ybS5qcworKysgYi9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY3VzdG9taXphYmxlLXRl c3QtZ3JvdXAtZm9ybS5qcwpAQCAtNCw2ICs0LDcgQEAgY2xhc3MgQ3VzdG9taXphYmxlVGVzdEdy b3VwRm9ybSBleHRlbmRzIFRlc3RHcm91cEZvcm0gewogICAgIHsKICAgICAgICAgc3VwZXIoJ2N1 c3RvbWl6YWJsZS10ZXN0LWdyb3VwLWZvcm0nKTsKICAgICAgICAgdGhpcy5fY29tbWl0U2V0TWFw ID0gbnVsbDsKKyAgICAgICAgdGhpcy5fdW5jdXN0b21pemVkQ29tbWl0U2V0TWFwID0gbnVsbDsK ICAgICAgICAgdGhpcy5fbmFtZSA9IG51bGw7CiAgICAgICAgIHRoaXMuX2lzQ3VzdG9taXplZCA9 IGZhbHNlOwogICAgICAgICB0aGlzLl9yZXZpc2lvbkVkaXRvck1hcCA9IG51bGw7CkBAIC0xNiw2 ICsxNyw3IEBAIGNsYXNzIEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0gZXh0ZW5kcyBUZXN0R3Jv dXBGb3JtIHsKICAgICBzZXRDb21taXRTZXRNYXAobWFwKQogICAgIHsKICAgICAgICAgdGhpcy5f Y29tbWl0U2V0TWFwID0gbWFwOworICAgICAgICB0aGlzLl91bmN1c3RvbWl6ZWRDb21taXRTZXRN YXAgPSBtYXA7CiAgICAgICAgIHRoaXMuX2lzQ3VzdG9taXplZCA9IGZhbHNlOwogICAgICAgICB0 aGlzLl9mZXRjaGluZ0NvbW1pdFByb21pc2VzID0gW107CiAgICAgICAgIHRoaXMuX2NoZWNrZWRM YWJlbEJ5UG9zaXRpb24gPSBuZXcgTWFwOwpAQCAtNDAsMTEgKzQyLDExIEBAIGNsYXNzIEN1c3Rv bWl6YWJsZVRlc3RHcm91cEZvcm0gZXh0ZW5kcyBUZXN0R3JvdXBGb3JtIHsKIAogICAgICAgICB0 aGlzLmNvbnRlbnQoJ2N1c3RvbWl6ZS1saW5rJykub25jbGljayA9IHRoaXMuY3JlYXRlRXZlbnRI YW5kbGVyKCgpID0+IHsKICAgICAgICAgICAgIGlmICghdGhpcy5faXNDdXN0b21pemVkKSB7Ci0g ICAgICAgICAgICAgICAgY29uc3Qgb3JpZ2luYWxDb21taXRTZXRNYXAgPSB0aGlzLl9jb21taXRT ZXRNYXA7CisgICAgICAgICAgICAgICAgY29uc3QgdW5jdXN0b21pemVkQ29tbWl0U2V0TWFwID0g dGhpcy5fY29tbWl0U2V0TWFwOwogICAgICAgICAgICAgICAgIGNvbnN0IGZldGNoaW5nQ29tbWl0 UHJvbWlzZXMgPSBbXTsKICAgICAgICAgICAgICAgICB0aGlzLl9jb21taXRTZXRNYXAgPSBuZXcg TWFwOwotICAgICAgICAgICAgICAgIGZvciAoY29uc3QgbGFiZWwgaW4gb3JpZ2luYWxDb21taXRT ZXRNYXApIHsKLSAgICAgICAgICAgICAgICAgICAgY29uc3QgaW50ZXJtZWRpYXRlQ29tbWl0U2V0 ID0gbmV3IEludGVybWVkaWF0ZUNvbW1pdFNldChvcmlnaW5hbENvbW1pdFNldE1hcFtsYWJlbF0p OworICAgICAgICAgICAgICAgIGZvciAoY29uc3QgbGFiZWwgaW4gdW5jdXN0b21pemVkQ29tbWl0 U2V0TWFwKSB7CisgICAgICAgICAgICAgICAgICAgIGNvbnN0IGludGVybWVkaWF0ZUNvbW1pdFNl dCA9IG5ldyBJbnRlcm1lZGlhdGVDb21taXRTZXQodW5jdXN0b21pemVkQ29tbWl0U2V0TWFwW2xh YmVsXSk7CiAgICAgICAgICAgICAgICAgICAgIGZldGNoaW5nQ29tbWl0UHJvbWlzZXMucHVzaChp bnRlcm1lZGlhdGVDb21taXRTZXQuZmV0Y2hDb21taXRMb2dzKCkpOwogICAgICAgICAgICAgICAg ICAgICB0aGlzLl9jb21taXRTZXRNYXAuc2V0KGxhYmVsLCBpbnRlcm1lZGlhdGVDb21taXRTZXQp OwogICAgICAgICAgICAgICAgIH0KQEAgLTU1LDcgKzU3LDcgQEAgY2xhc3MgQ3VzdG9taXphYmxl VGVzdEdyb3VwRm9ybSBleHRlbmRzIFRlc3RHcm91cEZvcm0gewogICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgICAgICB0aGlzLl9pc0N1c3RvbWl6ZWQgPSB0 cnVlOwogICAgICAgICAgICAgICAgICAgICB0aGlzLl9mZXRjaGluZ0NvbW1pdFByb21pc2VzID0g W107Ci0gICAgICAgICAgICAgICAgICAgIGZvciAoY29uc3QgbGFiZWwgaW4gb3JpZ2luYWxDb21t aXRTZXRNYXApCisgICAgICAgICAgICAgICAgICAgIGZvciAoY29uc3QgbGFiZWwgaW4gdW5jdXN0 b21pemVkQ29tbWl0U2V0TWFwKQogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fY2hlY2tl ZExhYmVsQnlQb3NpdGlvbi5zZXQobGFiZWwsIG5ldyBNYXApOwogICAgICAgICAgICAgICAgICAg ICB0aGlzLmVucXVldWVUb1JlbmRlcigpOwogICAgICAgICAgICAgICAgIH0pOwpAQCAtOTMsMTAg Kzk1LDEwIEBAIGNsYXNzIEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0gZXh0ZW5kcyBUZXN0R3Jv dXBGb3JtIHsKICAgICAgICAgdGhpcy5jb250ZW50KCdzdGFydC1idXR0b24nKS5kaXNhYmxlZCA9 ICEodGhpcy5fY29tbWl0U2V0TWFwICYmIHRoaXMuX25hbWUpOwogICAgICAgICB0aGlzLmNvbnRl bnQoJ2N1c3RvbWl6ZS1saW5rLWNvbnRhaW5lcicpLnN0eWxlLmRpc3BsYXkgPSAhdGhpcy5fY29t bWl0U2V0TWFwID8gJ25vbmUnIDogbnVsbDsKIAotICAgICAgICB0aGlzLl9yZW5kZXJDdXN0b21S ZXZpc2lvblRhYmxlKHRoaXMuX2NvbW1pdFNldE1hcCwgdGhpcy5faXNDdXN0b21pemVkKTsKKyAg ICAgICAgdGhpcy5fcmVuZGVyQ3VzdG9tUmV2aXNpb25UYWJsZSh0aGlzLl9jb21taXRTZXRNYXAs IHRoaXMuX2lzQ3VzdG9taXplZCwgdGhpcy5fdW5jdXN0b21pemVkQ29tbWl0U2V0TWFwKTsKICAg ICB9CiAKLSAgICBfcmVuZGVyQ3VzdG9tUmV2aXNpb25UYWJsZShjb21taXRTZXRNYXAsIGlzQ3Vz dG9taXplZCkKKyAgICBfcmVuZGVyQ3VzdG9tUmV2aXNpb25UYWJsZShjb21taXRTZXRNYXAsIGlz Q3VzdG9taXplZCwgdW5jdXN0b21pemVkQ29tbWl0U2V0TWFwKQogICAgIHsKICAgICAgICAgaWYg KCFjb21taXRTZXRNYXAgfHwgIWlzQ3VzdG9taXplZCkgewogICAgICAgICAgICAgdGhpcy5yZW5k ZXJSZXBsYWNlKHRoaXMuY29udGVudCgnY3VzdG9tLXRhYmxlJyksIFtdKTsKQEAgLTEzMywxMCAr MTM1LDEwIEBAIGNsYXNzIEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0gZXh0ZW5kcyBUZXN0R3Jv dXBGb3JtIHsKICAgICAgICAgICAgIGVsZW1lbnQoJ3RoZWFkJywKICAgICAgICAgICAgICAgICBl bGVtZW50KCd0cicsCiAgICAgICAgICAgICAgICAgICAgIFtlbGVtZW50KCd0ZCcsIHtjb2xzcGFu OiAyfSwgJ1JlcG9zaXRvcnknKSwgY29tbWl0U2V0TGFiZWxzLm1hcCgobGFiZWwpID0+IGVsZW1l bnQoJ3RkJywge2NvbHNwYW46IGNvbW1pdFNldExhYmVscy5sZW5ndGggKyAxfSwgbGFiZWwpKSwg ZWxlbWVudCgndGQnKV0pKSwKLSAgICAgICAgICAgIHRoaXMuX2NvbnN0cnVjdFRhYmxlQm9keUxp c3QocmVwb3NpdG9yeUxpc3QsIGNvbW1pdFNldE1hcCwgb3duZWRSZXBvc2l0b3JpZXNCeVJlcG9z aXRvcnksIHRoaXMuX2hhc0luY29tcGxldGVPd25lZFJlcG9zaXRvcnkpXSk7CisgICAgICAgICAg ICB0aGlzLl9jb25zdHJ1Y3RUYWJsZUJvZHlMaXN0KHJlcG9zaXRvcnlMaXN0LCBjb21taXRTZXRN YXAsIG93bmVkUmVwb3NpdG9yaWVzQnlSZXBvc2l0b3J5LCB0aGlzLl9oYXNJbmNvbXBsZXRlT3du ZWRSZXBvc2l0b3J5LCB1bmN1c3RvbWl6ZWRDb21taXRTZXRNYXApXSk7CiAgICAgfQogCi0gICAg X2NvbnN0cnVjdFRhYmxlQm9keUxpc3QocmVwb3NpdG9yeUxpc3QsIGNvbW1pdFNldE1hcCwgb3du ZWRSZXBvc2l0b3JpZXNCeVJlcG9zaXRvcnksIGhhc0luY29tcGxldGVPd25lZFJlcG9zaXRvcnkp CisgICAgX2NvbnN0cnVjdFRhYmxlQm9keUxpc3QocmVwb3NpdG9yeUxpc3QsIGNvbW1pdFNldE1h cCwgb3duZWRSZXBvc2l0b3JpZXNCeVJlcG9zaXRvcnksIGhhc0luY29tcGxldGVPd25lZFJlcG9z aXRvcnksIHVuY3VzdG9taXplZENvbW1pdFNldE1hcCkKICAgICB7CiAgICAgICAgIGNvbnN0IGVs ZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQ7CiAgICAgICAgIGNvbnN0IHRhYmxl Qm9keUxpc3QgPSBbXTsKQEAgLTE0Niw3ICsxNDgsNyBAQCBjbGFzcyBDdXN0b21pemFibGVUZXN0 R3JvdXBGb3JtIGV4dGVuZHMgVGVzdEdyb3VwRm9ybSB7CiAgICAgICAgICAgICBjb25zdCBoYXNJ bmNvbXBsZXRlUm93ID0gaGFzSW5jb21wbGV0ZU93bmVkUmVwb3NpdG9yeS5nZXQocmVwb3NpdG9y eSk7CiAgICAgICAgICAgICBjb25zdCBvd25lZFJlcG9zaXRvcmllcyA9IG93bmVkUmVwb3NpdG9y aWVzQnlSZXBvc2l0b3J5LmdldChyZXBvc2l0b3J5KTsKIAotICAgICAgICAgICAgcm93cy5wdXNo KHRoaXMuX2NvbnN0cnVjdFRhYmxlUm93Rm9yQ29tbWl0c1dpdGhvdXRPd25lcihjb21taXRTZXRN YXAsIHJlcG9zaXRvcnksIGFsbENvbW1pdFNldFNwZWNpZmllc093bmVyQ29tbWl0LCBoYXNJbmNv bXBsZXRlT3duZWRSZXBvc2l0b3J5KSk7CisgICAgICAgICAgICByb3dzLnB1c2godGhpcy5fY29u c3RydWN0VGFibGVSb3dGb3JDb21taXRzV2l0aG91dE93bmVyKGNvbW1pdFNldE1hcCwgcmVwb3Np dG9yeSwgYWxsQ29tbWl0U2V0U3BlY2lmaWVzT3duZXJDb21taXQsIGhhc0luY29tcGxldGVPd25l ZFJlcG9zaXRvcnksIHVuY3VzdG9taXplZENvbW1pdFNldE1hcCkpOwogCiAgICAgICAgICAgICBp ZiAoKCFvd25lZFJlcG9zaXRvcmllcyB8fCAhb3duZWRSZXBvc2l0b3JpZXMuc2l6ZSkgJiYgIWhh c0luY29tcGxldGVSb3cpIHsKICAgICAgICAgICAgICAgICB0YWJsZUJvZHlMaXN0LnB1c2goZWxl bWVudCgndGJvZHknLCByb3dzKSk7CkBAIC0xNTUsNyArMTU3LDcgQEAgY2xhc3MgQ3VzdG9taXph YmxlVGVzdEdyb3VwRm9ybSBleHRlbmRzIFRlc3RHcm91cEZvcm0gewogCiAgICAgICAgICAgICBp ZiAob3duZWRSZXBvc2l0b3JpZXMpIHsKICAgICAgICAgICAgICAgICBmb3IgKGNvbnN0IG93bmVk UmVwb3NpdG9yeSBvZiBvd25lZFJlcG9zaXRvcmllcykKLSAgICAgICAgICAgICAgICAgICAgcm93 cy5wdXNoKHRoaXMuX2NvbnN0cnVjdFRhYmxlUm93Rm9yQ29tbWl0c1dpdGhPd25lcihjb21taXRT ZXRNYXAsIG93bmVkUmVwb3NpdG9yeSwgcmVwb3NpdG9yeSkpOworICAgICAgICAgICAgICAgICAg ICByb3dzLnB1c2godGhpcy5fY29uc3RydWN0VGFibGVSb3dGb3JDb21taXRzV2l0aE93bmVyKGNv bW1pdFNldE1hcCwgb3duZWRSZXBvc2l0b3J5LCByZXBvc2l0b3J5LCB1bmN1c3RvbWl6ZWRDb21t aXRTZXRNYXApKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKGhhc0luY29tcGxl dGVSb3cpIHsKQEAgLTE2OCwxMyArMTcwLDEzIEBAIGNsYXNzIEN1c3RvbWl6YWJsZVRlc3RHcm91 cEZvcm0gZXh0ZW5kcyBUZXN0R3JvdXBGb3JtIHsKICAgICAgICAgcmV0dXJuIHRhYmxlQm9keUxp c3Q7CiAgICAgfQogCi0gICAgX2NvbnN0cnVjdFRhYmxlUm93Rm9yQ29tbWl0c1dpdGhvdXRPd25l cihjb21taXRTZXRNYXAsIHJlcG9zaXRvcnksIG93bnNSZXBvc2l0b3JpZXMsIGhhc0luY29tcGxl dGVPd25lZFJlcG9zaXRvcnkpCisgICAgX2NvbnN0cnVjdFRhYmxlUm93Rm9yQ29tbWl0c1dpdGhv dXRPd25lcihjb21taXRTZXRNYXAsIHJlcG9zaXRvcnksIG93bnNSZXBvc2l0b3JpZXMsIGhhc0lu Y29tcGxldGVPd25lZFJlcG9zaXRvcnksIHVuY3VzdG9taXplZENvbW1pdFNldE1hcCkKICAgICB7 CiAgICAgICAgIGNvbnN0IGVsZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQ7CiAg ICAgICAgIGNvbnN0IGNlbGxzID0gW2VsZW1lbnQoJ3RoJywge2NvbHNwYW46IDJ9LCByZXBvc2l0 b3J5LmxhYmVsKCkpXTsKIAogICAgICAgICBmb3IgKGNvbnN0IGxhYmVsIG9mIGNvbW1pdFNldE1h cC5rZXlzKCkpCi0gICAgICAgICAgICBjZWxscy5wdXNoKHRoaXMuX2NvbnN0cnVjdFJldmlzaW9u UmFkaW9CdXR0b25zKGNvbW1pdFNldE1hcCwgcmVwb3NpdG9yeSwgbGFiZWwsIG51bGwpKTsKKyAg ICAgICAgICAgIGNlbGxzLnB1c2godGhpcy5fY29uc3RydWN0UmV2aXNpb25SYWRpb0J1dHRvbnMo Y29tbWl0U2V0TWFwLCByZXBvc2l0b3J5LCBsYWJlbCwgbnVsbCwgdW5jdXN0b21pemVkQ29tbWl0 U2V0TWFwKSk7CiAKICAgICAgICAgaWYgKG93bnNSZXBvc2l0b3JpZXMpIHsKICAgICAgICAgICAg IGNvbnN0IHBsdXNCdXR0b24gPSBuZXcgUGx1c0J1dHRvbigpOwpAQCAtMTkwLDE0ICsxOTIsMTQg QEAgY2xhc3MgQ3VzdG9taXphYmxlVGVzdEdyb3VwRm9ybSBleHRlbmRzIFRlc3RHcm91cEZvcm0g ewogICAgICAgICByZXR1cm4gZWxlbWVudCgndHInLCBjZWxscyk7CiAgICAgfQogCi0gICAgX2Nv bnN0cnVjdFRhYmxlUm93Rm9yQ29tbWl0c1dpdGhPd25lcihjb21taXRTZXRNYXAsIHJlcG9zaXRv cnksIG93bmVyUmVwb3NpdG9yeSkKKyAgICBfY29uc3RydWN0VGFibGVSb3dGb3JDb21taXRzV2l0 aE93bmVyKGNvbW1pdFNldE1hcCwgcmVwb3NpdG9yeSwgb3duZXJSZXBvc2l0b3J5LCB1bmN1c3Rv bWl6ZWRDb21taXRTZXRNYXApCiAgICAgewogICAgICAgICBjb25zdCBlbGVtZW50ID0gQ29tcG9u ZW50QmFzZS5jcmVhdGVFbGVtZW50OwogICAgICAgICBjb25zdCBjZWxscyA9IFtlbGVtZW50KCd0 ZCcsIHtjbGFzczogJ293bmVyLXJlcG9zaXRvcnktbGFiZWwnfSksIGVsZW1lbnQoJ3RoJywgcmVw b3NpdG9yeS5sYWJlbCgpKV07CiAgICAgICAgIGNvbnN0IG1pbnVzQnV0dG9uID0gbmV3IE1pbnVz QnV0dG9uKCk7CiAKICAgICAgICAgZm9yIChjb25zdCBsYWJlbCBvZiBjb21taXRTZXRNYXAua2V5 cygpKQotICAgICAgICAgICAgY2VsbHMucHVzaCh0aGlzLl9jb25zdHJ1Y3RSZXZpc2lvblJhZGlv QnV0dG9ucyhjb21taXRTZXRNYXAsIHJlcG9zaXRvcnksIGxhYmVsLCBvd25lclJlcG9zaXRvcnkp KTsKKyAgICAgICAgICAgIGNlbGxzLnB1c2godGhpcy5fY29uc3RydWN0UmV2aXNpb25SYWRpb0J1 dHRvbnMoY29tbWl0U2V0TWFwLCByZXBvc2l0b3J5LCBsYWJlbCwgb3duZXJSZXBvc2l0b3J5LCB1 bmN1c3RvbWl6ZWRDb21taXRTZXRNYXApKTsKIAogICAgICAgICBtaW51c0J1dHRvbi5saXN0ZW5U b0FjdGlvbignYWN0aXZhdGUnLCAoKSA9PiB7CiAgICAgICAgICAgICBmb3IgKGNvbnN0IGNvbW1p dFNldCBvZiBjb21taXRTZXRNYXAudmFsdWVzKCkpCkBAIC0yNDAsNyArMjQyLDcgQEAgY2xhc3Mg Q3VzdG9taXphYmxlVGVzdEdyb3VwRm9ybSBleHRlbmRzIFRlc3RHcm91cEZvcm0gewogICAgICAg ICByZXR1cm4gZWxlbWVudCgndHInLCBjZWxscyk7CiAgICAgfQogCi0gICAgX2NvbnN0cnVjdFJl dmlzaW9uUmFkaW9CdXR0b25zKGNvbW1pdFNldE1hcCwgcmVwb3NpdG9yeSwgY29sdW1uTGFiZWws IG93bmVyUmVwb3NpdG9yeSkKKyAgICBfY29uc3RydWN0UmV2aXNpb25SYWRpb0J1dHRvbnMoY29t bWl0U2V0TWFwLCByZXBvc2l0b3J5LCBjb2x1bW5MYWJlbCwgb3duZXJSZXBvc2l0b3J5LCB1bmN1 c3RvbWl6ZWRDb21taXRTZXRNYXApCiAgICAgewogICAgICAgICBjb25zdCBlbGVtZW50ID0gQ29t cG9uZW50QmFzZS5jcmVhdGVFbGVtZW50OwogCkBAIC0yNjQsMTYgKzI2NiwxOCBAQCBjbGFzcyBD dXN0b21pemFibGVUZXN0R3JvdXBGb3JtIGV4dGVuZHMgVGVzdEdyb3VwRm9ybSB7CiAgICAgICAg IHRoaXMuX3JldmlzaW9uRWRpdG9yTWFwLmdldChjb2x1bW5MYWJlbCkuc2V0KHJlcG9zaXRvcnks IHJldmlzaW9uRWRpdG9yKTsKIAogICAgICAgICBjb25zdCBub2RlcyA9IFtdOwotICAgICAgICBm b3IgKGNvbnN0IGxhYmVsVG9DaG9vc2Ugb2YgY29tbWl0U2V0TWFwLmtleXMoKSkgewotICAgICAg ICAgICAgY29uc3QgY29tbWl0ID0gY29tbWl0U2V0TWFwLmdldChsYWJlbFRvQ2hvb3NlKS5jb21t aXRGb3JSZXBvc2l0b3J5KHJlcG9zaXRvcnkpOworICAgICAgICBmb3IgKGNvbnN0IFtsYWJlbFRv Q2hvb3NlLCBjb21taXRTZXRdIG9mIGNvbW1pdFNldE1hcCkgeworICAgICAgICAgICAgY29uc3Qg Y29tbWl0ID0gY29tbWl0U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSk7CiAgICAg ICAgICAgICBjb25zdCBjaGVja2VkTGFiZWwgPSB0aGlzLl9jaGVja2VkTGFiZWxCeVBvc2l0aW9u LmdldChjb2x1bW5MYWJlbCkuZ2V0KHJlcG9zaXRvcnkpIHx8IGNvbHVtbkxhYmVsOwotICAgICAg ICAgICAgY29uc3QgY2hlY2tlZCA9ICBsYWJlbFRvQ2hvb3NlID09IGNoZWNrZWRMYWJlbDsKKyAg ICAgICAgICAgIGNvbnN0IGNoZWNrZWQgPSBsYWJlbFRvQ2hvb3NlID09IGNoZWNrZWRMYWJlbDsK ICAgICAgICAgICAgIGNvbnN0IHJhZGlvQnV0dG9uID0gZWxlbWVudCgnaW5wdXQnLCB7dHlwZTog J3JhZGlvJywgbmFtZTogYCR7Y29sdW1uTGFiZWx9LSR7cmVwb3NpdG9yeS5pZCgpfS1yYWRpb2As IGNoZWNrZWQsCiAgICAgICAgICAgICAgICAgb25jaGFuZ2U6ICgpID0+IHsKKyAgICAgICAgICAg ICAgICAgICAgY29uc3QgdW5jdXN0b21pemVkQ29tbWl0ID0gdW5jdXN0b21pemVkQ29tbWl0U2V0 TWFwW2xhYmVsVG9DaG9vc2VdLmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSkgfHwgY29t bWl0OworICAgICAgICAgICAgICAgICAgICBjb21taXRTZXRNYXAuZ2V0KGNvbHVtbkxhYmVsKS5z ZXRDb21taXRGb3JSZXBvc2l0b3J5KHJlcG9zaXRvcnksIHVuY3VzdG9taXplZENvbW1pdCk7CiAg ICAgICAgICAgICAgICAgICAgIHRoaXMuX2NoZWNrZWRMYWJlbEJ5UG9zaXRpb24uZ2V0KGNvbHVt bkxhYmVsKS5zZXQocmVwb3NpdG9yeSwgbGFiZWxUb0Nob29zZSk7Ci0gICAgICAgICAgICAgICAg ICAgIHJldmlzaW9uRWRpdG9yLnZhbHVlID0gY29tbWl0ID8gY29tbWl0LnJldmlzaW9uKCkgOiAn JzsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGNvbW1pdCAmJiBjb21taXQub3duZXJDb21taXQo KSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX293bmVyUmV2aXNpb25NYXAuZ2V0KGNv bHVtbkxhYmVsKS5zZXQocmVwb3NpdG9yeSwgY29tbWl0Lm93bmVyQ29tbWl0KCkucmV2aXNpb24o KSk7CisgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uRWRpdG9yLnZhbHVlID0gdW5jdXN0b21p emVkQ29tbWl0ID8gdW5jdXN0b21pemVkQ29tbWl0LnJldmlzaW9uKCkgOiAnJzsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKHVuY3VzdG9taXplZENvbW1pdCAmJiB1bmN1c3RvbWl6ZWRDb21taXQu b3duZXJDb21taXQoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX293bmVyUmV2aXNp b25NYXAuZ2V0KGNvbHVtbkxhYmVsKS5zZXQocmVwb3NpdG9yeSwgdW5jdXN0b21pemVkQ29tbWl0 Lm93bmVyQ29tbWl0KCkucmV2aXNpb24oKSk7CiAgICAgICAgICAgICAgICAgfX0pOwogICAgICAg ICAgICAgbm9kZXMucHVzaChlbGVtZW50KCd0ZCcsIGVsZW1lbnQoJ2xhYmVsJywgW3JhZGlvQnV0 dG9uLCBsYWJlbFRvQ2hvb3NlXSkpKTsKICAgICAgICAgfQpAQCAtMzQ2LDQgKzM1MCw0IEBAIGNs YXNzIEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0gZXh0ZW5kcyBUZXN0R3JvdXBGb3JtIHsKICAg ICB9CiB9CiAKLUNvbXBvbmVudEJhc2UuZGVmaW5lRWxlbWVudCgnY3VzdG9taXphYmxlLXRlc3Qt Z3JvdXAtZm9ybScsIEN1c3RvbWl6YWJsZVRlc3RHcm91cEZvcm0pOworQ29tcG9uZW50QmFzZS5k ZWZpbmVFbGVtZW50KCdjdXN0b21pemFibGUtdGVzdC1ncm91cC1mb3JtJywgQ3VzdG9taXphYmxl VGVzdEdyb3VwRm9ybSk7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=