171138 2017-04-21 13:24:41 -0700 Make it possible to create more custom test groups in the analysis task page 2017-04-21 14:08:38 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez rniwa oldest_to_newest 1299825 0 rniwa 2017-04-21 13:24:41 -0700 Right now, creating a custom test group involves creating a new analysis task. It should be possible to create more custom test groups once the analysis task is created. 1299843 1 307790 rniwa 2017-04-21 13:46:25 -0700 Created attachment 307790 Adds the configurator to the analysis task page 1299845 2 307790 cdumez 2017-04-21 13:49:23 -0700 Comment on attachment 307790 Adds the configurator to the analysis task page rs=me 1299874 3 rniwa 2017-04-21 14:08:38 -0700 Committed r215636: <http://trac.webkit.org/changeset/215636> 307790 2017-04-21 13:46:25 -0700 2017-04-21 13:49:23 -0700 Adds the configurator to the analysis task page bug-171138-20170421134625.patch text/plain 39552 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NjMzCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBhNjI4MzU3YTE5MjYxZjY2NjVjOTJkMGNmMTlkOGJlNWVhMGIzMzU3Li5mYjViYmZmNmQx ZTQ4NTkzYTg2YTFhM2M0ZjUwY2IxMTc5YzBmZDZlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSw5MyBAQAogMjAxNy0wNC0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAorICAgICAgICBBZGQgdGhlIHN1cHBvcnQgZm9yIGNyZWF0aW5nIGEgY3Vz dG9tIHRlc3QgZ3JvdXAgaW4gdGhlIGFuYWx5c2lzIHRhc2sgcGFnZQorCisgICAgICAgIE1ha2Ug aXQgcG9zc2libGUgdG8gY3JlYXRlIG1vcmUgY3VzdG9tIHRlc3QgZ3JvdXBzIGluIHRoZSBhbmFs eXNpcyB0YXNrIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3MTEzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEV4dHJhY3RlZCBDdXN0b21Db25maWd1cmF0aW9uVGVzdEdyb3VwRm9ybSBvdXQgb2Yg Q3JlYXRlQW5hbHlzaXNUYXNrUGFnZSBhbmQgYWRkZWQgaXQgdG8gQW5hbHlzaXNUYXNrUGFnZSBp bnNpZGUKKyAgICAgICAgQW5hbHlzaXNUYXNrQ29uZmlndXJhdG9yUGFuZS4gVGhpcyBhbGxvd3Mg Y29uZmlndXJhdGlvbiBvZiBhIG5ldyB0ZXN0IGdyb3VwIHdpdGhpbiBhIGN1c3RvbSBhbmFseXNp cyB0YXNrLgorCisgICAgICAgICogcHVibGljL3ByaXZpbGVnZWQtYXBpL2NyZWF0ZS10ZXN0LWdy b3VwLnBocDoKKyAgICAgICAgKG1haW4pOiBGaXhlZCB0aGUgYnVnIHRoYXQgdGhlIHRyaWdnZXJh YmxlIHdhc24ndCByZXNvbHZlZCB3aGVuIGNyZWF0aW5nIGEgdGVzdCBncm91cCBpbiBhIGN1c3Rv bSBhbmFseXNpcyB0YXNrLgorCisgICAgICAgICogcHVibGljL3YzL2NvbXBvbmVudHMvY3VzdG9t LWFuYWx5c2lzLXRhc2stY29uZmlndXJhdG9yLmpzOgorICAgICAgICAoQ3VzdG9tQW5hbHlzaXNU YXNrQ29uZmlndXJhdG9yLnByb3RvdHlwZS5zZWxlY3RUZXN0cyk6IEFkZGVkLiBVc2VkIGJ5IEN1 c3RvbUNvbmZpZ3VyYXRpb25UZXN0R3JvdXBGb3JtJ3MKKyAgICAgICAgc2V0Q29uZmlndXJhdGlv bnMuCisgICAgICAgIChDdXN0b21BbmFseXNpc1Rhc2tDb25maWd1cmF0b3IucHJvdG90eXBlLnNl bGVjdFBsYXRmb3JtKTogRGl0dG8uCisgICAgICAgIChDdXN0b21BbmFseXNpc1Rhc2tDb25maWd1 cmF0b3IucHJvdG90eXBlLnNldENvbW1pdFNldHMpOiBEaXR0by4gCisgICAgICAgIChDdXN0b21B bmFseXNpc1Rhc2tDb25maWd1cmF0b3IucHJvdG90eXBlLl9zZXRVcGxvYWRlZEZpbGVzSWZFbXB0 eSk6IEFkZGVkLgorICAgICAgICAoQ3VzdG9tQW5hbHlzaXNUYXNrQ29uZmlndXJhdG9yLnByb3Rv dHlwZS5fcmV2aXNpb25NYXBGcm9tQ29tbWl0U2V0KTogQWRkZWQuCisgICAgICAgIChDdXN0b21B bmFseXNpc1Rhc2tDb25maWd1cmF0b3IucHJvdG90eXBlLnJlbmRlcik6IFVwZGF0ZSB0aGUgY3Vy cmVudGx5IHNlbGVjdGVkIHBsYXRmb3JtcyBhbmQgdGVzdHMgbm93IHRoYXQKKyAgICAgICAgdGhl eSBjYW4gYmUgc2V0IGV4dGVybmFsbHkgdmlhIHNlbGVjdFRlc3RzIGFuZCBzZWxlY3RQbGF0Zm9y bS4KKyAgICAgICAgKEN1c3RvbUFuYWx5c2lzVGFza0NvbmZpZ3VyYXRvci5wcm90b3R5cGUuX3Jl bmRlclRyaWdnZXJhYmxlVGVzdHMpOiBSZXR1cm4gdGhlIHJlc3VsdCBvZiBfcmVuZGVyUmFkaW9C dXR0b25MaXN0CisgICAgICAgIHNvIHRoYXQgdGhlIGNhbGxlciBjYW4gdXBkYXRlIHRoZSBjdXJy ZW50bHkgc2VsZWN0ZWQgdGVzdHMgd2l0aG91dCBoYXZpbmcgdG8gcmVjb25zdHJ1Y3QgdGhlIGxp c3QuCisgICAgICAgIChDdXN0b21BbmFseXNpc1Rhc2tDb25maWd1cmF0b3IucHJvdG90eXBlLl9y ZW5kZXJUcmlnZ2VyYWJsZVBsYXRmb3Jtcyk6IERpdHRvLgorICAgICAgICAoQ3VzdG9tQW5hbHlz aXNUYXNrQ29uZmlndXJhdG9yLnByb3RvdHlwZS5fcmVuZGVyUmFkaW9CdXR0b25MaXN0KTogUmVu YW1lZCBmcm9tIF9idWlsZENoZWNrYm94TGlzdC4gTm93IHJldHVybnMKKyAgICAgICAgYSBmdW5j dGlvbiB3aGljaCB1cGRhdGVzIHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgaXRlbXMuIFdlIHN0aWxs IHByZXRlbmQgdGhhdCBtdWx0aXBsZSBpdGVtcyBjYW4gYmUgc2VsZWN0ZWQgdG8KKyAgICAgICAg bWFrZSBpdCBmdXR1cmUtcHJvb2YuCisKKyAgICAgICAgKiBwdWJsaWMvdjMvY29tcG9uZW50cy9j dXN0b20tY29uZmlndXJhdGlvbi10ZXN0LWdyb3VwLWZvcm0uanM6IEFkZGVkLgorICAgICAgICAo Q3VzdG9tQ29uZmlndXJhdGlvblRlc3RHcm91cEZvcm0pOiBBZGRlZC4gSW5oZXJpdHMgZnJvbSBU ZXN0R3JvdXBGb3JtLiBFeHRyYWN0ZWQgZnJvbSBDcmVhdGVBbmFseXNpc1Rhc2tQYWdlLgorICAg ICAgICAoQ3VzdG9tQ29uZmlndXJhdGlvblRlc3RHcm91cEZvcm0ucHJvdG90eXBlLnNldEhhc1Rh c2spOiBBZGRlZC4KKyAgICAgICAgKEN1c3RvbUNvbmZpZ3VyYXRpb25UZXN0R3JvdXBGb3JtLnBy b3RvdHlwZS5oYXNDb21taXRTZXRzKTogQWRkZWQuCisgICAgICAgIChDdXN0b21Db25maWd1cmF0 aW9uVGVzdEdyb3VwRm9ybS5wcm90b3R5cGUuc2V0Q29uZmlndXJhdGlvbnMpOiBBZGRlZC4gVXNl ZCBieSBBbmFseXNpc1Rhc2tDb25maWd1cmF0b3JQYW5lIHRvCisgICAgICAgIHNldCB0aGUgZGVm YXVsdCBjb25maWd1cmF0aW9uIHRvIHdoYXQgdGhlIGxhdGVzdCB0ZXN0IGdyb3VwIHVzZWQuCisg ICAgICAgIChDdXN0b21Db25maWd1cmF0aW9uVGVzdEdyb3VwRm9ybS5wcm90b3R5cGUuc3RhcnRU ZXN0aW5nKTogQWRkZWQuIERpc3BhdGNoZXMgInN0YXJ0VGVzdGluZyIgYWN0aW9uIHdpdGgKKyAg ICAgICAgcGxhdGZvcm0sIHRlc3QsIHRhc2tOYW1lIGluIGFkZGl0aW9uIHRvIHdoYXQgQ3VzdG9t aXplZFRlc3RHcm91cEZvcm0gZW1pdHMuCisgICAgICAgIChDdXN0b21Db25maWd1cmF0aW9uVGVz dEdyb3VwRm9ybS5wcm90b3R5cGUuZGlkQ29uc3RydWN0U2hhZG93VHJlZSk6IEFkZGVkLgorICAg ICAgICAoQ3VzdG9tQ29uZmlndXJhdGlvblRlc3RHcm91cEZvcm0ucHJvdG90eXBlLnJlbmRlcik6 IEFkZGVkLgorICAgICAgICAoQ3VzdG9tQ29uZmlndXJhdGlvblRlc3RHcm91cEZvcm0ucHJvdG90 eXBlLl91cGRhdGVUZXN0R3JvdXBOYW1lKTogQWRkZWQuCisgICAgICAgIChDdXN0b21Db25maWd1 cmF0aW9uVGVzdEdyb3VwRm9ybS5jc3NUZW1wbGF0ZSk6IEFkZGVkLgorICAgICAgICAoQ3VzdG9t Q29uZmlndXJhdGlvblRlc3RHcm91cEZvcm0uaHRtbFRlbXBsYXRlKTogQWRkZWQuCisKKyAgICAg ICAgKiBwdWJsaWMvdjMvY29tcG9uZW50cy90ZXN0LWdyb3VwLWZvcm0uanM6CisgICAgICAgIChU ZXN0R3JvdXBGb3JtLmNzc1RlbXBsYXRlKTogTWFrZSB0aGUgZm9ybSBkaXNwbGF5OiBibG9jay4K KworICAgICAgICAqIHB1YmxpYy92My9pbmRleC5odG1sOgorCisgICAgICAgICogcHVibGljL3Yz L21vZGVscy90ZXN0LWdyb3VwLmpzOgorICAgICAgICAoVGVzdEdyb3VwLnByb3RvdHlwZS50ZXN0 KTogQWRkZWQuCisgICAgICAgIChUZXN0R3JvdXAucHJvdG90eXBlLnBsYXRmb3JtKTogQWRkZWQu CisgICAgICAgIChUZXN0R3JvdXAuY3JlYXRlV2l0aEN1c3RvbUNvbmZpZ3VyYXRpb24pOiBBZGRl ZC4gQ3JlYXRlcyBhIGN1c3RvbSB0ZXN0IGdyb3VwIHdpdGggYW4gZXhpc3RpbmcgYW5hbHlzaXMg dGFzay4KKworICAgICAgICAqIHB1YmxpYy92My9tb2RlbHMvdXBsb2FkZWQtZmlsZS5qczoKKyAg ICAgICAgKFVwbG9hZGVkRmlsZSk6IEZpeGVkIGEgYnVnIHRoYXQgX2RlbGV0ZWRBdCB3YXMgc2V0 IHRvIGEgRGF0ZSBvYmplY3QgZXZlbiB3aGVuIG9iamVjdC5kZWxldGVkQXQgaXMgbnVsbC4KKwor ICAgICAgICAqIHB1YmxpYy92My9wYWdlcy9hbmFseXNpcy10YXNrLXBhZ2UuanM6CisgICAgICAg IChBbmFseXNpc1Rhc2tDb25maWd1cmF0b3JQYW5lKTogQWRkZWQuCisgICAgICAgIChBbmFseXNp c1Rhc2tDb25maWd1cmF0b3JQYW5lLnByb3RvdHlwZS5kaWRDb25zdHJ1Y3RTaGFkb3dUcmVlKTog QWRkZWQuIERpc3BhdGNoIGNyZWF0ZUN1c3RvbVRlc3RHcm91cCBhY3Rpb24KKyAgICAgICAgaW4g dHVybiB3aGVuIHJlY2VpdmluZyBzdGFydFRlc3RpbmcgZnJvbSBDdXN0b21Db25maWd1cmF0aW9u VGVzdEdyb3VwRm9ybS4KKyAgICAgICAgKEFuYWx5c2lzVGFza0NvbmZpZ3VyYXRvclBhbmUucHJv dG90eXBlLnNldFRlc3RHcm91cHMpOiBBZGRlZC4KKyAgICAgICAgKEFuYWx5c2lzVGFza0NvbmZp Z3VyYXRvclBhbmUucHJvdG90eXBlLnJlbmRlcik6IEFkZGVkLgorICAgICAgICAoQW5hbHlzaXNU YXNrQ29uZmlndXJhdG9yUGFuZS5odG1sVGVtcGxhdGUpOiBBZGRlZC4gV2Ugb3ZlcnJpZGUgdGhp cyBpbnN0ZWFkIG9mIGZvcm1Db250ZW50IHRvIGRpc3BsYXkgdGhlCisgICAgICAgICJTdGFydCIg YnV0dG9uIGF0IHRoZSBlbmQgaW5zdGVhZCBvZiBhdCB0aGUgYmVnaW5ubmluZy4KKyAgICAgICAg KEFuYWx5c2lzVGFza0NvbmZpZ3VyYXRvclBhbmUuY3NzVGVtcGxhdGUpOiBBZGRlZC4KKyAgICAg ICAgKEFuYWx5c2lzVGFza1BhZ2UucHJvdG90eXBlLmRpZENvbnN0cnVjdFNoYWRvd1RyZWUpOiBM aXN0ZW4gdG8gY3JlYXRlQ3VzdG9tVGVzdEdyb3VwLgorICAgICAgICAoQW5hbHlzaXNUYXNrUGFn ZS5wcm90b3R5cGUucmVuZGVyKTogSGlkZSBBbmFseXNpc1Rhc2tDb25maWd1cmF0b3JQYW5lIHdo ZW4gdGhlIGFuYWx5c2lzIHRhc2sgaXMgbm90IGN1c3RvbS4KKyAgICAgICAgKEFuYWx5c2lzVGFz a1BhZ2UucHJvdG90eXBlLl9zaG93VGVzdEdyb3VwKTogTGV0IEFuYWx5c2lzVGFza0NvbmZpZ3Vy YXRvclBhbmUga25vdyBvZiB0aGUgY3VycmVudCB0ZXN0IGdyb3VwCisgICAgICAgIHNvIHRoYXQg aXQgY2FuIHVwZGF0ZSB0aGUgZGVmYXVsdCBjb25maWd1cmF0aW9uIGlmIHRoZSB1c2VyIGhhc24n dCBtb2RpZmllZCB5ZXQuCisgICAgICAgIChBbmFseXNpc1Rhc2tQYWdlLnByb3RvdHlwZS5fY3Jl YXRlQ3VzdG9tVGVzdEdyb3VwKTogQWRkZWQuIAorCisgICAgICAgICogcHVibGljL3YzL3BhZ2Vz L2NyZWF0ZS1hbmFseXNpcy10YXNrLXBhZ2UuanM6CisgICAgICAgIChDcmVhdGVBbmFseXNpc1Rh c2tQYWdlLnByb3RvdHlwZS5kaWRDb25zdHJ1Y3RTaGFkb3dUcmVlKToKKyAgICAgICAgKENyZWF0 ZUFuYWx5c2lzVGFza1BhZ2UucHJvdG90eXBlLl9jcmVhdGVBbmFseXNpc1Rhc2tXaXRoR3JvdXAp OgorICAgICAgICAoQ3JlYXRlQW5hbHlzaXNUYXNrUGFnZS5wcm90b3R5cGUucmVuZGVyKToKKyAg ICAgICAgKENyZWF0ZUFuYWx5c2lzVGFza1BhZ2UucHJvdG90eXBlLl9yZW5kZXJNZXNzYWdlKToK KyAgICAgICAgKENyZWF0ZUFuYWx5c2lzVGFza1BhZ2UuaHRtbFRlbXBsYXRlKToKKyAgICAgICAg KENyZWF0ZUFuYWx5c2lzVGFza1BhZ2UuY3NzVGVtcGxhdGUpOgorCisgICAgICAgICogc2VydmVy LXRlc3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS10ZXN0LWdyb3VwLXRlc3RzLmpzOiBBZGRlZCBh IHRlc3QgY2FzZSBmb3IgY3JlYXRpbmcgYSBjdXN0b20gdGVzdCBncm91cCBmb3IKKyAgICAgICAg YW4gZXhpc3RpbmcgYW5hbHlzaXMgdGFzay4KKworICAgICAgICAqIHNlcnZlci10ZXN0cy9yZXNv dXJjZXMvbW9jay1kYXRhLmpzOgorICAgICAgICAoTW9ja0RhdGEub3RoZXJQbGF0Zm9ybUlkKTog QWRkZWQuCisgICAgICAgIChNb2NrRGF0YS5hZGRNb2NrRGF0YSk6IEFkZGVkIGEgdGVzdCBjb25m aWd1cmF0aW9uIGZvciBvdGhlclBsYXRmb3JtSWQuCisKKzIwMTctMDQtMjEgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byB2aWV3 IHJlc3VsdHMgZm9yIHN1YiB0ZXN0cyBhbmQgbWV0cmljcyBpbiBBL0IgdGVzdGluZwogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwOTc1CiAKZGlmZiAt LWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvcHJpdmlsZWdlZC1hcGkvY3Jl YXRlLXRlc3QtZ3JvdXAucGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9wcml2 aWxlZ2VkLWFwaS9jcmVhdGUtdGVzdC1ncm91cC5waHAKaW5kZXggYThjMzcwNTU4OWVmMzc0ZGMx ZGE4YTg3YTc2MGFmOWYzMDQ4YzhhMy4uYmEwYWJkMTAwNGE3OTg3YjY1Yzk3MDMzYzdiMzllOWMy MGVlNjJiOCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9wcml2 aWxlZ2VkLWFwaS9jcmVhdGUtdGVzdC1ncm91cC5waHAKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy9wcml2aWxlZ2VkLWFwaS9jcmVhdGUtdGVzdC1ncm91cC5waHAKQEAgLTU5 LDcgKzU5LDggQEAgZnVuY3Rpb24gbWFpbigpCiAgICAgICAgICAgICAgICAgICAgIGV4aXRfd2l0 aF9lcnJvcignSW5jb25zaXN0ZW50VGVzdCcsIGFycmF5KCdncm91cFRlc3QnID0+ICR0ZXN0X2lk LCAndGFza1Rlc3QnID0+ICR0cmlnZ2VyYWJsZVsndGVzdCddKSk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KLSAgICB9IGVsc2UgaWYgKCRwbGF0Zm9ybV9pZCAmJiAkdGVzdF9pZCkgeworICAg IH0KKyAgICBpZiAoISR0cmlnZ2VyYWJsZV9pZCAmJiAkcGxhdGZvcm1faWQgJiYgJHRlc3RfaWQp IHsKICAgICAgICAgJHRyaWdnZXJhYmxlX2NvbmZpZ3VyYXRpb24gPSAkZGItPnNlbGVjdF9maXJz dF9yb3coJ3RyaWdnZXJhYmxlX2NvbmZpZ3VyYXRpb25zJywgJ3RyaWdjb25maWcnLAogICAgICAg ICAgICAgYXJyYXkoJ3Rlc3QnID0+ICR0ZXN0X2lkLCAncGxhdGZvcm0nID0+ICRwbGF0Zm9ybV9p ZCkpOwogICAgICAgICBpZiAoJHRyaWdnZXJhYmxlX2NvbmZpZ3VyYXRpb24pCmRpZmYgLS1naXQg YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY3VzdG9tLWFu YWx5c2lzLXRhc2stY29uZmlndXJhdG9yLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy92My9jb21wb25lbnRzL2N1c3RvbS1hbmFseXNpcy10YXNrLWNvbmZpZ3VyYXRvci5qcwpp bmRleCBlNWEzZDAxNDNkYzMyM2Y4NmUxZTQwZmU1MTljZTU4MDkwY2RmMDlkLi5kMzI4NzY5ZDky ZTg3YmU2NTcxNWExOTY5OTBmNmY5YjdmZmJiNjkyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY3VzdG9tLWFuYWx5c2lzLXRhc2stY29u ZmlndXJhdG9yLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29t cG9uZW50cy9jdXN0b20tYW5hbHlzaXMtdGFzay1jb25maWd1cmF0b3IuanMKQEAgLTMyLDYgKzMy LDY5IEBAIGNsYXNzIEN1c3RvbUFuYWx5c2lzVGFza0NvbmZpZ3VyYXRvciBleHRlbmRzIENvbXBv bmVudEJhc2UgewogICAgICAgICByZXR1cm4gW21hcFsnQmFzZWxpbmUnXSwgbWFwWydDb21wYXJp c29uJ11dOwogICAgIH0KIAorICAgIHNlbGVjdFRlc3RzKHNlbGVjdGVkVGVzdHMpCisgICAgewor ICAgICAgICB0aGlzLl9zZWxlY3RlZFRlc3RzID0gc2VsZWN0ZWRUZXN0czsKKworICAgICAgICB0 aGlzLl90cmlnZ2VyYWJsZVBsYXRmb3JtcyA9IFRyaWdnZXJhYmxlLnRyaWdnZXJhYmxlUGxhdGZv cm1zRm9yVGVzdHModGhpcy5fc2VsZWN0ZWRUZXN0cyk7CisgICAgICAgIGlmICh0aGlzLl9zZWxl Y3RlZFRlc3RzLmxlbmd0aCAmJiAhdGhpcy5fdHJpZ2dlcmFibGVQbGF0Zm9ybXMuaW5jbHVkZXMo dGhpcy5fc2VsZWN0ZWRQbGF0Zm9ybSkpCisgICAgICAgICAgICB0aGlzLl9zZWxlY3RlZFBsYXRm b3JtID0gbnVsbDsKKworICAgICAgICB0aGlzLmVucXVldWVUb1JlbmRlcigpOworICAgIH0KKwor ICAgIHNlbGVjdFBsYXRmb3JtKHNlbGVjdGVkUGxhdGZvcm0pCisgICAgeworICAgICAgICB0aGlz Ll9zZWxlY3RlZFBsYXRmb3JtID0gc2VsZWN0ZWRQbGF0Zm9ybTsKKworICAgICAgICBjb25zdCBb dHJpZ2dlcmFibGUsIGVycm9yXSA9IHRoaXMuX3VwZGF0ZVRyaWdnZXJhYmxlTGF6aWx5LmV2YWx1 YXRlKHRoaXMuX3NlbGVjdGVkVGVzdHMsIHRoaXMuX3NlbGVjdGVkUGxhdGZvcm0pOworICAgICAg ICB0aGlzLl91cGRhdGVSZXBvc2l0b3J5R3JvdXBzKHRyaWdnZXJhYmxlKTsKKyAgICAgICAgdGhp cy5fdXBkYXRlQ29tbWl0U2V0TWFwKCk7CisKKyAgICAgICAgdGhpcy5lbnF1ZXVlVG9SZW5kZXIo KTsKKyAgICB9CisKKyAgICBzZXRDb21taXRTZXRzKGJhc2VsaW5lQ29tbWl0U2V0LCBjb21wYXJp c29uQ29tbWl0U2V0KQorICAgIHsKKyAgICAgICAgY29uc3QgW3RyaWdnZXJhYmxlLCBlcnJvcl0g PSB0aGlzLl91cGRhdGVUcmlnZ2VyYWJsZUxhemlseS5ldmFsdWF0ZSh0aGlzLl9zZWxlY3RlZFRl c3RzLCB0aGlzLl9zZWxlY3RlZFBsYXRmb3JtKTsKKworICAgICAgICBpZiAoIXRyaWdnZXJhYmxl KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGNvbnN0IGJhc2VsaW5lUmVwb3NpdG9y eUdyb3VwID0gdHJpZ2dlcmFibGUucmVwb3NpdG9yeUdyb3VwcygpLmZpbmQoKHJlcG9zaXRvcnlH cm91cCkgPT4gcmVwb3NpdG9yeUdyb3VwLmFjY2VwdHMoYmFzZWxpbmVDb21taXRTZXQpKTsKKyAg ICAgICAgaWYgKGJhc2VsaW5lUmVwb3NpdG9yeUdyb3VwKSB7CisgICAgICAgICAgICB0aGlzLl9y ZXBvc2l0b3J5R3JvdXBCeUNvbmZpZ3VyYXRpb25bJ0Jhc2VsaW5lJ10gPSBiYXNlbGluZVJlcG9z aXRvcnlHcm91cDsKKyAgICAgICAgICAgIHRoaXMuX3NldFVwbG9hZGVkRmlsZXNJZkVtcHR5KHRo aXMuX2ZpbGVVcGxvYWRlcnNbJ0Jhc2VsaW5lJ10sIGJhc2VsaW5lQ29tbWl0U2V0KTsKKyAgICAg ICAgICAgIHRoaXMuX3NwZWNpZmllZFJldmlzaW9uc1snQmFzZWxpbmUnXSA9IHRoaXMuX3Jldmlz aW9uTWFwRnJvbUNvbW1pdFNldChiYXNlbGluZUNvbW1pdFNldCk7CisgICAgICAgIH0KKworICAg ICAgICBjb25zdCBjb21wYXJpc29uUmVwb3NpdG9yeUdyb3VwID0gdHJpZ2dlcmFibGUucmVwb3Np dG9yeUdyb3VwcygpLmZpbmQoKHJlcG9zaXRvcnlHcm91cCkgPT4gcmVwb3NpdG9yeUdyb3VwLmFj Y2VwdHMoYmFzZWxpbmVDb21taXRTZXQpKTsKKyAgICAgICAgaWYgKGNvbXBhcmlzb25SZXBvc2l0 b3J5R3JvdXApIHsKKyAgICAgICAgICAgIHRoaXMuX3JlcG9zaXRvcnlHcm91cEJ5Q29uZmlndXJh dGlvblsnQ29tcGFyaXNvbiddID0gY29tcGFyaXNvblJlcG9zaXRvcnlHcm91cDsKKyAgICAgICAg ICAgIHRoaXMuX3NldFVwbG9hZGVkRmlsZXNJZkVtcHR5KHRoaXMuX2ZpbGVVcGxvYWRlcnNbJ0Nv bXBhcmlzb24nXSwgY29tcGFyaXNvbkNvbW1pdFNldCk7CisgICAgICAgICAgICB0aGlzLl9zcGVj aWZpZWRSZXZpc2lvbnNbJ0NvbXBhcmlzb24nXSA9IHRoaXMuX3JldmlzaW9uTWFwRnJvbUNvbW1p dFNldChjb21wYXJpc29uQ29tbWl0U2V0KTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX3No b3dDb21wYXJpc29uID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQ29tbWl0U2V0TWFwKCk7 CisgICAgfQorCisgICAgX3NldFVwbG9hZGVkRmlsZXNJZkVtcHR5KHVwbG9hZGVyLCBjb21taXRT ZXQpCisgICAgeworICAgICAgICBpZiAodXBsb2FkZXIuaGFzRmlsZVRvVXBsb2FkKCkgfHwgdXBs b2FkZXIudXBsb2FkZWRGaWxlcygpLmxlbmd0aCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgZm9yIChjb25zdCB1cGxvYWRlZEZpbGUgb2YgY29tbWl0U2V0LmN1c3RvbVJvb3RzKCkpCisg ICAgICAgICAgICB1cGxvYWRlci5hZGRVcGxvYWRlZEZpbGUodXBsb2FkZWRGaWxlKTsKKyAgICB9 CisKKyAgICBfcmV2aXNpb25NYXBGcm9tQ29tbWl0U2V0KGNvbW1pdFNldCkKKyAgICB7CisgICAg ICAgIGNvbnN0IHJldmlzaW9uTWFwID0gbmV3IE1hcDsKKyAgICAgICAgZm9yIChjb25zdCByZXBv c2l0b3J5IG9mIGNvbW1pdFNldC5yZXBvc2l0b3JpZXMoKSkKKyAgICAgICAgICAgIHJldmlzaW9u TWFwLnNldChyZXBvc2l0b3J5LCBjb21taXRTZXQucmV2aXNpb25Gb3JSZXBvc2l0b3J5KHJlcG9z aXRvcnkpKTsKKyAgICAgICAgcmV0dXJuIHJldmlzaW9uTWFwOworICAgIH0KKwogICAgIGRpZENv bnN0cnVjdFNoYWRvd1RyZWUoKQogICAgIHsKICAgICAgICAgdGhpcy5jb250ZW50KCdzcGVjaWZ5 LWNvbXBhcmlzb24tYnV0dG9uJykub25jbGljayA9IHRoaXMuY3JlYXRlRXZlbnRIYW5kbGVyKCgp ID0+IHRoaXMuX2NvbmZpZ3VyZUNvbXBhcmlzb24oKSk7CkBAIC02OCw4ICsxMzEsMTEgQEAgY2xh c3MgQ3VzdG9tQW5hbHlzaXNUYXNrQ29uZmlndXJhdG9yIGV4dGVuZHMgQ29tcG9uZW50QmFzZSB7 CiAgICAgewogICAgICAgICBzdXBlci5yZW5kZXIoKTsKIAotICAgICAgICB0aGlzLl9yZW5kZXJU cmlnZ2VyYWJsZVRlc3RzTGF6aWx5LmV2YWx1YXRlKCk7Ci0gICAgICAgIHRoaXMuX3JlbmRlclRy aWdnZXJhYmxlUGxhdGZvcm1zTGF6aWx5LmV2YWx1YXRlKHRoaXMuX3NlbGVjdGVkVGVzdHMsIHRo aXMuX3RyaWdnZXJhYmxlUGxhdGZvcm1zKTsKKyAgICAgICAgY29uc3QgdXBkYXRlU2VsZWN0ZWRU ZXN0c0xhemlseSA9IHRoaXMuX3JlbmRlclRyaWdnZXJhYmxlVGVzdHNMYXppbHkuZXZhbHVhdGUo KTsKKyAgICAgICAgdXBkYXRlU2VsZWN0ZWRUZXN0c0xhemlseS5ldmFsdWF0ZSguLi50aGlzLl9z ZWxlY3RlZFRlc3RzKTsKKyAgICAgICAgY29uc3QgdXBkYXRlU2VsZWN0ZWRQbGF0Zm9ybXNMYXpp bHkgPSB0aGlzLl9yZW5kZXJUcmlnZ2VyYWJsZVBsYXRmb3Jtc0xhemlseS5ldmFsdWF0ZSh0aGlz Ll9zZWxlY3RlZFRlc3RzLCB0aGlzLl90cmlnZ2VyYWJsZVBsYXRmb3Jtcyk7CisgICAgICAgIGlm ICh1cGRhdGVTZWxlY3RlZFBsYXRmb3Jtc0xhemlseSkKKyAgICAgICAgICAgIHVwZGF0ZVNlbGVj dGVkUGxhdGZvcm1zTGF6aWx5LmV2YWx1YXRlKHRoaXMuX3NlbGVjdGVkUGxhdGZvcm0pOwogCiAg ICAgICAgIGNvbnN0IFt0cmlnZ2VyYWJsZSwgZXJyb3JdID0gdGhpcy5fdXBkYXRlVHJpZ2dlcmFi bGVMYXppbHkuZXZhbHVhdGUodGhpcy5fc2VsZWN0ZWRUZXN0cywgdGhpcy5fc2VsZWN0ZWRQbGF0 Zm9ybSk7CiAKQEAgLTgxLDUyICsxNDcsNTQgQEAgY2xhc3MgQ3VzdG9tQW5hbHlzaXNUYXNrQ29u ZmlndXJhdG9yIGV4dGVuZHMgQ29tcG9uZW50QmFzZSB7CiAgICAgICAgIGNvbnN0IGVuYWJsZWRU cmlnZ2VyYWJsZXMgPSBUcmlnZ2VyYWJsZS5hbGwoKS5maWx0ZXIoKHRyaWdnZXJhYmxlKSA9PiAh dHJpZ2dlcmFibGUuaXNEaXNhYmxlZCgpKTsKIAogICAgICAgICBsZXQgdGVzdHMgPSBUZXN0LnRv cExldmVsVGVzdHMoKS5maWx0ZXIoKHRlc3QpID0+IHRlc3QubWV0cmljcygpLmxlbmd0aCAmJiBl bmFibGVkVHJpZ2dlcmFibGVzLnNvbWUoKHRyaWdnZXJhYmxlKSA9PiB0cmlnZ2VyYWJsZS5hY2Nl cHRzVGVzdCh0ZXN0KSkpOwotICAgICAgICB0aGlzLnJlbmRlclJlcGxhY2UodGhpcy5jb250ZW50 KCd0ZXN0LWxpc3QnKSwgdGhpcy5fYnVpbGRDaGVja2JveExpc3QoJ3Rlc3QnLCB0ZXN0cywgKHNl bGVjdGVkVGVzdHMpID0+IHsKLSAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkVGVzdHMgPSBzZWxl Y3RlZFRlc3RzOwotCi0gICAgICAgICAgICB0aGlzLl90cmlnZ2VyYWJsZVBsYXRmb3JtcyA9IFRy aWdnZXJhYmxlLnRyaWdnZXJhYmxlUGxhdGZvcm1zRm9yVGVzdHModGhpcy5fc2VsZWN0ZWRUZXN0 cyk7Ci0gICAgICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRUZXN0cy5sZW5ndGggJiYgIXRoaXMu X3RyaWdnZXJhYmxlUGxhdGZvcm1zLmluY2x1ZGVzKHRoaXMuX3NlbGVjdGVkUGxhdGZvcm0pKQot ICAgICAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkUGxhdGZvcm0gPSBudWxsOwotICAgICAgICB9 KSk7CisgICAgICAgIHJldHVybiB0aGlzLl9yZW5kZXJSYWRpb0J1dHRvbkxpc3QodGhpcy5jb250 ZW50KCd0ZXN0LWxpc3QnKSwgJ3Rlc3QnLCB0ZXN0cywgdGhpcy5zZWxlY3RUZXN0cy5iaW5kKHRo aXMpKTsKICAgICB9CiAKICAgICBfcmVuZGVyVHJpZ2dlcmFibGVQbGF0Zm9ybXMoc2VsZWN0ZWRU ZXN0cywgdHJpZ2dlcmFibGVQbGF0Zm9ybXMpCiAgICAgewogICAgICAgICBpZiAoIXNlbGVjdGVk VGVzdHMubGVuZ3RoKSB7CiAgICAgICAgICAgICB0aGlzLmNvbnRlbnQoJ3BsYXRmb3JtLXBhbmUn KS5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgcmV0dXJuIG51bGw7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5jb250ZW50KCdwbGF0Zm9y bS1wYW5lJykuc3R5bGUuZGlzcGxheSA9IG51bGw7CiAKLSAgICAgICAgdGhpcy5yZW5kZXJSZXBs YWNlKHRoaXMuY29udGVudCgncGxhdGZvcm0tbGlzdCcpLCB0aGlzLl9idWlsZENoZWNrYm94TGlz dCgncGxhdGZvcm0nLCB0cmlnZ2VyYWJsZVBsYXRmb3JtcywgKHNlbGVjdGVkUGxhdGZvcm1zKSA9 PiB7Ci0gICAgICAgICAgICB0aGlzLl9zZWxlY3RlZFBsYXRmb3JtID0gc2VsZWN0ZWRQbGF0Zm9y bXMubGVuZ3RoID8gc2VsZWN0ZWRQbGF0Zm9ybXNbMF0gOiBudWxsOwotCi0gICAgICAgICAgICBj b25zdCBbdHJpZ2dlcmFibGUsIGVycm9yXSA9IHRoaXMuX3VwZGF0ZVRyaWdnZXJhYmxlTGF6aWx5 LmV2YWx1YXRlKHRoaXMuX3NlbGVjdGVkVGVzdHMsIHRoaXMuX3NlbGVjdGVkUGxhdGZvcm0pOwot ICAgICAgICAgICAgdGhpcy5fdXBkYXRlUmVwb3NpdG9yeUdyb3Vwcyh0cmlnZ2VyYWJsZSk7Ci0g ICAgICAgICAgICB0aGlzLl91cGRhdGVDb21taXRTZXRNYXAoKTsKLQotICAgICAgICAgICAgdGhp cy5lbnF1ZXVlVG9SZW5kZXIoKTsKLSAgICAgICAgfSkpOworICAgICAgICByZXR1cm4gdGhpcy5f cmVuZGVyUmFkaW9CdXR0b25MaXN0KHRoaXMuY29udGVudCgncGxhdGZvcm0tbGlzdCcpLCAncGxh dGZvcm0nLCB0cmlnZ2VyYWJsZVBsYXRmb3JtcywgKHNlbGVjdGVkUGxhdGZvcm1zKSA9PiB7Cisg ICAgICAgICAgICB0aGlzLnNlbGVjdFBsYXRmb3JtKHNlbGVjdGVkUGxhdGZvcm1zLmxlbmd0aCA/ IHNlbGVjdGVkUGxhdGZvcm1zWzBdIDogbnVsbCk7CisgICAgICAgIH0pOwogICAgIH0KIAotICAg IF9idWlsZENoZWNrYm94TGlzdChuYW1lLCBvYmplY3RzLCBjYWxsYmFjaykKKyAgICBfcmVuZGVy UmFkaW9CdXR0b25MaXN0KGxpc3RDb250YWluZXIsIG5hbWUsIG9iamVjdHMsIGNhbGxiYWNrKQog ICAgIHsKICAgICAgICAgY29uc3QgbGlzdEl0ZW1zID0gW107CiAgICAgICAgIGxldCBzZWxlY3Rl ZExpc3RJdGVtcyA9IFtdOwotICAgICAgICBjb25zdCBlbGVtZW50ID0gQ29tcG9uZW50QmFzZS5j cmVhdGVFbGVtZW50OwotICAgICAgICByZXR1cm4gb2JqZWN0cy5tYXAoKG9iamVjdCkgPT4gewot ICAgICAgICAgICAgY29uc3QgY2hlY2tib3ggPSBlbGVtZW50KCdpbnB1dCcsIHt0eXBlOiAncmFk aW8nLCBuYW1lOiBuYW1lLCBvbmNoYW5nZTogKCkgPT4gewotICAgICAgICAgICAgICAgIHNlbGVj dGVkTGlzdEl0ZW1zLmZvckVhY2goKGl0ZW0pID0+IGl0ZW0ubGFiZWwuY2xhc3NMaXN0LnJlbW92 ZSgnc2VsZWN0ZWQnKSk7Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWRMaXN0SXRlbXMgPSBsaXN0 SXRlbXMuZmlsdGVyKChpdGVtKSA9PiBpdGVtLmNoZWNrYm94LmNoZWNrZWQpOwotICAgICAgICAg ICAgICAgIHNlbGVjdGVkTGlzdEl0ZW1zLmZvckVhY2goKGl0ZW0pID0+IGl0ZW0ubGFiZWwuY2xh c3NMaXN0LmFkZCgnc2VsZWN0ZWQnKSk7CisgICAgICAgIGNvbnN0IGNoZWNrU2VsZWN0ZWRSYWRp b0J1dHRvbnMgPSAobmV3U2VsZWN0ZWRMaXN0SXRlbXMpID0+IHsKKyAgICAgICAgICAgIHNlbGVj dGVkTGlzdEl0ZW1zLmZvckVhY2goKGl0ZW0pID0+IHsKKyAgICAgICAgICAgICAgICBpdGVtLmxh YmVsLmNsYXNzTGlzdC5yZW1vdmUoJ3NlbGVjdGVkJyk7CisgICAgICAgICAgICAgICAgaXRlbS5y YWRpb0J1dHRvbi5jaGVja2VkID0gZmFsc2U7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg IHNlbGVjdGVkTGlzdEl0ZW1zID0gbmV3U2VsZWN0ZWRMaXN0SXRlbXM7CisgICAgICAgICAgICBz ZWxlY3RlZExpc3RJdGVtcy5mb3JFYWNoKChpdGVtKSA9PiB7CisgICAgICAgICAgICAgICAgaXRl bS5sYWJlbC5jbGFzc0xpc3QuYWRkKCdzZWxlY3RlZCcpOworICAgICAgICAgICAgICAgIGl0ZW0u cmFkaW9CdXR0b24uY2hlY2tlZCA9IHRydWU7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQog CisgICAgICAgIGNvbnN0IGVsZW1lbnQgPSBDb21wb25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQ7Cisg ICAgICAgIHRoaXMucmVuZGVyUmVwbGFjZShsaXN0Q29udGFpbmVyLCBvYmplY3RzLm1hcCgob2Jq ZWN0KSA9PiB7CisgICAgICAgICAgICBjb25zdCByYWRpb0J1dHRvbiA9IGVsZW1lbnQoJ2lucHV0 Jywge3R5cGU6ICdyYWRpbycsIG5hbWU6IG5hbWUsIG9uY2hhbmdlOiAoKSA9PiB7CisgICAgICAg ICAgICAgICAgY2hlY2tTZWxlY3RlZFJhZGlvQnV0dG9ucyhsaXN0SXRlbXMuZmlsdGVyKChpdGVt KSA9PiBpdGVtLnJhZGlvQnV0dG9uLmNoZWNrZWQpKTsKICAgICAgICAgICAgICAgICBjYWxsYmFj ayhzZWxlY3RlZExpc3RJdGVtcy5tYXAoKGl0ZW0pID0+IGl0ZW0ub2JqZWN0KSk7CiAgICAgICAg ICAgICAgICAgdGhpcy5lbnF1ZXVlVG9SZW5kZXIoKTsKICAgICAgICAgICAgIH19KTsKLSAgICAg ICAgICAgIGNvbnN0IGxhYmVsID0gZWxlbWVudCgnbGFiZWwnLCBbY2hlY2tib3gsIG9iamVjdC5s YWJlbCgpXSk7Ci0gICAgICAgICAgICBsaXN0SXRlbXMucHVzaCh7Y2hlY2tib3gsIGxhYmVsLCBv YmplY3R9KTsKKyAgICAgICAgICAgIGNvbnN0IGxhYmVsID0gZWxlbWVudCgnbGFiZWwnLCBbcmFk aW9CdXR0b24sIG9iamVjdC5sYWJlbCgpXSk7CisgICAgICAgICAgICBsaXN0SXRlbXMucHVzaCh7 cmFkaW9CdXR0b24sIGxhYmVsLCBvYmplY3R9KTsKICAgICAgICAgICAgIHJldHVybiBlbGVtZW50 KCdsaScsIGxhYmVsKTsKLSAgICAgICAgfSkKKyAgICAgICAgfSkpOworCisgICAgICAgIHJldHVy biBuZXcgTGF6aWx5RXZhbHVhdGVkRnVuY3Rpb24oKC4uLnNlbGVjdGVkT2JqZWN0cykgPT4gewor ICAgICAgICAgICAgY29uc3Qgb2JqZWN0cyA9IG5ldyBTZXQoc2VsZWN0ZWRPYmplY3RzKTsKKyAg ICAgICAgICAgIGNoZWNrU2VsZWN0ZWRSYWRpb0J1dHRvbnMobGlzdEl0ZW1zLmZpbHRlcigoaXRl bSkgPT4gb2JqZWN0cy5oYXMoaXRlbS5vYmplY3QpKSk7CisgICAgICAgIH0pOwogICAgIH0KIAog ICAgIF91cGRhdGVUcmlnZ2VyYWJsZSh0ZXN0cywgcGxhdGZvcm0pCmRpZmYgLS1naXQgYS9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY3VzdG9tLWNvbmZpZ3Vy YXRpb24tdGVzdC1ncm91cC1mb3JtLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92My9jb21wb25lbnRzL2N1c3RvbS1jb25maWd1cmF0aW9uLXRlc3QtZ3JvdXAtZm9ybS5qcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi41OGViYmFhZGM4Y2U1NjI3ZGYwNjI2ZGU4MDMwOTkzOTRlMjM3YjgwCi0tLSAv ZGV2L251bGwKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25l bnRzL2N1c3RvbS1jb25maWd1cmF0aW9uLXRlc3QtZ3JvdXAtZm9ybS5qcwpAQCAtMCwwICsxLDEx MCBAQAorCitjbGFzcyBDdXN0b21Db25maWd1cmF0aW9uVGVzdEdyb3VwRm9ybSBleHRlbmRzIFRl c3RHcm91cEZvcm0geworCisgICAgY29uc3RydWN0b3IoKQorICAgIHsKKyAgICAgICAgc3VwZXIo J2N1c3RvbS1jb25maWd1cmF0aW9uLXRlc3QtZ3JvdXAtZm9ybScpOworICAgICAgICB0aGlzLl9o YXNUYXNrID0gZmFsc2U7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRlc3RHcm91cE5hbWVMYXppbHkg PSBuZXcgTGF6aWx5RXZhbHVhdGVkRnVuY3Rpb24odGhpcy5fdXBkYXRlVGVzdEdyb3VwTmFtZS5i aW5kKHRoaXMpKTsKKyAgICB9CisKKyAgICBzZXRIYXNUYXNrKGhhc1Rhc2spCisgICAgeworICAg ICAgICB0aGlzLl9oYXNUYXNrID0gaGFzVGFzazsKKyAgICAgICAgdGhpcy5lbnF1ZXVlVG9SZW5k ZXIoKTsKKyAgICB9CisKKyAgICBoYXNDb21taXRTZXRzKCkKKyAgICB7CisgICAgICAgIHJldHVy biAhIXRoaXMucGFydCgnY29uZmlndXJhdG9yJykuY29tbWl0U2V0cygpOworICAgIH0KKworICAg IHNldENvbmZpZ3VyYXRpb25zKHRlc3QsIHBsYXRmb3JtLCByZXBldGl0aW9uQ291bnQsIGNvbW1p dFNldHMpCisgICAgeworICAgICAgICBjb25zdCBjb25maWd1cmF0b3IgPSB0aGlzLnBhcnQoJ2Nv bmZpZ3VyYXRvcicpOworICAgICAgICBjb25maWd1cmF0b3Iuc2VsZWN0VGVzdHMoW3Rlc3RdKTsK KyAgICAgICAgY29uZmlndXJhdG9yLnNlbGVjdFBsYXRmb3JtKHBsYXRmb3JtKTsKKyAgICAgICAg aWYgKGNvbW1pdFNldHMubGVuZ3RoID09IDIpCisgICAgICAgICAgICBjb25maWd1cmF0b3Iuc2V0 Q29tbWl0U2V0cyhjb21taXRTZXRzWzBdLCBjb21taXRTZXRzWzFdKTsKKyAgICAgICAgdGhpcy5z ZXRSZXBldGl0aW9uQ291bnQocmVwZXRpdGlvbkNvdW50KTsKKyAgICAgICAgdGhpcy5lbnF1ZXVl VG9SZW5kZXIoKTsKKyAgICB9CisKKyAgICBzdGFydFRlc3RpbmcoKQorICAgIHsKKyAgICAgICAg Y29uc3QgdGFza05hbWUgPSB0aGlzLmNvbnRlbnQoJ3Rhc2stbmFtZScpLnZhbHVlOworICAgICAg ICBjb25zdCB0ZXN0R3JvdXBOYW1lID0gdGhpcy5jb250ZW50KCdncm91cC1uYW1lJykudmFsdWU7 CisgICAgICAgIGNvbnN0IGNvbmZpZ3VyYXRvciA9IHRoaXMucGFydCgnY29uZmlndXJhdG9yJyk7 CisgICAgICAgIGNvbnN0IGNvbW1pdFNldHMgPSBjb25maWd1cmF0b3IuY29tbWl0U2V0cygpOwor ICAgICAgICBjb25zdCBwbGF0Zm9ybSA9IGNvbmZpZ3VyYXRvci5wbGF0Zm9ybSgpOworICAgICAg ICBjb25zdCB0ZXN0ID0gY29uZmlndXJhdG9yLnRlc3RzKClbMF07IC8vIEZJWE1FOiBBZGQgdGhl IHN1cHBvcnQgZm9yIHNwZWNpZnlpbmcgbXVsdGlwbGUgdGVzdHMuCisgICAgICAgIHRoaXMuZGlz cGF0Y2hBY3Rpb24oJ3N0YXJ0VGVzdGluZycsIHRoaXMuX3JlcGV0aXRpb25Db3VudCwgdGVzdEdy b3VwTmFtZSwgY29tbWl0U2V0cywgcGxhdGZvcm0sIHRlc3QsIHRhc2tOYW1lKTsKKyAgICB9CisK KyAgICBkaWRDb25zdHJ1Y3RTaGFkb3dUcmVlKCkKKyAgICB7CisgICAgICAgIHN1cGVyLmRpZENv bnN0cnVjdFNoYWRvd1RyZWUoKTsKKworICAgICAgICB0aGlzLnBhcnQoJ2NvbmZpZ3VyYXRvcicp Lmxpc3RlblRvQWN0aW9uKCdjb21taXRTZXRDaGFuZ2UnLCAoKSA9PiB0aGlzLmVucXVldWVUb1Jl bmRlcigpKTsKKworICAgICAgICB0aGlzLmNvbnRlbnQoJ3Rhc2stbmFtZScpLm9uaW5wdXQgPSAo KSA9PiB0aGlzLmVucXVldWVUb1JlbmRlcigpOworICAgICAgICB0aGlzLmNvbnRlbnQoJ2dyb3Vw LW5hbWUnKS5vbmlucHV0ID0gKCkgPT4gdGhpcy5lbnF1ZXVlVG9SZW5kZXIoKTsKKyAgICB9CisK KyAgICByZW5kZXIoKQorICAgIHsKKyAgICAgICAgc3VwZXIucmVuZGVyKCk7CisgICAgICAgIGNv bnN0IGNvbmZpZ3VyYXRvciA9IHRoaXMucGFydCgnY29uZmlndXJhdG9yJyk7CisgICAgICAgIHRo aXMuX3VwZGF0ZVRlc3RHcm91cE5hbWVMYXppbHkuZXZhbHVhdGUoY29uZmlndXJhdG9yLnRlc3Rz KCksIGNvbmZpZ3VyYXRvci5wbGF0Zm9ybSgpKTsKKworICAgICAgICBjb25zdCBuZWVkc1Rhc2tO YW1lID0gIXRoaXMuX2hhc1Rhc2sgJiYgIXRoaXMuY29udGVudCgndGFzay1uYW1lJykudmFsdWU7 CisgICAgICAgIHRoaXMuY29udGVudCgnaXRlcmF0aW9uLXN0YXJ0LXBhbmUnKS5zdHlsZS5kaXNw bGF5ID0gISFjb25maWd1cmF0b3IuY29tbWl0U2V0cygpID8gbnVsbCA6ICdub25lJzsKKyAgICAg ICAgdGhpcy5jb250ZW50KCd0YXNrLW5hbWUnKS5zdHlsZS5kaXNwbGF5ID0gdGhpcy5faGFzVGFz ayA/ICdub25lJyA6IG51bGw7CisgICAgICAgIHRoaXMuY29udGVudCgnc3RhcnQtYnV0dG9uJyku ZGlzYWJsZWQgPSBuZWVkc1Rhc2tOYW1lIHx8ICF0aGlzLmNvbnRlbnQoJ2dyb3VwLW5hbWUnKS52 YWx1ZTsKKyAgICB9CisKKyAgICBfdXBkYXRlVGVzdEdyb3VwTmFtZSh0ZXN0cywgcGxhdGZvcm0p CisgICAgeworICAgICAgICBpZiAoIXBsYXRmb3JtIHx8ICF0ZXN0cy5sZW5ndGgpCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIHRoaXMuY29udGVudCgnZ3JvdXAtbmFtZScpLnZhbHVlID0g YCR7dGVzdHMubWFwKCh0ZXN0KSA9PiB0ZXN0Lm5hbWUoKSkuam9pbignLCAnKX0gb24gJHtwbGF0 Zm9ybS5uYW1lKCl9YDsKKyAgICB9CisKKyAgICBzdGF0aWMgY3NzVGVtcGxhdGUoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHN1cGVyLmNzc1RlbXBsYXRlKCkgKyBgCisgICAgICAgICAgICBpbnB1 dCB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDMwJTsKKyAgICAgICAgICAgICAgICBtaW4td2lk dGg6IDEwcmVtOworICAgICAgICAgICAgICAgIGZvbnQtc2l6ZTogMXJlbTsKKyAgICAgICAgICAg ICAgICBmb250LXdlaWdodDogaW5oZXJpdDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg I2Zvcm0gPiAqIHsKKyAgICAgICAgICAgICAgICBtYXJnaW4tYm90dG9tOiAxcmVtOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICAjc3RhcnQtYnV0dG9uIHsKKyAgICAgICAgICAgICAgICBk aXNwbGF5OiBibG9jazsKKyAgICAgICAgICAgICAgICBtYXJnaW4tdG9wOiAwLjVyZW07CisgICAg ICAgICAgICAgICAgZm9udC1zaXplOiAxLjJyZW07CisgICAgICAgICAgICAgICAgZm9udC13ZWln aHQ6IGluaGVyaXQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBgOworICAgIH0KKworICAg IHN0YXRpYyBodG1sVGVtcGxhdGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGA8Zm9ybSBpZD0i Zm9ybSI+CisgICAgICAgICAgICA8aW5wdXQgaWQ9InRhc2stbmFtZSIgdHlwZT0idGV4dCIgcGxh Y2Vob2xkZXI9Ik5hbWUgdGhpcyB0YXNrIj4KKyAgICAgICAgICAgIDxjdXN0b20tYW5hbHlzaXMt dGFzay1jb25maWd1cmF0b3IgaWQ9ImNvbmZpZ3VyYXRvciI+PC9jdXN0b20tYW5hbHlzaXMtdGFz ay1jb25maWd1cmF0b3I+CisgICAgICAgICAgICA8ZGl2IGlkPSJpdGVyYXRpb24tc3RhcnQtcGFu ZSI+CisgICAgICAgICAgICAgICAgPGlucHV0IGlkPSJncm91cC1uYW1lIiB0eXBlPSJ0ZXh0IiBw bGFjZWhvbGRlcj0iVGVzdCBncm91cCBuYW1lIj4KKyAgICAgICAgICAgICAgICAke3N1cGVyLmZv cm1Db250ZW50KCl9CisgICAgICAgICAgICAgICAgPGJ1dHRvbiBpZD0ic3RhcnQtYnV0dG9uIj5T dGFydDwvYnV0dG9uPgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZm9ybT5gOworICAg IH0KK30KKworQ29tcG9uZW50QmFzZS5kZWZpbmVFbGVtZW50KCdjdXN0b20tY29uZmlndXJhdGlv bi10ZXN0LWdyb3VwLWZvcm0nLCBDdXN0b21Db25maWd1cmF0aW9uVGVzdEdyb3VwRm9ybSk7CmRp ZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMv dGVzdC1ncm91cC1mb3JtLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9j b21wb25lbnRzL3Rlc3QtZ3JvdXAtZm9ybS5qcwppbmRleCA3ZTBhYzBhZmYyZGZhMjVkMmMyZDBm MWM4YTAwN2NiOGNkMGMwODcxLi5jNDRiNjZmYTA1ZDBhNjI0MjI3ZjZiYWM1MzkwMWVjNzQ4NDBi NGQ1IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBv bmVudHMvdGVzdC1ncm91cC1mb3JtLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9w dWJsaWMvdjMvY29tcG9uZW50cy90ZXN0LWdyb3VwLWZvcm0uanMKQEAgLTMyLDYgKzMyLDE1IEBA IGNsYXNzIFRlc3RHcm91cEZvcm0gZXh0ZW5kcyBDb21wb25lbnRCYXNlIHsKICAgICAgICAgcmV0 dXJuIGA8Zm9ybSBpZD0iZm9ybSI+PGJ1dHRvbiBpZD0ic3RhcnQtYnV0dG9uIiB0eXBlPSJzdWJt aXQiPjxzbG90PlN0YXJ0IEEvQiB0ZXN0aW5nPC9zbG90PjwvYnV0dG9uPiR7dGhpcy5mb3JtQ29u dGVudCgpfTwvZm9ybT5gOwogICAgIH0KIAorICAgIHN0YXRpYyBjc3NUZW1wbGF0ZSgpCisgICAg eworICAgICAgICByZXR1cm4gYAorICAgICAgICAgICAgOmhvc3QgeworICAgICAgICAgICAgICAg IGRpc3BsYXk6IGJsb2NrOworICAgICAgICAgICAgfQorICAgICAgICBgOworICAgIH0KKwogICAg IHN0YXRpYyBmb3JtQ29udGVudCgpCiAgICAgewogICAgICAgICByZXR1cm4gYApkaWZmIC0tZ2l0 IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9pbmRleC5odG1sIGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9pbmRleC5odG1sCmluZGV4IDdjZDUxMTM5YzIw Nzg3YjJkNzc2MzA2ZjE5OGM2ZWRlYWQ5ZmEzNjYuLmQ3MGNhMmQ5OGYxZjI0YTNhOTJkMGE2YWJj NmVhMTc1YTkxOThhODcgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvdjMvaW5kZXguaHRtbAorKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yz L2luZGV4Lmh0bWwKQEAgLTk2LDYgKzk2LDcgQEAgUnVuIHRvb2xzL2J1bmRsZS12My1zY3JpcHRz IHRvIHNwZWVkIHVwIHRoZSBsb2FkIHRpbWUgZm9yIHByb2R1Y3Rpb24uYCk7CiAgICAgICAgIDxz Y3JpcHQgc3JjPSJjb21wb25lbnRzL2FuYWx5c2lzLXRhc2stYnVnLWxpc3QuanMiPjwvc2NyaXB0 PgogICAgICAgICA8c2NyaXB0IHNyYz0iY29tcG9uZW50cy9yYXRpby1iYXItZ3JhcGguanMiPjwv c2NyaXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0iY29tcG9uZW50cy9jdXN0b20tYW5hbHlzaXMt dGFzay1jb25maWd1cmF0b3IuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iY29t cG9uZW50cy9jdXN0b20tY29uZmlndXJhdGlvbi10ZXN0LWdyb3VwLWZvcm0uanMiPjwvc2NyaXB0 PgogICAgICAgICA8c2NyaXB0IHNyYz0iY29tcG9uZW50cy9pbnN0YW50LWZpbGUtdXBsb2FkZXIu anMiPjwvc2NyaXB0PgogCiAgICAgICAgIDxzY3JpcHQgc3JjPSJwYWdlcy9wYWdlLmpzIj48L3Nj cmlwdD4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9k ZWxzL3Rlc3QtZ3JvdXAuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21v ZGVscy90ZXN0LWdyb3VwLmpzCmluZGV4IDFlODE0MGJhMjc3NmY5ZjQ4ODI3MGQ5MjdiYmFjMjM5 NDVjMjIzNmUuLjMyYmUwYTYzNTIyN2RmMDIwYzQ1YzNhY2Y5ODY4YTkwNGZjMWE0NjUgMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3Rlc3QtZ3Jv dXAuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGVz dC1ncm91cC5qcwpAQCAtNDAsNiArNDAsMjAgQEAgY2xhc3MgVGVzdEdyb3VwIGV4dGVuZHMgTGFi ZWxlZE9iamVjdCB7CiAgICAgICAgIHRoaXMuX2NvbW1pdFNldFRvTGFiZWwuY2xlYXIoKTsKICAg ICB9CiAKKyAgICB0ZXN0KCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fYnVpbGRSZXF1ZXN0 cy5sZW5ndGgpCisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgcmV0dXJuIHRoaXMu X2J1aWxkUmVxdWVzdHNbMF0udGVzdCgpOworICAgIH0KKworICAgIHBsYXRmb3JtKCkKKyAgICB7 CisgICAgICAgIGlmICghdGhpcy5fYnVpbGRSZXF1ZXN0cy5sZW5ndGgpCisgICAgICAgICAgICBy ZXR1cm4gbnVsbDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2J1aWxkUmVxdWVzdHNbMF0ucGxhdGZv cm0oKTsKKyAgICB9CisKICAgICByZXBldGl0aW9uQ291bnQoKQogICAgIHsKICAgICAgICAgaWYg KCF0aGlzLl9idWlsZFJlcXVlc3RzLmxlbmd0aCkKQEAgLTE4OCw2ICsyMDIsMTYgQEAgY2xhc3Mg VGVzdEdyb3VwIGV4dGVuZHMgTGFiZWxlZE9iamVjdCB7CiAgICAgICAgIH0pOwogICAgIH0KIAor ICAgIHN0YXRpYyBjcmVhdGVXaXRoQ3VzdG9tQ29uZmlndXJhdGlvbih0YXNrLCBwbGF0Zm9ybSwg dGVzdCwgZ3JvdXBOYW1lLCByZXBldGl0aW9uQ291bnQsIGNvbW1pdFNldHMpCisgICAgeworICAg ICAgICBjb25zb2xlLmFzc2VydChjb21taXRTZXRzLmxlbmd0aCA9PSAyKTsKKyAgICAgICAgY29u c3QgcmV2aXNpb25TZXRzID0gdGhpcy5fcmV2aXNpb25TZXRzRnJvbUNvbW1pdFNldHMoY29tbWl0 U2V0cyk7CisgICAgICAgIGNvbnN0IHBhcmFtcyA9IHt0YXNrOiB0YXNrLmlkKCksIG5hbWU6IGdy b3VwTmFtZSwgcGxhdGZvcm06IHBsYXRmb3JtLmlkKCksIHRlc3Q6IHRlc3QuaWQoKSwgcmVwZXRp dGlvbkNvdW50LCByZXZpc2lvblNldHN9OworICAgICAgICByZXR1cm4gUHJpdmlsZWdlZEFQSS5z ZW5kUmVxdWVzdCgnY3JlYXRlLXRlc3QtZ3JvdXAnLCBwYXJhbXMpLnRoZW4oKGRhdGEpID0+IHsK KyAgICAgICAgICAgIHJldHVybiB0aGlzLl9mZXRjaFRlc3RHcm91cHNGb3JUYXNrKHRhc2suaWQo KSk7CisgICAgICAgIH0pOworICAgIH0KKwogICAgIHN0YXRpYyBjcmVhdGVBbmRSZWZldGNoVGVz dEdyb3Vwcyh0YXNrLCBuYW1lLCByZXBldGl0aW9uQ291bnQsIGNvbW1pdFNldHMpCiAgICAgewog ICAgICAgICBjb25zb2xlLmFzc2VydChjb21taXRTZXRzLmxlbmd0aCA9PSAyKTsKZGlmZiAtLWdp dCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3VwbG9hZGVkLWZp bGUuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21vZGVscy91cGxvYWRl ZC1maWxlLmpzCmluZGV4IDQ1YjY1MzdjOWY1NmUwZDNhN2ZjMjM1YTk1MjhiYWE0YTc1ZTk3NWEu LmQ3YWI0YWM3ZmE1MmFjMDg4MjM5OTAwYjI2ODI4ODc0MGUzNmI2Y2QgMTAwNjQ0Ci0tLSBhL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3VwbG9hZGVkLWZpbGUuanMK KysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdXBsb2FkZWQt ZmlsZS5qcwpAQCAtNSw3ICs1LDcgQEAgY2xhc3MgVXBsb2FkZWRGaWxlIGV4dGVuZHMgRGF0YU1v ZGVsT2JqZWN0IHsKICAgICB7CiAgICAgICAgIHN1cGVyKGlkLCBvYmplY3QpOwogICAgICAgICB0 aGlzLl9jcmVhdGVkQXQgPSBuZXcgRGF0ZShvYmplY3QuY3JlYXRlZEF0KTsKLSAgICAgICAgdGhp cy5fZGVsZXRlZEF0ID0gbmV3IERhdGUob2JqZWN0LmRlbGV0ZWRBdCk7CisgICAgICAgIHRoaXMu X2RlbGV0ZWRBdCA9IG9iamVjdC5kZWxldGVkQXQgPyBuZXcgRGF0ZShvYmplY3QuZGVsZXRlZEF0 KSA6IG51bGw7CiAgICAgICAgIHRoaXMuX2ZpbGVuYW1lID0gb2JqZWN0LmZpbGVuYW1lOwogICAg ICAgICB0aGlzLl9hdXRob3IgPSBvYmplY3QuYXV0aG9yOwogICAgICAgICB0aGlzLl9zaXplID0g b2JqZWN0LnNpemU7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YzL3BhZ2VzL2FuYWx5c2lzLXRhc2stcGFnZS5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9wdWJsaWMvdjMvcGFnZXMvYW5hbHlzaXMtdGFzay1wYWdlLmpzCmluZGV4IDMwMjIxYTVlMzlm NGM0MzBjYWEyZmZiNzkzYTk2NzJlNzJmODJmMjYuLmVlN2ZjOGU4N2NlMzM0MTRiOWNkMGEwNDFj ZWNjOGZhZWFlMzQ3YTMgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvdjMvcGFnZXMvYW5hbHlzaXMtdGFzay1wYWdlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvYW5hbHlzaXMtdGFzay1wYWdlLmpzCkBAIC0xMzMsNiAr MTMzLDUzIEBAIGNsYXNzIEFuYWx5c2lzVGFza1Jlc3VsdHNQYW5lIGV4dGVuZHMgQ29tcG9uZW50 QmFzZSB7CiAKIENvbXBvbmVudEJhc2UuZGVmaW5lRWxlbWVudCgnYW5hbHlzaXMtdGFzay1yZXN1 bHRzLXBhbmUnLCBBbmFseXNpc1Rhc2tSZXN1bHRzUGFuZSk7CiAKK2NsYXNzIEFuYWx5c2lzVGFz a0NvbmZpZ3VyYXRvclBhbmUgZXh0ZW5kcyBDb21wb25lbnRCYXNlIHsKKyAgICBjb25zdHJ1Y3Rv cigpCisgICAgeworICAgICAgICBzdXBlcignYW5hbHlzaXMtdGFzay1jb25maWd1cmF0b3ItcGFu ZScpOworICAgICAgICB0aGlzLl9jdXJyZW50R3JvdXAgPSBudWxsOworICAgIH0KKworICAgIGRp ZENvbnN0cnVjdFNoYWRvd1RyZWUoKQorICAgIHsKKyAgICAgICAgY29uc3QgZm9ybSA9IHRoaXMu cGFydCgnZm9ybScpOworICAgICAgICBmb3JtLnNldEhhc1Rhc2sodHJ1ZSk7CisgICAgICAgIGZv cm0ubGlzdGVuVG9BY3Rpb24oJ3N0YXJ0VGVzdGluZycsICguLi5hcmdzKSA9PiB7CisgICAgICAg ICAgICB0aGlzLmRpc3BhdGNoQWN0aW9uKCdjcmVhdGVDdXN0b21UZXN0R3JvdXAnLCAuLi5hcmdz KTsKKyAgICAgICAgfSk7CisgICAgfQorCisgICAgc2V0VGVzdEdyb3Vwcyh0ZXN0R3JvdXBzLCBj dXJyZW50R3JvdXApCisgICAgeworICAgICAgICB0aGlzLl9jdXJyZW50R3JvdXAgPSBjdXJyZW50 R3JvdXA7CisgICAgICAgIGNvbnN0IGZvcm0gPSB0aGlzLnBhcnQoJ2Zvcm0nKTsKKyAgICAgICAg aWYgKCFmb3JtLmhhc0NvbW1pdFNldHMoKSkKKyAgICAgICAgICAgIGZvcm0uc2V0Q29uZmlndXJh dGlvbnMoY3VycmVudEdyb3VwLnRlc3QoKSwgY3VycmVudEdyb3VwLnBsYXRmb3JtKCksIGN1cnJl bnRHcm91cC5yZXBldGl0aW9uQ291bnQoKSwgY3VycmVudEdyb3VwLnJlcXVlc3RlZENvbW1pdFNl dHMoKSk7CisgICAgICAgIHRoaXMuZW5xdWV1ZVRvUmVuZGVyKCk7CisgICAgfQorCisgICAgcmVu ZGVyKCkKKyAgICB7CisgICAgICAgIHN1cGVyLnJlbmRlcigpOworICAgIH0KKyAgICAKKyAgICBz dGF0aWMgaHRtbFRlbXBsYXRlKCkKKyAgICB7CisgICAgICAgIHJldHVybiBgPGN1c3RvbS1jb25m aWd1cmF0aW9uLXRlc3QtZ3JvdXAtZm9ybSBpZD0iZm9ybSI+PC9jdXN0b20tY29uZmlndXJhdGlv bi10ZXN0LWdyb3VwLWZvcm0+YDsKKyAgICB9CisKKyAgICBzdGF0aWMgY3NzVGVtcGxhdGUoKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIGAKKyAgICAgICAgICAgICNmb3JtIHsKKyAgICAgICAgICAg ICAgICBtYXJnaW46IDFyZW07CisgICAgICAgICAgICB9CisgICAgICAgIGA7CisgICAgfQorfTsK KworQ29tcG9uZW50QmFzZS5kZWZpbmVFbGVtZW50KCdhbmFseXNpcy10YXNrLWNvbmZpZ3VyYXRv ci1wYW5lJywgQW5hbHlzaXNUYXNrQ29uZmlndXJhdG9yUGFuZSk7CisKIGNsYXNzIEFuYWx5c2lz VGFza1Rlc3RHcm91cFBhbmUgZXh0ZW5kcyBDb21wb25lbnRCYXNlIHsKIAogICAgIGNvbnN0cnVj dG9yKCkKQEAgLTM4OSw2ICs0MzYsOCBAQCBjbGFzcyBBbmFseXNpc1Rhc2tQYWdlIGV4dGVuZHMg UGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgcmVzdWx0c1BhbmUubGlzdGVuVG9BY3Rpb24oJ3No b3dUZXN0R3JvdXAnLCAodGVzdEdyb3VwKSA9PiB0aGlzLl9zaG93VGVzdEdyb3VwKHRlc3RHcm91 cCkpOwogICAgICAgICByZXN1bHRzUGFuZS5saXN0ZW5Ub0FjdGlvbignbmV3VGVzdEdyb3VwJywg dGhpcy5fY3JlYXRlVGVzdEdyb3VwQWZ0ZXJWZXJpZnlpbmdDb21taXRTZXRMaXN0LmJpbmQodGhp cykpOwogCisgICAgICAgIHRoaXMucGFydCgnY29uZmlndXJhdG9yLXBhbmUnKS5saXN0ZW5Ub0Fj dGlvbignY3JlYXRlQ3VzdG9tVGVzdEdyb3VwJywgdGhpcy5fY3JlYXRlQ3VzdG9tVGVzdEdyb3Vw LmJpbmQodGhpcykpOworCiAgICAgICAgIGNvbnN0IGdyb3VwUGFuZSA9IHRoaXMucGFydCgnZ3Jv dXAtcGFuZScpOwogICAgICAgICBncm91cFBhbmUubGlzdGVuVG9BY3Rpb24oJ3Nob3dUZXN0R3Jv dXAnLCAodGVzdEdyb3VwKSA9PiB0aGlzLl9zaG93VGVzdEdyb3VwKHRlc3RHcm91cCkpOwogICAg ICAgICBncm91cFBhbmUubGlzdGVuVG9BY3Rpb24oJ3Nob3dIaWRkZW5UZXN0R3JvdXBzJywgKCkg PT4gdGhpcy5fc2hvd0FsbFRlc3RHcm91cHMoKSk7CkBAIC01MjQsNiArNTczLDggQEAgY2xhc3Mg QW5hbHlzaXNUYXNrUGFnZSBleHRlbmRzIFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgICAgIHRoaXMu Y29udGVudCgncmVzdWx0cy1wYW5lJykuc3R5bGUuZGlzcGxheSA9IHRoaXMuX3Rhc2sgJiYgIXRo aXMuX3Rhc2suaXNDdXN0b20oKSA/IG51bGwgOiAnbm9uZSc7CiAgICAgICAgIHRoaXMucGFydCgn cmVzdWx0cy1wYW5lJykuc2V0U2hvd0Zvcm0oISF0aGlzLl90cmlnZ2VyYWJsZSk7CiAKKyAgICAg ICAgdGhpcy5jb250ZW50KCdjb25maWd1cmF0b3ItcGFuZScpLnN0eWxlLmRpc3BsYXkgPSB0aGlz Ll90YXNrICYmIHRoaXMuX3Rhc2suaXNDdXN0b20oKSA/IG51bGwgOiAnbm9uZSc7CisKICAgICAg ICAgSW5zdHJ1bWVudGF0aW9uLmVuZE1lYXN1cmluZ1RpbWUoJ0FuYWx5c2lzVGFza1BhZ2UnLCAn cmVuZGVyJyk7CiAgICAgfQogCkBAIC01ODMsNiArNjM0LDcgQEAgY2xhc3MgQW5hbHlzaXNUYXNr UGFnZSBleHRlbmRzIFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgX3Nob3dUZXN0R3JvdXAodGVzdEdy b3VwKQogICAgIHsKICAgICAgICAgdGhpcy5fY3VycmVudFRlc3RHcm91cCA9IHRlc3RHcm91cDsK KyAgICAgICAgdGhpcy5wYXJ0KCdjb25maWd1cmF0b3ItcGFuZScpLnNldFRlc3RHcm91cHModGhp cy5fZmlsdGVyZWRUZXN0R3JvdXBzLCB0aGlzLl9jdXJyZW50VGVzdEdyb3VwKTsKICAgICAgICAg dGhpcy5wYXJ0KCdyZXN1bHRzLXBhbmUnKS5zZXRUZXN0R3JvdXBzKHRoaXMuX2ZpbHRlcmVkVGVz dEdyb3VwcywgdGhpcy5fY3VycmVudFRlc3RHcm91cCk7CiAgICAgICAgIGNvbnN0IGdyb3Vwc0lu UmV2ZXJzZUNocm9ub2xvZ3kgPSB0aGlzLl9maWx0ZXJlZFRlc3RHcm91cHMuc2xpY2UoMCkucmV2 ZXJzZSgpOwogICAgICAgICBjb25zdCBzaG93SGlkZGVuR3JvdXBzID0gIXRoaXMuX3Rlc3RHcm91 cHMuc29tZSgoZ3JvdXApID0+IGdyb3VwLmlzSGlkZGVuKCkpIHx8IHRoaXMuX3Nob3dIaWRkZW5U ZXN0R3JvdXBzOwpAQCAtNzExLDYgKzc2MywyMCBAQCBjbGFzcyBBbmFseXNpc1Rhc2tQYWdlIGV4 dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgfSk7CiAgICAgfQogCisgICAgX2NyZWF0 ZUN1c3RvbVRlc3RHcm91cChyZXBldGl0aW9uQ291bnQsIHRlc3RHcm91cE5hbWUsIGNvbW1pdFNl dHMsIHBsYXRmb3JtLCB0ZXN0KQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5f dGFzay5pc0N1c3RvbSgpKTsKKyAgICAgICAgaWYgKHRoaXMuX2hhc0R1cGxpY2F0ZVRlc3RHcm91 cE5hbWUodGVzdEdyb3VwTmFtZSkpIHsKKyAgICAgICAgICAgIGFsZXJ0KGBUaGVyZSBpcyBhbHJl YWR5IGEgdGVzdCBncm91cCBuYW1lZCAiJHt0ZXN0R3JvdXBOYW1lfSJgKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIFRlc3RHcm91cC5jcmVhdGVXaXRoQ3VzdG9t Q29uZmlndXJhdGlvbih0aGlzLl90YXNrLCBwbGF0Zm9ybSwgdGVzdCwgdGVzdEdyb3VwTmFtZSwg cmVwZXRpdGlvbkNvdW50LCBjb21taXRTZXRzKQorICAgICAgICAgICAgLnRoZW4odGhpcy5fZGlk RmV0Y2hUZXN0R3JvdXBzLmJpbmQodGhpcyksIGZ1bmN0aW9uIChlcnJvcikgeworICAgICAgICAg ICAgYWxlcnQoJ0ZhaWxlZCB0byBjcmVhdGUgYSBuZXcgdGVzdCBncm91cDogJyArIGVycm9yKTsK KyAgICAgICAgfSk7CisgICAgfQorCiAgICAgX2NyZWF0ZVJldHJ5TmFtZUZvclRlc3RHcm91cChu YW1lKQogICAgIHsKICAgICAgICAgdmFyIG5hbWVXaXRoTnVtYmVyTWF0Y2ggPSBuYW1lLm1hdGNo KC8oLis/KVxzKlwoXHMqKFxkKylccypcKVxzKiQvKTsKQEAgLTc3Nyw2ICs4NDMsNyBAQCBjbGFz cyBBbmFseXNpc1Rhc2tQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgICAg ICAgICA8L2Rpdj4KICAgICAgICAgICAgICAgICA8YW5hbHlzaXMtdGFzay1jaGFydC1wYW5lIGlk PSJjaGFydC1wYW5lIj48L2FuYWx5c2lzLXRhc2stY2hhcnQtcGFuZT4KICAgICAgICAgICAgICAg ICA8YW5hbHlzaXMtdGFzay1yZXN1bHRzLXBhbmUgaWQ9InJlc3VsdHMtcGFuZSI+PC9hbmFseXNp cy10YXNrLXJlc3VsdHMtcGFuZT4KKyAgICAgICAgICAgICAgICA8YW5hbHlzaXMtdGFzay1jb25m aWd1cmF0b3ItcGFuZSBpZD0iY29uZmlndXJhdG9yLXBhbmUiPjwvYW5hbHlzaXMtdGFzay1jb25m aWd1cmF0b3ItcGFuZT4KICAgICAgICAgICAgICAgICA8YW5hbHlzaXMtdGFzay10ZXN0LWdyb3Vw LXBhbmUgaWQ9Imdyb3VwLXBhbmUiPjwvYW5hbHlzaXMtdGFzay10ZXN0LWdyb3VwLXBhbmU+CiAg ICAgICAgICAgICA8L2Rpdj4KIGA7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvcHVibGljL3YzL3BhZ2VzL2NyZWF0ZS1hbmFseXNpcy10YXNrLXBhZ2UuanMgYi9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL2NyZWF0ZS1hbmFseXNpcy10YXNrLXBh Z2UuanMKaW5kZXggOWVjZmYwM2I0YjNjNzRhYTg4NmE3NDE0NDRlYTk5MjUxODdjMzc1Yi4uYTlm MDg5MGMxOWJlZmI2MzBiZjA3ZGJiYjVlNWNlM2VlMmIzNjVhYyAxMDA2NDQKLS0tIGEvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9jcmVhdGUtYW5hbHlzaXMtdGFzay1w YWdlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY3Jl YXRlLWFuYWx5c2lzLXRhc2stcGFnZS5qcwpAQCAtMTksMzIgKzE5LDEyIEBAIGNsYXNzIENyZWF0 ZUFuYWx5c2lzVGFza1BhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogCiAgICAgZGlkQ29u c3RydWN0U2hhZG93VHJlZSgpCiAgICAgewotICAgICAgICB0aGlzLnBhcnQoJ2NvbmZpZ3VyYXRv cicpLmxpc3RlblRvQWN0aW9uKCdjb21taXRTZXRDaGFuZ2UnLCAoKSA9PiB0aGlzLmVucXVldWVU b1JlbmRlcigpKTsKLSAgICAgICAgdGhpcy5jb250ZW50KCdzdGFydC1idXR0b24nKS5vbmNsaWNr ID0gdGhpcy5jcmVhdGVFdmVudEhhbmRsZXIoKCkgPT4gdGhpcy5fY3JlYXRlQW5hbHlzaXNUYXNr V2l0aEdyb3VwKCkpOworICAgICAgICB0aGlzLnBhcnQoJ2Zvcm0nKS5saXN0ZW5Ub0FjdGlvbign c3RhcnRUZXN0aW5nJywgdGhpcy5fY3JlYXRlQW5hbHlzaXNUYXNrV2l0aEdyb3VwLmJpbmQodGhp cykpOwogICAgIH0KIAotICAgIF9jcmVhdGVBbmFseXNpc1Rhc2tXaXRoR3JvdXAoKQorICAgIF9j cmVhdGVBbmFseXNpc1Rhc2tXaXRoR3JvdXAocmVwZXRpdGlvbkNvdW50LCB0ZXN0R3JvdXBOYW1l LCBjb21taXRTZXRzLCBwbGF0Zm9ybSwgdGVzdCwgdGFza05hbWUpCiAgICAgewotICAgICAgICBj b25zdCB0YXNrTmFtZUlucHV0ID0gdGhpcy5jb250ZW50KCd0YXNrLW5hbWUnKTsKLSAgICAgICAg aWYgKCF0YXNrTmFtZUlucHV0LnJlcG9ydFZhbGlkaXR5KCkpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgY29uc3QgdGVzdEdyb3VwSW5wdXQgPSB0aGlzLmNvbnRlbnQoJ3Rlc3QtZ3Jv dXAtbmFtZScpOwotICAgICAgICBpZiAoIXRlc3RHcm91cElucHV0LnJlcG9ydFZhbGlkaXR5KCkp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgY29uc3QgY29uZmlndXJhdG9yID0gdGhp cy5wYXJ0KCdjb25maWd1cmF0b3InKTsKLSAgICAgICAgY29uc3QgdGVzdHMgPSBjb25maWd1cmF0 b3IudGVzdHMoKTsKLSAgICAgICAgaWYgKHRlc3RzLmxlbmd0aCAhPSAxKQotICAgICAgICAgICAg cmV0dXJuIGFsZXJ0KCdFeGFjdGx5IG9uZSB0ZXN0IG11c3QgYmUgc2VsZWN0ZWQnKTsKLQotICAg ICAgICBjb25zdCB0YXNrTmFtZSA9IHRhc2tOYW1lSW5wdXQudmFsdWU7Ci0gICAgICAgIGNvbnN0 IHRlc3RHcm91cE5hbWUgPSB0ZXN0R3JvdXBJbnB1dC52YWx1ZTsKLSAgICAgICAgY29uc3QgaXRl cmF0aW9uQ291bnQgPSB0aGlzLmNvbnRlbnQoJ2l0ZXJhdGlvbi1jb3VudCcpLnZhbHVlOwotICAg ICAgICBjb25zdCBwbGF0Zm9ybSA9IGNvbmZpZ3VyYXRvci5wbGF0Zm9ybSgpOwotICAgICAgICBj b25zdCBjb21taXRTZXRzID0gY29uZmlndXJhdG9yLmNvbW1pdFNldHMoKTsKLQotICAgICAgICBU ZXN0R3JvdXAuY3JlYXRlV2l0aFRhc2sodGFza05hbWUsIHBsYXRmb3JtLCB0ZXN0c1swXSwgdGVz dEdyb3VwTmFtZSwgaXRlcmF0aW9uQ291bnQsIGNvbW1pdFNldHMpLnRoZW4oKHRhc2spID0+IHsK KyAgICAgICAgVGVzdEdyb3VwLmNyZWF0ZVdpdGhUYXNrKHRhc2tOYW1lLCBwbGF0Zm9ybSwgdGVz dCwgdGVzdEdyb3VwTmFtZSwgcmVwZXRpdGlvbkNvdW50LCBjb21taXRTZXRzKS50aGVuKCh0YXNr KSA9PiB7CiAgICAgICAgICAgICBjb25zdCB1cmwgPSB0aGlzLnJvdXRlcigpLnVybChgYW5hbHlz aXMvdGFzay8ke3Rhc2suaWQoKX1gKTsKICAgICAgICAgICAgIGxvY2F0aW9uLmhyZWYgPSB0aGlz LnJvdXRlcigpLnVybChgYW5hbHlzaXMvdGFzay8ke3Rhc2suaWQoKX1gKTsKICAgICAgICAgfSwg KGVycm9yKSA9PiB7CkBAIC01NSw0MSArMzUsMjMgQEAgY2xhc3MgQ3JlYXRlQW5hbHlzaXNUYXNr UGFnZSBleHRlbmRzIFBhZ2VXaXRoSGVhZGluZyB7CiAgICAgcmVuZGVyKCkKICAgICB7CiAgICAg ICAgIHN1cGVyLnJlbmRlcigpOwotICAgICAgICBjb25zdCBjb25maWd1cmF0b3IgPSB0aGlzLnBh cnQoJ2NvbmZpZ3VyYXRvcicpOwotICAgICAgICB0aGlzLl9yZW5kZXJNZXNzYWdlTGF6aWx5LmV2 YWx1YXRlKHRoaXMuX21lc3NhZ2UsICEhY29uZmlndXJhdG9yLmNvbW1pdFNldHMoKSwgY29uZmln dXJhdG9yLnRlc3RzKCksIGNvbmZpZ3VyYXRvci5wbGF0Zm9ybSgpKTsKKyAgICAgICAgdGhpcy5f cmVuZGVyTWVzc2FnZUxhemlseS5ldmFsdWF0ZSh0aGlzLl9tZXNzYWdlKTsKICAgICB9CiAKLSAg ICBfcmVuZGVyTWVzc2FnZShtZXNzYWdlLCBoYXNWYWxpZENvbW1pdFNldHMsIHRlc3RzLCBwbGF0 Zm9ybSkKKyAgICBfcmVuZGVyTWVzc2FnZShtZXNzYWdlKQogICAgIHsKICAgICAgICAgY29uc3Qg bWVzc2FnZUNvbnRhaW5lciA9IHRoaXMuY29udGVudCgnbWVzc2FnZScpOwogICAgICAgICBtZXNz YWdlQ29udGFpbmVyLnRleHRDb250ZW50ID0gdGhpcy5fbWVzc2FnZTsKICAgICAgICAgbWVzc2Fn ZUNvbnRhaW5lci5zdHlsZS5kaXNwbGF5ID0gdGhpcy5fbWVzc2FnZSA/IG51bGwgOiAnbm9uZSc7 Ci0gICAgICAgIHRoaXMuY29udGVudCgnbmV3LXRhc2snKS5zdHlsZS5kaXNwbGF5ID0gdGhpcy5f bWVzc2FnZSA/ICdub25lJyA6IG51bGw7Ci0gICAgICAgIGlmIChwbGF0Zm9ybSkKLSAgICAgICAg ICAgIHRoaXMuY29udGVudCgndGVzdC1ncm91cC1uYW1lJykudmFsdWUgPSBgJHt0ZXN0cy5tYXAo KHRlc3QpID0+IHRlc3QubmFtZSgpKS5qb2luKCcsICcpfSBvbiAke3BsYXRmb3JtLm5hbWUoKX1g OwotICAgICAgICB0aGlzLmNvbnRlbnQoJ2l0ZXJhdGlvbi1zdGFydC1wYW5lJykuc3R5bGUuZGlz cGxheSA9ICF0aGlzLl9tZXNzYWdlICYmIGhhc1ZhbGlkQ29tbWl0U2V0cyA/IG51bGwgOiAnbm9u ZSc7CisgICAgICAgIHRoaXMuY29udGVudCgnZm9ybScpLnN0eWxlLmRpc3BsYXkgPSB0aGlzLl9t ZXNzYWdlID8gJ25vbmUnIDogbnVsbDsKKwogICAgICAgfQogCiAgICAgc3RhdGljIGh0bWxUZW1w bGF0ZSgpCiAgICAgewogICAgICAgICByZXR1cm4gYAogICAgICAgICAgICAgPHAgaWQ9Im1lc3Nh Z2UiPjwvcD4KLSAgICAgICAgICAgIDxkaXYgaWQ9Im5ldy10YXNrIj4KLSAgICAgICAgICAgICAg ICA8aW5wdXQgaWQ9InRhc2stbmFtZSIgdHlwZT0idGV4dCIgcGxhY2Vob2xkZXI9Ik5hbWUgdGhp cyB0YXNrIiByZXF1aXJlZD4KLSAgICAgICAgICAgICAgICA8Y3VzdG9tLWFuYWx5c2lzLXRhc2st Y29uZmlndXJhdG9yIGlkPSJjb25maWd1cmF0b3IiPjwvY3VzdG9tLWFuYWx5c2lzLXRhc2stY29u ZmlndXJhdG9yPgotICAgICAgICAgICAgICAgIDxkaXYgaWQ9Iml0ZXJhdGlvbi1zdGFydC1wYW5l Ij4KLSAgICAgICAgICAgICAgICAgICAgPGlucHV0IGlkPSJ0ZXN0LWdyb3VwLW5hbWUiIHBsYWNl aG9sZGVyPSJOYW1lIHRoaXMgdGVzdCBncm91cCIgcmVxdWlyZWQ+Ci0gICAgICAgICAgICAgICAg ICAgIDxsYWJlbD48c2VsZWN0IGlkPSJpdGVyYXRpb24tY291bnQiPgotICAgICAgICAgICAgICAg ICAgICAgICAgPG9wdGlvbj4xPC9vcHRpb24+Ci0gICAgICAgICAgICAgICAgICAgICAgICA8b3B0 aW9uPjI8L29wdGlvbj4KLSAgICAgICAgICAgICAgICAgICAgICAgIDxvcHRpb24+Mzwvb3B0aW9u PgotICAgICAgICAgICAgICAgICAgICAgICAgPG9wdGlvbiBzZWxlY3RlZD40PC9vcHRpb24+Ci0g ICAgICAgICAgICAgICAgICAgICAgICA8b3B0aW9uPjU8L29wdGlvbj4KLSAgICAgICAgICAgICAg ICAgICAgICAgIDxvcHRpb24+Njwvb3B0aW9uPgotICAgICAgICAgICAgICAgICAgICA8L3NlbGVj dD4gaXRlcmF0aW9ucyBwZXIgY29uZmlndXJhdGlvbjwvbGFiZWw+Ci0gICAgICAgICAgICAgICAg ICAgIDxidXR0b24gaWQ9InN0YXJ0LWJ1dHRvbiI+U3RhcnQ8L2J1dHRvbj4KLSAgICAgICAgICAg ICAgICA8L2Rpdj4KLSAgICAgICAgICAgIDwvZGl2PmA7CisgICAgICAgICAgICA8Y3VzdG9tLWNv bmZpZ3VyYXRpb24tdGVzdC1ncm91cC1mb3JtIGlkPSJmb3JtIj48L2N1c3RvbS1jb25maWd1cmF0 aW9uLXRlc3QtZ3JvdXAtZm9ybT5gOwogICAgIH0KIAogICAgIHN0YXRpYyBjc3NUZW1wbGF0ZSgp CkBAIC05OCwyNSArNjAsOSBAQCBjbGFzcyBDcmVhdGVBbmFseXNpc1Rhc2tQYWdlIGV4dGVuZHMg UGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgICAgICNtZXNzYWdlIHsKICAgICAgICAgICAgICAg ICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICNuZXct dGFzayA+ICogewotICAgICAgICAgICAgICAgIGRpc3BsYXk6IGJsb2NrOworICAgICAgICAgICAg I2Zvcm0gewogICAgICAgICAgICAgICAgIG1hcmdpbjogMXJlbTsKICAgICAgICAgICAgIH0KLQot ICAgICAgICAgICAgI25ldy10YXNrIGlucHV0IHsKLSAgICAgICAgICAgICAgICB3aWR0aDogMzAl OwotICAgICAgICAgICAgICAgIG1pbi13aWR0aDogMTByZW07Ci0gICAgICAgICAgICAgICAgZm9u dC1zaXplOiAxcmVtOwotICAgICAgICAgICAgICAgIGZvbnQtd2VpZ2h0OiBpbmhlcml0OwotICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICAjc3RhcnQtYnV0dG9uIHsKLSAgICAgICAgICAgICAg ICBkaXNwbGF5OiBibG9jazsKLSAgICAgICAgICAgICAgICBtYXJnaW4tdG9wOiAwLjVyZW07Ci0g ICAgICAgICAgICAgICAgZm9udC1zaXplOiAxLjJyZW07Ci0gICAgICAgICAgICAgICAgZm9udC13 ZWlnaHQ6IGluaGVyaXQ7Ci0gICAgICAgICAgICB9CiBgOwogICAgIH0KIH0KZGlmZiAtLWdpdCBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcHJpdmlsZWdlZC1hcGktY3Jl YXRlLXRlc3QtZ3JvdXAtdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVy LXRlc3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS10ZXN0LWdyb3VwLXRlc3RzLmpzCmluZGV4IGFm YjgyYzEzOWVmM2JkZDk0YzYzZGJlMjE2YTk2OWVkNDZjZGZkNmUuLjY2NzE3NWQzNTA5OTg0OTNj NzlhN2ZiNTRiMzY4ZTVjY2E2ODU1MTggMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9zZXJ2ZXItdGVzdHMvcHJpdmlsZWdlZC1hcGktY3JlYXRlLXRlc3QtZ3JvdXAtdGVzdHMu anMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9wcml2aWxlZ2Vk LWFwaS1jcmVhdGUtdGVzdC1ncm91cC10ZXN0cy5qcwpAQCAtOTksNyArOTksOCBAQCBmdW5jdGlv biBhZGRUcmlnZ2VyYWJsZUFuZENyZWF0ZVRhc2sobmFtZSkKICAgICAgICAgJ3NsYXZlUGFzc3dv cmQnOiAnYW5vdGhlclBhc3N3b3JkJywKICAgICAgICAgJ3RyaWdnZXJhYmxlJzogJ2J1aWxkLXdl YmtpdCcsCiAgICAgICAgICdjb25maWd1cmF0aW9ucyc6IFsKLSAgICAgICAgICAgIHt0ZXN0OiBN b2NrRGF0YS5zb21lVGVzdElkKCksIHBsYXRmb3JtOiBNb2NrRGF0YS5zb21lUGxhdGZvcm1JZCgp fQorICAgICAgICAgICAge3Rlc3Q6IE1vY2tEYXRhLnNvbWVUZXN0SWQoKSwgcGxhdGZvcm06IE1v Y2tEYXRhLnNvbWVQbGF0Zm9ybUlkKCl9LAorICAgICAgICAgICAge3Rlc3Q6IE1vY2tEYXRhLnNv bWVUZXN0SWQoKSwgcGxhdGZvcm06IE1vY2tEYXRhLm90aGVyUGxhdGZvcm1JZCgpfSwKICAgICAg ICAgXSwKICAgICAgICAgJ3JlcG9zaXRvcnlHcm91cHMnOiBbCiAgICAgICAgICAgICB7bmFtZTog J3dlYmtpdC1vbmx5JywgcmVwb3NpdG9yaWVzOiBbTW9ja0RhdGEud2Via2l0UmVwb3NpdG9yeUlk KCldfSwKQEAgLTUyNCw0ICs1MjUsNjEgQEAgZGVzY3JpYmUoJy9wcml2aWxlZ2VkLWFwaS9jcmVh dGUtdGVzdC1ncm91cCcsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgfSk7CiAgICAgfSk7CiAKKyAg ICBpdCgnc2hvdWxkIGNyZWF0ZSBhIGN1c3RvbSB0ZXN0IGdyb3VwIGZvciBhbiBleGlzdGluZyBj dXN0b20gYW5hbHlzaXMgdGFzaycsICgpID0+IHsKKyAgICAgICAgbGV0IGZpcnN0UmVzdWx0Owor ICAgICAgICBsZXQgc2Vjb25kUmVzdWx0OworICAgICAgICBsZXQgd2Via2l0OworICAgICAgICBs ZXQgdGVzdCA9IE1vY2tEYXRhLnNvbWVUZXN0SWQoKTsKKyAgICAgICAgcmV0dXJuIGFkZFRyaWdn ZXJhYmxlQW5kQ3JlYXRlVGFzaygnc29tZSB0YXNrJykudGhlbigoKSA9PiB7CisgICAgICAgICAg ICB3ZWJraXQgPSBSZXBvc2l0b3J5LmFsbCgpLmZpbHRlcigocmVwb3NpdG9yeSkgPT4gcmVwb3Np dG9yeS5uYW1lKCkgPT0gJ1dlYktpdCcpWzBdOworICAgICAgICAgICAgY29uc3QgcmV2aXNpb25T ZXRzID0gW3tbd2Via2l0LmlkKCldOiAnMTkxNjIyJ30sIHtbd2Via2l0LmlkKCldOiAnMTkxNjIz J31dOworICAgICAgICAgICAgcmV0dXJuIFByaXZpbGVnZWRBUEkuc2VuZFJlcXVlc3QoJ2NyZWF0 ZS10ZXN0LWdyb3VwJywKKyAgICAgICAgICAgICAgICB7bmFtZTogJ3Rlc3QxJywgdGFza05hbWU6 ICdvdGhlciB0YXNrJywgcGxhdGZvcm06IE1vY2tEYXRhLnNvbWVQbGF0Zm9ybUlkKCksIHRlc3Qs IHJldmlzaW9uU2V0c30pOworICAgICAgICB9KS50aGVuKChyZXN1bHQpID0+IHsKKyAgICAgICAg ICAgIGZpcnN0UmVzdWx0ID0gcmVzdWx0OworICAgICAgICAgICAgY29uc3QgcmV2aXNpb25TZXRz ID0gW3tbd2Via2l0LmlkKCldOiAnMTkxNjIyJ30sIHtbd2Via2l0LmlkKCldOiAnMTkyNzM2J31d OworICAgICAgICAgICAgcmV0dXJuIFByaXZpbGVnZWRBUEkuc2VuZFJlcXVlc3QoJ2NyZWF0ZS10 ZXN0LWdyb3VwJywKKyAgICAgICAgICAgICAgICB7bmFtZTogJ3Rlc3QyJywgdGFzazogcmVzdWx0 Wyd0YXNrSWQnXSwgcGxhdGZvcm06IE1vY2tEYXRhLm90aGVyUGxhdGZvcm1JZCgpLCB0ZXN0LCBy ZXZpc2lvblNldHMsIHJlcGV0aXRpb25Db3VudDogMn0pOworICAgICAgICB9KS50aGVuKChyZXN1 bHQpID0+IHsKKyAgICAgICAgICAgIHNlY29uZFJlc3VsdCA9IHJlc3VsdDsKKyAgICAgICAgICAg IGFzc2VydC5lcXVhbChmaXJzdFJlc3VsdFsndGFza0lkJ10sIHNlY29uZFJlc3VsdFsndGFza0lk J10pOworICAgICAgICAgICAgcmV0dXJuIFByb21pc2UuYWxsKFtBbmFseXNpc1Rhc2suZmV0Y2hC eUlkKHJlc3VsdFsndGFza0lkJ10pLCBUZXN0R3JvdXAuZmV0Y2hCeVRhc2socmVzdWx0Wyd0YXNr SWQnXSldKTsKKyAgICAgICAgfSkudGhlbigocmVzdWx0KSA9PiB7CisgICAgICAgICAgICBjb25z dCBbYW5hbHlzaXNUYXNrLCB0ZXN0R3JvdXBzXSA9IHJlc3VsdDsKKworICAgICAgICAgICAgYXNz ZXJ0LmVxdWFsKGFuYWx5c2lzVGFzay5uYW1lKCksICdvdGhlciB0YXNrJyk7CisKKyAgICAgICAg ICAgIGFzc2VydC5lcXVhbCh0ZXN0R3JvdXBzLmxlbmd0aCwgMik7CisgICAgICAgICAgICBUZXN0 R3JvdXAuc29ydEJ5TmFtZSh0ZXN0R3JvdXBzKTsKKworICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KHRlc3RHcm91cHNbMF0ubmFtZSgpLCAndGVzdDEnKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVh bCh0ZXN0R3JvdXBzWzBdLnJlcGV0aXRpb25Db3VudCgpLCAxKTsKKyAgICAgICAgICAgIGxldCBy ZXF1ZXN0cyA9IHRlc3RHcm91cHNbMF0uYnVpbGRSZXF1ZXN0cygpOworICAgICAgICAgICAgYXNz ZXJ0LmVxdWFsKHJlcXVlc3RzLmxlbmd0aCwgMik7CisgICAgICAgICAgICBsZXQgc2V0MCA9IHJl cXVlc3RzWzBdLmNvbW1pdFNldCgpOworICAgICAgICAgICAgbGV0IHNldDEgPSByZXF1ZXN0c1sx XS5jb21taXRTZXQoKTsKKyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwoc2V0MC5yZXBvc2l0 b3JpZXMoKSwgW3dlYmtpdF0pOworICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChzZXQwLmN1 c3RvbVJvb3RzKCksIFtdKTsKKyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwoc2V0MS5yZXBv c2l0b3JpZXMoKSwgW3dlYmtpdF0pOworICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChzZXQx LmN1c3RvbVJvb3RzKCksIFtdKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChzZXQwLnJldmlz aW9uRm9yUmVwb3NpdG9yeSh3ZWJraXQpLCAnMTkxNjIyJyk7CisgICAgICAgICAgICBhc3NlcnQu ZXF1YWwoc2V0MS5yZXZpc2lvbkZvclJlcG9zaXRvcnkod2Via2l0KSwgJzE5MTYyMycpOworCisg ICAgICAgICAgICBhc3NlcnQuZXF1YWwodGVzdEdyb3Vwc1sxXS5uYW1lKCksICd0ZXN0MicpOwor ICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHRlc3RHcm91cHNbMV0ucmVwZXRpdGlvbkNvdW50KCks IDIpOworICAgICAgICAgICAgcmVxdWVzdHMgPSB0ZXN0R3JvdXBzWzFdLmJ1aWxkUmVxdWVzdHMo KTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDQpOworICAgICAg ICAgICAgc2V0MCA9IHJlcXVlc3RzWzBdLmNvbW1pdFNldCgpOworICAgICAgICAgICAgc2V0MSA9 IHJlcXVlc3RzWzFdLmNvbW1pdFNldCgpOworICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChy ZXF1ZXN0c1syXS5jb21taXRTZXQoKSwgc2V0MCk7CisgICAgICAgICAgICBhc3NlcnQuZGVlcEVx dWFsKHJlcXVlc3RzWzNdLmNvbW1pdFNldCgpLCBzZXQxKTsKKyAgICAgICAgICAgIGFzc2VydC5k ZWVwRXF1YWwoc2V0MC5yZXBvc2l0b3JpZXMoKSwgW3dlYmtpdF0pOworICAgICAgICAgICAgYXNz ZXJ0LmRlZXBFcXVhbChzZXQwLmN1c3RvbVJvb3RzKCksIFtdKTsKKyAgICAgICAgICAgIGFzc2Vy dC5kZWVwRXF1YWwoc2V0MS5yZXBvc2l0b3JpZXMoKSwgW3dlYmtpdF0pOworICAgICAgICAgICAg YXNzZXJ0LmRlZXBFcXVhbChzZXQxLmN1c3RvbVJvb3RzKCksIFtdKTsKKyAgICAgICAgICAgIGFz c2VydC5lcXVhbChzZXQwLnJldmlzaW9uRm9yUmVwb3NpdG9yeSh3ZWJraXQpLCAnMTkxNjIyJyk7 CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoc2V0MS5yZXZpc2lvbkZvclJlcG9zaXRvcnkod2Vi a2l0KSwgJzE5MjczNicpOworICAgICAgICB9KTsKKyAgICB9KTsKKwogfSk7CmRpZmYgLS1naXQg YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Jlc291cmNlcy9tb2NrLWRh dGEuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Jlc291cmNlcy9t b2NrLWRhdGEuanMKaW5kZXggNmUwNjdkNWY5YjA5ZDY5NzEwMzllMWZlOGY3NjgzNjFjYjE3Zjdl ZS4uMWNiMzI2MjRjYmEwM2NiYzg0ZjIyY2NhZjgzZmY5NmRiZGFlZjQ5OCAxMDA2NDQKLS0tIGEv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9yZXNvdXJjZXMvbW9jay1kYXRh LmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3VyY2Vz L21vY2stZGF0YS5qcwpAQCAtMjEsNiArMjEsNyBAQCBNb2NrRGF0YSA9IHsKICAgICBlbXB0eVRy aWdnZXJhZ2JsZUlkKCkgeyByZXR1cm4gMTAwMTsgfSwKICAgICBzb21lVGVzdElkKCkgeyByZXR1 cm4gMjAwOyB9LAogICAgIHNvbWVQbGF0Zm9ybUlkKCkgeyByZXR1cm4gNjU7IH0sCisgICAgb3Ro ZXJQbGF0Zm9ybUlkKCkgeyByZXR1cm4gMTAxOyB9LAogICAgIG1hY29zUmVwb3NpdG9yeUlkKCkg eyByZXR1cm4gOTsgfSwKICAgICB3ZWJraXRSZXBvc2l0b3J5SWQoKSB7IHJldHVybiAxMTsgfSwK ICAgICBnaXRXZWJraXRSZXBvc2l0b3J5SWQoKSB7IHJldHVybiAxMTE7IH0sCkBAIC00MSw5ICs0 MiwxMSBAQCBNb2NrRGF0YSA9IHsKICAgICAgICAgICAgIGRiLmluc2VydCgnY29tbWl0cycsIHtp ZDogOTYzMzYsIHJlcG9zaXRvcnk6IHRoaXMud2Via2l0UmVwb3NpdG9yeUlkKCksIHJldmlzaW9u OiAnMTkyNzM2JywgdGltZTogKG5ldyBEYXRlKDE0NDgyMjUzMjU2NTApKS50b0lTT1N0cmluZygp fSksCiAgICAgICAgICAgICBkYi5pbnNlcnQoJ2J1aWxkcycsIHtpZDogOTAxLCBudW1iZXI6ICc5 MDEnLCB0aW1lOiAnMjAxNS0xMC0yN1QxMjowNToyNy4xWid9KSwKICAgICAgICAgICAgIGRiLmlu c2VydCgncGxhdGZvcm1zJywge2lkOiBNb2NrRGF0YS5zb21lUGxhdGZvcm1JZCgpLCBuYW1lOiAn c29tZSBwbGF0Zm9ybSd9KSwKKyAgICAgICAgICAgIGRiLmluc2VydCgncGxhdGZvcm1zJywge2lk OiBNb2NrRGF0YS5vdGhlclBsYXRmb3JtSWQoKSwgbmFtZTogJ290aGVyIHBsYXRmb3JtJ30pLAog ICAgICAgICAgICAgZGIuaW5zZXJ0KCd0ZXN0cycsIHtpZDogTW9ja0RhdGEuc29tZVRlc3RJZCgp LCBuYW1lOiAnc29tZSB0ZXN0J30pLAogICAgICAgICAgICAgZGIuaW5zZXJ0KCd0ZXN0X21ldHJp Y3MnLCB7aWQ6IDMwMCwgdGVzdDogMjAwLCBuYW1lOiAnc29tZSBtZXRyaWMnfSksCi0gICAgICAg ICAgICBkYi5pbnNlcnQoJ3Rlc3RfY29uZmlndXJhdGlvbnMnLCB7aWQ6IDMwMSwgbWV0cmljOiAz MDAsIHBsYXRmb3JtOiA2NSwgdHlwZTogJ2N1cnJlbnQnfSksCisgICAgICAgICAgICBkYi5pbnNl cnQoJ3Rlc3RfY29uZmlndXJhdGlvbnMnLCB7aWQ6IDMwMSwgbWV0cmljOiAzMDAsIHBsYXRmb3Jt OiBNb2NrRGF0YS5zb21lUGxhdGZvcm1JZCgpLCB0eXBlOiAnY3VycmVudCd9KSwKKyAgICAgICAg ICAgIGRiLmluc2VydCgndGVzdF9jb25maWd1cmF0aW9ucycsIHtpZDogMzAyLCBtZXRyaWM6IDMw MCwgcGxhdGZvcm06IE1vY2tEYXRhLm90aGVyUGxhdGZvcm1JZCgpLCB0eXBlOiAnY3VycmVudCd9 KSwKICAgICAgICAgICAgIGRiLmluc2VydCgndGVzdF9ydW5zJywge2lkOiA4MDEsIGNvbmZpZzog MzAxLCBidWlsZDogOTAxLCBtZWFuX2NhY2hlOiAxMDB9KSwKICAgICAgICAgICAgIGRiLmluc2Vy dCgnY29tbWl0X3NldHMnLCB7aWQ6IDQwMX0pLAogICAgICAgICAgICAgZGIuaW5zZXJ0KCdjb21t aXRfc2V0X3JlbGF0aW9uc2hpcHMnLCB7c2V0OiA0MDEsIGNvbW1pdDogODc4MzJ9KSwK