224958 2021-04-22 16:53:31 -0700 Add an option to not enable all experimental features in WebKitTestRunner 2021-04-25 19:11:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225041 1 rniwa rniwa darin ews-watchlist glenn jbedard sam simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1753360 0 rniwa 2021-04-22 16:53:31 -0700 We need an option to avoid enabling all experimental features in WebKitTestRunner so that we can run tests with the set of features we're intending to ship / are stable. 1753362 1 426865 rniwa 2021-04-22 16:59:16 -0700 Created attachment 426865 Patch 1753372 2 426865 thorton 2021-04-22 17:05:48 -0700 Comment on attachment 426865 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426865&action=review > Tools/WebKitTestRunner/TestController.h:542 > + bool m_enableAllExperimentalFeatures { false }; Humorous and confusing that the default is different here (I assume it gets plumbed from Options?) 1753383 3 426865 rniwa 2021-04-22 17:12:07 -0700 Comment on attachment 426865 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426865&action=review >> Tools/WebKitTestRunner/TestController.h:542 >> + bool m_enableAllExperimentalFeatures { false }; > > Humorous and confusing that the default is different here (I assume it gets plumbed from Options?) Yup. I'd change the default to true for consistency. 1753389 4 426872 rniwa 2021-04-22 17:19:48 -0700 Created attachment 426872 Patch for landing 1753390 5 426872 rniwa 2021-04-22 17:20:19 -0700 Comment on attachment 426872 Patch for landing Wait for EWS. 1753399 6 426872 sam 2021-04-22 17:37:03 -0700 Comment on attachment 426872 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=426872&action=review > Source/WebKit/ChangeLog:8 > + Added a helper SPI to reset the runtime flags of all experimental features. I don't think this is needed. We already reset everything between tests. Just don't enable the experimental features if you don't want them enable. 1753965 7 rniwa 2021-04-24 17:05:28 -0700 (In reply to Sam Weinig from comment #6) > Comment on attachment 426872 [details] > Patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=426872&action=review > > > Source/WebKit/ChangeLog:8 > > + Added a helper SPI to reset the runtime flags of all experimental features. > > I don't think this is needed. We already reset everything between tests. > Just don't enable the experimental features if you don't want them enable. Oh, you're right. Will revert this part before landing. 1753968 8 426992 rniwa 2021-04-24 17:13:26 -0700 Created attachment 426992 Patch for landing 1753974 9 ews-feeder 2021-04-24 17:39:52 -0700 Committed r276559 (236996@main): <https://commits.webkit.org/236996@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426992. 1753975 10 webkit-bug-importer 2021-04-24 17:40:15 -0700 <rdar://problem/77111442> 426865 2021-04-22 16:59:16 -0700 2021-04-22 17:19:45 -0700 Patch bug-224958-20210422165916.patch text/plain 12174 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5ZjI4YjAxNDgzMjUyNmY3 YmEwNzg1ZDhiNTEyNmVmZWY3Y2U5NWYuLmJhYzBiYTgwODAxYjFiODA2ODIyNjFjYjhkNzg1MDQ4 NzNiYTIxZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDQtMjIgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIG9wdGlvbiB0byBub3Qg ZW5hYmxlIGFsbCBleHBlcmltZW50YWwgZmVhdHVyZXMgaW4gV2ViS2l0VGVzdFJ1bm5lcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBoZWxw ZXIgU1BJIHRvIHJlc2V0IHRoZSBydW50aW1lIGZsYWdzIG9mIGFsbCBleHBlcmltZW50YWwgZmVh dHVyZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL1ByZWZlcmVuY2VzVGVtcGxhdGVzL1dlYlByZWZl cmVuY2VzRXhwZXJpbWVudGFsRmVhdHVyZXMuY3BwLmVyYjoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzUmVzZXRBbGxF eHBlcmltZW50YWxGZWF0dXJlcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXNSZWZQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmg6 CisKIDIwMjEtMDQtMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBOb3dQbGF5aW5nSW5mb0ZvckdQVU1hbmFnZXI6OmNsZWFyTm93UGxheWluZ0luZm9Qcml2YXRl KCkgc29tZXRpbWVzIGxhdW5jaGVzIHRoZSBHUFVQcm9jZXNzIG9uIHBhZ2UgY2xvc2UKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9QcmVmZXJlbmNlc1RlbXBsYXRlcy9XZWJQcmVm ZXJlbmNlc0V4cGVyaW1lbnRhbEZlYXR1cmVzLmNwcC5lcmIgYi9Tb3VyY2UvV2ViS2l0L1Njcmlw dHMvUHJlZmVyZW5jZXNUZW1wbGF0ZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWxGZWF0dXJl cy5jcHAuZXJiCmluZGV4IDUwODYzMmUxM2YzZTgwYzM3ZWUyMGY4ODA4NWZhMGM3ZjZlMzlkNDgu LmU5YjQ2OWNjOWNkNGQyZWM3ZmI4YjdiZmQzMTRjY2E5NDg1MzEwMjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvU2NyaXB0cy9QcmVmZXJlbmNlc1RlbXBsYXRlcy9XZWJQcmVmZXJlbmNlc0V4 cGVyaW1lbnRhbEZlYXR1cmVzLmNwcC5lcmIKKysrIGIvU291cmNlL1dlYktpdC9TY3JpcHRzL1By ZWZlcmVuY2VzVGVtcGxhdGVzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsRmVhdHVyZXMuY3Bw LmVyYgpAQCAtMTI1LDQgKzEyNSwxOCBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjplbmFibGVBbGxF eHBlcmltZW50YWxGZWF0dXJlcygpCiA8JS0gZW5kIC0lPgogfQogCit2b2lkIFdlYlByZWZlcmVu Y2VzOjpyZXNldEFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKCkKK3sKKyAgICBVcGRhdGVCYXRjaCBi YXRjaCgqdGhpcyk7Cis8JS0gZm9yIEBwcmVmIGluIEBleHBvc2VkRXhwZXJpbWVudGFsRmVhdHVy ZXMgZG8gLSU+Cis8JS0gaWYgQHByZWYuY29uZGl0aW9uIC0lPgorI2lmIDwlPSBAcHJlZi5jb25k aXRpb24gJT4KKzwlLSBlbmQgLSU+CisgICAgc2V0PCU9IEBwcmVmLm5hbWUgJT4oREVGQVVMVF9W QUxVRV9GT1JfPCU9IEBwcmVmLm5hbWUgJT4pOworPCUtIGlmIEBwcmVmLmNvbmRpdGlvbiAtJT4K KyNlbmRpZgorPCUtIGVuZCAtJT4KKzwlLSBlbmQgLSU+Cit9CisKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKaW5kZXggMDUxNmRiNDcxNWVm NjdmNzBjZmM4MTU4YTkyNDAyZTM5YzA2OWYyZC4uZWVlOWVhNWY0YTdiMDRjNjFkMjg5N2JiMTk0 NmQ1MGQxNjRjOWUyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQ cmVmZXJlbmNlcy5jcHAKQEAgLTczLDYgKzczLDExIEBAIHZvaWQgV0tQcmVmZXJlbmNlc0VuYWJs ZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYp CiAgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+ZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVy ZXMoKTsKIH0KIAordm9pZCBXS1ByZWZlcmVuY2VzUmVzZXRBbGxFeHBlcmltZW50YWxGZWF0dXJl cyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHRvSW1wbChwcmVmZXJl bmNlc1JlZiktPnJlc2V0QWxsRXhwZXJpbWVudGFsRmVhdHVyZXMoKTsKK30KKwogdm9pZCBXS1By ZWZlcmVuY2VzU2V0RXhwZXJpbWVudGFsRmVhdHVyZUZvcktleShXS1ByZWZlcmVuY2VzUmVmIHBy ZWZlcmVuY2VzUmVmLCBib29sIHZhbHVlLCBXS1N0cmluZ1JlZiBleHBlcmltZW50YWxGZWF0dXJl S2V5KQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEV4cGVyaW1lbnRhbEZlYXR1 cmVFbmFibGVkRm9yS2V5KHRvV1RGU3RyaW5nKGV4cGVyaW1lbnRhbEZlYXR1cmVLZXkpLCB2YWx1 ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzUmVmUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlc1JlZlByaXZhdGUuaAppbmRleCAwZjUyMzBjYzI3MjEzMDRlZjkxMjg4MDg2NTI3NmUxMzcy NzgyMWIyLi4xMWQwNzgyMGE0ZDkwYWQxNDIxZDNlNjRjNzUwMzhiYTM3YzRhZmE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0 ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQ cml2YXRlLmgKQEAgLTU0LDYgKzU0LDcgQEAgV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1N0 YXJ0QmF0Y2hpbmdVcGRhdGVzKFdLUHJlZmVyZW5jZXNSZWYpOwogV0tfRVhQT1JUIHZvaWQgV0tQ cmVmZXJlbmNlc0VuZEJhdGNoaW5nVXBkYXRlcyhXS1ByZWZlcmVuY2VzUmVmKTsKIAogV0tfRVhQ T1JUIHZvaWQgV0tQcmVmZXJlbmNlc0VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKFdLUHJl ZmVyZW5jZXNSZWYpOworV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1Jlc2V0QWxsRXhwZXJp bWVudGFsRmVhdHVyZXMoV0tQcmVmZXJlbmNlc1JlZik7CiBXS19FWFBPUlQgdm9pZCBXS1ByZWZl cmVuY2VzU2V0RXhwZXJpbWVudGFsRmVhdHVyZUZvcktleShXS1ByZWZlcmVuY2VzUmVmLCBib29s LCBXS1N0cmluZ1JlZik7CiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzUmVzZXRBbGxJbnRl cm5hbERlYnVnRmVhdHVyZXMoV0tQcmVmZXJlbmNlc1JlZik7CiBXS19FWFBPUlQgdm9pZCBXS1By ZWZlcmVuY2VzU2V0SW50ZXJuYWxEZWJ1Z0ZlYXR1cmVGb3JLZXkoV0tQcmVmZXJlbmNlc1JlZiwg Ym9vbCwgV0tTdHJpbmdSZWYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJlZmVyZW5jZXMuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2Vz LmgKaW5kZXggZWRiZmI5YWU2YjNmOWQxYWZhZTNjNjA5YjgzNTdlZmRjM2RjODZmYS4uNzRiNzM0 OTUwYmQ3Nzg3ODNmODlhNWY3OTJhNzc0Mzg4YzhjNmUyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcmVmZXJlbmNlcy5oCkBAIC03MSw2ICs3MSw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldEZlYXR1cmVFbmFibGVkKGNvbnN0IEFQSTo6RXhwZXJpbWVudGFsRmVhdHVyZSYsIGJvb2wp OwogICAgIHZvaWQgc2V0RXhwZXJpbWVudGFsRmVhdHVyZUVuYWJsZWRGb3JLZXkoY29uc3QgU3Ry aW5nJiwgYm9vbCk7CiAgICAgdm9pZCBlbmFibGVBbGxFeHBlcmltZW50YWxGZWF0dXJlcygpOwor ICAgIHZvaWQgcmVzZXRBbGxFeHBlcmltZW50YWxGZWF0dXJlcygpOwogCiAgICAgc3RhdGljIGNv bnN0IFZlY3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiYgaW50ZXJuYWxEZWJ1Z0ZlYXR1cmVzKCk7 CiAgICAgYm9vbCBpc0ZlYXR1cmVFbmFibGVkKGNvbnN0IEFQSTo6SW50ZXJuYWxEZWJ1Z0ZlYXR1 cmUmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCA5NjExYzFhMGE3ZTJkMWZmZGZiNzIxNjJjNTU2MWFjZDYyZWMwYjczLi4zMDUxNGJm OTk3MDY0YWUzM2VkMTZhZDdiYTk4YzUyNzIzZGVkMTcyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDQtMjIg IFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIG9wdGlv biB0byBub3QgZW5hYmxlIGFsbCBleHBlcmltZW50YWwgZmVhdHVyZXMgaW4gV2ViS2l0VGVzdFJ1 bm5lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0 OTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk ZWQgLS1uby1lbmFibGUtYWxsLWV4cGVyaW1lbnRhbC1mZWF0dXJlcyB0byBydW4td2Via2l0LXRl c3RzIGFuZCBXZWJLaXRUZXN0UnVubmVyLgorCisgICAgICAgIEl0IGNhdXNlcyBhIGNyYXNoIGlu IER1bXBSZW5kZXJUcmVlIGZvciBub3cuIFdlIHNob3VsZCByZWN0aWZ5IHRoaXMgaW4gdGhlIGZ1 dHVyZQorICAgICAgICB3aGVuIHdlIGFsaWduIHRoZSBiZWhhdmlvcnMgb2YgV2ViS2l0VGVzdFJ1 bm5lciBhbmQgRHVtcFJlbmRlclRyZWUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAocGFyc2VfYXJncyk6IEFk ZGVkIC0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50YWwtZmVhdHVyZXMuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAgICAgICAgKERyaXZlci5jbWRfbGluZSk6 IFBhc3MgYWxvbmcgdGhlIG9wdGlvbiB0byBXZWJLaXRUZXN0UnVubmVyLgorICAgICAgICAqIFdl YktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHA6CisgICAgICAgIChXVFI6OmhhbmRsZU9wdGlvbk5v RW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMpOiBBZGRlZC4KKyAgICAgICAgKFdUUjo6T3B0 aW9uc0hhbmRsZXI6Ok9wdGlvbnNIYW5kbGVyKTogQWRkZWQgLS1uby1lbmFibGUtYWxsLWV4cGVy aW1lbnRhbC1mZWF0dXJlcy4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpUZXN0Q29u dHJvbGxlcjo6cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyk6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oOgorCiAyMDIxLTA0LTIyICBUaW0gTmd1 eWVuICA8bnRpbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkICJUaW0gTmd1eWVuIiB0byBjb250 cmlidXRvcnMuanNvbi4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDM4MjA4NmVkZTJmMjU1NGUyYWQzYTJj MzQ2ZWVmYjJjNThiNTYxYWMuLjExNTQ2NjE3ZmM4MmEwMDg3OTUyMGQ1ZDJiNWEzOGJlYjc5ZWE1 MTMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMTI2LDYgKzEyNiw4IEBAIGRlZiBwYXJzZV9hcmdzKGFy Z3MpOgogICAgICAgICAgICAgaGVscD0iRW5hYmxlIChkaXNhYmxlKSBhbiBpbnRlcm5hbCBmZWF0 dXJlICgtLWludGVybmFsLWZlYXR1cmUgRmVhdHVyZU5hbWVbPXRydWV8ZmFsc2VdKSIpLAogICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1leHBlcmltZW50YWwtZmVhdHVyZSIsIHR5cGU9 InN0cmluZyIsIGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKICAgICAgICAgICAgIGhlbHA9 IkVuYWJsZSAoZGlzYWJsZSkgYW4gZXhwZXJpbWVudGFsIGZlYXR1cmUgKC0tZXhwZXJpbWVudGFs LWZlYXR1cmUgRmVhdHVyZU5hbWVbPXRydWV8ZmFsc2VdKSIpLAorICAgICAgICBvcHRwYXJzZS5t YWtlX29wdGlvbigiLS1uby1lbmFibGUtYWxsLWV4cGVyaW1lbnRhbC1mZWF0dXJlcyIsIGFjdGlv bj0ic3RvcmVfZmFsc2UiLCBkZWZhdWx0PVRydWUsIGRlc3Q9ImVuYWJsZV9hbGxfZXhwZXJpbWVu dGFsX2ZlYXR1cmVzIiwKKyAgICAgICAgICAgIGhlbHA9IkVuYWJsZXMgYWxsIGV4cGVyaW1lbnRh bCBmZWF0dXJlcyBpbiBXZWJLaXRUZXN0UnVubmVyIiksCiAgICAgXSkpCiAKICAgICBvcHRpb25f Z3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5kKCgiV2ViS2l0IE9wdGlvbnMiLCBbCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2RyaXZlci5weQppbmRleCAzM2VhYzVkY2E3ODg5OTQ3MDNhMzBhMjc5MWNh YWYxOWFmOGQzMjFiLi40NTQyZGY1ZDdkMzk3Y2E2ZGJiY2ZhMzU3YzZmNzNmN2JhYTk3NWY4IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKQEAgLTUzNCw2ICs1MzQsOSBAQCBj bGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0taW50ZXJuYWwt ZmVhdHVyZScpCiAgICAgICAgICAgICBjbWQuYXBwZW5kKGZlYXR1cmUpCiAKKyAgICAgICAgaWYg bm90IHNlbGYuX3BvcnQuZ2V0X29wdGlvbignZW5hYmxlX2FsbF9leHBlcmltZW50YWxfZmVhdHVy ZXMnKToKKyAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50 YWwtZmVhdHVyZXMnKQorCiAgICAgICAgIGZvciBmZWF0dXJlIGluIHNlbGYuX3BvcnQuZXhwZXJp bWVudGFsX2ZlYXR1cmUoKToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZXhwZXJpbWVudGFs LWZlYXR1cmUnKQogICAgICAgICAgICAgY21kLmFwcGVuZChmZWF0dXJlKQpkaWZmIC0tZ2l0IGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvT3B0aW9ucy5jcHAKaW5kZXggNDM5YjZjYjNlNzA5MjIyMTJmMTVmOGZiNjc2Yzg5ZmVhNjc2 MjJjMi4uOTBlY2U4OWJkMTFmMWEwYTk3NzFmN2U1MjI2ZTg4N2E3MDhhMDdiYyAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmNwcAorKysgYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL09wdGlvbnMuY3BwCkBAIC0xMjgsNiArMTI4LDEyIEBAIHN0YXRpYyBib29sIHBh cnNlRmVhdHVyZShzdGQ6OnN0cmluZ192aWV3IGZlYXR1cmVTdHJpbmcsIFRlc3RGZWF0dXJlcyYg ZmVhdHVyZXMpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK3N0YXRpYyBib29sIGhhbmRsZU9wdGlv bk5vRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMoT3B0aW9ucyYgb3B0aW9ucywgY29uc3Qg Y2hhciosIGNvbnN0IGNoYXIqIGZlYXR1cmUpCit7CisgICAgb3B0aW9ucy5lbmFibGVBbGxFeHBl cmltZW50YWxGZWF0dXJlcyA9IGZhbHNlOworICAgIHJldHVybiB0cnVlOworfQorCiBzdGF0aWMg Ym9vbCBoYW5kbGVPcHRpb25FeHBlcmltZW50YWxGZWF0dXJlKE9wdGlvbnMmIG9wdGlvbnMsIGNv bnN0IGNoYXIqLCBjb25zdCBjaGFyKiBmZWF0dXJlKQogewogICAgIHJldHVybiBwYXJzZUZlYXR1 cmUoZmVhdHVyZSwgb3B0aW9ucy5mZWF0dXJlcyk7CkBAIC0xNjIsNiArMTY4LDcgQEAgT3B0aW9u c0hhbmRsZXI6Ok9wdGlvbnNIYW5kbGVyKE9wdGlvbnMmIG8pCiAgICAgb3B0aW9uTGlzdC5hcHBl bmQoT3B0aW9uKCItLXNob3ctd2VidmlldyIsICJTaG93IHRoZSBXZWJWaWV3IGR1cmluZyB0ZXN0 IHJ1bnMgKGZvciBkZWJ1Z2dpbmcpIiwgaGFuZGxlT3B0aW9uU2hvd1dlYlZpZXcpKTsKICAgICBv cHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tc2hvdy10b3VjaGVzIiwgIlNob3cgdGhlIHRvdWNo ZXMgZHVyaW5nIHRlc3QgcnVucyAoZm9yIGRlYnVnZ2luZykiLCBoYW5kbGVPcHRpb25TaG93VG91 Y2hlcykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS13b3JsZC1sZWFrcyIsICJD aGVjayBmb3IgbGVha3Mgb2Ygd29ybGQgb2JqZWN0cyAoY3VycmVudGx5LCBkb2N1bWVudHMpIiwg aGFuZGxlT3B0aW9uQ2hlY2tGb3JXb3JsZExlYWtzKSk7CisgICAgb3B0aW9uTGlzdC5hcHBlbmQo T3B0aW9uKCItLW5vLWVuYWJsZS1hbGwtZXhwZXJpbWVudGFsLWZlYXR1cmVzIiwgIkRvIG5vdCBl bmFibGUgYWxsIGV4cGVyaW1lbnRhbCBmZWF0dXJlcyBieSBkZWZhdWx0IiwgaGFuZGxlT3B0aW9u Tm9FbmFibGVBbGxFeHBlcmltZW50YWxGZWF0dXJlcykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5k KE9wdGlvbigiLS1leHBlcmltZW50YWwtZmVhdHVyZSIsICJFbmFibGUgZXhwZXJpbWVudGFsIGZl YXR1cmUiLCBoYW5kbGVPcHRpb25FeHBlcmltZW50YWxGZWF0dXJlLCB0cnVlKSk7CiAgICAgb3B0 aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLWludGVybmFsLWZlYXR1cmUiLCAiRW5hYmxlIGludGVy bmFsIGZlYXR1cmUiLCBoYW5kbGVPcHRpb25JbnRlcm5hbEZlYXR1cmUsIHRydWUpKTsKICNpZiBF TkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9PcHRpb25zLmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMu aAppbmRleCBlMDkzMDJiNzA0MjY2OGE3NzAwMTk1OTc0MTkyZjIzYmQ0ZmQ3NmZlLi44ZWZlZDUy ZmJlZDQzMjlhN2IwNGYxYzI1MDk2MjJkYzAyZjFjOGZkIDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL09wdGlvbnMuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlv bnMuaApAQCAtNDksNiArNDksNyBAQCBzdHJ1Y3QgT3B0aW9ucyB7CiAgICAgYm9vbCBmb3JjZUNv bXBsZXhUZXh0IHsgZmFsc2UgfTsKICAgICBib29sIGNoZWNrRm9yV29ybGRMZWFrcyB7IGZhbHNl IH07CiAgICAgYm9vbCBhbGxvd0FueUhUVFBTQ2VydGlmaWNhdGVGb3JBbGxvd2VkSG9zdHMgeyBm YWxzZSB9OworICAgIGJvb2wgZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMgeyB0cnVlIH07 CiAgICAgc3RkOjp2ZWN0b3I8c3RkOjpzdHJpbmc+IHBhdGhzOwogICAgIHN0ZDo6c2V0PHN0ZDo6 c3RyaW5nPiBhbGxvd2VkSG9zdHM7CiAgICAgVGVzdEZlYXR1cmVzIGZlYXR1cmVzOwpkaWZmIC0t Z2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCA1ZmM5OTVjYzVlZjJhNTlk YzlmZThmYjNlMTA4NDkyNWQ3ZTBmYmZkLi4yNjc2MDBmYjlkMzY4YmEwOTFlYjU3OTM1NDVkNDE1 MGQ0Zjg1NzdjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9s bGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApA QCAtNTMzLDYgKzUzMyw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50IGFy Z2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKICAgICBtX2FsbG93ZWRIb3N0cyA9IG9wdGlvbnMuYWxs b3dlZEhvc3RzOwogICAgIG1fY2hlY2tGb3JXb3JsZExlYWtzID0gb3B0aW9ucy5jaGVja0Zvcldv cmxkTGVha3M7CiAgICAgbV9hbGxvd0FueUhUVFBTQ2VydGlmaWNhdGVGb3JBbGxvd2VkSG9zdHMg PSBvcHRpb25zLmFsbG93QW55SFRUUFNDZXJ0aWZpY2F0ZUZvckFsbG93ZWRIb3N0czsKKyAgICBt X2VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzID0gb3B0aW9ucy5lbmFibGVBbGxFeHBlcmlt ZW50YWxGZWF0dXJlczsKICAgICBtX2dsb2JhbEZlYXR1cmVzID0gc3RkOjptb3ZlKG9wdGlvbnMu ZmVhdHVyZXMpOwogCiAgICAgbV91c2luZ1NlcnZlck1vZGUgPSAobV9wYXRocy5zaXplKCkgPT0g MSAmJiBtX3BhdGhzWzBdID09ICItIik7CkBAIC04ODEsMTAgKzg4MiwxMyBAQCB0ZW1wbGF0ZTx0 eXBlbmFtZSBGPiBzdGF0aWMgdm9pZCBiYXRjaFVwZGF0ZVByZWZlcmVuY2VzKFdLUHJlZmVyZW5j ZXNSZWYgcHJlZmVyZQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpyZXNldFByZWZlcmVuY2VzVG9D b25zaXN0ZW50VmFsdWVzKGNvbnN0IFRlc3RPcHRpb25zJiBvcHRpb25zKQogewotICAgIGJhdGNo VXBkYXRlUHJlZmVyZW5jZXMocGxhdGZvcm1QcmVmZXJlbmNlcygpLCBbb3B0aW9uc10gKGF1dG8g cHJlZmVyZW5jZXMpIHsKKyAgICBiYXRjaFVwZGF0ZVByZWZlcmVuY2VzKHBsYXRmb3JtUHJlZmVy ZW5jZXMoKSwgW29wdGlvbnMsIGVuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzID0gbV9lbmFi bGVBbGxFeHBlcmltZW50YWxGZWF0dXJlc10gKGF1dG8gcHJlZmVyZW5jZXMpIHsKICAgICAgICAg V0tQcmVmZXJlbmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRlcyhwcmVmZXJlbmNlcyk7CiAKLSAg ICAgICAgV0tQcmVmZXJlbmNlc0VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKHByZWZlcmVu Y2VzKTsKKyAgICAgICAgaWYgKGVuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKQorICAgICAg ICAgICAgV0tQcmVmZXJlbmNlc0VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKHByZWZlcmVu Y2VzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgV0tQcmVmZXJlbmNlc1Jlc2V0QWxsRXhw ZXJpbWVudGFsRmVhdHVyZXMocHJlZmVyZW5jZXMpOwogCiAgICAgICAgIFdLUHJlZmVyZW5jZXNT ZXRQcm9jZXNzU3dhcE9uTmF2aWdhdGlvbkVuYWJsZWQocHJlZmVyZW5jZXMsIG9wdGlvbnMuc2hv dWxkRW5hYmxlUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24oKSk7CiAgICAgICAgIFdLUHJlZmVyZW5j ZXNTZXRTdG9yYWdlQmxvY2tpbmdQb2xpY3kocHJlZmVyZW5jZXMsIGtXS0FsbG93QWxsU3RvcmFn ZSk7IC8vIEZJWE1FOiBXZSBzaG91bGQgYmUgdGVzdGluZyB0aGUgZGVmYXVsdC4KZGlmZiAtLWdp dCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAppbmRleCAzMWFlNDYxMDBjN2Y5MGQyZTk0Njcz ZDI1ZTQ2OWE3ZGNiMWQ1ODA0Li5jODdmNTBlZDJlNjM1MTcwOTVkNjJkOTg3NjNjNjg0OTdlM2Fk MzYwIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgK KysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCkBAIC01MzksNiAr NTM5LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZ2NCZXR3ZWVuVGVzdHMgeyBmYWxzZSB9Owog ICAgIGJvb2wgbV9zaG91bGREdW1wUGl4ZWxzRm9yQWxsVGVzdHMgeyBmYWxzZSB9OwogICAgIGJv b2wgbV9jcmVhdGVkT3RoZXJQYWdlIHsgZmFsc2UgfTsKKyAgICBib29sIG1fZW5hYmxlQWxsRXhw ZXJpbWVudGFsRmVhdHVyZXMgeyBmYWxzZSB9OwogICAgIHN0ZDo6dmVjdG9yPHN0ZDo6c3RyaW5n PiBtX3BhdGhzOwogICAgIHN0ZDo6c2V0PHN0ZDo6c3RyaW5nPiBtX2FsbG93ZWRIb3N0czsKICAg ICBUZXN0RmVhdHVyZXMgbV9nbG9iYWxGZWF0dXJlczsK 426872 2021-04-22 17:19:48 -0700 2021-04-24 17:13:24 -0700 Patch for landing bug-224958-20210422171947.patch text/plain 13158 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5ZjI4YjAxNDgzMjUyNmY3 YmEwNzg1ZDhiNTEyNmVmZWY3Y2U5NWYuLjE3YjhlZjk0NDAwOTBhNzI0ZmEzNmY0MTgzNGUyZWE3 NDhiZTI4N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDQtMjIgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuIG9wdGlvbiB0byBub3Qg ZW5hYmxlIGFsbCBleHBlcmltZW50YWwgZmVhdHVyZXMgaW4gV2ViS2l0VGVzdFJ1bm5lcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBBZGRlZCBhIGhlbHBlciBT UEkgdG8gcmVzZXQgdGhlIHJ1bnRpbWUgZmxhZ3Mgb2YgYWxsIGV4cGVyaW1lbnRhbCBmZWF0dXJl cy4KKworICAgICAgICAqIFNjcmlwdHMvUHJlZmVyZW5jZXNUZW1wbGF0ZXMvV2ViUHJlZmVyZW5j ZXNFeHBlcmltZW50YWxGZWF0dXJlcy5jcHAuZXJiOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNSZXNldEFsbEV4cGVy aW1lbnRhbEZlYXR1cmVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNl c1JlZlByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaDoKKwog MjAyMS0wNC0yMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE5v d1BsYXlpbmdJbmZvRm9yR1BVTWFuYWdlcjo6Y2xlYXJOb3dQbGF5aW5nSW5mb1ByaXZhdGUoKSBz b21ldGltZXMgbGF1bmNoZXMgdGhlIEdQVVByb2Nlc3Mgb24gcGFnZSBjbG9zZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9TY3JpcHRzL1ByZWZlcmVuY2VzVGVtcGxhdGVzL1dlYlByZWZlcmVu Y2VzRXhwZXJpbWVudGFsRmVhdHVyZXMuY3BwLmVyYiBiL1NvdXJjZS9XZWJLaXQvU2NyaXB0cy9Q cmVmZXJlbmNlc1RlbXBsYXRlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbEZlYXR1cmVzLmNw cC5lcmIKaW5kZXggNTA4NjMyZTEzZjNlODBjMzdlZTIwZjg4MDg1ZmEwYzdmNmUzOWQ0OC4uZTli NDY5Y2M5Y2Q0ZDJlYzdmYjhiN2JmZDMxNGNjYTk0ODUzMTAyOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9TY3JpcHRzL1ByZWZlcmVuY2VzVGVtcGxhdGVzL1dlYlByZWZlcmVuY2VzRXhwZXJp bWVudGFsRmVhdHVyZXMuY3BwLmVyYgorKysgYi9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvUHJlZmVy ZW5jZXNUZW1wbGF0ZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWxGZWF0dXJlcy5jcHAuZXJi CkBAIC0xMjUsNCArMTI1LDE4IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmVuYWJsZUFsbEV4cGVy aW1lbnRhbEZlYXR1cmVzKCkKIDwlLSBlbmQgLSU+CiB9CiAKK3ZvaWQgV2ViUHJlZmVyZW5jZXM6 OnJlc2V0QWxsRXhwZXJpbWVudGFsRmVhdHVyZXMoKQoreworICAgIFVwZGF0ZUJhdGNoIGJhdGNo KCp0aGlzKTsKKzwlLSBmb3IgQHByZWYgaW4gQGV4cG9zZWRFeHBlcmltZW50YWxGZWF0dXJlcyBk byAtJT4KKzwlLSBpZiBAcHJlZi5jb25kaXRpb24gLSU+CisjaWYgPCU9IEBwcmVmLmNvbmRpdGlv biAlPgorPCUtIGVuZCAtJT4KKyAgICBzZXQ8JT0gQHByZWYubmFtZSAlPihERUZBVUxUX1ZBTFVF X0ZPUl88JT0gQHByZWYubmFtZSAlPik7Cis8JS0gaWYgQHByZWYuY29uZGl0aW9uIC0lPgorI2Vu ZGlmCis8JS0gZW5kIC0lPgorPCUtIGVuZCAtJT4KK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCAwNTE2ZGI0NzE1ZWY2N2Y3 MGNmYzgxNThhOTI0MDJlMzljMDY5ZjJkLi5lZWU5ZWE1ZjRhN2IwNGM2MWQyODk3YmIxOTQ2ZDUw ZDE2NGM5ZTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1By ZWZlcmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZl cmVuY2VzLmNwcApAQCAtNzMsNiArNzMsMTEgQEAgdm9pZCBXS1ByZWZlcmVuY2VzRW5hYmxlQWxs RXhwZXJpbWVudGFsRmVhdHVyZXMoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKICAg ICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5lbmFibGVBbGxFeHBlcmltZW50YWxGZWF0dXJlcygp OwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNSZXNldEFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgdG9JbXBsKHByZWZlcmVuY2Vz UmVmKS0+cmVzZXRBbGxFeHBlcmltZW50YWxGZWF0dXJlcygpOworfQorCiB2b2lkIFdLUHJlZmVy ZW5jZXNTZXRFeHBlcmltZW50YWxGZWF0dXJlRm9yS2V5KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVy ZW5jZXNSZWYsIGJvb2wgdmFsdWUsIFdLU3RyaW5nUmVmIGV4cGVyaW1lbnRhbEZlYXR1cmVLZXkp CiB7CiAgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0RXhwZXJpbWVudGFsRmVhdHVyZUVu YWJsZWRGb3JLZXkodG9XVEZTdHJpbmcoZXhwZXJpbWVudGFsRmVhdHVyZUtleSksIHZhbHVlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNS ZWZQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2Vz UmVmUHJpdmF0ZS5oCmluZGV4IDBmNTIzMGNjMjcyMTMwNGVmOTEyODgwODY1Mjc2ZTEzNzI3ODIx YjIuLjExZDA3ODIwYTRkOTBhZDE0MjFkM2U2NGM3NTAzOGJhMzdjNGFmYTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZh dGUuaApAQCAtNTQsNiArNTQsNyBAQCBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU3RhcnRC YXRjaGluZ1VwZGF0ZXMoV0tQcmVmZXJlbmNlc1JlZik7CiBXS19FWFBPUlQgdm9pZCBXS1ByZWZl cmVuY2VzRW5kQmF0Y2hpbmdVcGRhdGVzKFdLUHJlZmVyZW5jZXNSZWYpOwogCiBXS19FWFBPUlQg dm9pZCBXS1ByZWZlcmVuY2VzRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMoV0tQcmVmZXJl bmNlc1JlZik7CitXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzUmVzZXRBbGxFeHBlcmltZW50 YWxGZWF0dXJlcyhXS1ByZWZlcmVuY2VzUmVmKTsKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5j ZXNTZXRFeHBlcmltZW50YWxGZWF0dXJlRm9yS2V5KFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wsIFdL U3RyaW5nUmVmKTsKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNSZXNldEFsbEludGVybmFs RGVidWdGZWF0dXJlcyhXS1ByZWZlcmVuY2VzUmVmKTsKIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVy ZW5jZXNTZXRJbnRlcm5hbERlYnVnRmVhdHVyZUZvcktleShXS1ByZWZlcmVuY2VzUmVmLCBib29s LCBXS1N0cmluZ1JlZik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cmVmZXJlbmNlcy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaApp bmRleCBlZGJmYjlhZTZiM2Y5ZDFhZmFlM2M2MDliODM1N2VmZGMzZGM4NmZhLi43NGI3MzQ5NTBi ZDc3ODc4M2Y4OWE1Zjc5MmE3NzQzODhjOGM2ZTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByZWZlcmVuY2VzLmgKQEAgLTcxLDYgKzcxLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 RmVhdHVyZUVuYWJsZWQoY29uc3QgQVBJOjpFeHBlcmltZW50YWxGZWF0dXJlJiwgYm9vbCk7CiAg ICAgdm9pZCBzZXRFeHBlcmltZW50YWxGZWF0dXJlRW5hYmxlZEZvcktleShjb25zdCBTdHJpbmcm LCBib29sKTsKICAgICB2b2lkIGVuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKCk7CisgICAg dm9pZCByZXNldEFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKCk7CiAKICAgICBzdGF0aWMgY29uc3Qg VmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+JiBpbnRlcm5hbERlYnVnRmVhdHVyZXMoKTsKICAg ICBib29sIGlzRmVhdHVyZUVuYWJsZWQoY29uc3QgQVBJOjpJbnRlcm5hbERlYnVnRmVhdHVyZSYp IGNvbnN0OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDk2MTFjMWEwYTdlMmQxZmZkZmI3MjE2MmM1NTYxYWNkNjJlYzBiNzMuLjcxOTEyNjNlOTMx M2M3N2MwNzc1YTQ3N2E5M2Q2ZmE1NjdjYmVmNGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAyMS0wNC0yMiAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgYW4gb3B0aW9uIHRv IG5vdCBlbmFibGUgYWxsIGV4cGVyaW1lbnRhbCBmZWF0dXJlcyBpbiBXZWJLaXRUZXN0UnVubmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ5NTgK KworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZGVkIC0tbm8t ZW5hYmxlLWFsbC1leHBlcmltZW50YWwtZmVhdHVyZXMgdG8gcnVuLXdlYmtpdC10ZXN0cyBhbmQg V2ViS2l0VGVzdFJ1bm5lci4KKworICAgICAgICBJdCBjYXVzZXMgYSBjcmFzaCBpbiBEdW1wUmVu ZGVyVHJlZSBmb3Igbm93LiBXZSBzaG91bGQgcmVjdGlmeSB0aGlzIGluIHRoZSBmdXR1cmUKKyAg ICAgICAgd2hlbiB3ZSBhbGlnbiB0aGUgYmVoYXZpb3JzIG9mIFdlYktpdFRlc3RSdW5uZXIgYW5k IER1bXBSZW5kZXJUcmVlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOiBBZGRlZCAtLW5v LWVuYWJsZS1hbGwtZXhwZXJpbWVudGFsLWZlYXR1cmVzLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kcml2ZXIucHk6CisgICAgICAgIChEcml2ZXIuY21kX2xpbmUpOiBQYXNzIGFs b25nIHRoZSBvcHRpb24gdG8gV2ViS2l0VGVzdFJ1bm5lci4KKyAgICAgICAgKiBXZWJLaXRUZXN0 UnVubmVyL09wdGlvbnMuY3BwOgorICAgICAgICAoV1RSOjpoYW5kbGVPcHRpb25Ob0VuYWJsZUFs bEV4cGVyaW1lbnRhbEZlYXR1cmVzKTogQWRkZWQuCisgICAgICAgIChXVFI6Ok9wdGlvbnNIYW5k bGVyOjpPcHRpb25zSGFuZGxlcik6IEFkZGVkIC0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50YWwt ZmVhdHVyZXMuCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmg6CisgICAgICAg ICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRl c3RDb250cm9sbGVyOjppbml0aWFsaXplKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6 OnJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAqIFdlYktpdFRl c3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaDoKKwogMjAyMS0wNC0yMiAgVGltIE5ndXllbiAgPG50 aW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCAiVGltIE5ndXllbiIgdG8gY29udHJpYnV0b3Jz Lmpzb24uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCAzODIwODZlZGUyZjI1NTRlMmFkM2EyYzM0NmVlZmIy YzU4YjU2MWFjLi4xMTU0NjYxN2ZjODJhMDA4Nzk1MjBkNWQyYjVhMzhiZWI3OWVhNTEzIDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHkKQEAgLTEyNiw2ICsxMjYsOCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzKToKICAg ICAgICAgICAgIGhlbHA9IkVuYWJsZSAoZGlzYWJsZSkgYW4gaW50ZXJuYWwgZmVhdHVyZSAoLS1p bnRlcm5hbC1mZWF0dXJlIEZlYXR1cmVOYW1lWz10cnVlfGZhbHNlXSkiKSwKICAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oIi0tZXhwZXJpbWVudGFsLWZlYXR1cmUiLCB0eXBlPSJzdHJpbmci LCBhY3Rpb249ImFwcGVuZCIsIGRlZmF1bHQ9W10sCiAgICAgICAgICAgICBoZWxwPSJFbmFibGUg KGRpc2FibGUpIGFuIGV4cGVyaW1lbnRhbCBmZWF0dXJlICgtLWV4cGVyaW1lbnRhbC1mZWF0dXJl IEZlYXR1cmVOYW1lWz10cnVlfGZhbHNlXSkiKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oIi0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50YWwtZmVhdHVyZXMiLCBhY3Rpb249InN0b3Jl X2ZhbHNlIiwgZGVmYXVsdD1UcnVlLCBkZXN0PSJlbmFibGVfYWxsX2V4cGVyaW1lbnRhbF9mZWF0 dXJlcyIsCisgICAgICAgICAgICBoZWxwPSJFbmFibGVzIGFsbCBleHBlcmltZW50YWwgZmVhdHVy ZXMgaW4gV2ViS2l0VGVzdFJ1bm5lciIpLAogICAgIF0pKQogCiAgICAgb3B0aW9uX2dyb3VwX2Rl ZmluaXRpb25zLmFwcGVuZCgoIldlYktpdCBPcHRpb25zIiwgWwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kcml2ZXIucHkKaW5kZXggMzNlYWM1ZGNhNzg4OTk0NzAzYTMwYTI3OTFjYWFmMTlhZjhk MzIxYi4uNDU0MmRmNWQ3ZDM5N2NhNmRiYmNmYTM1N2M2ZjczZjdiYWE5NzVmOCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CkBAIC01MzQsNiArNTM0LDkgQEAgY2xhc3MgRHJp dmVyKG9iamVjdCk6CiAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWludGVybmFsLWZlYXR1cmUn KQogICAgICAgICAgICAgY21kLmFwcGVuZChmZWF0dXJlKQogCisgICAgICAgIGlmIG5vdCBzZWxm Ll9wb3J0LmdldF9vcHRpb24oJ2VuYWJsZV9hbGxfZXhwZXJpbWVudGFsX2ZlYXR1cmVzJyk6Cisg ICAgICAgICAgICBjbWQuYXBwZW5kKCctLW5vLWVuYWJsZS1hbGwtZXhwZXJpbWVudGFsLWZlYXR1 cmVzJykKKwogICAgICAgICBmb3IgZmVhdHVyZSBpbiBzZWxmLl9wb3J0LmV4cGVyaW1lbnRhbF9m ZWF0dXJlKCk6CiAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWV4cGVyaW1lbnRhbC1mZWF0dXJl JykKICAgICAgICAgICAgIGNtZC5hcHBlbmQoZmVhdHVyZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CmluZGV4IGVmYjkyN2EzMjNiMGQzZGI2YTdm NDgzYzE1ZDk4MDAxODhiMTAxY2QuLjg1YzgwM2NmZWI0NTZkMzJhZmM4ZGNmZWI2MzczZDkwYjU0 ZGNjMzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXJfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlcl91bml0dGVz dC5weQpAQCAtMjcsNiArMjcsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgdW5pdHRlc3QK K2ltcG9ydCBvcHRwYXJzZQogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9z dF9tb2NrIGltcG9ydCBNb2NrU3lzdGVtSG9zdAogCkBAIC0yMDUsNyArMjA2LDcgQEAgY2xhc3Mg RHJpdmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo Y29udGVudF9ibG9jay5kZWNvZGVkX2NvbnRlbnQsIGInMTIzNDU2NzhcbicpCiAKICAgICBkZWYg dGVzdF9ub190aW1lb3V0KHNlbGYpOgotICAgICAgICBwb3J0ID0gVGVzdFdlYktpdFBvcnQoKQor ICAgICAgICBwb3J0ID0gVGVzdFdlYktpdFBvcnQob3B0aW9ucz1vcHRwYXJzZS5WYWx1ZXMoeydl bmFibGVfYWxsX2V4cGVyaW1lbnRhbF9mZWF0dXJlcyc6IFRydWV9KSkKICAgICAgICAgcG9ydC5f Y29uZmlnLmJ1aWxkX2RpcmVjdG9yeSA9IGxhbWJkYSBjb25maWd1cmF0aW9uOiAnL21vY2stYnVp bGQnCiAgICAgICAgIGRyaXZlciA9IERyaXZlcihwb3J0LCAwLCBwaXhlbF90ZXN0cz1UcnVlLCBu b190aW1lb3V0PVRydWUpCiAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4n KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHAgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwCmluZGV4IDQzOWI2Y2IzZTcwOTIyMjEyZjE1 ZjhmYjY3NmM4OWZlYTY3NjIyYzIuLjkwZWNlODliZDExZjFhMGE5NzcxZjdlNTIyNmU4ODdhNzA4 YTA3YmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHAKKysr IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmNwcApAQCAtMTI4LDYgKzEyOCwxMiBA QCBzdGF0aWMgYm9vbCBwYXJzZUZlYXR1cmUoc3RkOjpzdHJpbmdfdmlldyBmZWF0dXJlU3RyaW5n LCBUZXN0RmVhdHVyZXMmIGZlYXR1cmVzKQogICAgIHJldHVybiB0cnVlOwogfQogCitzdGF0aWMg Ym9vbCBoYW5kbGVPcHRpb25Ob0VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKE9wdGlvbnMm IG9wdGlvbnMsIGNvbnN0IGNoYXIqLCBjb25zdCBjaGFyKiBmZWF0dXJlKQoreworICAgIG9wdGlv bnMuZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMgPSBmYWxzZTsKKyAgICByZXR1cm4gdHJ1 ZTsKK30KKwogc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uRXhwZXJpbWVudGFsRmVhdHVyZShPcHRp b25zJiBvcHRpb25zLCBjb25zdCBjaGFyKiwgY29uc3QgY2hhciogZmVhdHVyZSkKIHsKICAgICBy ZXR1cm4gcGFyc2VGZWF0dXJlKGZlYXR1cmUsIG9wdGlvbnMuZmVhdHVyZXMpOwpAQCAtMTYyLDYg KzE2OCw3IEBAIE9wdGlvbnNIYW5kbGVyOjpPcHRpb25zSGFuZGxlcihPcHRpb25zJiBvKQogICAg IG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1zaG93LXdlYnZpZXciLCAiU2hvdyB0aGUgV2Vi VmlldyBkdXJpbmcgdGVzdCBydW5zIChmb3IgZGVidWdnaW5nKSIsIGhhbmRsZU9wdGlvblNob3dX ZWJWaWV3KSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXNob3ctdG91Y2hlcyIs ICJTaG93IHRoZSB0b3VjaGVzIGR1cmluZyB0ZXN0IHJ1bnMgKGZvciBkZWJ1Z2dpbmcpIiwgaGFu ZGxlT3B0aW9uU2hvd1RvdWNoZXMpKTsKICAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0t d29ybGQtbGVha3MiLCAiQ2hlY2sgZm9yIGxlYWtzIG9mIHdvcmxkIG9iamVjdHMgKGN1cnJlbnRs eSwgZG9jdW1lbnRzKSIsIGhhbmRsZU9wdGlvbkNoZWNrRm9yV29ybGRMZWFrcykpOworICAgIG9w dGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1uby1lbmFibGUtYWxsLWV4cGVyaW1lbnRhbC1mZWF0 dXJlcyIsICJEbyBub3QgZW5hYmxlIGFsbCBleHBlcmltZW50YWwgZmVhdHVyZXMgYnkgZGVmYXVs dCIsIGhhbmRsZU9wdGlvbk5vRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMpKTsKICAgICBv cHRpb25MaXN0LmFwcGVuZChPcHRpb24oIi0tZXhwZXJpbWVudGFsLWZlYXR1cmUiLCAiRW5hYmxl IGV4cGVyaW1lbnRhbCBmZWF0dXJlIiwgaGFuZGxlT3B0aW9uRXhwZXJpbWVudGFsRmVhdHVyZSwg dHJ1ZSkpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9wdGlvbigiLS1pbnRlcm5hbC1mZWF0dXJl IiwgIkVuYWJsZSBpbnRlcm5hbCBmZWF0dXJlIiwgaGFuZGxlT3B0aW9uSW50ZXJuYWxGZWF0dXJl LCB0cnVlKSk7CiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKZGlmZiAt LWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5oIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9PcHRpb25zLmgKaW5kZXggZTA5MzAyYjcwNDI2NjhhNzcwMDE5NTk3NDE5MmYyM2Jk NGZkNzZmZS4uOGVmZWQ1MmZiZWQ0MzI5YTdiMDRmMWMyNTA5NjIyZGMwMmYxYzhmZCAxMDA2NDQK LS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmgKKysrIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9PcHRpb25zLmgKQEAgLTQ5LDYgKzQ5LDcgQEAgc3RydWN0IE9wdGlvbnMgewog ICAgIGJvb2wgZm9yY2VDb21wbGV4VGV4dCB7IGZhbHNlIH07CiAgICAgYm9vbCBjaGVja0Zvcldv cmxkTGVha3MgeyBmYWxzZSB9OwogICAgIGJvb2wgYWxsb3dBbnlIVFRQU0NlcnRpZmljYXRlRm9y QWxsb3dlZEhvc3RzIHsgZmFsc2UgfTsKKyAgICBib29sIGVuYWJsZUFsbEV4cGVyaW1lbnRhbEZl YXR1cmVzIHsgdHJ1ZSB9OwogICAgIHN0ZDo6dmVjdG9yPHN0ZDo6c3RyaW5nPiBwYXRoczsKICAg ICBzdGQ6OnNldDxzdGQ6OnN0cmluZz4gYWxsb3dlZEhvc3RzOwogICAgIFRlc3RGZWF0dXJlcyBm ZWF0dXJlczsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xs ZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXgg NWZjOTk1Y2M1ZWYyYTU5ZGM5ZmU4ZmIzZTEwODQ5MjVkN2UwZmJmZC4uMjY3NjAwZmI5ZDM2OGJh MDkxZWI1NzkzNTQ1ZDQxNTBkNGY4NTc3YyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 Q29udHJvbGxlci5jcHAKQEAgLTUzMyw2ICs1MzMsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpp bml0aWFsaXplKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgbV9hbGxvd2VkSG9z dHMgPSBvcHRpb25zLmFsbG93ZWRIb3N0czsKICAgICBtX2NoZWNrRm9yV29ybGRMZWFrcyA9IG9w dGlvbnMuY2hlY2tGb3JXb3JsZExlYWtzOwogICAgIG1fYWxsb3dBbnlIVFRQU0NlcnRpZmljYXRl Rm9yQWxsb3dlZEhvc3RzID0gb3B0aW9ucy5hbGxvd0FueUhUVFBTQ2VydGlmaWNhdGVGb3JBbGxv d2VkSG9zdHM7CisgICAgbV9lbmFibGVBbGxFeHBlcmltZW50YWxGZWF0dXJlcyA9IG9wdGlvbnMu ZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXM7CiAgICAgbV9nbG9iYWxGZWF0dXJlcyA9IHN0 ZDo6bW92ZShvcHRpb25zLmZlYXR1cmVzKTsKIAogICAgIG1fdXNpbmdTZXJ2ZXJNb2RlID0gKG1f cGF0aHMuc2l6ZSgpID09IDEgJiYgbV9wYXRoc1swXSA9PSAiLSIpOwpAQCAtODgxLDEwICs4ODIs MTMgQEAgdGVtcGxhdGU8dHlwZW5hbWUgRj4gc3RhdGljIHZvaWQgYmF0Y2hVcGRhdGVQcmVmZXJl bmNlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmUKIAogdm9pZCBUZXN0Q29udHJvbGxlcjo6cmVz ZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyhjb25zdCBUZXN0T3B0aW9ucyYgb3B0aW9u cykKIHsKLSAgICBiYXRjaFVwZGF0ZVByZWZlcmVuY2VzKHBsYXRmb3JtUHJlZmVyZW5jZXMoKSwg W29wdGlvbnNdIChhdXRvIHByZWZlcmVuY2VzKSB7CisgICAgYmF0Y2hVcGRhdGVQcmVmZXJlbmNl cyhwbGF0Zm9ybVByZWZlcmVuY2VzKCksIFtvcHRpb25zLCBlbmFibGVBbGxFeHBlcmltZW50YWxG ZWF0dXJlcyA9IG1fZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXNdIChhdXRvIHByZWZlcmVu Y2VzKSB7CiAgICAgICAgIFdLUHJlZmVyZW5jZXNSZXNldFRlc3RSdW5uZXJPdmVycmlkZXMocHJl ZmVyZW5jZXMpOwogCi0gICAgICAgIFdLUHJlZmVyZW5jZXNFbmFibGVBbGxFeHBlcmltZW50YWxG ZWF0dXJlcyhwcmVmZXJlbmNlcyk7CisgICAgICAgIGlmIChlbmFibGVBbGxFeHBlcmltZW50YWxG ZWF0dXJlcykKKyAgICAgICAgICAgIFdLUHJlZmVyZW5jZXNFbmFibGVBbGxFeHBlcmltZW50YWxG ZWF0dXJlcyhwcmVmZXJlbmNlcyk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIFdLUHJlZmVy ZW5jZXNSZXNldEFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKHByZWZlcmVuY2VzKTsKIAogICAgICAg ICBXS1ByZWZlcmVuY2VzU2V0UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb25FbmFibGVkKHByZWZlcmVu Y2VzLCBvcHRpb25zLnNob3VsZEVuYWJsZVByb2Nlc3NTd2FwT25OYXZpZ2F0aW9uKCkpOwogICAg ICAgICBXS1ByZWZlcmVuY2VzU2V0U3RvcmFnZUJsb2NraW5nUG9saWN5KHByZWZlcmVuY2VzLCBr V0tBbGxvd0FsbFN0b3JhZ2UpOyAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIHRlc3RpbmcgdGhlIGRl ZmF1bHQuCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVy LmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKaW5kZXggMzFhZTQ2 MTAwYzdmOTBkMmU5NDY3M2QyNWU0NjlhN2RjYjFkNTgwNC4uNDYyZTkwMGI0MGY1MzBhNjNmNDcy MjNhNmZlOWYxN2FiM2M0ZTIzNCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xs ZXIuaApAQCAtNTM5LDYgKzUzOSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2djQmV0d2VlblRl c3RzIHsgZmFsc2UgfTsKICAgICBib29sIG1fc2hvdWxkRHVtcFBpeGVsc0ZvckFsbFRlc3RzIHsg ZmFsc2UgfTsKICAgICBib29sIG1fY3JlYXRlZE90aGVyUGFnZSB7IGZhbHNlIH07CisgICAgYm9v bCBtX2VuYWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzIHsgdHJ1ZSB9OwogICAgIHN0ZDo6dmVj dG9yPHN0ZDo6c3RyaW5nPiBtX3BhdGhzOwogICAgIHN0ZDo6c2V0PHN0ZDo6c3RyaW5nPiBtX2Fs bG93ZWRIb3N0czsKICAgICBUZXN0RmVhdHVyZXMgbV9nbG9iYWxGZWF0dXJlczsK 426992 2021-04-24 17:13:26 -0700 2021-04-24 17:39:53 -0700 Patch for landing bug-224958-20210424171325.patch text/plain 8723 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDc5NDY5ODc5NTlmMjhlM2RlMmExNjY2NDljY2VkNzg1 ZGM2MTRlZS4uNTg4NDA3ZTY5NjhiZjE1ZjUxZmY3NDRmMDcxMmI3ZjhiYWYwOTM5ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDIxLTA0LTI0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIEFkZCBhbiBvcHRpb24gdG8gbm90IGVuYWJsZSBhbGwgZXhwZXJpbWVudGFsIGZlYXR1cmVz IGluIFdlYktpdFRlc3RSdW5uZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNDk1OAorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisK KyAgICAgICAgQWRkZWQgLS1uby1lbmFibGUtYWxsLWV4cGVyaW1lbnRhbC1mZWF0dXJlcyB0byBy dW4td2Via2l0LXRlc3RzIGFuZCBXZWJLaXRUZXN0UnVubmVyLgorCisgICAgICAgIEl0IGNhdXNl cyBhIGNyYXNoIGluIER1bXBSZW5kZXJUcmVlIGZvciBub3cuIFdlIHNob3VsZCByZWN0aWZ5IHRo aXMgaW4gdGhlIGZ1dHVyZQorICAgICAgICB3aGVuIHdlIGFsaWduIHRoZSBiZWhhdmlvcnMgb2Yg V2ViS2l0VGVzdFJ1bm5lciBhbmQgRHVtcFJlbmRlclRyZWUuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAocGFy c2VfYXJncyk6IEFkZGVkIC0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50YWwtZmVhdHVyZXMuCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAgICAgICAgKERyaXZl ci5jbWRfbGluZSk6IFBhc3MgYWxvbmcgdGhlIG9wdGlvbiB0byBXZWJLaXRUZXN0UnVubmVyLgor ICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHA6CisgICAgICAgIChXVFI6Omhh bmRsZU9wdGlvbk5vRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMpOiBBZGRlZC4KKyAgICAg ICAgKFdUUjo6T3B0aW9uc0hhbmRsZXI6Ok9wdGlvbnNIYW5kbGVyKTogQWRkZWQgLS1uby1lbmFi bGUtYWxsLWV4cGVyaW1lbnRhbC1mZWF0dXJlcy4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVy L09wdGlvbnMuaDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAo V1RSOjpUZXN0Q29udHJvbGxlcjo6cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyk6 CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oOgorCiAyMDIxLTA0 LTI0ICBUeWxlciBXaWxjb2NrICA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+CiAKICAgICAgICAg UmVmYWN0b3IgVmFsdWVSYW5nZSBmcm9tIGVudW0gdG8gZW51bSBjbGFzcwpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkK aW5kZXggMzgyMDg2ZWRlMmYyNTU0ZTJhZDNhMmMzNDZlZWZiMmM1OGI1NjFhYy4uMTE1NDY2MTdm YzgyYTAwODc5NTIwZDVkMmI1YTM4YmViNzllYTUxMyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0xMjYs NiArMTI2LDggQEAgZGVmIHBhcnNlX2FyZ3MoYXJncyk6CiAgICAgICAgICAgICBoZWxwPSJFbmFi bGUgKGRpc2FibGUpIGFuIGludGVybmFsIGZlYXR1cmUgKC0taW50ZXJuYWwtZmVhdHVyZSBGZWF0 dXJlTmFtZVs9dHJ1ZXxmYWxzZV0pIiksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCIt LWV4cGVyaW1lbnRhbC1mZWF0dXJlIiwgdHlwZT0ic3RyaW5nIiwgYWN0aW9uPSJhcHBlbmQiLCBk ZWZhdWx0PVtdLAogICAgICAgICAgICAgaGVscD0iRW5hYmxlIChkaXNhYmxlKSBhbiBleHBlcmlt ZW50YWwgZmVhdHVyZSAoLS1leHBlcmltZW50YWwtZmVhdHVyZSBGZWF0dXJlTmFtZVs9dHJ1ZXxm YWxzZV0pIiksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5vLWVuYWJsZS1hbGwt ZXhwZXJpbWVudGFsLWZlYXR1cmVzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlZmF1bHQ9VHJ1 ZSwgZGVzdD0iZW5hYmxlX2FsbF9leHBlcmltZW50YWxfZmVhdHVyZXMiLAorICAgICAgICAgICAg aGVscD0iRW5hYmxlcyBhbGwgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGluIFdlYktpdFRlc3RSdW5u ZXIiKSwKICAgICBdKSkKIAogICAgIG9wdGlvbl9ncm91cF9kZWZpbml0aW9ucy5hcHBlbmQoKCJX ZWJLaXQgT3B0aW9ucyIsIFsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CmluZGV4 IDMzZWFjNWRjYTc4ODk5NDcwM2EzMGEyNzkxY2FhZjE5YWY4ZDMyMWIuLjQ1NDJkZjVkN2QzOTdj YTZkYmJjZmEzNTdjNmY3M2Y3YmFhOTc1ZjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Ry aXZlci5weQpAQCAtNTM0LDYgKzUzNCw5IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAg ICAgICAgY21kLmFwcGVuZCgnLS1pbnRlcm5hbC1mZWF0dXJlJykKICAgICAgICAgICAgIGNtZC5h cHBlbmQoZmVhdHVyZSkKIAorICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdl bmFibGVfYWxsX2V4cGVyaW1lbnRhbF9mZWF0dXJlcycpOgorICAgICAgICAgICAgY21kLmFwcGVu ZCgnLS1uby1lbmFibGUtYWxsLWV4cGVyaW1lbnRhbC1mZWF0dXJlcycpCisKICAgICAgICAgZm9y IGZlYXR1cmUgaW4gc2VsZi5fcG9ydC5leHBlcmltZW50YWxfZmVhdHVyZSgpOgogICAgICAgICAg ICAgY21kLmFwcGVuZCgnLS1leHBlcmltZW50YWwtZmVhdHVyZScpCiAgICAgICAgICAgICBjbWQu YXBwZW5kKGZlYXR1cmUpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv ZHJpdmVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlcl91 bml0dGVzdC5weQppbmRleCBlZmI5MjdhMzIzYjBkM2RiNmE3ZjQ4M2MxNWQ5ODAwMTg4YjEwMWNk Li44NWM4MDNjZmViNDU2ZDMyYWZjOGRjZmViNjM3M2Q5MGI1NGRjYzM1IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkKQEAgLTI3LDYgKzI3LDcg QEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KIAogaW1wb3J0IHVuaXR0ZXN0CitpbXBvcnQgb3B0cGFyc2UKIAog ZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5 c3RlbUhvc3QKIApAQCAtMjA1LDcgKzIwNiw3IEBAIGNsYXNzIERyaXZlclRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRlbnRfYmxvY2suZGVjb2Rl ZF9jb250ZW50LCBiJzEyMzQ1Njc4XG4nKQogCiAgICAgZGVmIHRlc3Rfbm9fdGltZW91dChzZWxm KToKLSAgICAgICAgcG9ydCA9IFRlc3RXZWJLaXRQb3J0KCkKKyAgICAgICAgcG9ydCA9IFRlc3RX ZWJLaXRQb3J0KG9wdGlvbnM9b3B0cGFyc2UuVmFsdWVzKHsnZW5hYmxlX2FsbF9leHBlcmltZW50 YWxfZmVhdHVyZXMnOiBUcnVlfSkpCiAgICAgICAgIHBvcnQuX2NvbmZpZy5idWlsZF9kaXJlY3Rv cnkgPSBsYW1iZGEgY29uZmlndXJhdGlvbjogJy9tb2NrLWJ1aWxkJwogICAgICAgICBkcml2ZXIg PSBEcml2ZXIocG9ydCwgMCwgcGl4ZWxfdGVzdHM9VHJ1ZSwgbm9fdGltZW91dD1UcnVlKQogICAg ICAgICBpZiBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnd2luJyk6CmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9P cHRpb25zLmNwcAppbmRleCA0MzliNmNiM2U3MDkyMjIxMmYxNWY4ZmI2NzZjODlmZWE2NzYyMmMy Li45MGVjZTg5YmQxMWYxYTBhOTc3MWY3ZTUyMjZlODg3YTcwOGEwN2JjIDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvT3B0aW9ucy5jcHAKQEAgLTEyOCw2ICsxMjgsMTIgQEAgc3RhdGljIGJvb2wgcGFyc2VG ZWF0dXJlKHN0ZDo6c3RyaW5nX3ZpZXcgZmVhdHVyZVN0cmluZywgVGVzdEZlYXR1cmVzJiBmZWF0 dXJlcykKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgaGFuZGxlT3B0aW9uTm9F bmFibGVBbGxFeHBlcmltZW50YWxGZWF0dXJlcyhPcHRpb25zJiBvcHRpb25zLCBjb25zdCBjaGFy KiwgY29uc3QgY2hhciogZmVhdHVyZSkKK3sKKyAgICBvcHRpb25zLmVuYWJsZUFsbEV4cGVyaW1l bnRhbEZlYXR1cmVzID0gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHN0YXRpYyBib29s IGhhbmRsZU9wdGlvbkV4cGVyaW1lbnRhbEZlYXR1cmUoT3B0aW9ucyYgb3B0aW9ucywgY29uc3Qg Y2hhciosIGNvbnN0IGNoYXIqIGZlYXR1cmUpCiB7CiAgICAgcmV0dXJuIHBhcnNlRmVhdHVyZShm ZWF0dXJlLCBvcHRpb25zLmZlYXR1cmVzKTsKQEAgLTE2Miw2ICsxNjgsNyBAQCBPcHRpb25zSGFu ZGxlcjo6T3B0aW9uc0hhbmRsZXIoT3B0aW9ucyYgbykKICAgICBvcHRpb25MaXN0LmFwcGVuZChP cHRpb24oIi0tc2hvdy13ZWJ2aWV3IiwgIlNob3cgdGhlIFdlYlZpZXcgZHVyaW5nIHRlc3QgcnVu cyAoZm9yIGRlYnVnZ2luZykiLCBoYW5kbGVPcHRpb25TaG93V2ViVmlldykpOwogICAgIG9wdGlv bkxpc3QuYXBwZW5kKE9wdGlvbigiLS1zaG93LXRvdWNoZXMiLCAiU2hvdyB0aGUgdG91Y2hlcyBk dXJpbmcgdGVzdCBydW5zIChmb3IgZGVidWdnaW5nKSIsIGhhbmRsZU9wdGlvblNob3dUb3VjaGVz KSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0aW9uKCItLXdvcmxkLWxlYWtzIiwgIkNoZWNr IGZvciBsZWFrcyBvZiB3b3JsZCBvYmplY3RzIChjdXJyZW50bHksIGRvY3VtZW50cykiLCBoYW5k bGVPcHRpb25DaGVja0ZvcldvcmxkTGVha3MpKTsKKyAgICBvcHRpb25MaXN0LmFwcGVuZChPcHRp b24oIi0tbm8tZW5hYmxlLWFsbC1leHBlcmltZW50YWwtZmVhdHVyZXMiLCAiRG8gbm90IGVuYWJs ZSBhbGwgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGJ5IGRlZmF1bHQiLCBoYW5kbGVPcHRpb25Ob0Vu YWJsZUFsbEV4cGVyaW1lbnRhbEZlYXR1cmVzKSk7CiAgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0 aW9uKCItLWV4cGVyaW1lbnRhbC1mZWF0dXJlIiwgIkVuYWJsZSBleHBlcmltZW50YWwgZmVhdHVy ZSIsIGhhbmRsZU9wdGlvbkV4cGVyaW1lbnRhbEZlYXR1cmUsIHRydWUpKTsKICAgICBvcHRpb25M aXN0LmFwcGVuZChPcHRpb24oIi0taW50ZXJuYWwtZmVhdHVyZSIsICJFbmFibGUgaW50ZXJuYWwg ZmVhdHVyZSIsIGhhbmRsZU9wdGlvbkludGVybmFsRmVhdHVyZSwgdHJ1ZSkpOwogI2lmIEVOQUJM RShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL09wdGlvbnMuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5oCmlu ZGV4IGUwOTMwMmI3MDQyNjY4YTc3MDAxOTU5NzQxOTJmMjNiZDRmZDc2ZmUuLjhlZmVkNTJmYmVk NDMyOWE3YjA0ZjFjMjUwOTYyMmRjMDJmMWM4ZmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvT3B0aW9ucy5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5o CkBAIC00OSw2ICs0OSw3IEBAIHN0cnVjdCBPcHRpb25zIHsKICAgICBib29sIGZvcmNlQ29tcGxl eFRleHQgeyBmYWxzZSB9OwogICAgIGJvb2wgY2hlY2tGb3JXb3JsZExlYWtzIHsgZmFsc2UgfTsK ICAgICBib29sIGFsbG93QW55SFRUUFNDZXJ0aWZpY2F0ZUZvckFsbG93ZWRIb3N0cyB7IGZhbHNl IH07CisgICAgYm9vbCBlbmFibGVBbGxFeHBlcmltZW50YWxGZWF0dXJlcyB7IHRydWUgfTsKICAg ICBzdGQ6OnZlY3RvcjxzdGQ6OnN0cmluZz4gcGF0aHM7CiAgICAgc3RkOjpzZXQ8c3RkOjpzdHJp bmc+IGFsbG93ZWRIb3N0czsKICAgICBUZXN0RmVhdHVyZXMgZmVhdHVyZXM7CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDVmYzk5NWNjNWVmMmE1OWRjOWZl OGZiM2UxMDg0OTI1ZDdlMGZiZmQuLmUyNzhlMmNkNmFlZDA1OGU4N2Q4ZDViNDM1MTg5NjkzMDI3 Y2Y4OGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC01 MzMsNiArNTMzLDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywg Y29uc3QgY2hhciogYXJndltdKQogICAgIG1fYWxsb3dlZEhvc3RzID0gb3B0aW9ucy5hbGxvd2Vk SG9zdHM7CiAgICAgbV9jaGVja0ZvcldvcmxkTGVha3MgPSBvcHRpb25zLmNoZWNrRm9yV29ybGRM ZWFrczsKICAgICBtX2FsbG93QW55SFRUUFNDZXJ0aWZpY2F0ZUZvckFsbG93ZWRIb3N0cyA9IG9w dGlvbnMuYWxsb3dBbnlIVFRQU0NlcnRpZmljYXRlRm9yQWxsb3dlZEhvc3RzOworICAgIG1fZW5h YmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMgPSBvcHRpb25zLmVuYWJsZUFsbEV4cGVyaW1lbnRh bEZlYXR1cmVzOwogICAgIG1fZ2xvYmFsRmVhdHVyZXMgPSBzdGQ6Om1vdmUob3B0aW9ucy5mZWF0 dXJlcyk7CiAKICAgICBtX3VzaW5nU2VydmVyTW9kZSA9IChtX3BhdGhzLnNpemUoKSA9PSAxICYm IG1fcGF0aHNbMF0gPT0gIi0iKTsKQEAgLTg4MSwxMCArODgyLDExIEBAIHRlbXBsYXRlPHR5cGVu YW1lIEY+IHN0YXRpYyB2b2lkIGJhdGNoVXBkYXRlUHJlZmVyZW5jZXMoV0tQcmVmZXJlbmNlc1Jl ZiBwcmVmZXJlCiAKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0NvbnNp c3RlbnRWYWx1ZXMoY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvbnMpCiB7Ci0gICAgYmF0Y2hVcGRh dGVQcmVmZXJlbmNlcyhwbGF0Zm9ybVByZWZlcmVuY2VzKCksIFtvcHRpb25zXSAoYXV0byBwcmVm ZXJlbmNlcykgeworICAgIGJhdGNoVXBkYXRlUHJlZmVyZW5jZXMocGxhdGZvcm1QcmVmZXJlbmNl cygpLCBbb3B0aW9ucywgZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMgPSBtX2VuYWJsZUFs bEV4cGVyaW1lbnRhbEZlYXR1cmVzXSAoYXV0byBwcmVmZXJlbmNlcykgewogICAgICAgICBXS1By ZWZlcmVuY2VzUmVzZXRUZXN0UnVubmVyT3ZlcnJpZGVzKHByZWZlcmVuY2VzKTsKIAotICAgICAg ICBXS1ByZWZlcmVuY2VzRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMocHJlZmVyZW5jZXMp OworICAgICAgICBpZiAoZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMpCisgICAgICAgICAg ICBXS1ByZWZlcmVuY2VzRW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMocHJlZmVyZW5jZXMp OwogCiAgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRQcm9jZXNzU3dhcE9uTmF2aWdhdGlvbkVuYWJs ZWQocHJlZmVyZW5jZXMsIG9wdGlvbnMuc2hvdWxkRW5hYmxlUHJvY2Vzc1N3YXBPbk5hdmlnYXRp b24oKSk7CiAgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRTdG9yYWdlQmxvY2tpbmdQb2xpY3kocHJl ZmVyZW5jZXMsIGtXS0FsbG93QWxsU3RvcmFnZSk7IC8vIEZJWE1FOiBXZSBzaG91bGQgYmUgdGVz dGluZyB0aGUgZGVmYXVsdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVz dENvbnRyb2xsZXIuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaApp bmRleCAzMWFlNDYxMDBjN2Y5MGQyZTk0NjczZDI1ZTQ2OWE3ZGNiMWQ1ODA0Li40NjJlOTAwYjQw ZjUzMGE2M2Y0NzIyM2E2ZmU5ZjE3YWIzYzRlMjM0IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0Q29udHJvbGxlci5oCkBAIC01MzksNiArNTM5LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1f Z2NCZXR3ZWVuVGVzdHMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9zaG91bGREdW1wUGl4ZWxzRm9y QWxsVGVzdHMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9jcmVhdGVkT3RoZXJQYWdlIHsgZmFsc2Ug fTsKKyAgICBib29sIG1fZW5hYmxlQWxsRXhwZXJpbWVudGFsRmVhdHVyZXMgeyB0cnVlIH07CiAg ICAgc3RkOjp2ZWN0b3I8c3RkOjpzdHJpbmc+IG1fcGF0aHM7CiAgICAgc3RkOjpzZXQ8c3RkOjpz dHJpbmc+IG1fYWxsb3dlZEhvc3RzOwogICAgIFRlc3RGZWF0dXJlcyBtX2dsb2JhbEZlYXR1cmVz Owo=