207684 2020-02-12 23:15:12 -0800 Stub repositories fail to upload some results due to missing head svn revision 2020-02-21 10:08:23 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jlewis3 jlewis3 ews-watchlist glenn jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1618408 0 jlewis3 2020-02-12 23:15:12 -0800 Currently we fail to upload some results when running tests from a stub repository because we expect to be able to get the head for a given svn checkout. We need to make it possible to get this information from the checkout_information.json I'm proposing we just add an additional entry to the json for 'head': '<revision>' to help with getting the required information. 1618409 1 webkit-bug-importer 2020-02-12 23:15:25 -0800 <rdar://problem/59414903> 1618503 2 390649 jlewis3 2020-02-13 08:37:59 -0800 Created attachment 390649 Patch I believe this should fix the issues while maintaining functionality. 1618558 3 390649 jbedard 2020-02-13 10:10:07 -0800 Comment on attachment 390649 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390649&action=review > Tools/Scripts/webkitpy/common/checkout/scm/git.py:295 > + return self.svn_revision(path) I'm a bit confused. What does webkitpy think the difference between a head revision and the svn revision is? > Tools/Scripts/webkitpy/common/checkout/scm/stub_repository.py:70 > + return self._find_parent_path_matching_callback_condition(path, lambda path: self._decode_json(path)['head'], filesystem=self._filesystem) I think that the if you don't have a HEAD in the json, you should default to the native_revision(...) 1619753 4 jlewis3 2020-02-17 11:23:08 -0800 We discovered that there is a better way to fix this issue than the proposed one due to the outdated code. As such a slightly bigger change is needed. 1620254 5 391073 jlewis3 2020-02-18 11:43:01 -0800 Created attachment 391073 Patch Though this doesn't seem like a large change, this has a bigger impact. In multiple spots we are determining our root directory off the actual host running the test suites. This basically made our unit test for certain areas using the mock filesystem and SCMs worthless. 1620267 6 391073 jbedard 2020-02-18 12:08:43 -0800 Comment on attachment 391073 Patch Matt and I talked about this change this morning. This looks correct, although we should be careful landing because fully testing upload changes is difficult, I know we've been bitten by that a few times in the last 2-3 months. 1620271 7 jlewis3 2020-02-18 12:17:42 -0800 Committed r256851: <https://trac.webkit.org/changeset/256851> 1620454 8 ryanhaddad 2020-02-18 17:16:16 -0800 Reverted r256851 for reason: Broke internal bots Committed r256894: <https://trac.webkit.org/changeset/256894> 1620455 9 ryanhaddad 2020-02-18 17:16:37 -0800 (In reply to Ryan Haddad from comment #8) > Reverted r256851 for reason: > > Broke internal bots > > Committed r256894: <https://trac.webkit.org/changeset/256894> Details in radar. 1621279 10 391302 jlewis3 2020-02-20 10:23:11 -0800 Created attachment 391302 Patch Still needs testing. 1621309 11 391302 jlewis3 2020-02-20 11:13:33 -0800 Comment on attachment 391302 Patch Testing show this should work. 1621400 12 391302 jbedard 2020-02-20 13:20:59 -0800 Comment on attachment 391302 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391302&action=review I don't think we have correctness issues anymore. I think we need to think about script performance for a moment, though. initialie_scm() is a relatively expensive call and should be avoided unless we really need it. > Tools/Scripts/webkitpy/api_tests/run_api_tests.py:44 > + host.initialize_scm() Do we actually need this? It's a relatively expensive call, this patch means that we're running it even when we pass --help. > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:67 > + host.initialize_scm() What happens if we call this twice in a test run? Does the function actually run twice? I ask because initializing the sum is actually a relatively expensive task, it feels like we should reserve it for the commits_for_upload call. > Tools/Scripts/webkitpy/test/main.py:61 > + _webkit_root = _host.scm().checkout_root I know I r+ed something like this earlier, but I wonder if we're actually making the right call here. We don't need the SCM to run the tests, we only need it for reporting. If we want to make changes to this file, I think we should do it in another patch. This change (in my opinion) would make things worse in test-webkitpy. 1621445 13 391341 jlewis3 2020-02-20 15:22:43 -0800 Created attachment 391341 Patch Still needs testing. 1621459 14 391348 jlewis3 2020-02-20 15:50:33 -0800 Created attachment 391348 Patch Good point about the initialize stuff. We now only call it when uploading. Unfortunately we still have to detect the SCM per repo to get the right type, but this allows it to work in all types of SCMs that we might be using, or lack there of.I think we got it this time. 1621489 15 391348 jbedard 2020-02-20 16:51:28 -0800 Comment on attachment 391348 Patch I talked to Matt about this offline, he's going to refrain landing it until tomorrow morning. 1621689 16 jlewis3 2020-02-21 10:08:23 -0800 Committed r257144: <https://trac.webkit.org/changeset/257144> 390649 2020-02-13 08:37:59 -0800 2020-02-18 11:42:59 -0800 Patch bug-207684-20200213083758.patch text/plain 10854 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NTAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTI4M2Y5ODg1MGJlY2RkMzRmOTNiZDc2OGJiYzJmMDY4 NzVkMWZiYi4uOTc4NDg1MDYzZDRmOTliOWE0YjZiYjM5ZDFjMzRjNmEwODMwYzZmYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIwLTAyLTEyICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgUHJldmVudCBTdHViIHJlcG9zaXRvcmllcyBmcm9tIGZhaWxpbmcgdG8gdXBsb2FkIHNvbWUg cmVzdWx0cyBkdWUgdG8gbWlzc2luZyBoZWFkIHN2biByZXZpc2lvbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3Njg0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZWQgdGhlIGhlYWRfc3ZuX3Jldmlz aW9uIGZ1bmN0aW9uIGZyb20gYmVpbmcgY2FsbGVkIGluIHNjbSB0byBoYXZpbmcgdGhlIHJlcXVp cmVtZW50IG9mCisgICAgICAgIGJlaW5nIGltcGxlbWV0ZWQgaW4gc3ViY2xhc3Nlcy4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6IEltcGxl bWVudGVkIHJlcXVpcmVkIGZ1bmN0aW9ucy4KKyAgICAgICAgKEdpdC5oZWFkX3N2bl9yZXZpc2lv bik6CisgICAgICAgIChHaXQucHJlcGVuZF9zdm5fcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6IAorICAgICAgICAoU0NNLmhl YWRfc3ZuX3JldmlzaW9uKTogTWFkZSB0aGlzIGEgcmVxdWlyZWQgaW1wbGVtZW50YXRpb24gYnkg c3ViY2xhc3Nlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc2NtX3VuaXR0ZXN0LnB5OiBBZGp1c3RlZCBmb3IgY29kZSBjaGFuZ2VzLgorICAgICAgICAo X3NoYXJlZF90ZXN0X2hlYWRfc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKHRlc3RfaGVhZF9zdm5f cmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zdHViX3JlcG9zaXRvcnkucHk6CisgICAgICAgIChTdHViUmVwb3NpdG9yeS5oZWFkX3N2bl9y ZXZpc2lvbik6IEltcGxlbWVudGVkIGZ1bmN0aW9uIHRvIGZpbmQgSGVhZCByZWZlcmVuY2UKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3R1Yl9yZXBvc2l0 b3J5X3VuaXR0ZXN0LnB5OgorICAgICAgICAoU3R1YlJlcG9zaXRvcnlUZXN0LnRlc3RfaGVhZF9z dm5fcmV2aXNpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zdm4ucHk6IEltcGxlbWVudGVkIGZ1bmN0aW9uIHRvIGZpbmQgSGVhZCByZWZlcmVuY2UK KyAgICAgICAgKFNWTi5oZWFkX3N2bl9yZXZpc2lvbik6IAorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5OiBBZGRlZCByZXF1 aXJlZCBwYXJhbWV0ZXIgdG8gaGVhZF9zdm5fcmV2aXNpb24gY2FsbC4KKyAgICAgICAgKHN1bW1h cml6ZV9yZXN1bHRzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9t b2RlbHMvdGVzdF9ydW5fcmVzdWx0c191bml0dGVzdC5weTogQWRqdXN0ZWQgdW5pdCB0ZXN0cyBm b3IgY29kZSBjaGFuZ2VzCisgICAgICAgIChTdW1tYXJpemVkUmVzdWx0c1Rlc3QudGVzdF9zdm5f cmV2aXNpb24pOgorCiAyMDIwLTAxLTMxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl LmNvbT4KIAogICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEhhbmRsZSBtb2RpZmllZCBmaXJl d2FsbCBydWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9naXQucHkKaW5kZXggNjE3ZmMyZmNiMWUwMWE3ZGE5ZDk4ODFkMDQzNmNiNTkxNzdhMzJl Yi4uM2NjNDgzMjQyNjIyMGJkOTdjZDMxMTZiMzkzODVhMjJiMmNjMGNlOCAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0yOTEs NiArMjkxLDkgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIG5hdGl2 ZV9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9naXQoWyct QycsIHNlbGYuZmluZF9jaGVja291dF9yb290KHBhdGgpLCAnbG9nJywgJy0xJywgJy0tcHJldHR5 PWZvcm1hdDolSCddKQogCisgICAgZGVmIGhlYWRfc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgor ICAgICAgICByZXR1cm4gc2VsZi5zdm5fcmV2aXNpb24ocGF0aCkKKwogICAgIGRlZiBuYXRpdmVf YnJhbmNoKHNlbGYsIHBhdGgpOgogICAgICAgICByZXN1bHQgPSBzZWxmLl9ydW5fZ2l0KFsnLUMn LCBzZWxmLmZpbmRfY2hlY2tvdXRfcm9vdChwYXRoKSwgJ3Jldi1wYXJzZScsICctLWFiYnJldi1y ZWYnLCAnSEVBRCddKS5yc3RyaXAoKQogCkBAIC0zMjgsNyArMzMxLDcgQEAgY2xhc3MgR2l0KFND TSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIHJldHVybiBjb21taXRfdGltZXN0YW1wLnN0cmZ0 aW1lKCclWS0lbS0lZFQlSDolTTolU1onKQogCiAgICAgZGVmIHByZXBlbmRfc3ZuX3JldmlzaW9u KHNlbGYsIGRpZmYpOgotICAgICAgICByZXZpc2lvbiA9IHNlbGYuaGVhZF9zdm5fcmV2aXNpb24o KQorICAgICAgICByZXZpc2lvbiA9IHNlbGYuaGVhZF9zdm5fcmV2aXNpb24oc2VsZi5jaGVja291 dF9yb290KQogICAgICAgICBpZiBub3QgcmV2aXNpb246CiAgICAgICAgICAgICByZXR1cm4gZGlm ZgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weQppbmRleCA5YTk0M2I0ZTUyNDIwNmNjOTE1NGJiZmU0YzgzMmMxMzg3YmQ3YmM4Li42MWIy ZmM0MmMxYzk3YzMzZTQ0NWU5ODk3ODFkOWYwZTJkOTMyNDI1IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTE1Niw4ICsxNTYs OCBAQCBjbGFzcyBTQ006CiAgICAgZGVmIGRpc3BsYXlfbmFtZShzZWxmKToKICAgICAgICAgc2Vs Zi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCi0gICAgZGVmIGhlYWRfc3ZuX3JldmlzaW9u KHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5zdm5fcmV2aXNpb24oc2VsZi5jaGVja291dF9y b290KQorICAgIGRlZiBoZWFkX3N2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKKyAgICAgICAgc2Vs Zi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCiAgICAgZGVmIHN2bl9yZXZpc2lvbihzZWxm LCBwYXRoKToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21f dW5pdHRlc3QucHkKaW5kZXggMzI1MzMzZmQxMmEwZWU4YTZiNjM4OGY1MjQxNzZjNDYyYjY1NWIz OC4uZTU3NjY4YWQzZDllMWE2NDJlMjE2ODg2YzVjNDdjZTExMzRkOGZlNCAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3Vu aXR0ZXN0LnB5CkBAIC01NjIsNyArNTYyLDcgQEAgT2NtWWV4JnJlRCQ7c084KkY5TClCCiAgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2Uoc2NtLmV4aXN0cygnZm9vLnR4dCcpKQogCiAgICAgZGVmIF9z aGFyZWRfdGVzdF9oZWFkX3N2bl9yZXZpc2lvbihzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChzZWxmLnNjbS5oZWFkX3N2bl9yZXZpc2lvbigpLCAnNScpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc2VsZi5zY20uaGVhZF9zdm5fcmV2aXNpb24oc2VsZi5zY20uY2hlY2tvdXRfcm9v dCksICc1JykKIAogCiAjIENvbnRleHQgbWFuYWdlciB0aGF0IG92ZXJyaWRlcyB0aGUgY3VycmVu dCB0aW1lem9uZS4KQEAgLTkyMSw3ICs5MjEsNyBAQCBFTkQKICAgICAgICAgc2VsZi5fc2hhcmVk X3Rlc3RfaGVhZF9zdm5fcmV2aXNpb24oKQogCiAgICAgZGVmIHRlc3RfbmF0aXZlX3JldmlzaW9u KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuc2NtLmhlYWRfc3ZuX3Jldmlz aW9uKCksIHNlbGYuc2NtLm5hdGl2ZV9yZXZpc2lvbignLicpKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNlbGYuc2NtLmhlYWRfc3ZuX3JldmlzaW9uKHNlbGYuc2NtLmNoZWNrb3V0X3Jvb3Qp LCBzZWxmLnNjbS5uYXRpdmVfcmV2aXNpb24oJy4nKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzZWxmLnNjbS5uYXRpdmVfcmV2aXNpb24oJy4nKSwgJzUnKQogCiAgICAgZGVmIHRlc3RfbmF0 aXZlX2JyYW5jaChzZWxmKToKQEAgLTExMjIsNyArMTEyMiw3IEBAIGNsYXNzIEdpdFRlc3QoU0NN VGVzdCk6CiAgICAgICAgIHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKHNlbGYudW50cmFja2luZ19j aGVja291dF9wYXRoKQogICAgICAgICAjIElmIHdlIGNsb25lZCBhIGdpdCByZXBvIHRyYWNraW5n IGFuIFNWTiByZXBvLCB0aGlzIHdvdWxkIGdpdmUgdGhlIHNhbWUgcmVzdWx0IGFzCiAgICAgICAg ICMgc2VsZi5fc2hhcmVkX3Rlc3RfaGVhZF9zdm5fcmV2aXNpb24oKS4KLSAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChzY20uaGVhZF9zdm5fcmV2aXNpb24oKSwgJycpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc2NtLmhlYWRfc3ZuX3JldmlzaW9uKHNjbS5jaGVja291dF9yb290KSwgJycpCiAK ICAgICBkZWYgdGVzdF9uYXRpdmVfcmV2aXNpb24oc2VsZik6CiAgICAgICAgIHNjbSA9IHNlbGYu dHJhY2tpbmdfc2NtCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3R1Yl9yZXBvc2l0b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3N0dWJfcmVwb3NpdG9yeS5weQppbmRleCA4ODY3OWExMDQ2MjEw NzBkOTg3MTdlNjRhMjlhYzEyNTI4Y2I3YmIxLi45NmQzMGNmMzg4MTkyNTk0ZWRiNDYxMTUwZTUw Njg2OGQ3YzUyNTE1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3R1Yl9yZXBvc2l0b3J5LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdHViX3JlcG9zaXRvcnkucHkKQEAgLTY2LDYgKzY2LDkg QEAgY2xhc3MgU3R1YlJlcG9zaXRvcnkoU0NNKToKICAgICBkZWYgbmF0aXZlX3JldmlzaW9uKHNl bGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmluZF9wYXJlbnRfcGF0aF9tYXRjaGlu Z19jYWxsYmFja19jb25kaXRpb24ocGF0aCwgbGFtYmRhIHBhdGg6IHNlbGYuX2RlY29kZV9qc29u KHBhdGgpWydpZCddLCBmaWxlc3lzdGVtPXNlbGYuX2ZpbGVzeXN0ZW0pCiAKKyAgICBkZWYgaGVh ZF9zdm5fcmV2aXNpb24oc2VsZiwgcGF0aCk6CisgICAgICAgIHJldHVybiBzZWxmLl9maW5kX3Bh cmVudF9wYXRoX21hdGNoaW5nX2NhbGxiYWNrX2NvbmRpdGlvbihwYXRoLCBsYW1iZGEgcGF0aDog c2VsZi5fZGVjb2RlX2pzb24ocGF0aClbJ2hlYWQnXSwgZmlsZXN5c3RlbT1zZWxmLl9maWxlc3lz dGVtKQorCiAgICAgZGVmIG5hdGl2ZV9icmFuY2goc2VsZiwgcGF0aCk6CiAgICAgICAgIHJldHVy biBzZWxmLl9maW5kX3BhcmVudF9wYXRoX21hdGNoaW5nX2NhbGxiYWNrX2NvbmRpdGlvbihwYXRo LCBsYW1iZGEgcGF0aDogc2VsZi5fZGVjb2RlX2pzb24ocGF0aClbJ2JyYW5jaCddLCBmaWxlc3lz dGVtPXNlbGYuX2ZpbGVzeXN0ZW0pCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdHViX3JlcG9zaXRvcnlfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3R1Yl9yZXBvc2l0b3J5X3Vu aXR0ZXN0LnB5CmluZGV4IDQyNmRmMWI2ZjcyMmMwOTk4MTJkZmRlOGMxNzA3MmNkMTk1YmI4MjMu LmZjODc5NjMxOTFmZjU0YTNmNzRkOTljMGIxOTUyOTc4OWQwMjFlNzEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdHViX3JlcG9zaXRvcnlf dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3N0dWJfcmVwb3NpdG9yeV91bml0dGVzdC5weQpAQCAtMjUsMTEgKzI1LDExIEBAIGltcG9y dCB1bml0dGVzdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBmaWxlc3lzdGVt X21vY2sKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5zdHViX3JlcG9zaXRvcnkg aW1wb3J0IFN0dWJSZXBvc2l0b3J5CiAKLW1vY2tfc3R1Yl9yZXBvc2l0b3J5X2pzb24gPSB7J2Jy YW5jaCc6ICd0cnVuaycsICdpZCc6ICcyNzM4NDk5J30KK21vY2tfc3R1Yl9yZXBvc2l0b3J5X2pz b24gPSB7J2JyYW5jaCc6ICd0cnVuaycsICdpZCc6ICcyNzM4NDk5JywgJ2hlYWQnOiAnMjcxNjM2 J30KIAogRkFLRV9GSUxFUyA9IHsKICAgICAnL1Rlc3REaXJlY3RvcnkvdGVzdC50eHQnOiAndGVz dCcsCi0gICAgJy9UZXN0RGlyZWN0b3J5L1Rlc3REaXJlY3RvcnkyL2NoZWNrb3V0X2luZm9ybWF0 aW9uLmpzb24nOiAneyAiYnJhbmNoIjogInRydW5rIiwgImlkIjogIjI3Mzg0OTkiIH0nLAorICAg ICcvVGVzdERpcmVjdG9yeS9UZXN0RGlyZWN0b3J5Mi9jaGVja291dF9pbmZvcm1hdGlvbi5qc29u JzogJ3sgImJyYW5jaCI6ICJ0cnVuayIsICJpZCI6ICIyNzM4NDk5IiwgImhlYWQiOiAiMjcxNjM2 IiB9JywKICAgICAnL1Rlc3REaXJlY3RvcnkvVGVzdERpcmVjdG9yeTIvVGVzdERpcmVjdG9yeTMv dGVzdDIudHh0JzogJ3Rlc3QnLAogfQogCkBAIC02MCw2ICs2MCwxMSBAQCBjbGFzcyBTdHViUmVw b3NpdG9yeVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICByZXBvc2l0b3J5ID0gU3R1 YlJlcG9zaXRvcnkoY3dkPWhvc3QuZ2V0Y3dkKCksIGZpbGVzeXN0ZW09aG9zdCkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChyZXBvc2l0b3J5LnN2bl9yZXZpc2lvbihwYXRoPWhvc3Quam9pbiho b3N0LmdldGN3ZCgpLCAnVGVzdERpcmVjdG9yeScsICdUZXN0RGlyZWN0b3J5MicsICdUZXN0RGly ZWN0b3J5MycpKSwgbW9ja19zdHViX3JlcG9zaXRvcnlfanNvblsnaWQnXSkKIAorICAgIGRlZiB0 ZXN0X2hlYWRfc3ZuX3JldmlzaW9uKHNlbGYpOgorICAgICAgICBob3N0ID0gU3R1YlJlcG9zaXRv cnlUZXN0Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKKyAgICAgICAgcmVwb3NpdG9y eSA9IFN0dWJSZXBvc2l0b3J5KGN3ZD1ob3N0LmdldGN3ZCgpLCBmaWxlc3lzdGVtPWhvc3QpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwb3NpdG9yeS5oZWFkX3N2bl9yZXZpc2lvbihwYXRo PWhvc3Quam9pbihob3N0LmdldGN3ZCgpLCAnVGVzdERpcmVjdG9yeScsICdUZXN0RGlyZWN0b3J5 MicsICdUZXN0RGlyZWN0b3J5MycpKSwgbW9ja19zdHViX3JlcG9zaXRvcnlfanNvblsnaGVhZCdd KQorCiAgICAgZGVmIHRlc3RfZmluZF9jaGVja291dF9yb290KHNlbGYpOgogICAgICAgICBob3N0 ID0gU3R1YlJlcG9zaXRvcnlUZXN0Lm1vY2tfaG9zdF9mb3Jfc3R1Yl9yZXBvc2l0b3J5KCkKICAg ICAgICAgcmVwb3NpdG9yeSA9IFN0dWJSZXBvc2l0b3J5KGN3ZD1ob3N0LmdldGN3ZCgpLCBmaWxl c3lzdGVtPWhvc3QpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3N2bi5weQppbmRleCBjNWEzNDhlZTE1NjVlYzM5Nzc3Yzg3NzQzNjUwOTNhOWVjMTY0 ZWYyLi4yMmY5ZDE3ZWIzYTFmODE5NzM2ZmNhYmY5YmM4MjlhZGU2MGNiY2RkIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTI3 Niw2ICsyNzYsOSBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYgc3Zu X3JldmlzaW9uKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gc2VsZi52YWx1ZV9mcm9tX3N2 bl9pbmZvKHBhdGgsICdSZXZpc2lvbicpCiAKKyAgICBkZWYgaGVhZF9zdm5fcmV2aXNpb24oc2Vs ZiwgcGF0aCk6CisgICAgICAgIHJldHVybiBzZWxmLnN2bl9yZXZpc2lvbihwYXRoKQorCiAgICAg ZGVmIG5hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHNlbGYuc3Zu X3JldmlzaW9uKHBhdGgpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkKaW5kZXggZjM3NWY5 ZTRkZGM4ZDllOTEyNjNiZDc3NTE5NmFjMjNkODdiZjkwZS4uYjc4MmI5YTY3ODliYjY4MWE3MjAx NWFmODllMTVhZWVhM2Q2MTZiYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkKQEAgLTM1 OSw3ICszNTksNyBAQCBkZWYgc3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4cGVjdGF0aW9u c19ieV90eXBlLCBpbml0aWFsX3Jlc3VsdHMsIHJldHJ5X3JlcwogICAgICAgICAjIEZJWE1FOiBE byB3ZSByZWFsbHkgbmVlZCB0byBwb3B1bGF0ZSB0aGlzIGJvdGggaGVyZSBhbmQgaW4gdGhlIGpz b25fcmVzdWx0c19nZW5lcmF0b3I/CiAgICAgICAgIGlmIHBvcnRfb2JqLmdldF9vcHRpb24oImJ1 aWxkZXJfbmFtZSIpOgogICAgICAgICAgICAgcG9ydF9vYmouaG9zdC5pbml0aWFsaXplX3NjbSgp Ci0gICAgICAgICAgICByZXN1bHRzWydyZXZpc2lvbiddID0gcG9ydF9vYmouaG9zdC5zY20oKS5o ZWFkX3N2bl9yZXZpc2lvbigpCisgICAgICAgICAgICByZXN1bHRzWydyZXZpc2lvbiddID0gcG9y dF9vYmouaG9zdC5zY20oKS5oZWFkX3N2bl9yZXZpc2lvbihwb3J0X29iai5ob3N0LnNjbS5jaGVj a291dF9yb290KQogICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgX2xvZy53YXJu KCJGYWlsZWQgdG8gZGV0ZXJtaW5lIHN2biByZXZpc2lvbiBmb3IgY2hlY2tvdXQgKGN3ZDogJXMs IHdlYmtpdF9iYXNlOiAlcyksIGxlYXZpbmcgJ3JldmlzaW9uJyBrZXkgYmxhbmsgaW4gZnVsbF9y ZXN1bHRzLmpzb24uXG4lcyIgJSAocG9ydF9vYmouX2ZpbGVzeXN0ZW0uZ2V0Y3dkKCksIHBvcnRf b2JqLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBlKSkKICAgICAgICAgIyBIYW5kbGUgY2FzZXMg d2hlcmUgd2UncmUgcnVubmluZyBvdXRzaWRlIG9mIHZlcnNpb24gY29udHJvbC4KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9y ZXN1bHRzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKaW5kZXggMmRmNDVkOTlmY2Y1ZGE2 YTM2NjkxYmE4ZWQzZTBjYTBlZDBhYTA5NC4uY2QxZWE2ZTI3NWQyNzIyMDNlZGUxMGE4ZTM0NTMw NDczOGIzN2RkMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3Qu cHkKQEAgLTE1Nyw3ICsxNTcsNyBAQCBjbGFzcyBTdW1tYXJpemVkUmVzdWx0c1Rlc3QodW5pdHRl c3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X3N2bl9yZXZpc2lvbihzZWxmKToKICAgICAgICAg c2VsZi5wb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVyJwogICAgICAg ICBzdW1tYXJ5ID0gc3VtbWFyaXplZF9yZXN1bHRzKHNlbGYucG9ydCwgZXhwZWN0ZWQ9RmFsc2Us IHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNlKQotICAgICAgICBzZWxmLmFzc2VydE5vdEVxdWFs cyhzdW1tYXJ5WydyZXZpc2lvbiddLCAnJykKKyAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbHMo c3VtbWFyeVsncmV2aXNpb24nXSwgJzEyMzQnKQogCiAgICAgZGVmIHRlc3Rfc3VtbWFyaXplZF9y ZXN1bHRzX3dvbnRmaXgoc2VsZik6CiAgICAgICAgIHNlbGYucG9ydC5fb3B0aW9ucy5idWlsZGVy X25hbWUgPSAnZHVtbXkgYnVpbGRlcicK 391073 2020-02-18 11:43:01 -0800 2020-02-20 10:23:09 -0800 Patch bug-207684-20200218114300.patch text/plain 6071 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NTAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTI4M2Y5ODg1MGJlY2RkMzRmOTNiZDc2OGJiYzJmMDY4 NzVkMWZiYi4uNzRmYjkwNmZjNzM5NmM5ZmZlZThmOGMzN2ZlNDVhYTQ0NjJmYTgzOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDIwLTAyLTE4ICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgU3R1YiByZXBvc2l0b3JpZXMgZmFpbCB0byB1cGxvYWQgc29tZSByZXN1bHRzIGR1ZSB0byBt aXNzaW5nIGhlYWQgc3ZuIHJldmlzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDc2ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVz dHMucHk6CisgICAgICAgIChtYWluKTogQWRkZWQgaW5pdGlhbGl6aW5nIHRoZSBzY20gdG8gdGhl IGhvc3Qgb2JqZWN0LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21v ZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5OgorICAgICAgICAoc3VtbWFyaXplX3Jlc3VsdHMpOiBD aGFuZ2VkIGNhbGwgdG8gaGVhZF9zdm5fcmV2aXNpb24gdG8gcG9ydC5jb21taXRzX2Zvcl91cGxv YWQoKSB0byBicmluZyAKKyAgICAgICAgaXQgaW4gbGluZSB3aXRoIG1vZGVybiBjb2RlLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6 CisgICAgICAgIChtYWluKTogQWRkZWQgaW5pYWxpemluZyB0aGUgc2NtIHRvIHRoZSBob3N0IG9i amVjdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAg KFBvcnQuY29tbWl0c19mb3JfdXBsb2FkKTogUmVtb3ZlZCB0aGUgZm9yY2VkIG1vdmVtZW50IHVw IHRoZSBzeXN0ZW1zIHRyZWUgdGhhdCBwcmV2ZW50ZWQgdXMgCisgICAgICAgIGZyb20gdXNpbmcg bW9jayBTQ01zIGFuZCBtb3JlCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4u cHk6CisgICAgICAgIChtYWluKTogIFJlbW92ZWQgdGhlIGZvcmNlZCBtb3ZlbWVudCB1cCB0aGUg c3lzdGVtcyB0cmVlLCBpbml0aWFsaXplZCB0aGUgU0NNIG9uIHRoZSBob3N0IG9iamVjdCwKKyAg ICAgICAgYW5kIGNvbnZlcnRlZCB0aGUgd2Via2l0X3Jvb3QgdmFyaWFibGUgdG8gdGhlIFNDTSBj aGVja291dCByb290LgorICAgICAgICAoVGVzdGVyLl9ydW5fdGVzdHMpOgorCiAyMDIwLTAxLTMx ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICByZXN1bHRz LndlYmtpdC5vcmc6IEhhbmRsZSBtb2RpZmllZCBmaXJld2FsbCBydWxlcwpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9hcGlfdGVzdHMvcnVuX2FwaV90ZXN0cy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHkKaW5kZXggN2E4MzRj NzBjNGM3MDU2MmZkNTE5NzFhZDZlMzY2YzQyZmYyNjljNi4uMDQ3NmE0M2NiMWM1YmE0NDQxYzYz MmE5ODFmYWFjZDRkZmMxODFkYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9h cGlfdGVzdHMvcnVuX2FwaV90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Fw aV90ZXN0cy9ydW5fYXBpX3Rlc3RzLnB5CkBAIC00MSw2ICs0MSw3IEBAIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKIGRlZiBtYWluKGFyZ3YsIHN0ZG91dCwgc3RkZXJyKToKICAg ICBvcHRpb25zLCBhcmdzID0gcGFyc2VfYXJncyhhcmd2KQogICAgIGhvc3QgPSBIb3N0KCkKKyAg ICBob3N0LmluaXRpYWxpemVfc2NtKCkKIAogICAgIHRyeToKICAgICAgICAgb3B0aW9ucy53ZWJr aXRfdGVzdF9ydW5uZXIgPSBUcnVlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5CmluZGV4IGYz NzVmOWU0ZGRjOGQ5ZTkxMjYzYmQ3NzUxOTZhYzIzZDg3YmY5MGUuLmVhY2RhODU4MGVlODcyY2Y2 ZTRkNjFhYTliOWViMjkxMTBkNGVjMmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzLnB5CkBA IC0zNTksNyArMzU5LDcgQEAgZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3Rh dGlvbnNfYnlfdHlwZSwgaW5pdGlhbF9yZXN1bHRzLCByZXRyeV9yZXMKICAgICAgICAgIyBGSVhN RTogRG8gd2UgcmVhbGx5IG5lZWQgdG8gcG9wdWxhdGUgdGhpcyBib3RoIGhlcmUgYW5kIGluIHRo ZSBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yPwogICAgICAgICBpZiBwb3J0X29iai5nZXRfb3B0aW9u KCJidWlsZGVyX25hbWUiKToKICAgICAgICAgICAgIHBvcnRfb2JqLmhvc3QuaW5pdGlhbGl6ZV9z Y20oKQotICAgICAgICAgICAgcmVzdWx0c1sncmV2aXNpb24nXSA9IHBvcnRfb2JqLmhvc3Quc2Nt KCkuaGVhZF9zdm5fcmV2aXNpb24oKQorICAgICAgICAgICAgcmVzdWx0c1sncmV2aXNpb24nXSA9 IHBvcnRfb2JqLmNvbW1pdHNfZm9yX3VwbG9hZCgpWzBdWydpZCddCiAgICAgZXhjZXB0IEV4Y2Vw dGlvbiBhcyBlOgogICAgICAgICBfbG9nLndhcm4oIkZhaWxlZCB0byBkZXRlcm1pbmUgc3ZuIHJl dmlzaW9uIGZvciBjaGVja291dCAoY3dkOiAlcywgd2Via2l0X2Jhc2U6ICVzKSwgbGVhdmluZyAn cmV2aXNpb24nIGtleSBibGFuayBpbiBmdWxsX3Jlc3VsdHMuanNvbi5cbiVzIiAlIChwb3J0X29i ai5fZmlsZXN5c3RlbS5nZXRjd2QoKSwgcG9ydF9vYmoucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCks IGUpKQogICAgICAgICAjIEhhbmRsZSBjYXNlcyB3aGVyZSB3ZSdyZSBydW5uaW5nIG91dHNpZGUg b2YgdmVyc2lvbiBjb250cm9sLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggZTQ3MDljNGRlYjYxMTQxY2Zi ZjljYzQxMDE3ZWU5NTc3YTFiMDk0Ny4uOTZhMjkyMmM4OTAwNDYxNGRiZmZlOGJmY2E5NDNhZmQ3 MjgxYWIzMCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC02NCw2ICs2NCw3IEBAIGRlZiBtYWluKGFyZ3Ys IHN0ZG91dCwgc3RkZXJyKToKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICBlbHNlOgog ICAgICAgICBob3N0ID0gSG9zdCgpCisgICAgICAgIGhvc3QuaW5pdGlhbGl6ZV9zY20oKQogCiAg ICAgaWYgb3B0aW9ucy5saW50X3Rlc3RfZmlsZXM6CiAgICAgICAgIGZyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLmxpbnRfdGVzdF9leHBlY3RhdGlvbnMgaW1wb3J0IGxpbnQKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2Jhc2UucHkKaW5kZXggZGUwMDY2NjdiMmQxZTVlNWVlYjhmMmQxYTQ0OGI3NTZm N2YwNjZjZC4uOTkzYzFhNTRiMGEwODIxMjg4MWZjZDlmNzZlYjZlOWE1YjIxN2RlMyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAgLTE2MDEsMTYgKzE2MDEsMTIgQEAgY2xhc3Mg UG9ydChvYmplY3QpOgogICAgICAgICByZXBvcyA9IHt9CiAgICAgICAgIGlmIHBvcnRfY29uZmln LmFwcGxlX2FkZGl0aW9ucygpIGFuZCBnZXRhdHRyKHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9u cygpLCAncmVwb3MnLCBGYWxzZSk6CiAgICAgICAgICAgICByZXBvcyA9IHBvcnRfY29uZmlnLmFw cGxlX2FkZGl0aW9ucygpLnJlcG9zKCkKLQotICAgICAgICB1cCA9IG9zLnBhdGguZGlybmFtZQot ICAgICAgICByZXBvc1snd2Via2l0J10gPSB1cCh1cCh1cCh1cCh1cChvcy5wYXRoLmFic3BhdGgo X19maWxlX18pKSkpKSkKLQorICAgICAgICByZXBvc1snd2Via2l0J10gPSBzZWxmLmhvc3Quc2Nt KCkuY2hlY2tvdXRfcm9vdAogICAgICAgICBjb21taXRzID0gW10KICAgICAgICAgZm9yIHJlcG9f aWQsIHBhdGggaW4gcmVwb3MuaXRlbXMoKToKLSAgICAgICAgICAgIHNjbSA9IFNDTURldGVjdG9y KHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYuX2V4ZWN1dGl2ZSkuZGV0ZWN0X3NjbV9zeXN0ZW0ocGF0 aCkKICAgICAgICAgICAgIGNvbW1pdHMuYXBwZW5kKFVwbG9hZC5jcmVhdGVfY29tbWl0KAogICAg ICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9cmVwb19pZCwKLSAgICAgICAgICAgICAgICBpZD1z Y20ubmF0aXZlX3JldmlzaW9uKHBhdGgpLAotICAgICAgICAgICAgICAgIGJyYW5jaD1zY20ubmF0 aXZlX2JyYW5jaChwYXRoKSwKKyAgICAgICAgICAgICAgICBpZD1zZWxmLmhvc3Quc2NtKCkubmF0 aXZlX3JldmlzaW9uKHBhdGgpLAorICAgICAgICAgICAgICAgIGJyYW5jaD1zZWxmLmhvc3Quc2Nt KCkubmF0aXZlX2JyYW5jaChwYXRoKSwKICAgICAgICAgICAgICkpCiAgICAgICAgIHJldHVybiBj b21taXRzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvbWFpbi5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CmluZGV4IDY5MTMyOTY1N2VlYThm MmM1MGQ3MmRkNTZjZTdjY2Q4N2ZhYTFjMzcuLjA5YzYwNWFiYzE1OTYyOTFkMTIyNGRhZGJiZDZj ZjZiYzdhOWIwNzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWlu LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWluLnB5CkBAIC01MCw2ICs1 MCw3IEBAIGZyb20gd2Via2l0cHkucmVzdWx0cy5vcHRpb25zIGltcG9ydCB1cGxvYWRfb3B0aW9u cwogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiBfaG9zdCA9IEhvc3QoKQor X2hvc3QuaW5pdGlhbGl6ZV9zY20oKQogX3dlYmtpdF9yb290ID0gTm9uZQogCiAKQEAgLTU3LDgg KzU4LDcgQEAgZGVmIG1haW4oKToKICAgICBnbG9iYWwgX3dlYmtpdF9yb290CiAgICAgY29uZmln dXJlX2xvZ2dpbmcobG9nZ2VyPV9sb2cpCiAKLSAgICB1cCA9IG9zLnBhdGguZGlybmFtZQotICAg IF93ZWJraXRfcm9vdCA9IHVwKHVwKHVwKHVwKHVwKG9zLnBhdGguYWJzcGF0aChfX2ZpbGVfXykp KSkpKQorICAgIF93ZWJraXRfcm9vdCA9IF9ob3N0LnNjbSgpLmNoZWNrb3V0X3Jvb3QKIAogICAg IHRlc3RlciA9IFRlc3RlcigpCiAgICAgdGVzdGVyLmFkZF90cmVlKG9zLnBhdGguam9pbihfd2Vi a2l0X3Jvb3QsICdUb29scycsICdTY3JpcHRzJyksICd3ZWJraXRweScpCkBAIC0yMjYsNyArMjI2 LDYgQEAgY2xhc3MgVGVzdGVyKG9iamVjdCk6CiAgICAgICAgICAgICBmb3IgdGVzdCwgZmFpbHVy ZXMgaW4gdGVzdF9ydW5uZXIuZmFpbHVyZXM6CiAgICAgICAgICAgICAgICAgcmVzdWx0c1t0ZXN0 XSA9IFVwbG9hZC5jcmVhdGVfdGVzdF9yZXN1bHQoYWN0dWFsPVVwbG9hZC5FeHBlY3RhdGlvbnMu RkFJTCwgbG9nPScvbicuam9pbihmYWlsdXJlcykpCiAKLSAgICAgICAgICAgIF9ob3N0LmluaXRp YWxpemVfc2NtKCkKICAgICAgICAgICAgIHVwbG9hZCA9IFVwbG9hZCgKICAgICAgICAgICAgICAg ICBzdWl0ZT0nd2Via2l0cHktdGVzdHMnLAogICAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb249 VXBsb2FkLmNyZWF0ZV9jb25maWd1cmF0aW9uKAo= 391302 2020-02-20 10:23:11 -0800 2020-02-20 15:22:42 -0800 Patch bug-207684-20200220102310.patch text/plain 9268 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MDEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTdmN2IzZTUxYTZhNWI4ZjlkNTI5YjQ5YzFlYTg5Nzg1 YmZiYTc3OC4uNGM4MWVkNTViM2U4ODBmZjBjMGI0ZjA4YjU1YjFlZWY2OWQ2OGMxOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDIwLTAyLTIwICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgU3R1YiByZXBvc2l0b3JpZXMgZmFpbCB0byB1cGxvYWQgc29tZSByZXN1bHRzIGR1ZSB0byBt aXNzaW5nIGhlYWQgc3ZuIHJldmlzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDc2ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVz dHMucHk6CisgICAgICAgIChtYWluKTogQWRkZWQgaW5pdGlhbGl6aW5nIHRoZSBzY20gdG8gdGhl IGhvc3Qgb2JqZWN0LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9j ay5weTogQWRkZWQgaW4gY2FsbCBmb3IgY3JlYXRpbmcgc3R1YiByZXBvIGNoZWNrb3V0IGluZm9y bWF0aW9uIGZvciB1cGxvYWQgdGVzdHMuCisgICAgICAgIChNb2NrSG9zdC5fX2luaXRfXyk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jl c3VsdHMucHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6IENoYW5nZWQgY2FsbCB0byBo ZWFkX3N2bl9yZXZpc2lvbiB0byBwb3J0LmNvbW1pdHNfZm9yX3VwbG9hZCgpIHRvIGJyaW5nCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jl c3VsdHNfdW5pdHRlc3QucHk6CisgICAgICAgIChTdW1tYXJpemVkUmVzdWx0c1Rlc3Quc2V0VXAp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHk6CisgICAgICAgIChtYWluKTogQWRkZWQgaW5pYWxpemluZyB0aGUgc2NtIHRvIHRoZSBo b3N0IG9iamVjdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAg ICAgICAgKFBvcnQuY29tbWl0c19mb3JfdXBsb2FkKTogUmVtb3ZlZCB0aGUgZm9yY2VkIG1vdmVt ZW50IHVwIHRoZSBzeXN0ZW1zIHRyZWUgdGhhdCBwcmV2ZW50ZWQgdXMgCisgICAgICAgIGZyb20g dXNpbmcgbW9jayBTQ01zIGFuZCBtb3JlCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L3Rlc3QucHk6IEFkZGVkIGZ1bmN0aW9uIHRvIG1ha2UgdGhlIGNoZWNrb3V0X2luZm9ybWF0aW9u Lmpzb24gZm9yIHVwbG9hZCB0ZXN0aW5nLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGVz dC9tYWluLnB5OgorICAgICAgICAobWFpbik6IFJlbW92ZWQgdGhlIGZvcmNlZCBtb3ZlbWVudCB1 cCB0aGUgc3lzdGVtcyB0cmVlLCBpbml0aWFsaXplZCB0aGUgU0NNIG9uIHRoZSBob3N0IG9iamVj dCwKKyAgICAgICAgYW5kIGNvbnZlcnRlZCB0aGUgd2Via2l0X3Jvb3QgdmFyaWFibGUgdG8gdGhl IFNDTSBjaGVja291dCByb290LgorICAgICAgICAoVGVzdGVyLl9ydW5fdGVzdHMpOgorCiAyMDIw LTAyLTE5ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGNo ZWNrLXdlYmtpdC1zdHlsZSBlcnJvcnMgcmVsYXRlZCB0byBBVkZvdW5kYXRpb25TUEkuaApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9hcGlfdGVzdHMvcnVuX2FwaV90ZXN0cy5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXBpX3Rlc3RzL3J1bl9hcGlfdGVzdHMucHkKaW5k ZXggN2E4MzRjNzBjNGM3MDU2MmZkNTE5NzFhZDZlMzY2YzQyZmYyNjljNi4uMDQ3NmE0M2NiMWM1 YmE0NDQxYzYzMmE5ODFmYWFjZDRkZmMxODFkYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9hcGlfdGVzdHMvcnVuX2FwaV90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2FwaV90ZXN0cy9ydW5fYXBpX3Rlc3RzLnB5CkBAIC00MSw2ICs0MSw3IEBAIF9sb2cg PSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIGRlZiBtYWluKGFyZ3YsIHN0ZG91dCwgc3Rk ZXJyKToKICAgICBvcHRpb25zLCBhcmdzID0gcGFyc2VfYXJncyhhcmd2KQogICAgIGhvc3QgPSBI b3N0KCkKKyAgICBob3N0LmluaXRpYWxpemVfc2NtKCkKIAogICAgIHRyeToKICAgICAgICAgb3B0 aW9ucy53ZWJraXRfdGVzdF9ydW5uZXIgPSBUcnVlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9ob3N0X21vY2sucHkKaW5kZXggYzZmYTBhYWNmMzIzNDlhOGFhNTczNzMzYzQ0NzA5NTBl ZmZhMTU3OS4uYjQ0MWIwOTFhMTZmMTNjMzA1OWI5YWFjNDVjMzdiYWJiYWIzMWE4YiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdF9tb2NrLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9jay5weQpAQCAtMzYsMTMgKzM2LDE1 IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLndhdGNobGlzdC53YXRjaGxpc3RfbW9jayBpbXBvcnQg TW9ja1dhdGNoTGlzdAogCiAjIE5ldy1zdHlsZSBwb3J0cyBuZWVkIHRvIG1vdmUgZG93biBpbnRv IHdlYmtpdHB5LmNvbW1vbi4KIGZyb20gd2Via2l0cHkucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0 RmFjdG9yeQotZnJvbSB3ZWJraXRweS5wb3J0LnRlc3QgaW1wb3J0IGFkZF91bml0X3Rlc3RzX3Rv X21vY2tfZmlsZXN5c3RlbQorZnJvbSB3ZWJraXRweS5wb3J0LnRlc3QgaW1wb3J0IGFkZF91bml0 X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbSwgYWRkX2NoZWNrb3V0X2luZm9ybWF0aW9uX2pzb25f dG9fbW9ja19maWxlc3lzdGVtCiAKIAogY2xhc3MgTW9ja0hvc3QoTW9ja1N5c3RlbUhvc3QpOgot ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBsb2dfZXhlY3V0aXZlPUZhbHNlLCBleGVjdXRpdmVfdGhy b3dzX3doZW5fcnVuPU5vbmUsIGluaXRpYWxpemVfc2NtX2J5X2RlZmF1bHQ9VHJ1ZSwgd2ViPU5v bmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBsb2dfZXhlY3V0aXZlPUZhbHNlLCBleGVjdXRp dmVfdGhyb3dzX3doZW5fcnVuPU5vbmUsIGluaXRpYWxpemVfc2NtX2J5X2RlZmF1bHQ9VHJ1ZSwg d2ViPU5vbmUsIGNyZWF0ZV9zdHViX3JlcG9zaXRvcnlfZmlsZXM9RmFsc2UpOgogICAgICAgICBN b2NrU3lzdGVtSG9zdC5fX2luaXRfXyhzZWxmLCBsb2dfZXhlY3V0aXZlLCBleGVjdXRpdmVfdGhy b3dzX3doZW5fcnVuKQogICAgICAgICBhZGRfdW5pdF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0o c2VsZi5maWxlc3lzdGVtKQorICAgICAgICBpZiBjcmVhdGVfc3R1Yl9yZXBvc2l0b3J5X2ZpbGVz OgorICAgICAgICAgICAgYWRkX2NoZWNrb3V0X2luZm9ybWF0aW9uX2pzb25fdG9fbW9ja19maWxl c3lzdGVtKHNlbGYuZmlsZXN5c3RlbSkKICAgICAgICAgc2VsZi53ZWIgPSB3ZWIgb3IgTW9ja1dl YigpCiAKICAgICAgICAgc2VsZi5fY2hlY2tvdXQgPSBNb2NrQ2hlY2tvdXQoKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jl c3VsdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9ydW5fcmVzdWx0cy5weQppbmRleCBmMzc1ZjllNGRkYzhkOWU5MTI2M2JkNzc1MTk2YWMyM2Q4 N2JmOTBlLi5lYWNkYTg1ODBlZTg3MmNmNmU0ZDYxYWE5YjllYjI5MTEwZDRlYzJjIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5f cmVzdWx0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2Rl bHMvdGVzdF9ydW5fcmVzdWx0cy5weQpAQCAtMzU5LDcgKzM1OSw3IEBAIGRlZiBzdW1tYXJpemVf cmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXRpb25zX2J5X3R5cGUsIGluaXRpYWxfcmVzdWx0cywg cmV0cnlfcmVzCiAgICAgICAgICMgRklYTUU6IERvIHdlIHJlYWxseSBuZWVkIHRvIHBvcHVsYXRl IHRoaXMgYm90aCBoZXJlIGFuZCBpbiB0aGUganNvbl9yZXN1bHRzX2dlbmVyYXRvcj8KICAgICAg ICAgaWYgcG9ydF9vYmouZ2V0X29wdGlvbigiYnVpbGRlcl9uYW1lIik6CiAgICAgICAgICAgICBw b3J0X29iai5ob3N0LmluaXRpYWxpemVfc2NtKCkKLSAgICAgICAgICAgIHJlc3VsdHNbJ3Jldmlz aW9uJ10gPSBwb3J0X29iai5ob3N0LnNjbSgpLmhlYWRfc3ZuX3JldmlzaW9uKCkKKyAgICAgICAg ICAgIHJlc3VsdHNbJ3JldmlzaW9uJ10gPSBwb3J0X29iai5jb21taXRzX2Zvcl91cGxvYWQoKVsw XVsnaWQnXQogICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgX2xvZy53YXJuKCJG YWlsZWQgdG8gZGV0ZXJtaW5lIHN2biByZXZpc2lvbiBmb3IgY2hlY2tvdXQgKGN3ZDogJXMsIHdl YmtpdF9iYXNlOiAlcyksIGxlYXZpbmcgJ3JldmlzaW9uJyBrZXkgYmxhbmsgaW4gZnVsbF9yZXN1 bHRzLmpzb24uXG4lcyIgJSAocG9ydF9vYmouX2ZpbGVzeXN0ZW0uZ2V0Y3dkKCksIHBvcnRfb2Jq LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBlKSkKICAgICAgICAgIyBIYW5kbGUgY2FzZXMgd2hl cmUgd2UncmUgcnVubmluZyBvdXRzaWRlIG9mIHZlcnNpb24gY29udHJvbC4KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1 bHRzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKaW5kZXggMmRmNDVkOTlmY2Y1ZGE2YTM2 NjkxYmE4ZWQzZTBjYTBlZDBhYTA5NC4uZDVhY2IwZTNiNmQyNzkxMjFlYmExOGJmMmE2ODZlOTlk NGY4ODgyOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkK QEAgLTE0Nyw3ICsxNDcsNyBAQCBjbGFzcyBJbnRlcnByZXRUZXN0RmFpbHVyZXNUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKIAogY2xhc3MgU3VtbWFyaXplZFJlc3VsdHNUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6Ci0gICAgICAgIGhvc3QgPSBNb2NrSG9zdChp bml0aWFsaXplX3NjbV9ieV9kZWZhdWx0PUZhbHNlKQorICAgICAgICBob3N0ID0gTW9ja0hvc3Qo aW5pdGlhbGl6ZV9zY21fYnlfZGVmYXVsdD1GYWxzZSwgY3JlYXRlX3N0dWJfcmVwb3NpdG9yeV9m aWxlcz1UcnVlKQogICAgICAgICBzZWxmLnBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9y dF9uYW1lPSd0ZXN0Jywgb3B0aW9ucz1Nb2NrT3B0aW9ucyhodHRwPVRydWUsIHBpeGVsX3Rlc3Rz PUZhbHNlLCB3b3JsZF9sZWFrcz1GYWxzZSkpCiAKICAgICBkZWYgdGVzdF9ub19zdm5fcmV2aXNp b24oc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBlNDcwOWM0ZGViNjExNDFjZmJmOWNjNDEwMTdl ZTk1NzdhMWIwOTQ3Li45NmEyOTIyYzg5MDA0NjE0ZGJmZmU4YmZjYTk0M2FmZDcyODFhYjMwIDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKQEAgLTY0LDYgKzY0LDcgQEAgZGVmIG1haW4oYXJndiwgc3Rkb3V0LCBz dGRlcnIpOgogICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQogICAgIGVsc2U6CiAgICAgICAgIGhv c3QgPSBIb3N0KCkKKyAgICAgICAgaG9zdC5pbml0aWFsaXplX3NjbSgpCiAKICAgICBpZiBvcHRp b25zLmxpbnRfdGVzdF9maWxlczoKICAgICAgICAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMu bGludF90ZXN0X2V4cGVjdGF0aW9ucyBpbXBvcnQgbGludApkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv YmFzZS5weQppbmRleCBkZTAwNjY2N2IyZDFlNWU1ZWViOGYyZDFhNDQ4Yjc1NmY3ZjA2NmNkLi5m NTk2ODA3MWJjZDAyYjc5ZTcwNWRhNjRmZWFmZWI4OTMwZGM1YWExIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvYmFzZS5weQpAQCAtMTYwMSwxMCArMTYwMSw3IEBAIGNsYXNzIFBvcnQob2JqZWN0 KToKICAgICAgICAgcmVwb3MgPSB7fQogICAgICAgICBpZiBwb3J0X2NvbmZpZy5hcHBsZV9hZGRp dGlvbnMoKSBhbmQgZ2V0YXR0cihwb3J0X2NvbmZpZy5hcHBsZV9hZGRpdGlvbnMoKSwgJ3JlcG9z JywgRmFsc2UpOgogICAgICAgICAgICAgcmVwb3MgPSBwb3J0X2NvbmZpZy5hcHBsZV9hZGRpdGlv bnMoKS5yZXBvcygpCi0KLSAgICAgICAgdXAgPSBvcy5wYXRoLmRpcm5hbWUKLSAgICAgICAgcmVw b3NbJ3dlYmtpdCddID0gdXAodXAodXAodXAodXAob3MucGF0aC5hYnNwYXRoKF9fZmlsZV9fKSkp KSkpCi0KKyAgICAgICAgcmVwb3NbJ3dlYmtpdCddID0gc2VsZi5ob3N0LnNjbSgpLmNoZWNrb3V0 X3Jvb3QKICAgICAgICAgY29tbWl0cyA9IFtdCiAgICAgICAgIGZvciByZXBvX2lkLCBwYXRoIGlu IHJlcG9zLml0ZW1zKCk6CiAgICAgICAgICAgICBzY20gPSBTQ01EZXRlY3RvcihzZWxmLl9maWxl c3lzdGVtLCBzZWxmLl9leGVjdXRpdmUpLmRldGVjdF9zY21fc3lzdGVtKHBhdGgpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC90ZXN0LnB5CmluZGV4IDI0ZWQwY2E4MDJjZjhiYzlkOWJmODczZDAyM2Qw MWNmOTRkMTg2N2IuLmI2ZGY1YTJlNjQzZDJkNDRiNzA1OWNkMTAxMGY2YTZiODA3N2EwMjQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5CkBAIC0yODIsNiArMjgyLDcgQEAgbGF5ZXIg YXQgKDAsMCkgc2l6ZSA4MDB4MzQKIAogTEFZT1VUX1RFU1RfRElSID0gJy90ZXN0LmNoZWNrb3V0 L0xheW91dFRlc3RzJwogUEVSRl9URVNUX0RJUiA9ICcvdGVzdC5jaGVja291dC9QZXJmb3JtYW5j ZVRlc3RzJworVEVTVF9ESVIgPSAnL21vY2stY2hlY2tvdXQnCiAKIAogIyBIZXJlIHdlIHN5bnRo ZXNpemUgYW4gaW4tbWVtb3J5IGZpbGVzeXN0ZW0gZnJvbSB0aGUgdGVzdCBsaXN0CkBAIC0zNjUs NiArMzY2LDEyIEBAIEJ1Zyh0ZXN0KSBwYXNzZXMvc2tpcHBlZC9za2lwLmh0bWwgWyBTa2lwIF0K ICAgICBmaWxlc3lzdGVtLmNsZWFyX3dyaXR0ZW5fZmlsZXMoKQogCiAKK2RlZiBhZGRfY2hlY2tv dXRfaW5mb3JtYXRpb25fanNvbl90b19tb2NrX2ZpbGVzeXN0ZW0oZmlsZXN5c3RlbSk6CisgICAg aWYgbm90IGZpbGVzeXN0ZW0uZXhpc3RzKFRFU1RfRElSKToKKyAgICAgICAgZmlsZXN5c3RlbS5t YXliZV9tYWtlX2RpcmVjdG9yeShURVNUX0RJUikKKyAgICBmaWxlc3lzdGVtLndyaXRlX3RleHRf ZmlsZShURVNUX0RJUiArICcvY2hlY2tvdXRfaW5mb3JtYXRpb24uanNvbicsICd7ICJicmFuY2gi OiAidHJ1bmsiLCAiaWQiOiAiMjczODQ5OSIgfScpCisKKwogY2xhc3MgVGVzdFBvcnQoUG9ydCk6 CiAgICAgcG9ydF9uYW1lID0gJ3Rlc3QnCiAgICAgZGVmYXVsdF9wb3J0X25hbWUgPSAndGVzdC1t YWMtbGVvcGFyZCcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9tYWlu LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKaW5kZXggNjkxMzI5NjU3 ZWVhOGYyYzUwZDcyZGQ1NmNlN2NjZDg3ZmFhMWMzNy4uMDljNjA1YWJjMTU5NjI5MWQxMjI0ZGFk YmJkNmNmNmJjN2E5YjA3NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0 L21haW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L21haW4ucHkKQEAgLTUw LDYgKzUwLDcgQEAgZnJvbSB3ZWJraXRweS5yZXN1bHRzLm9wdGlvbnMgaW1wb3J0IHVwbG9hZF9v cHRpb25zCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIF9ob3N0ID0gSG9z dCgpCitfaG9zdC5pbml0aWFsaXplX3NjbSgpCiBfd2Via2l0X3Jvb3QgPSBOb25lCiAKIApAQCAt NTcsOCArNTgsNyBAQCBkZWYgbWFpbigpOgogICAgIGdsb2JhbCBfd2Via2l0X3Jvb3QKICAgICBj b25maWd1cmVfbG9nZ2luZyhsb2dnZXI9X2xvZykKIAotICAgIHVwID0gb3MucGF0aC5kaXJuYW1l Ci0gICAgX3dlYmtpdF9yb290ID0gdXAodXAodXAodXAodXAob3MucGF0aC5hYnNwYXRoKF9fZmls ZV9fKSkpKSkpCisgICAgX3dlYmtpdF9yb290ID0gX2hvc3Quc2NtKCkuY2hlY2tvdXRfcm9vdAog CiAgICAgdGVzdGVyID0gVGVzdGVyKCkKICAgICB0ZXN0ZXIuYWRkX3RyZWUob3MucGF0aC5qb2lu KF93ZWJraXRfcm9vdCwgJ1Rvb2xzJywgJ1NjcmlwdHMnKSwgJ3dlYmtpdHB5JykKQEAgLTIyNiw3 ICsyMjYsNiBAQCBjbGFzcyBUZXN0ZXIob2JqZWN0KToKICAgICAgICAgICAgIGZvciB0ZXN0LCBm YWlsdXJlcyBpbiB0ZXN0X3J1bm5lci5mYWlsdXJlczoKICAgICAgICAgICAgICAgICByZXN1bHRz W3Rlc3RdID0gVXBsb2FkLmNyZWF0ZV90ZXN0X3Jlc3VsdChhY3R1YWw9VXBsb2FkLkV4cGVjdGF0 aW9ucy5GQUlMLCBsb2c9Jy9uJy5qb2luKGZhaWx1cmVzKSkKIAotICAgICAgICAgICAgX2hvc3Qu aW5pdGlhbGl6ZV9zY20oKQogICAgICAgICAgICAgdXBsb2FkID0gVXBsb2FkKAogICAgICAgICAg ICAgICAgIHN1aXRlPSd3ZWJraXRweS10ZXN0cycsCiAgICAgICAgICAgICAgICAgY29uZmlndXJh dGlvbj1VcGxvYWQuY3JlYXRlX2NvbmZpZ3VyYXRpb24oCg== 391341 2020-02-20 15:22:43 -0800 2020-02-20 15:50:32 -0800 Patch bug-207684-20200220152242.patch text/plain 6999 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MDEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTdmN2IzZTUxYTZhNWI4ZjlkNTI5YjQ5YzFlYTg5Nzg1 YmZiYTc3OC4uNTIzNTZhMTkzNmY2ZDg2YmMzMjU5ZjZjNzA0YmFjMmUzNGJjZDNiMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIwLTAyLTIwICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgU3R1YiByZXBvc2l0b3JpZXMgZmFpbCB0byB1cGxvYWQgc29tZSByZXN1bHRzIGR1ZSB0byBt aXNzaW5nIGhlYWQgc3ZuIHJldmlzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDc2ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9jay5weTog QWRkZWQgaW4gY2FsbCBmb3IgY3JlYXRpbmcgc3R1YiByZXBvIGNoZWNrb3V0IGluZm9ybWF0aW9u IGZvciB1cGxvYWQgdGVzdHMuCisgICAgICAgIChNb2NrSG9zdC5fX2luaXRfXyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMu cHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6IENoYW5nZWQgY2FsbCB0byBoZWFkX3N2 bl9yZXZpc2lvbiB0byBwb3J0LmNvbW1pdHNfZm9yX3VwbG9hZCgpIHRvIGJyaW5nCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNf dW5pdHRlc3QucHk6CisgICAgICAgIChTdW1tYXJpemVkUmVzdWx0c1Rlc3Quc2V0VXApOiBBZGRl ZCBpbiBuZXcgcmVxdWlyZWQgcGFyYW1ldGVyIGZvciB0ZXN0aW5nLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zvcl91cGxv YWQpOiBSZW1vdmVkIHRoZSBmb3JjZWQgbW92ZW1lbnQgdXAgdGhlIHN5c3RlbXMgdHJlZSB0aGF0 IHByZXZlbnRlZCB1cyAKKyAgICAgICAgZnJvbSB1c2luZyBtb2NrIFNDTXMgYW5kIG1vcmUKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weTogQWRkZWQgZnVuY3Rpb24gdG8g bWFrZSB0aGUgY2hlY2tvdXRfaW5mb3JtYXRpb24uanNvbiBmb3IgdXBsb2FkIHRlc3RpbmcuCisK IDIwMjAtMDItMTkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggY2hlY2std2Via2l0LXN0eWxlIGVycm9ycyByZWxhdGVkIHRvIEFWRm91bmRhdGlvblNQSS5o CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkKaW5kZXggYzZmYTBh YWNmMzIzNDlhOGFhNTczNzMzYzQ0NzA5NTBlZmZhMTU3OS4uYjQ0MWIwOTFhMTZmMTNjMzA1OWI5 YWFjNDVjMzdiYWJiYWIzMWE4YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vaG9zdF9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hv c3RfbW9jay5weQpAQCAtMzYsMTMgKzM2LDE1IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLndhdGNo bGlzdC53YXRjaGxpc3RfbW9jayBpbXBvcnQgTW9ja1dhdGNoTGlzdAogCiAjIE5ldy1zdHlsZSBw b3J0cyBuZWVkIHRvIG1vdmUgZG93biBpbnRvIHdlYmtpdHB5LmNvbW1vbi4KIGZyb20gd2Via2l0 cHkucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0RmFjdG9yeQotZnJvbSB3ZWJraXRweS5wb3J0LnRl c3QgaW1wb3J0IGFkZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbQorZnJvbSB3ZWJraXRw eS5wb3J0LnRlc3QgaW1wb3J0IGFkZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbSwgYWRk X2NoZWNrb3V0X2luZm9ybWF0aW9uX2pzb25fdG9fbW9ja19maWxlc3lzdGVtCiAKIAogY2xhc3Mg TW9ja0hvc3QoTW9ja1N5c3RlbUhvc3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBsb2dfZXhl Y3V0aXZlPUZhbHNlLCBleGVjdXRpdmVfdGhyb3dzX3doZW5fcnVuPU5vbmUsIGluaXRpYWxpemVf c2NtX2J5X2RlZmF1bHQ9VHJ1ZSwgd2ViPU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBs b2dfZXhlY3V0aXZlPUZhbHNlLCBleGVjdXRpdmVfdGhyb3dzX3doZW5fcnVuPU5vbmUsIGluaXRp YWxpemVfc2NtX2J5X2RlZmF1bHQ9VHJ1ZSwgd2ViPU5vbmUsIGNyZWF0ZV9zdHViX3JlcG9zaXRv cnlfZmlsZXM9RmFsc2UpOgogICAgICAgICBNb2NrU3lzdGVtSG9zdC5fX2luaXRfXyhzZWxmLCBs b2dfZXhlY3V0aXZlLCBleGVjdXRpdmVfdGhyb3dzX3doZW5fcnVuKQogICAgICAgICBhZGRfdW5p dF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0oc2VsZi5maWxlc3lzdGVtKQorICAgICAgICBpZiBj cmVhdGVfc3R1Yl9yZXBvc2l0b3J5X2ZpbGVzOgorICAgICAgICAgICAgYWRkX2NoZWNrb3V0X2lu Zm9ybWF0aW9uX2pzb25fdG9fbW9ja19maWxlc3lzdGVtKHNlbGYuZmlsZXN5c3RlbSkKICAgICAg ICAgc2VsZi53ZWIgPSB3ZWIgb3IgTW9ja1dlYigpCiAKICAgICAgICAgc2VsZi5fY2hlY2tvdXQg PSBNb2NrQ2hlY2tvdXQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQppbmRleCBmMzc1Zjll NGRkYzhkOWU5MTI2M2JkNzc1MTk2YWMyM2Q4N2JmOTBlLi5lYWNkYTg1ODBlZTg3MmNmNmU0ZDYx YWE5YjllYjI5MTEwZDRlYzJjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQpAQCAtMzU5 LDcgKzM1OSw3IEBAIGRlZiBzdW1tYXJpemVfcmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXRpb25z X2J5X3R5cGUsIGluaXRpYWxfcmVzdWx0cywgcmV0cnlfcmVzCiAgICAgICAgICMgRklYTUU6IERv IHdlIHJlYWxseSBuZWVkIHRvIHBvcHVsYXRlIHRoaXMgYm90aCBoZXJlIGFuZCBpbiB0aGUganNv bl9yZXN1bHRzX2dlbmVyYXRvcj8KICAgICAgICAgaWYgcG9ydF9vYmouZ2V0X29wdGlvbigiYnVp bGRlcl9uYW1lIik6CiAgICAgICAgICAgICBwb3J0X29iai5ob3N0LmluaXRpYWxpemVfc2NtKCkK LSAgICAgICAgICAgIHJlc3VsdHNbJ3JldmlzaW9uJ10gPSBwb3J0X29iai5ob3N0LnNjbSgpLmhl YWRfc3ZuX3JldmlzaW9uKCkKKyAgICAgICAgICAgIHJlc3VsdHNbJ3JldmlzaW9uJ10gPSBwb3J0 X29iai5jb21taXRzX2Zvcl91cGxvYWQoKVswXVsnaWQnXQogICAgIGV4Y2VwdCBFeGNlcHRpb24g YXMgZToKICAgICAgICAgX2xvZy53YXJuKCJGYWlsZWQgdG8gZGV0ZXJtaW5lIHN2biByZXZpc2lv biBmb3IgY2hlY2tvdXQgKGN3ZDogJXMsIHdlYmtpdF9iYXNlOiAlcyksIGxlYXZpbmcgJ3Jldmlz aW9uJyBrZXkgYmxhbmsgaW4gZnVsbF9yZXN1bHRzLmpzb24uXG4lcyIgJSAocG9ydF9vYmouX2Zp bGVzeXN0ZW0uZ2V0Y3dkKCksIHBvcnRfb2JqLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBlKSkK ICAgICAgICAgIyBIYW5kbGUgY2FzZXMgd2hlcmUgd2UncmUgcnVubmluZyBvdXRzaWRlIG9mIHZl cnNpb24gY29udHJvbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3Qu cHkKaW5kZXggMmRmNDVkOTlmY2Y1ZGE2YTM2NjkxYmE4ZWQzZTBjYTBlZDBhYTA5NC4uZDVhY2Iw ZTNiNmQyNzkxMjFlYmExOGJmMmE2ODZlOTlkNGY4ODgyOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKQEAgLTE0Nyw3ICsxNDcsNyBAQCBjbGFzcyBJbnRl cnByZXRUZXN0RmFpbHVyZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogY2xhc3MgU3VtbWFy aXplZFJlc3VsdHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6 Ci0gICAgICAgIGhvc3QgPSBNb2NrSG9zdChpbml0aWFsaXplX3NjbV9ieV9kZWZhdWx0PUZhbHNl KQorICAgICAgICBob3N0ID0gTW9ja0hvc3QoaW5pdGlhbGl6ZV9zY21fYnlfZGVmYXVsdD1GYWxz ZSwgY3JlYXRlX3N0dWJfcmVwb3NpdG9yeV9maWxlcz1UcnVlKQogICAgICAgICBzZWxmLnBvcnQg PSBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lPSd0ZXN0Jywgb3B0aW9ucz1Nb2NrT3B0 aW9ucyhodHRwPVRydWUsIHBpeGVsX3Rlc3RzPUZhbHNlLCB3b3JsZF9sZWFrcz1GYWxzZSkpCiAK ICAgICBkZWYgdGVzdF9ub19zdm5fcmV2aXNpb24oc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9iYXNlLnB5CmluZGV4IGRlMDA2NjY3YjJkMWU1ZTVlZWI4ZjJkMWE0NDhiNzU2ZjdmMDY2Y2Qu LjhjMmRkOWFhYThlNDM3MzExOGUyNTQ0ZmUzYTE5YTQ3NzhmMzk3NTYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9iYXNlLnB5CkBAIC0xNTk3LDIwICsxNTk3LDE2IEBAIGNsYXNzIFBvcnQob2Jq ZWN0KToKICAgICBAbWVtb2l6ZWQKICAgICBkZWYgY29tbWl0c19mb3JfdXBsb2FkKHNlbGYpOgog ICAgICAgICBmcm9tIHdlYmtpdHB5LnJlc3VsdHMudXBsb2FkIGltcG9ydCBVcGxvYWQKLQorICAg ICAgICBzZWxmLmhvc3QuaW5pdGlhbGl6ZV9zY20oKQogICAgICAgICByZXBvcyA9IHt9CiAgICAg ICAgIGlmIHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpIGFuZCBnZXRhdHRyKHBvcnRfY29u ZmlnLmFwcGxlX2FkZGl0aW9ucygpLCAncmVwb3MnLCBGYWxzZSk6CiAgICAgICAgICAgICByZXBv cyA9IHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0aW9ucygpLnJlcG9zKCkKLQotICAgICAgICB1cCA9 IG9zLnBhdGguZGlybmFtZQotICAgICAgICByZXBvc1snd2Via2l0J10gPSB1cCh1cCh1cCh1cCh1 cChvcy5wYXRoLmFic3BhdGgoX19maWxlX18pKSkpKSkKLQorICAgICAgICByZXBvc1snd2Via2l0 J10gPSBzZWxmLmhvc3Quc2NtKCkuY2hlY2tvdXRfcm9vdAogICAgICAgICBjb21taXRzID0gW10K ICAgICAgICAgZm9yIHJlcG9faWQsIHBhdGggaW4gcmVwb3MuaXRlbXMoKToKLSAgICAgICAgICAg IHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYuX2V4ZWN1dGl2ZSkuZGV0 ZWN0X3NjbV9zeXN0ZW0ocGF0aCkKICAgICAgICAgICAgIGNvbW1pdHMuYXBwZW5kKFVwbG9hZC5j cmVhdGVfY29tbWl0KAogICAgICAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9cmVwb19pZCwKLSAg ICAgICAgICAgICAgICBpZD1zY20ubmF0aXZlX3JldmlzaW9uKHBhdGgpLAotICAgICAgICAgICAg ICAgIGJyYW5jaD1zY20ubmF0aXZlX2JyYW5jaChwYXRoKSwKKyAgICAgICAgICAgICAgICBpZD1z ZWxmLmhvc3Quc2NtKCkubmF0aXZlX3JldmlzaW9uKHBhdGgpLAorICAgICAgICAgICAgICAgIGJy YW5jaD1zZWxmLmhvc3Quc2NtKCkubmF0aXZlX2JyYW5jaChwYXRoKSwKICAgICAgICAgICAgICkp CiAgICAgICAgIHJldHVybiBjb21taXRzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvdGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5Cmlu ZGV4IDI0ZWQwY2E4MDJjZjhiYzlkOWJmODczZDAyM2QwMWNmOTRkMTg2N2IuLmI2ZGY1YTJlNjQz ZDJkNDRiNzA1OWNkMTAxMGY2YTZiODA3N2EwMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC90ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90 ZXN0LnB5CkBAIC0yODIsNiArMjgyLDcgQEAgbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4MzQKIAog TEFZT1VUX1RFU1RfRElSID0gJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzJwogUEVSRl9URVNU X0RJUiA9ICcvdGVzdC5jaGVja291dC9QZXJmb3JtYW5jZVRlc3RzJworVEVTVF9ESVIgPSAnL21v Y2stY2hlY2tvdXQnCiAKIAogIyBIZXJlIHdlIHN5bnRoZXNpemUgYW4gaW4tbWVtb3J5IGZpbGVz eXN0ZW0gZnJvbSB0aGUgdGVzdCBsaXN0CkBAIC0zNjUsNiArMzY2LDEyIEBAIEJ1Zyh0ZXN0KSBw YXNzZXMvc2tpcHBlZC9za2lwLmh0bWwgWyBTa2lwIF0KICAgICBmaWxlc3lzdGVtLmNsZWFyX3dy aXR0ZW5fZmlsZXMoKQogCiAKK2RlZiBhZGRfY2hlY2tvdXRfaW5mb3JtYXRpb25fanNvbl90b19t b2NrX2ZpbGVzeXN0ZW0oZmlsZXN5c3RlbSk6CisgICAgaWYgbm90IGZpbGVzeXN0ZW0uZXhpc3Rz KFRFU1RfRElSKToKKyAgICAgICAgZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShURVNU X0RJUikKKyAgICBmaWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShURVNUX0RJUiArICcvY2hlY2tv dXRfaW5mb3JtYXRpb24uanNvbicsICd7ICJicmFuY2giOiAidHJ1bmsiLCAiaWQiOiAiMjczODQ5 OSIgfScpCisKKwogY2xhc3MgVGVzdFBvcnQoUG9ydCk6CiAgICAgcG9ydF9uYW1lID0gJ3Rlc3Qn CiAgICAgZGVmYXVsdF9wb3J0X25hbWUgPSAndGVzdC1tYWMtbGVvcGFyZCcK 391348 2020-02-20 15:50:33 -0800 2020-02-20 16:51:28 -0800 Patch bug-207684-20200220155033.patch text/plain 6638 jlewis3 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MDEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTdmN2IzZTUxYTZhNWI4ZjlkNTI5YjQ5YzFlYTg5Nzg1 YmZiYTc3OC4uNTIzNTZhMTkzNmY2ZDg2YmMzMjU5ZjZjNzA0YmFjMmUzNGJjZDNiMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIwLTAyLTIwICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg ICAgU3R1YiByZXBvc2l0b3JpZXMgZmFpbCB0byB1cGxvYWQgc29tZSByZXN1bHRzIGR1ZSB0byBt aXNzaW5nIGhlYWQgc3ZuIHJldmlzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDc2ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9jay5weTog QWRkZWQgaW4gY2FsbCBmb3IgY3JlYXRpbmcgc3R1YiByZXBvIGNoZWNrb3V0IGluZm9ybWF0aW9u IGZvciB1cGxvYWQgdGVzdHMuCisgICAgICAgIChNb2NrSG9zdC5fX2luaXRfXyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMu cHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6IENoYW5nZWQgY2FsbCB0byBoZWFkX3N2 bl9yZXZpc2lvbiB0byBwb3J0LmNvbW1pdHNfZm9yX3VwbG9hZCgpIHRvIGJyaW5nCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNf dW5pdHRlc3QucHk6CisgICAgICAgIChTdW1tYXJpemVkUmVzdWx0c1Rlc3Quc2V0VXApOiBBZGRl ZCBpbiBuZXcgcmVxdWlyZWQgcGFyYW1ldGVyIGZvciB0ZXN0aW5nLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5jb21taXRzX2Zvcl91cGxv YWQpOiBSZW1vdmVkIHRoZSBmb3JjZWQgbW92ZW1lbnQgdXAgdGhlIHN5c3RlbXMgdHJlZSB0aGF0 IHByZXZlbnRlZCB1cyAKKyAgICAgICAgZnJvbSB1c2luZyBtb2NrIFNDTXMgYW5kIG1vcmUKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weTogQWRkZWQgZnVuY3Rpb24gdG8g bWFrZSB0aGUgY2hlY2tvdXRfaW5mb3JtYXRpb24uanNvbiBmb3IgdXBsb2FkIHRlc3RpbmcuCisK IDIwMjAtMDItMTkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggY2hlY2std2Via2l0LXN0eWxlIGVycm9ycyByZWxhdGVkIHRvIEFWRm91bmRhdGlvblNQSS5o CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkKaW5kZXggYzZmYTBh YWNmMzIzNDlhOGFhNTczNzMzYzQ0NzA5NTBlZmZhMTU3OS4uYjQ0MWIwOTFhMTZmMTNjMzA1OWI5 YWFjNDVjMzdiYWJiYWIzMWE4YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vaG9zdF9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hv c3RfbW9jay5weQpAQCAtMzYsMTMgKzM2LDE1IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLndhdGNo bGlzdC53YXRjaGxpc3RfbW9jayBpbXBvcnQgTW9ja1dhdGNoTGlzdAogCiAjIE5ldy1zdHlsZSBw b3J0cyBuZWVkIHRvIG1vdmUgZG93biBpbnRvIHdlYmtpdHB5LmNvbW1vbi4KIGZyb20gd2Via2l0 cHkucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0RmFjdG9yeQotZnJvbSB3ZWJraXRweS5wb3J0LnRl c3QgaW1wb3J0IGFkZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbQorZnJvbSB3ZWJraXRw eS5wb3J0LnRlc3QgaW1wb3J0IGFkZF91bml0X3Rlc3RzX3RvX21vY2tfZmlsZXN5c3RlbSwgYWRk X2NoZWNrb3V0X2luZm9ybWF0aW9uX2pzb25fdG9fbW9ja19maWxlc3lzdGVtCiAKIAogY2xhc3Mg TW9ja0hvc3QoTW9ja1N5c3RlbUhvc3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBsb2dfZXhl Y3V0aXZlPUZhbHNlLCBleGVjdXRpdmVfdGhyb3dzX3doZW5fcnVuPU5vbmUsIGluaXRpYWxpemVf c2NtX2J5X2RlZmF1bHQ9VHJ1ZSwgd2ViPU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBs b2dfZXhlY3V0aXZlPUZhbHNlLCBleGVjdXRpdmVfdGhyb3dzX3doZW5fcnVuPU5vbmUsIGluaXRp YWxpemVfc2NtX2J5X2RlZmF1bHQ9VHJ1ZSwgd2ViPU5vbmUsIGNyZWF0ZV9zdHViX3JlcG9zaXRv cnlfZmlsZXM9RmFsc2UpOgogICAgICAgICBNb2NrU3lzdGVtSG9zdC5fX2luaXRfXyhzZWxmLCBs b2dfZXhlY3V0aXZlLCBleGVjdXRpdmVfdGhyb3dzX3doZW5fcnVuKQogICAgICAgICBhZGRfdW5p dF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0oc2VsZi5maWxlc3lzdGVtKQorICAgICAgICBpZiBj cmVhdGVfc3R1Yl9yZXBvc2l0b3J5X2ZpbGVzOgorICAgICAgICAgICAgYWRkX2NoZWNrb3V0X2lu Zm9ybWF0aW9uX2pzb25fdG9fbW9ja19maWxlc3lzdGVtKHNlbGYuZmlsZXN5c3RlbSkKICAgICAg ICAgc2VsZi53ZWIgPSB3ZWIgb3IgTW9ja1dlYigpCiAKICAgICAgICAgc2VsZi5fY2hlY2tvdXQg PSBNb2NrQ2hlY2tvdXQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQppbmRleCBmMzc1Zjll NGRkYzhkOWU5MTI2M2JkNzc1MTk2YWMyM2Q4N2JmOTBlLi5lYWNkYTg1ODBlZTg3MmNmNmU0ZDYx YWE5YjllYjI5MTEwZDRlYzJjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQpAQCAtMzU5 LDcgKzM1OSw3IEBAIGRlZiBzdW1tYXJpemVfcmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXRpb25z X2J5X3R5cGUsIGluaXRpYWxfcmVzdWx0cywgcmV0cnlfcmVzCiAgICAgICAgICMgRklYTUU6IERv IHdlIHJlYWxseSBuZWVkIHRvIHBvcHVsYXRlIHRoaXMgYm90aCBoZXJlIGFuZCBpbiB0aGUganNv bl9yZXN1bHRzX2dlbmVyYXRvcj8KICAgICAgICAgaWYgcG9ydF9vYmouZ2V0X29wdGlvbigiYnVp bGRlcl9uYW1lIik6CiAgICAgICAgICAgICBwb3J0X29iai5ob3N0LmluaXRpYWxpemVfc2NtKCkK LSAgICAgICAgICAgIHJlc3VsdHNbJ3JldmlzaW9uJ10gPSBwb3J0X29iai5ob3N0LnNjbSgpLmhl YWRfc3ZuX3JldmlzaW9uKCkKKyAgICAgICAgICAgIHJlc3VsdHNbJ3JldmlzaW9uJ10gPSBwb3J0 X29iai5jb21taXRzX2Zvcl91cGxvYWQoKVswXVsnaWQnXQogICAgIGV4Y2VwdCBFeGNlcHRpb24g YXMgZToKICAgICAgICAgX2xvZy53YXJuKCJGYWlsZWQgdG8gZGV0ZXJtaW5lIHN2biByZXZpc2lv biBmb3IgY2hlY2tvdXQgKGN3ZDogJXMsIHdlYmtpdF9iYXNlOiAlcyksIGxlYXZpbmcgJ3Jldmlz aW9uJyBrZXkgYmxhbmsgaW4gZnVsbF9yZXN1bHRzLmpzb24uXG4lcyIgJSAocG9ydF9vYmouX2Zp bGVzeXN0ZW0uZ2V0Y3dkKCksIHBvcnRfb2JqLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpLCBlKSkK ICAgICAgICAgIyBIYW5kbGUgY2FzZXMgd2hlcmUgd2UncmUgcnVubmluZyBvdXRzaWRlIG9mIHZl cnNpb24gY29udHJvbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3Qu cHkKaW5kZXggMmRmNDVkOTlmY2Y1ZGE2YTM2NjkxYmE4ZWQzZTBjYTBlZDBhYTA5NC4uZDVhY2Iw ZTNiNmQyNzkxMjFlYmExOGJmMmE2ODZlOTlkNGY4ODgyOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHkKQEAgLTE0Nyw3ICsxNDcsNyBAQCBjbGFzcyBJbnRl cnByZXRUZXN0RmFpbHVyZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogY2xhc3MgU3VtbWFy aXplZFJlc3VsdHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6 Ci0gICAgICAgIGhvc3QgPSBNb2NrSG9zdChpbml0aWFsaXplX3NjbV9ieV9kZWZhdWx0PUZhbHNl KQorICAgICAgICBob3N0ID0gTW9ja0hvc3QoaW5pdGlhbGl6ZV9zY21fYnlfZGVmYXVsdD1GYWxz ZSwgY3JlYXRlX3N0dWJfcmVwb3NpdG9yeV9maWxlcz1UcnVlKQogICAgICAgICBzZWxmLnBvcnQg PSBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lPSd0ZXN0Jywgb3B0aW9ucz1Nb2NrT3B0 aW9ucyhodHRwPVRydWUsIHBpeGVsX3Rlc3RzPUZhbHNlLCB3b3JsZF9sZWFrcz1GYWxzZSkpCiAK ICAgICBkZWYgdGVzdF9ub19zdm5fcmV2aXNpb24oc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9iYXNlLnB5CmluZGV4IGRlMDA2NjY3YjJkMWU1ZTVlZWI4ZjJkMWE0NDhiNzU2ZjdmMDY2Y2Qu Ljk3ZjlmYmYwYTE1ZjgwZGQ5MWE0OTBkOTE1YzE5NzdiMGMxMzkxYzcgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9iYXNlLnB5CkBAIC0xNTk4LDEzICsxNTk4LDExIEBAIGNsYXNzIFBvcnQob2Jq ZWN0KToKICAgICBkZWYgY29tbWl0c19mb3JfdXBsb2FkKHNlbGYpOgogICAgICAgICBmcm9tIHdl YmtpdHB5LnJlc3VsdHMudXBsb2FkIGltcG9ydCBVcGxvYWQKIAorICAgICAgICBzZWxmLmhvc3Qu aW5pdGlhbGl6ZV9zY20oKQogICAgICAgICByZXBvcyA9IHt9CiAgICAgICAgIGlmIHBvcnRfY29u ZmlnLmFwcGxlX2FkZGl0aW9ucygpIGFuZCBnZXRhdHRyKHBvcnRfY29uZmlnLmFwcGxlX2FkZGl0 aW9ucygpLCAncmVwb3MnLCBGYWxzZSk6CiAgICAgICAgICAgICByZXBvcyA9IHBvcnRfY29uZmln LmFwcGxlX2FkZGl0aW9ucygpLnJlcG9zKCkKLQotICAgICAgICB1cCA9IG9zLnBhdGguZGlybmFt ZQotICAgICAgICByZXBvc1snd2Via2l0J10gPSB1cCh1cCh1cCh1cCh1cChvcy5wYXRoLmFic3Bh dGgoX19maWxlX18pKSkpKSkKLQorICAgICAgICByZXBvc1snd2Via2l0J10gPSBzZWxmLmhvc3Qu c2NtKCkuY2hlY2tvdXRfcm9vdAogICAgICAgICBjb21taXRzID0gW10KICAgICAgICAgZm9yIHJl cG9faWQsIHBhdGggaW4gcmVwb3MuaXRlbXMoKToKICAgICAgICAgICAgIHNjbSA9IFNDTURldGVj dG9yKHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYuX2V4ZWN1dGl2ZSkuZGV0ZWN0X3NjbV9zeXN0ZW0o cGF0aCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3QucHkKaW5kZXggMjRlZDBjYTgwMmNmOGJj OWQ5YmY4NzNkMDIzZDAxY2Y5NGQxODY3Yi4uYjZkZjVhMmU2NDNkMmQ0NGI3MDU5Y2QxMDEwZjZh NmI4MDc3YTAyNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3QucHkKQEAgLTI4Miw2ICsy ODIsNyBAQCBsYXllciBhdCAoMCwwKSBzaXplIDgwMHgzNAogCiBMQVlPVVRfVEVTVF9ESVIgPSAn L3Rlc3QuY2hlY2tvdXQvTGF5b3V0VGVzdHMnCiBQRVJGX1RFU1RfRElSID0gJy90ZXN0LmNoZWNr b3V0L1BlcmZvcm1hbmNlVGVzdHMnCitURVNUX0RJUiA9ICcvbW9jay1jaGVja291dCcKIAogCiAj IEhlcmUgd2Ugc3ludGhlc2l6ZSBhbiBpbi1tZW1vcnkgZmlsZXN5c3RlbSBmcm9tIHRoZSB0ZXN0 IGxpc3QKQEAgLTM2NSw2ICszNjYsMTIgQEAgQnVnKHRlc3QpIHBhc3Nlcy9za2lwcGVkL3NraXAu aHRtbCBbIFNraXAgXQogICAgIGZpbGVzeXN0ZW0uY2xlYXJfd3JpdHRlbl9maWxlcygpCiAKIAor ZGVmIGFkZF9jaGVja291dF9pbmZvcm1hdGlvbl9qc29uX3RvX21vY2tfZmlsZXN5c3RlbShmaWxl c3lzdGVtKToKKyAgICBpZiBub3QgZmlsZXN5c3RlbS5leGlzdHMoVEVTVF9ESVIpOgorICAgICAg ICBmaWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KFRFU1RfRElSKQorICAgIGZpbGVzeXN0 ZW0ud3JpdGVfdGV4dF9maWxlKFRFU1RfRElSICsgJy9jaGVja291dF9pbmZvcm1hdGlvbi5qc29u JywgJ3sgImJyYW5jaCI6ICJ0cnVuayIsICJpZCI6ICIyNzM4NDk5IiB9JykKKworCiBjbGFzcyBU ZXN0UG9ydChQb3J0KToKICAgICBwb3J0X25hbWUgPSAndGVzdCcKICAgICBkZWZhdWx0X3BvcnRf bmFtZSA9ICd0ZXN0LW1hYy1sZW9wYXJkJwo=