161507 2016-09-01 14:01:54 -0700 Fix --no-sample-on-timeout command line argument 2022-03-01 02:40:01 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbedard jbedard ap commit-queue glenn lforschler ryanhaddad oldest_to_newest 1225516 0 jbedard 2016-09-01 14:01:54 -0700 Provide command line arguments to enable/disable sampling on timeout and pick between spindump and sample to reduce memory usage on bots. 1225522 1 287674 jbedard 2016-09-01 14:09:08 -0700 Created attachment 287674 Patch 1225524 2 287676 jbedard 2016-09-01 14:10:24 -0700 Created attachment 287676 Patch 1225581 3 287676 dean_johnson 2016-09-01 15:51:37 -0700 Comment on attachment 287676 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=287676&action=review Does this also fix the issue where spindump is dumping binary information into logs as well? All this seems to do is allow for forcing sample instead of spindump. LGTM other than the changes mentioned above. > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:145 > + optparse.make_option("--sample-on-timeout", action="store_true", > + dest="sample_on_timeout", help="Don't run sample on timeout (OS X only)"), The description for this command doesn't seem to follow the command name. I think it should read "Run sample on timeouts (OS X only)". 1225584 4 jbedard 2016-09-01 15:59:38 -0700 (In reply to comment #3) > Comment on attachment 287676 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=287676&action=review > > Does this also fix the issue where spindump is dumping binary information > into logs as well? All this seems to do is allow for forcing sample instead > of spindump. > > ... No, it does not fix this issue, but this issue is also not a trivial fix. The binary information can be used to mutate the spindump with command line tools after it is generated, there isn't a flag to simply disable the binary output. Because of this, an the fact that the binary output is only a third of the spindump and we aren't yet compressing results, it seems that the binary data is a fix that should be delayed, if done at all. 1225590 5 287697 jbedard 2016-09-01 16:05:47 -0700 Created attachment 287697 Patch 1225675 6 287697 ap 2016-09-01 20:19:52 -0700 Comment on attachment 287697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=287697&action=review > Tools/ChangeLog:8 > + This patch disables spindump by default to conserve memory on bots. It does the same with the —-sample-on-timeout flag. I think that we want this enabled by default going forward, and it's not clear if a temporary workaround is needed. Lucas should make the call. 1225794 7 287767 jbedard 2016-09-02 09:47:28 -0700 Created attachment 287767 Patch 1225805 8 287770 jbedard 2016-09-02 10:17:12 -0700 Created attachment 287770 Patch 1225807 9 287770 ap 2016-09-02 10:21:18 -0700 Comment on attachment 287770 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=287770&action=review > Tools/ChangeLog:3 > + Provide additional command line arguments for spindump/sample The title is no longer accurate. 1225813 10 287772 jbedard 2016-09-02 10:33:41 -0700 Created attachment 287772 Patch 1225815 11 287772 commit-queue 2016-09-02 10:34:52 -0700 Comment on attachment 287772 Patch Rejecting attachment 287772 from commit-queue. jbedard@apple.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 1225827 12 287772 commit-queue 2016-09-02 11:01:12 -0700 Comment on attachment 287772 Patch Clearing flags on attachment: 287772 Committed r205351: <http://trac.webkit.org/changeset/205351> 1225828 13 commit-queue 2016-09-02 11:01:17 -0700 All reviewed patches have been landed. Closing bug. 1225852 14 287697 lforschler 2016-09-02 11:28:16 -0700 Comment on attachment 287697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=287697&action=review >> Tools/ChangeLog:8 >> + This patch disables spindump by default to conserve memory on bots. It does the same with the —-sample-on-timeout flag. > > I think that we want this enabled by default going forward, and it's not clear if a temporary workaround is needed. Lucas should make the call. The spin dumps take a significant amount of disk space on build-safari after they are uploaded. I think for now we need to either stop generating them... or at least stop collecting them the test results upload archive. Having a flag with default disabled is a good starting point. This will allow us to turn it back on when we are ready. (meaning that we have a storage solution for results in place) 1225854 15 jbedard 2016-09-02 11:32:55 -0700 (In reply to comment #14) > ... > > The spin dumps take a significant amount of disk space on build-safari after > they are uploaded. I think for now we need to either stop generating them... > or at least stop collecting them the test results upload archive. Having a > flag with default disabled is a good starting point. This will allow us to > turn it back on when we are ready. (meaning that we have a storage solution > for results in place) As it turns out, all of our bots are passing --no-sample-on-timeout in the first place. The memory issues where caused by spindumping on timeout (I believe) and spindumping on crashes is a relatively rare occurrence, it shouldn't cause that much of a memory issue. The patch (which has no landed) should stop generating spindumps on timeout (previously, the --no-sample-on-timeout was broken in a number of places, this patch fixes those). This should fix our memory issues in the short term. 287674 2016-09-01 14:09:08 -0700 2016-09-01 14:10:21 -0700 Patch bug-161507-20160901140654.patch text/plain 7286 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNTMxMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE2LTA5LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQcm92aWRlIGFkZGl0aW9uYWwgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3Igc3BpbmR1bXAvc2FtcGxlCisgICAgICAgIE5odHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTYxNTA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBwYXRjaCBkaXNhYmxlcyBzcGluZHVtcCBieSBkZWZhdWx0IHRvIGNv bnNlcnZlIG1lbW9yeSBvbiBib3RzLiAgSXQgZG9lcyB0aGUgc2FtZSB3aXRoIHRoZSDigJQtc2Ft cGxlLW9uLXRpbWVvdXQgZmxhZy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIChwYXJzZV9hcmdzKTogQWRkZWQg 4oCULXVzZS1zcGluZHVtcCBhbmQg4oCULXNhbXBsZS1vbi10aW1lb3V0LgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcG9ydC9hcHBsZS5weToKKyAgICAgICAgKEFwcGxlUG9ydC5zYW1wbGVf cHJvY2Vzcyk6IENoZWNrIOKAlC11c2Utc3BpbmR1bXAgZmxhZy4KKyAgICAgICAgKEFwcGxlUG9y dC5zcGluZHVtcF9maWxlX3BhdGgpOiBTcGluZHVtcCBhbmQgc2FtcGxlIGZpbGUgbmFtZXMgYXJl IGRpZmZlcmVudC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5Ogor ICAgICAgICAoRHJpdmVyLl9jaGVja19mb3JfZHJpdmVyX3RpbWVvdXQpOiBDaGVjayDigJxzYW1w bGVfb25fdGltZW91dOKAnSBmbGFnLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9t YWNfdW5pdHRlc3QucHk6CisgICAgICAgIChNYWNUZXN0LnRlc3Rfc3BpbmR1bXApOiBNb2RpZmll ZCBmb3Ig4oCULXVzZS1zcGluZHVtcCBmbGFnLgorICAgICAgICAoTWFjVGVzdC50ZXN0X25vX3Nw aW5kdW1wKTogQWRkZWQgdG8gdGVzdCDigJQtdXNlLXNwaW5kdW1wIGZsYWcuCisgICAgICAgIChN YWNUZXN0LnRlc3Rfc2FtcGxlX3Byb2Nlc3MpOiBNb2RpZmllZCBmb3Ig4oCULXVzZS1zcGluZHVt cCBmbGFnLgorCiAyMDE2LTA5LTAxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgYWRkIEJsb2NrUHRyOjpmcm9tQ2FsbGFibGUKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 cy5weQkocmV2aXNpb24gMjA1MzEzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkod29ya2luZyBjb3B5KQpAQCAtMTQxLDYgKzE0MSwx MCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzKToKICAgICAgICAgICAgIGRlc3Q9InBpeGVsX3Rlc3Rz IiwgaGVscD0iRGlzYWJsZSBwaXhlbC10by1waXhlbCBQTkcgY29tcGFyaXNvbnMiKSwKICAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8tc2FtcGxlLW9uLXRpbWVvdXQiLCBhY3Rpb249 InN0b3JlX2ZhbHNlIiwKICAgICAgICAgICAgIGRlc3Q9InNhbXBsZV9vbl90aW1lb3V0IiwgaGVs cD0iRG9uJ3QgcnVuIHNhbXBsZSBvbiB0aW1lb3V0IChPUyBYIG9ubHkpIiksCisgICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXNhbXBsZS1vbi10aW1lb3V0IiwgYWN0aW9uPSJzdG9yZV90 cnVlIiwKKyAgICAgICAgICAgIGRlc3Q9InNhbXBsZV9vbl90aW1lb3V0IiwgaGVscD0iRG9uJ3Qg cnVuIHNhbXBsZSBvbiB0aW1lb3V0IChPUyBYIG9ubHkpIiksCisgICAgICAgIG9wdHBhcnNlLm1h a2Vfb3B0aW9uKCItLXVzZS1zcGluZHVtcCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9 RmFsc2UsCisgICAgICAgICAgICBkZXN0PSJ1c2Vfc3BpbmR1bXAiLCBoZWxwPSJSdW4gc3BpbmR1 bXAgaW5zdGVhZCBvZiBzYW1wbGUgKE9TIFggb25seSkiKSwKICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0tbm8tcmVmLXRlc3RzIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKICAgICAgICAg ICAgIGRlc3Q9Im5vX3JlZl90ZXN0cyIsIGhlbHA9IlNraXAgYWxsIHJlZiB0ZXN0cyIpLAogICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS10b2xlcmFuY2UiLApJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2FwcGxlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9hcHBsZS5weQkocmV2aXNpb24gMjA1MzEzKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2FwcGxlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xOTgsMjYgKzE5OCwy OCBAQCBjbGFzcyBBcHBsZVBvcnQoUG9ydCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9tZXJnZV9j cmFzaF9sb2dzKGNyYXNoX2xvZ3MsIGFsbF9jcmFzaF9sb2csIGNyYXNoZWRfcHJvY2Vzc2VzKQog CiAgICAgZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCk6Ci0gICAgICAgIGhhbmdf cmVwb3J0ID0gc2VsZi5zYW1wbGVfZmlsZV9wYXRoKG5hbWUsIHBpZCkKLSAgICAgICAgZXhpdF9z dGF0dXMgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWwotICAgICAgICAgICAgIi91c3Iv YmluL3N1ZG8iLAotICAgICAgICAgICAgIi1uIiwKLSAgICAgICAgICAgICIvdXNyL3NiaW4vc3Bp bmR1bXAiLAotICAgICAgICAgICAgcGlkLAotICAgICAgICAgICAgMTAsCi0gICAgICAgICAgICAx MCwKLSAgICAgICAgICAgICItZmlsZSIsCi0gICAgICAgICAgICBoYW5nX3JlcG9ydCwKKyAgICAg ICAgZXhpdF9zdGF0dXMgPSAxCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigidXNlX3NwaW5k dW1wIik6CisgICAgICAgICAgICBleGl0X3N0YXR1cyA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29t bWFuZChbCisgICAgICAgICAgICAgICAgIi91c3IvYmluL3N1ZG8iLAorICAgICAgICAgICAgICAg ICItbiIsCisgICAgICAgICAgICAgICAgIi91c3Ivc2Jpbi9zcGluZHVtcCIsCisgICAgICAgICAg ICAgICAgcGlkLAorICAgICAgICAgICAgICAgIDEwLAorICAgICAgICAgICAgICAgIDEwLAorICAg ICAgICAgICAgICAgICItZmlsZSIsCisgICAgICAgICAgICAgICAgc2VsZi5zcGluZHVtcF9maWxl X3BhdGgobmFtZSwgcGlkKSwKICAgICAgICAgXSwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKQogICAg ICAgICBpZiBleGl0X3N0YXR1czoKICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICBo YW5nX3JlcG9ydCA9IHNlbGYuc2FtcGxlX2ZpbGVfcGF0aChuYW1lLCBwaWQpCiAgICAgICAgICAg ICAgICAgc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsKICAgICAgICAgICAgICAgICAgICAg Ii91c3IvYmluL3NhbXBsZSIsCiAgICAgICAgICAgICAgICAgICAgIHBpZCwKICAgICAgICAgICAg ICAgICAgICAgMTAsCiAgICAgICAgICAgICAgICAgICAgIDEwLAogICAgICAgICAgICAgICAgICAg ICAiLWZpbGUiLAotICAgICAgICAgICAgICAgICAgICBoYW5nX3JlcG9ydCwKKyAgICAgICAgICAg ICAgICAgICAgc2VsZi5zYW1wbGVfZmlsZV9wYXRoKG5hbWUsIHBpZCksCiAgICAgICAgICAgICAg ICAgXSkKICAgICAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciBhcyBlOgogICAgICAgICAgICAg ICAgIF9sb2cud2FybmluZygnVW5hYmxlIHRvIHNhbXBsZSBwcm9jZXNzOicgKyBzdHIoZSkpCkBA IC0yMjUsNiArMjI3LDkgQEAgY2xhc3MgQXBwbGVQb3J0KFBvcnQpOgogICAgIGRlZiBzYW1wbGVf ZmlsZV9wYXRoKHNlbGYsIG5hbWUsIHBpZCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lz dGVtLmpvaW4oc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpLCAiezB9LXsxfS1zYW1wbGUudHh0Ii5m b3JtYXQobmFtZSwgcGlkKSkKIAorICAgIGRlZiBzcGluZHVtcF9maWxlX3BhdGgoc2VsZiwgbmFt ZSwgcGlkKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLnJlc3Vs dHNfZGlyZWN0b3J5KCksICJ7MH0tezF9LXNwaW5kdW1wLnR4dCIuZm9ybWF0KG5hbWUsIHBpZCkp CisKICAgICBkZWYgbG9va19mb3JfbmV3X3NhbXBsZXMoc2VsZiwgdW5yZXNwb25zaXZlX3Byb2Nl c3Nlcywgc3RhcnRfdGltZSk6CiAgICAgICAgIHNhbXBsZV9maWxlcyA9IHt9CiAgICAgICAgIGZv ciAodGVzdF9uYW1lLCBwcm9jZXNzX25hbWUsIHBpZCkgaW4gdW5yZXNwb25zaXZlX3Byb2Nlc3Nl czoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQkocmV2aXNpb24gMjA1 MzEzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQkod29ya2luZyBj b3B5KQpAQCAtNDMwLDcgKzQzMCw4IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICAg ICAgZXJyX2xpbmUgPSAnV2FpdCBvbiBub3RpZnlEb25lIHRpbWVkIG91dCwgcHJvY2VzcyAnICsg Y2hpbGRfcHJvY2Vzc19uYW1lICsgJyBwaWQgPSAnICsgc3RyKGNoaWxkX3Byb2Nlc3NfcGlkKQog ICAgICAgICAgICAgc2VsZi5lcnJvcl9mcm9tX3Rlc3QgKz0gZXJyX2xpbmUKICAgICAgICAgICAg IF9sb2cuZGVidWcoZXJyX2xpbmUpCi0gICAgICAgICAgICBzZWxmLl9wb3J0LnNhbXBsZV9wcm9j ZXNzKGNoaWxkX3Byb2Nlc3NfbmFtZSwgY2hpbGRfcHJvY2Vzc19waWQpCisgICAgICAgICAgICBp ZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oInNhbXBsZV9vbl90aW1lb3V0Iik6CisgICAgICAgICAg ICAgICAgc2VsZi5fcG9ydC5zYW1wbGVfcHJvY2VzcyhjaGlsZF9wcm9jZXNzX25hbWUsIGNoaWxk X3Byb2Nlc3NfcGlkKQogICAgICAgICBpZiBvdXRfbGluZSA9PSAiRkFJTDogVGltZWQgb3V0IHdh aXRpbmcgZm9yIG5vdGlmeURvbmUgdG8gYmUgY2FsbGVkXG4iOgogICAgICAgICAgICAgc2VsZi5f ZHJpdmVyX3RpbWVkX291dCA9IFRydWUKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L21hY191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvbWFjX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMDMsOCAr MjAzLDE4IEBAIGNsYXNzIE1hY1Rlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UKICAgICAg ICAgICAgIHByaW50IGFyZ3MKIAogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAg ICAgICBwb3J0LnNldF9vcHRpb24oInVzZV9zcGluZHVtcCIsIFRydWUpCiAgICAgICAgIHBvcnQu X2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdfcnVuX2Nv bW1hbmQpCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3N1ZG8nLCAnLW4n LCAnL3Vzci9zYmluL3NwaW5kdW1wJywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9tb2NrLWJ1aWxk L2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi1zYW1wbGUudHh0J11cbiIKKyAgICAgICAgZXhw ZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc3VkbycsICctbicsICcvdXNyL3NiaW4vc3BpbmR1 bXAnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQvbGF5b3V0LXRlc3QtcmVzdWx0 cy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddXG4iCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3Nl cnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQyXSwg ZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKKworICAgIGRlZiB0ZXN0X25vX3NwaW5k dW1wKHNlbGYpOgorICAgICAgICBkZWYgbG9nZ2luZ19ydW5fY29tbWFuZChhcmdzKToKKyAgICAg ICAgICAgIHByaW50IGFyZ3MKKworICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAg ICAgICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj1sb2dn aW5nX3J1bl9jb21tYW5kKQorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9z YW1wbGUnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQvbGF5b3V0LXRlc3QtcmVz dWx0cy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNz ZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0Ml0s IGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCiAKICAgICBkZWYgdGVzdF9zYW1wbGVf cHJvY2VzcyhzZWxmKToKQEAgLTIxNiw2ICsyMjYsNyBAQCBjbGFzcyBNYWNUZXN0KHBvcnRfdGVz dGNhc2UuUG9ydFRlc3RDYXNlCiAgICAgICAgICAgICByZXR1cm4gMAogCiAgICAgICAgIHBvcnQg PSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBvcnQuc2V0X29wdGlvbigidXNlX3NwaW5kdW1w IiwgVHJ1ZSkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2Nv bW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKICAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0g IlsnL3Vzci9iaW4vc2FtcGxlJywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9tb2NrLWJ1aWxkL2xh eW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi1zYW1wbGUudHh0J11cbiIKICAgICAgICAgT3V0cHV0 Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9 Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQo= 287676 2016-09-01 14:10:24 -0700 2016-09-01 16:05:44 -0700 Patch bug-161507-20160901140810.patch text/plain 7285 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNTMxMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE2LTA5LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQcm92aWRlIGFkZGl0aW9uYWwgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3Igc3BpbmR1bXAvc2FtcGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjE1MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIGRpc2FibGVzIHNwaW5kdW1wIGJ5IGRlZmF1bHQgdG8gY29u c2VydmUgbWVtb3J5IG9uIGJvdHMuICBJdCBkb2VzIHRoZSBzYW1lIHdpdGggdGhlIOKAlC1zYW1w bGUtb24tdGltZW91dCBmbGFnLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOiBBZGRlZCDi gJQtdXNlLXNwaW5kdW1wIGFuZCDigJQtc2FtcGxlLW9uLXRpbWVvdXQuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L2FwcGxlLnB5OgorICAgICAgICAoQXBwbGVQb3J0LnNhbXBsZV9w cm9jZXNzKTogQ2hlY2sg4oCULXVzZS1zcGluZHVtcCBmbGFnLgorICAgICAgICAoQXBwbGVQb3J0 LnNwaW5kdW1wX2ZpbGVfcGF0aCk6IFNwaW5kdW1wIGFuZCBzYW1wbGUgZmlsZSBuYW1lcyBhcmUg ZGlmZmVyZW50LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHk6Cisg ICAgICAgIChEcml2ZXIuX2NoZWNrX2Zvcl9kcml2ZXJfdGltZW91dCk6IENoZWNrIOKAnHNhbXBs ZV9vbl90aW1lb3V04oCdIGZsYWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L21h Y191bml0dGVzdC5weToKKyAgICAgICAgKE1hY1Rlc3QudGVzdF9zcGluZHVtcCk6IE1vZGlmaWVk IGZvciDigJQtdXNlLXNwaW5kdW1wIGZsYWcuCisgICAgICAgIChNYWNUZXN0LnRlc3Rfbm9fc3Bp bmR1bXApOiBBZGRlZCB0byB0ZXN0IOKAlC11c2Utc3BpbmR1bXAgZmxhZy4KKyAgICAgICAgKE1h Y1Rlc3QudGVzdF9zYW1wbGVfcHJvY2Vzcyk6IE1vZGlmaWVkIGZvciDigJQtdXNlLXNwaW5kdW1w IGZsYWcuCisKIDIwMTYtMDktMDEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBhZGQgQmxvY2tQdHI6OmZyb21DYWxsYWJsZQpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNiArMTQxLDEw IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3MpOgogICAgICAgICAgICAgZGVzdD0icGl4ZWxfdGVzdHMi LCBoZWxwPSJEaXNhYmxlIHBpeGVsLXRvLXBpeGVsIFBORyBjb21wYXJpc29ucyIpLAogICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1zYW1wbGUtb24tdGltZW91dCIsIGFjdGlvbj0i c3RvcmVfZmFsc2UiLAogICAgICAgICAgICAgZGVzdD0ic2FtcGxlX29uX3RpbWVvdXQiLCBoZWxw PSJEb24ndCBydW4gc2FtcGxlIG9uIHRpbWVvdXQgKE9TIFggb25seSkiKSwKKyAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oIi0tc2FtcGxlLW9uLXRpbWVvdXQiLCBhY3Rpb249InN0b3JlX3Ry dWUiLAorICAgICAgICAgICAgZGVzdD0ic2FtcGxlX29uX3RpbWVvdXQiLCBoZWxwPSJEb24ndCBy dW4gc2FtcGxlIG9uIHRpbWVvdXQgKE9TIFggb25seSkiKSwKKyAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0tdXNlLXNwaW5kdW1wIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1G YWxzZSwKKyAgICAgICAgICAgIGRlc3Q9InVzZV9zcGluZHVtcCIsIGhlbHA9IlJ1biBzcGluZHVt cCBpbnN0ZWFkIG9mIHNhbXBsZSAoT1MgWCBvbmx5KSIpLAogICAgICAgICBvcHRwYXJzZS5tYWtl X29wdGlvbigiLS1uby1yZWYtdGVzdHMiLCBhY3Rpb249InN0b3JlX3RydWUiLAogICAgICAgICAg ICAgZGVzdD0ibm9fcmVmX3Rlc3RzIiwgaGVscD0iU2tpcCBhbGwgcmVmIHRlc3RzIiksCiAgICAg ICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXRvbGVyYW5jZSIsCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvYXBwbGUucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2FwcGxlLnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvYXBwbGUucHkJKHdvcmtpbmcgY29weSkKQEAgLTE5OCwyNiArMTk4LDI4 IEBAIGNsYXNzIEFwcGxlUG9ydChQb3J0KToKICAgICAgICAgcmV0dXJuIHNlbGYuX21lcmdlX2Ny YXNoX2xvZ3MoY3Jhc2hfbG9ncywgYWxsX2NyYXNoX2xvZywgY3Jhc2hlZF9wcm9jZXNzZXMpCiAK ICAgICBkZWYgc2FtcGxlX3Byb2Nlc3Moc2VsZiwgbmFtZSwgcGlkKToKLSAgICAgICAgaGFuZ19y ZXBvcnQgPSBzZWxmLnNhbXBsZV9maWxlX3BhdGgobmFtZSwgcGlkKQotICAgICAgICBleGl0X3N0 YXR1cyA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbCi0gICAgICAgICAgICAiL3Vzci9i aW4vc3VkbyIsCi0gICAgICAgICAgICAiLW4iLAotICAgICAgICAgICAgIi91c3Ivc2Jpbi9zcGlu ZHVtcCIsCi0gICAgICAgICAgICBwaWQsCi0gICAgICAgICAgICAxMCwKLSAgICAgICAgICAgIDEw LAotICAgICAgICAgICAgIi1maWxlIiwKLSAgICAgICAgICAgIGhhbmdfcmVwb3J0LAorICAgICAg ICBleGl0X3N0YXR1cyA9IDEKKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCJ1c2Vfc3BpbmR1 bXAiKToKKyAgICAgICAgICAgIGV4aXRfc3RhdHVzID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21t YW5kKFsKKyAgICAgICAgICAgICAgICAiL3Vzci9iaW4vc3VkbyIsCisgICAgICAgICAgICAgICAg Ii1uIiwKKyAgICAgICAgICAgICAgICAiL3Vzci9zYmluL3NwaW5kdW1wIiwKKyAgICAgICAgICAg ICAgICBwaWQsCisgICAgICAgICAgICAgICAgMTAsCisgICAgICAgICAgICAgICAgMTAsCisgICAg ICAgICAgICAgICAgIi1maWxlIiwKKyAgICAgICAgICAgICAgICBzZWxmLnNwaW5kdW1wX2ZpbGVf cGF0aChuYW1lLCBwaWQpLAogICAgICAgICBdLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCiAgICAg ICAgIGlmIGV4aXRfc3RhdHVzOgogICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIGhh bmdfcmVwb3J0ID0gc2VsZi5zYW1wbGVfZmlsZV9wYXRoKG5hbWUsIHBpZCkKICAgICAgICAgICAg ICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWwogICAgICAgICAgICAgICAgICAgICAi L3Vzci9iaW4vc2FtcGxlIiwKICAgICAgICAgICAgICAgICAgICAgcGlkLAogICAgICAgICAgICAg ICAgICAgICAxMCwKICAgICAgICAgICAgICAgICAgICAgMTAsCiAgICAgICAgICAgICAgICAgICAg ICItZmlsZSIsCi0gICAgICAgICAgICAgICAgICAgIGhhbmdfcmVwb3J0LAorICAgICAgICAgICAg ICAgICAgICBzZWxmLnNhbXBsZV9maWxlX3BhdGgobmFtZSwgcGlkKSwKICAgICAgICAgICAgICAg ICBdKQogICAgICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yIGFzIGU6CiAgICAgICAgICAgICAg ICAgX2xvZy53YXJuaW5nKCdVbmFibGUgdG8gc2FtcGxlIHByb2Nlc3M6JyArIHN0cihlKSkKQEAg LTIyNSw2ICsyMjcsOSBAQCBjbGFzcyBBcHBsZVBvcnQoUG9ydCk6CiAgICAgZGVmIHNhbXBsZV9m aWxlX3BhdGgoc2VsZiwgbmFtZSwgcGlkKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCksICJ7MH0tezF9LXNhbXBsZS50eHQiLmZv cm1hdChuYW1lLCBwaWQpKQogCisgICAgZGVmIHNwaW5kdW1wX2ZpbGVfcGF0aChzZWxmLCBuYW1l LCBwaWQpOgorICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYucmVzdWx0 c19kaXJlY3RvcnkoKSwgInswfS17MX0tc3BpbmR1bXAudHh0Ii5mb3JtYXQobmFtZSwgcGlkKSkK KwogICAgIGRlZiBsb29rX2Zvcl9uZXdfc2FtcGxlcyhzZWxmLCB1bnJlc3BvbnNpdmVfcHJvY2Vz c2VzLCBzdGFydF90aW1lKToKICAgICAgICAgc2FtcGxlX2ZpbGVzID0ge30KICAgICAgICAgZm9y ICh0ZXN0X25hbWUsIHByb2Nlc3NfbmFtZSwgcGlkKSBpbiB1bnJlc3BvbnNpdmVfcHJvY2Vzc2Vz OgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CShyZXZpc2lvbiAyMDUz MTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CSh3b3JraW5nIGNv cHkpCkBAIC00MzAsNyArNDMwLDggQEAgY2xhc3MgRHJpdmVyKG9iamVjdCk6CiAgICAgICAgICAg ICBlcnJfbGluZSA9ICdXYWl0IG9uIG5vdGlmeURvbmUgdGltZWQgb3V0LCBwcm9jZXNzICcgKyBj aGlsZF9wcm9jZXNzX25hbWUgKyAnIHBpZCA9ICcgKyBzdHIoY2hpbGRfcHJvY2Vzc19waWQpCiAg ICAgICAgICAgICBzZWxmLmVycm9yX2Zyb21fdGVzdCArPSBlcnJfbGluZQogICAgICAgICAgICAg X2xvZy5kZWJ1ZyhlcnJfbGluZSkKLSAgICAgICAgICAgIHNlbGYuX3BvcnQuc2FtcGxlX3Byb2Nl c3MoY2hpbGRfcHJvY2Vzc19uYW1lLCBjaGlsZF9wcm9jZXNzX3BpZCkKKyAgICAgICAgICAgIGlm IHNlbGYuX3BvcnQuZ2V0X29wdGlvbigic2FtcGxlX29uX3RpbWVvdXQiKToKKyAgICAgICAgICAg ICAgICBzZWxmLl9wb3J0LnNhbXBsZV9wcm9jZXNzKGNoaWxkX3Byb2Nlc3NfbmFtZSwgY2hpbGRf cHJvY2Vzc19waWQpCiAgICAgICAgIGlmIG91dF9saW5lID09ICJGQUlMOiBUaW1lZCBvdXQgd2Fp dGluZyBmb3Igbm90aWZ5RG9uZSB0byBiZSBjYWxsZWRcbiI6CiAgICAgICAgICAgICBzZWxmLl9k cml2ZXJfdGltZWRfb3V0ID0gVHJ1ZQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvbWFjX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9tYWNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIwNTMxMykKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwMyw4ICsy MDMsMTggQEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZQogICAgICAg ICAgICAgcHJpbnQgYXJncwogCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAg ICAgIHBvcnQuc2V0X29wdGlvbigidXNlX3NwaW5kdW1wIiwgVHJ1ZSkKICAgICAgICAgcG9ydC5f ZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29t bWFuZCkKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc3VkbycsICctbics ICcvdXNyL3NiaW4vc3BpbmR1bXAnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQv bGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgorICAgICAgICBleHBl Y3RlZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9zdWRvJywgJy1uJywgJy91c3Ivc2Jpbi9zcGluZHVt cCcsIDQyLCAxMCwgMTAsICctZmlsZScsICcvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRz L3Rlc3QtNDItc3BpbmR1bXAudHh0J11cbiIKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2Vy dF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBl eHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQorCisgICAgZGVmIHRlc3Rfbm9fc3BpbmR1 bXAoc2VsZik6CisgICAgICAgIGRlZiBsb2dnaW5nX3J1bl9jb21tYW5kKGFyZ3MpOgorICAgICAg ICAgICAgcHJpbnQgYXJncworCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAg ICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dp bmdfcnVuX2NvbW1hbmQpCisgICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3Nh bXBsZScsIDQyLCAxMCwgMTAsICctZmlsZScsICcvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1 bHRzL3Rlc3QtNDItc2FtcGxlLnR4dCddXG4iCiAgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3Nl cnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQyXSwg ZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKIAogICAgIGRlZiB0ZXN0X3NhbXBsZV9w cm9jZXNzKHNlbGYpOgpAQCAtMjE2LDYgKzIyNiw3IEBAIGNsYXNzIE1hY1Rlc3QocG9ydF90ZXN0 Y2FzZS5Qb3J0VGVzdENhc2UKICAgICAgICAgICAgIHJldHVybiAwCiAKICAgICAgICAgcG9ydCA9 IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgcG9ydC5zZXRfb3B0aW9uKCJ1c2Vfc3BpbmR1bXAi LCBUcnVlKQogICAgICAgICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihydW5fY29t bWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQogICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAi WycvdXNyL2Jpbi9zYW1wbGUnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQvbGF5 b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgogICAgICAgICBPdXRwdXRD YXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1b J3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCg== 287697 2016-09-01 16:05:47 -0700 2022-03-01 02:40:01 -0800 Patch bug-161507-20160901160332.patch text/plain 7279 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNTMxMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE2LTA5LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQcm92aWRlIGFkZGl0aW9uYWwgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3Igc3BpbmR1bXAvc2FtcGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjE1MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIGRpc2FibGVzIHNwaW5kdW1wIGJ5IGRlZmF1bHQgdG8gY29u c2VydmUgbWVtb3J5IG9uIGJvdHMuICBJdCBkb2VzIHRoZSBzYW1lIHdpdGggdGhlIOKAlC1zYW1w bGUtb24tdGltZW91dCBmbGFnLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOiBBZGRlZCDi gJQtdXNlLXNwaW5kdW1wIGFuZCDigJQtc2FtcGxlLW9uLXRpbWVvdXQuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L2FwcGxlLnB5OgorICAgICAgICAoQXBwbGVQb3J0LnNhbXBsZV9w cm9jZXNzKTogQ2hlY2sg4oCULXVzZS1zcGluZHVtcCBmbGFnLgorICAgICAgICAoQXBwbGVQb3J0 LnNwaW5kdW1wX2ZpbGVfcGF0aCk6IFNwaW5kdW1wIGFuZCBzYW1wbGUgZmlsZSBuYW1lcyBhcmUg ZGlmZmVyZW50LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHk6Cisg ICAgICAgIChEcml2ZXIuX2NoZWNrX2Zvcl9kcml2ZXJfdGltZW91dCk6IENoZWNrIOKAnHNhbXBs ZV9vbl90aW1lb3V04oCdIGZsYWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L21h Y191bml0dGVzdC5weToKKyAgICAgICAgKE1hY1Rlc3QudGVzdF9zcGluZHVtcCk6IE1vZGlmaWVk IGZvciDigJQtdXNlLXNwaW5kdW1wIGZsYWcuCisgICAgICAgIChNYWNUZXN0LnRlc3Rfbm9fc3Bp bmR1bXApOiBBZGRlZCB0byB0ZXN0IOKAlC11c2Utc3BpbmR1bXAgZmxhZy4KKyAgICAgICAgKE1h Y1Rlc3QudGVzdF9zYW1wbGVfcHJvY2Vzcyk6IE1vZGlmaWVkIGZvciDigJQtdXNlLXNwaW5kdW1w IGZsYWcuCisKIDIwMTYtMDktMDEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBhZGQgQmxvY2tQdHI6OmZyb21DYWxsYWJsZQpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNiArMTQxLDEw IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3MpOgogICAgICAgICAgICAgZGVzdD0icGl4ZWxfdGVzdHMi LCBoZWxwPSJEaXNhYmxlIHBpeGVsLXRvLXBpeGVsIFBORyBjb21wYXJpc29ucyIpLAogICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1zYW1wbGUtb24tdGltZW91dCIsIGFjdGlvbj0i c3RvcmVfZmFsc2UiLAogICAgICAgICAgICAgZGVzdD0ic2FtcGxlX29uX3RpbWVvdXQiLCBoZWxw PSJEb24ndCBydW4gc2FtcGxlIG9uIHRpbWVvdXQgKE9TIFggb25seSkiKSwKKyAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oIi0tc2FtcGxlLW9uLXRpbWVvdXQiLCBhY3Rpb249InN0b3JlX3Ry dWUiLAorICAgICAgICAgICAgZGVzdD0ic2FtcGxlX29uX3RpbWVvdXQiLCBoZWxwPSJSdW4gc2Ft cGxlIG9uIHRpbWVvdXQgKE9TIFggb25seSkiKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oIi0tdXNlLXNwaW5kdW1wIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwK KyAgICAgICAgICAgIGRlc3Q9InVzZV9zcGluZHVtcCIsIGhlbHA9IlJ1biBzcGluZHVtcCBpbnN0 ZWFkIG9mIHNhbXBsZSAoT1MgWCBvbmx5KSIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlv bigiLS1uby1yZWYtdGVzdHMiLCBhY3Rpb249InN0b3JlX3RydWUiLAogICAgICAgICAgICAgZGVz dD0ibm9fcmVmX3Rlc3RzIiwgaGVscD0iU2tpcCBhbGwgcmVmIHRlc3RzIiksCiAgICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXRvbGVyYW5jZSIsCkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvYXBwbGUucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2FwcGxlLnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvYXBwbGUucHkJKHdvcmtpbmcgY29weSkKQEAgLTE5OCwyNiArMTk4LDI4IEBAIGNs YXNzIEFwcGxlUG9ydChQb3J0KToKICAgICAgICAgcmV0dXJuIHNlbGYuX21lcmdlX2NyYXNoX2xv Z3MoY3Jhc2hfbG9ncywgYWxsX2NyYXNoX2xvZywgY3Jhc2hlZF9wcm9jZXNzZXMpCiAKICAgICBk ZWYgc2FtcGxlX3Byb2Nlc3Moc2VsZiwgbmFtZSwgcGlkKToKLSAgICAgICAgaGFuZ19yZXBvcnQg PSBzZWxmLnNhbXBsZV9maWxlX3BhdGgobmFtZSwgcGlkKQotICAgICAgICBleGl0X3N0YXR1cyA9 IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbCi0gICAgICAgICAgICAiL3Vzci9iaW4vc3Vk byIsCi0gICAgICAgICAgICAiLW4iLAotICAgICAgICAgICAgIi91c3Ivc2Jpbi9zcGluZHVtcCIs Ci0gICAgICAgICAgICBwaWQsCi0gICAgICAgICAgICAxMCwKLSAgICAgICAgICAgIDEwLAotICAg ICAgICAgICAgIi1maWxlIiwKLSAgICAgICAgICAgIGhhbmdfcmVwb3J0LAorICAgICAgICBleGl0 X3N0YXR1cyA9IDEKKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCJ1c2Vfc3BpbmR1bXAiKToK KyAgICAgICAgICAgIGV4aXRfc3RhdHVzID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsK KyAgICAgICAgICAgICAgICAiL3Vzci9iaW4vc3VkbyIsCisgICAgICAgICAgICAgICAgIi1uIiwK KyAgICAgICAgICAgICAgICAiL3Vzci9zYmluL3NwaW5kdW1wIiwKKyAgICAgICAgICAgICAgICBw aWQsCisgICAgICAgICAgICAgICAgMTAsCisgICAgICAgICAgICAgICAgMTAsCisgICAgICAgICAg ICAgICAgIi1maWxlIiwKKyAgICAgICAgICAgICAgICBzZWxmLnNwaW5kdW1wX2ZpbGVfcGF0aChu YW1lLCBwaWQpLAogICAgICAgICBdLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCiAgICAgICAgIGlm IGV4aXRfc3RhdHVzOgogICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIGhhbmdfcmVw b3J0ID0gc2VsZi5zYW1wbGVfZmlsZV9wYXRoKG5hbWUsIHBpZCkKICAgICAgICAgICAgICAgICBz ZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWwogICAgICAgICAgICAgICAgICAgICAiL3Vzci9i aW4vc2FtcGxlIiwKICAgICAgICAgICAgICAgICAgICAgcGlkLAogICAgICAgICAgICAgICAgICAg ICAxMCwKICAgICAgICAgICAgICAgICAgICAgMTAsCiAgICAgICAgICAgICAgICAgICAgICItZmls ZSIsCi0gICAgICAgICAgICAgICAgICAgIGhhbmdfcmVwb3J0LAorICAgICAgICAgICAgICAgICAg ICBzZWxmLnNhbXBsZV9maWxlX3BhdGgobmFtZSwgcGlkKSwKICAgICAgICAgICAgICAgICBdKQog ICAgICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yIGFzIGU6CiAgICAgICAgICAgICAgICAgX2xv Zy53YXJuaW5nKCdVbmFibGUgdG8gc2FtcGxlIHByb2Nlc3M6JyArIHN0cihlKSkKQEAgLTIyNSw2 ICsyMjcsOSBAQCBjbGFzcyBBcHBsZVBvcnQoUG9ydCk6CiAgICAgZGVmIHNhbXBsZV9maWxlX3Bh dGgoc2VsZiwgbmFtZSwgcGlkKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9p bihzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCksICJ7MH0tezF9LXNhbXBsZS50eHQiLmZvcm1hdChu YW1lLCBwaWQpKQogCisgICAgZGVmIHNwaW5kdW1wX2ZpbGVfcGF0aChzZWxmLCBuYW1lLCBwaWQp OgorICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYucmVzdWx0c19kaXJl Y3RvcnkoKSwgInswfS17MX0tc3BpbmR1bXAudHh0Ii5mb3JtYXQobmFtZSwgcGlkKSkKKwogICAg IGRlZiBsb29rX2Zvcl9uZXdfc2FtcGxlcyhzZWxmLCB1bnJlc3BvbnNpdmVfcHJvY2Vzc2VzLCBz dGFydF90aW1lKToKICAgICAgICAgc2FtcGxlX2ZpbGVzID0ge30KICAgICAgICAgZm9yICh0ZXN0 X25hbWUsIHByb2Nlc3NfbmFtZSwgcGlkKSBpbiB1bnJlc3BvbnNpdmVfcHJvY2Vzc2VzOgpJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CShyZXZpc2lvbiAyMDUzMTMpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CSh3b3JraW5nIGNvcHkpCkBA IC00MzAsNyArNDMwLDggQEAgY2xhc3MgRHJpdmVyKG9iamVjdCk6CiAgICAgICAgICAgICBlcnJf bGluZSA9ICdXYWl0IG9uIG5vdGlmeURvbmUgdGltZWQgb3V0LCBwcm9jZXNzICcgKyBjaGlsZF9w cm9jZXNzX25hbWUgKyAnIHBpZCA9ICcgKyBzdHIoY2hpbGRfcHJvY2Vzc19waWQpCiAgICAgICAg ICAgICBzZWxmLmVycm9yX2Zyb21fdGVzdCArPSBlcnJfbGluZQogICAgICAgICAgICAgX2xvZy5k ZWJ1ZyhlcnJfbGluZSkKLSAgICAgICAgICAgIHNlbGYuX3BvcnQuc2FtcGxlX3Byb2Nlc3MoY2hp bGRfcHJvY2Vzc19uYW1lLCBjaGlsZF9wcm9jZXNzX3BpZCkKKyAgICAgICAgICAgIGlmIHNlbGYu X3BvcnQuZ2V0X29wdGlvbigic2FtcGxlX29uX3RpbWVvdXQiKToKKyAgICAgICAgICAgICAgICBz ZWxmLl9wb3J0LnNhbXBsZV9wcm9jZXNzKGNoaWxkX3Byb2Nlc3NfbmFtZSwgY2hpbGRfcHJvY2Vz c19waWQpCiAgICAgICAgIGlmIG91dF9saW5lID09ICJGQUlMOiBUaW1lZCBvdXQgd2FpdGluZyBm b3Igbm90aWZ5RG9uZSB0byBiZSBjYWxsZWRcbiI6CiAgICAgICAgICAgICBzZWxmLl9kcml2ZXJf dGltZWRfb3V0ID0gVHJ1ZQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFj X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9t YWNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIwNTMxMykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9tYWNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwMyw4ICsyMDMsMTgg QEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZQogICAgICAgICAgICAg cHJpbnQgYXJncwogCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBv cnQuc2V0X29wdGlvbigidXNlX3NwaW5kdW1wIiwgVHJ1ZSkKICAgICAgICAgcG9ydC5fZXhlY3V0 aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkK LSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc3VkbycsICctbicsICcvdXNy L3NiaW4vc3BpbmR1bXAnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQvbGF5b3V0 LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgorICAgICAgICBleHBlY3RlZF9z dGRvdXQgPSAiWycvdXNyL2Jpbi9zdWRvJywgJy1uJywgJy91c3Ivc2Jpbi9zcGluZHVtcCcsIDQy LCAxMCwgMTAsICctZmlsZScsICcvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3Qt NDItc3BpbmR1bXAudHh0J11cbiIKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRw dXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3Rl ZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQorCisgICAgZGVmIHRlc3Rfbm9fc3BpbmR1bXAoc2Vs Zik6CisgICAgICAgIGRlZiBsb2dnaW5nX3J1bl9jb21tYW5kKGFyZ3MpOgorICAgICAgICAgICAg cHJpbnQgYXJncworCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBv cnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdfcnVu X2NvbW1hbmQpCisgICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3NhbXBsZScs IDQyLCAxMCwgMTAsICctZmlsZScsICcvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rl c3QtNDItc2FtcGxlLnR4dCddXG4iCiAgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0 cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQyXSwgZXhwZWN0 ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKIAogICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNz KHNlbGYpOgpAQCAtMjE2LDYgKzIyNiw3IEBAIGNsYXNzIE1hY1Rlc3QocG9ydF90ZXN0Y2FzZS5Q b3J0VGVzdENhc2UKICAgICAgICAgICAgIHJldHVybiAwCiAKICAgICAgICAgcG9ydCA9IHNlbGYu bWFrZV9wb3J0KCkKKyAgICAgICAgcG9ydC5zZXRfb3B0aW9uKCJ1c2Vfc3BpbmR1bXAiLCBUcnVl KQogICAgICAgICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9m bj1sb2dnaW5nX3J1bl9jb21tYW5kKQogICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiWycvdXNy L2Jpbi9zYW1wbGUnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQvbGF5b3V0LXRl c3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgogICAgICAgICBPdXRwdXRDYXB0dXJl KCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3Qn LCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCg== 287767 2016-09-02 09:47:28 -0700 2016-09-02 10:17:09 -0700 Patch bug-161507-20160902094512.patch text/plain 9358 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNTM0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE2LTA5LTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQcm92aWRlIGFkZGl0aW9uYWwgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3Igc3BpbmR1bXAvc2FtcGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjE1MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBudW1iZXIgb2YgZmxhZ3MgY29udHJvbGxpbmcg dGhlIGdlbmVyYXRpb24gb2Ygc3BpbmR1bXBzIGFuZCBzYW1wbGVzIHdoZW4gYSB0ZXN0IHRpbWVz LW91dC4gIEl0IGFsc28gbWFrZXMgdXNlIG9mIHRoZXNlIGZsYWdzIG9uIHNvbWUgc3lzdGVtcywg bW9zdCBub3RhYmx5IGlPUyBzaW11bGF0b3JzLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZzoKKyAgICAgICAgKFJ1bldlYktp dFRlc3RzKTogUmVtb3ZlZCDigJjigJQtbm8tc2FtcGxlLW9uLXRpbWVvdXTigJkgYXJndW1lbnQu CisgICAgICAgIChSdW5XZWJLaXRUZXN0cy5zdGFydCk6IEFkZGVkIOKAmOKAlC1uby1zYW1wbGUt b24tdGltZW91dOKAmSBhbmQg4oCY4oCULXVzZS1zYW1wbGXigJkgZm9yIGlPUy4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAg ICAgICAocGFyc2VfYXJncyk6IEFkZGVkIOKAlC11c2Utc3BpbmR1bXAgYW5kIOKAlC1zYW1wbGUt b24tdGltZW91dC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYXBwbGUucHk6Cisg ICAgICAgIChBcHBsZVBvcnQuc2FtcGxlX3Byb2Nlc3MpOiBDaGVjayDigJQtdXNlLXNwaW5kdW1w IGZsYWcuCisgICAgICAgIChBcHBsZVBvcnQuc3BpbmR1bXBfZmlsZV9wYXRoKTogU3BpbmR1bXAg YW5kIHNhbXBsZSBmaWxlIG5hbWVzIGFyZSBkaWZmZXJlbnQuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAgICAgICAgKERyaXZlci5fY2hlY2tfZm9yX2RyaXZl cl90aW1lb3V0KTogQ2hlY2sg4oCcc2FtcGxlX29uX3RpbWVvdXTigJ0gZmxhZy4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFjVGVz dC50ZXN0X3NwaW5kdW1wKTogTW9kaWZpZWQgZm9yIOKAlC11c2Utc3BpbmR1bXAgZmxhZy4KKyAg ICAgICAgKE1hY1Rlc3QudGVzdF9ub19zcGluZHVtcCk6IEFkZGVkIHRvIHRlc3Qg4oCULXVzZS1z cGluZHVtcCBmbGFnLgorICAgICAgICAoTWFjVGVzdC50ZXN0X3NhbXBsZV9wcm9jZXNzKTogTW9k aWZpZWQgZm9yIOKAlC11c2Utc3BpbmR1bXAgZmxhZy4KKwogMjAxNi0wOS0wMiAgSm9uYXRoYW4g QmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZDogbW92ZWQg bXlzZWxmIHRvIHRoZSByZXZpZXdlcnMgbGlzdC4KSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwko cmV2aXNpb24gMjA1MzEzKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyLmNmZwkod29ya2luZyBjb3B5KQpAQCAtMzM3LDcgKzMzNyw2IEBA IGNsYXNzIFJ1bldlYktpdFRlc3RzKHNoZWxsLlRlc3QpOgogICAgICAgICAgICAgICAgIi0tbm8t YnVpbGQiLAogICAgICAgICAgICAgICAgIi0tbm8tc2hvdy1yZXN1bHRzIiwKICAgICAgICAgICAg ICAgICItLW5vLW5ldy10ZXN0LXJlc3VsdHMiLAotICAgICAgICAgICAgICAgIi0tbm8tc2FtcGxl LW9uLXRpbWVvdXQiLAogICAgICAgICAgICAgICAgIi0tcmVzdWx0cy1kaXJlY3RvcnkiLCAibGF5 b3V0LXRlc3QtcmVzdWx0cyIsCiAgICAgICAgICAgICAgICAiLS1idWlsZGVyLW5hbWUiLCBXaXRo UHJvcGVydGllcygiJShidWlsZGVybmFtZSlzIiksCiAgICAgICAgICAgICAgICAiLS1idWlsZC1u dW1iZXIiLCBXaXRoUHJvcGVydGllcygiJShidWlsZG51bWJlcilzIiksCkBAIC0zNTgsNiArMzU3 LDExIEBAIGNsYXNzIFJ1bldlYktpdFRlc3RzKHNoZWxsLlRlc3QpOgogICAgICAgICBpZiBwbGF0 Zm9ybSA9PSAid2luIjoKICAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQg KyBbJy0tYmF0Y2gtc2l6ZScsICcxMDAnLCAnLS1yb290PScgKyBvcy5wYXRoLmpvaW4oIldlYktp dEJ1aWxkIiwgc2VsZi5nZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicpLCAiYmluMzIiKV0pCiAK KyAgICAgICAgIyBMb3dlcnMgbWVtb3J5IHVzYWdlIG9uIHNlcnZlciwgc3BpbmR1bXBzIGZvciBz aW11bGF0b3JzIGFyZSB2ZXJ5IGxhcmdlLgorICAgICAgICBpZiBwbGF0Zm9ybS5zdGFydHN3aXRo KCdpb3Mtc2ltdWxhdG9yJyk6CisgICAgICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1uby1zYW1w bGUtb24tdGltZW91dCIpCisgICAgICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS11c2Utc2FtcGxl IikKKwogICAgICAgICBpZiBhZGRpdGlvbmFsQXJndW1lbnRzOgogICAgICAgICAgICAgc2VsZi5z ZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIGFkZGl0aW9uYWxBcmd1bWVudHMpCiAgICAgICAgIHJl dHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9u IDIwNTMxMykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw4ICsxMzksMTQgQEAgZGVmIHBhcnNl X2FyZ3MoYXJncyk6CiAgICAgICAgICAgICBkZXN0PSJwaXhlbF90ZXN0cyIsIGhlbHA9IkVuYWJs ZSBwaXhlbC10by1waXhlbCBQTkcgY29tcGFyaXNvbnMiKSwKICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0tbm8tcGl4ZWwiLCAiLS1uby1waXhlbC10ZXN0cyIsIGFjdGlvbj0ic3RvcmVf ZmFsc2UiLAogICAgICAgICAgICAgZGVzdD0icGl4ZWxfdGVzdHMiLCBoZWxwPSJEaXNhYmxlIHBp eGVsLXRvLXBpeGVsIFBORyBjb21wYXJpc29ucyIpLAotICAgICAgICBvcHRwYXJzZS5tYWtlX29w dGlvbigiLS1uby1zYW1wbGUtb24tdGltZW91dCIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAorICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1zYW1wbGUtb24tdGltZW91dCIsIGFjdGlv bj0ic3RvcmVfZmFsc2UiLCBkZWZhdWx0PVRydWUsCiAgICAgICAgICAgICBkZXN0PSJzYW1wbGVf b25fdGltZW91dCIsIGhlbHA9IkRvbid0IHJ1biBzYW1wbGUgb24gdGltZW91dCAoT1MgWCBvbmx5 KSIpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1zYW1wbGUtb24tdGltZW91dCIs IGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9VHJ1ZSwKKyAgICAgICAgICAgIGRlc3Q9InNh bXBsZV9vbl90aW1lb3V0IiwgaGVscD0iUnVuIHNhbXBsZSBvbiB0aW1lb3V0IChPUyBYIG9ubHkp IiksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXVzZS1zcGluZHVtcCIsIGFjdGlv bj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9VHJ1ZSwKKyAgICAgICAgICAgIGRlc3Q9InVzZV9zcGlu ZHVtcCIsIGhlbHA9IlJ1biBzcGluZHVtcCBpbnN0ZWFkIG9mIHNhbXBsZSAoT1MgWCBvbmx5KSIp LAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS11c2Utc2FtcGxlIiwgYWN0aW9uPSJz dG9yZV9mYWxzZSIsIGRlZmF1bHQ9VHJ1ZSwKKyAgICAgICAgICAgIGRlc3Q9InVzZV9zcGluZHVt cCIsIGhlbHA9IlJ1biBzcGluZHVtcCBpbnN0ZWFkIG9mIHNhbXBsZSAoT1MgWCBvbmx5KSIpLAog ICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1uby1yZWYtdGVzdHMiLCBhY3Rpb249InN0 b3JlX3RydWUiLAogICAgICAgICAgICAgZGVzdD0ibm9fcmVmX3Rlc3RzIiwgaGVscD0iU2tpcCBh bGwgcmVmIHRlc3RzIiksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXRvbGVyYW5j ZSIsCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYXBwbGUucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2FwcGxlLnB5CShyZXZpc2lvbiAyMDUz MTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYXBwbGUucHkJKHdvcmtpbmcgY29w eSkKQEAgLTE5OCwyNiArMTk4LDI4IEBAIGNsYXNzIEFwcGxlUG9ydChQb3J0KToKICAgICAgICAg cmV0dXJuIHNlbGYuX21lcmdlX2NyYXNoX2xvZ3MoY3Jhc2hfbG9ncywgYWxsX2NyYXNoX2xvZywg Y3Jhc2hlZF9wcm9jZXNzZXMpCiAKICAgICBkZWYgc2FtcGxlX3Byb2Nlc3Moc2VsZiwgbmFtZSwg cGlkKToKLSAgICAgICAgaGFuZ19yZXBvcnQgPSBzZWxmLnNhbXBsZV9maWxlX3BhdGgobmFtZSwg cGlkKQotICAgICAgICBleGl0X3N0YXR1cyA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChb Ci0gICAgICAgICAgICAiL3Vzci9iaW4vc3VkbyIsCi0gICAgICAgICAgICAiLW4iLAotICAgICAg ICAgICAgIi91c3Ivc2Jpbi9zcGluZHVtcCIsCi0gICAgICAgICAgICBwaWQsCi0gICAgICAgICAg ICAxMCwKLSAgICAgICAgICAgIDEwLAotICAgICAgICAgICAgIi1maWxlIiwKLSAgICAgICAgICAg IGhhbmdfcmVwb3J0LAorICAgICAgICBleGl0X3N0YXR1cyA9IDEKKyAgICAgICAgaWYgc2VsZi5n ZXRfb3B0aW9uKCJ1c2Vfc3BpbmR1bXAiKToKKyAgICAgICAgICAgIGV4aXRfc3RhdHVzID0gc2Vs Zi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsKKyAgICAgICAgICAgICAgICAiL3Vzci9iaW4vc3Vk byIsCisgICAgICAgICAgICAgICAgIi1uIiwKKyAgICAgICAgICAgICAgICAiL3Vzci9zYmluL3Nw aW5kdW1wIiwKKyAgICAgICAgICAgICAgICBwaWQsCisgICAgICAgICAgICAgICAgMTAsCisgICAg ICAgICAgICAgICAgMTAsCisgICAgICAgICAgICAgICAgIi1maWxlIiwKKyAgICAgICAgICAgICAg ICBzZWxmLnNwaW5kdW1wX2ZpbGVfcGF0aChuYW1lLCBwaWQpLAogICAgICAgICBdLCByZXR1cm5f ZXhpdF9jb2RlPVRydWUpCiAgICAgICAgIGlmIGV4aXRfc3RhdHVzOgogICAgICAgICAgICAgdHJ5 OgorICAgICAgICAgICAgICAgIGhhbmdfcmVwb3J0ID0gc2VsZi5zYW1wbGVfZmlsZV9wYXRoKG5h bWUsIHBpZCkKICAgICAgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWwog ICAgICAgICAgICAgICAgICAgICAiL3Vzci9iaW4vc2FtcGxlIiwKICAgICAgICAgICAgICAgICAg ICAgcGlkLAogICAgICAgICAgICAgICAgICAgICAxMCwKICAgICAgICAgICAgICAgICAgICAgMTAs CiAgICAgICAgICAgICAgICAgICAgICItZmlsZSIsCi0gICAgICAgICAgICAgICAgICAgIGhhbmdf cmVwb3J0LAorICAgICAgICAgICAgICAgICAgICBzZWxmLnNhbXBsZV9maWxlX3BhdGgobmFtZSwg cGlkKSwKICAgICAgICAgICAgICAgICBdKQogICAgICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9y IGFzIGU6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdVbmFibGUgdG8gc2FtcGxlIHBy b2Nlc3M6JyArIHN0cihlKSkKQEAgLTIyNSw2ICsyMjcsOSBAQCBjbGFzcyBBcHBsZVBvcnQoUG9y dCk6CiAgICAgZGVmIHNhbXBsZV9maWxlX3BhdGgoc2VsZiwgbmFtZSwgcGlkKToKICAgICAgICAg cmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCksICJ7 MH0tezF9LXNhbXBsZS50eHQiLmZvcm1hdChuYW1lLCBwaWQpKQogCisgICAgZGVmIHNwaW5kdW1w X2ZpbGVfcGF0aChzZWxmLCBuYW1lLCBwaWQpOgorICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5 c3RlbS5qb2luKHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSwgInswfS17MX0tc3BpbmR1bXAudHh0 Ii5mb3JtYXQobmFtZSwgcGlkKSkKKwogICAgIGRlZiBsb29rX2Zvcl9uZXdfc2FtcGxlcyhzZWxm LCB1bnJlc3BvbnNpdmVfcHJvY2Vzc2VzLCBzdGFydF90aW1lKToKICAgICAgICAgc2FtcGxlX2Zp bGVzID0ge30KICAgICAgICAgZm9yICh0ZXN0X25hbWUsIHByb2Nlc3NfbmFtZSwgcGlkKSBpbiB1 bnJlc3BvbnNpdmVfcHJvY2Vzc2VzOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2RyaXZlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJp dmVyLnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv ZHJpdmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MzAsNyArNDMwLDggQEAgY2xhc3MgRHJpdmVy KG9iamVjdCk6CiAgICAgICAgICAgICBlcnJfbGluZSA9ICdXYWl0IG9uIG5vdGlmeURvbmUgdGlt ZWQgb3V0LCBwcm9jZXNzICcgKyBjaGlsZF9wcm9jZXNzX25hbWUgKyAnIHBpZCA9ICcgKyBzdHIo Y2hpbGRfcHJvY2Vzc19waWQpCiAgICAgICAgICAgICBzZWxmLmVycm9yX2Zyb21fdGVzdCArPSBl cnJfbGluZQogICAgICAgICAgICAgX2xvZy5kZWJ1ZyhlcnJfbGluZSkKLSAgICAgICAgICAgIHNl bGYuX3BvcnQuc2FtcGxlX3Byb2Nlc3MoY2hpbGRfcHJvY2Vzc19uYW1lLCBjaGlsZF9wcm9jZXNz X3BpZCkKKyAgICAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbigic2FtcGxlX29uX3Rp bWVvdXQiKToKKyAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnNhbXBsZV9wcm9jZXNzKGNoaWxk X3Byb2Nlc3NfbmFtZSwgY2hpbGRfcHJvY2Vzc19waWQpCiAgICAgICAgIGlmIG91dF9saW5lID09 ICJGQUlMOiBUaW1lZCBvdXQgd2FpdGluZyBmb3Igbm90aWZ5RG9uZSB0byBiZSBjYWxsZWRcbiI6 CiAgICAgICAgICAgICBzZWxmLl9kcml2ZXJfdGltZWRfb3V0ID0gVHJ1ZQogCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIwNTMx MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTIwMyw4ICsyMDMsMTggQEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rlc3RjYXNl LlBvcnRUZXN0Q2FzZQogICAgICAgICAgICAgcHJpbnQgYXJncwogCiAgICAgICAgIHBvcnQgPSBz ZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBvcnQuc2V0X29wdGlvbigidXNlX3NwaW5kdW1wIiwg VHJ1ZSkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1h bmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsn L3Vzci9iaW4vc3VkbycsICctbicsICcvdXNyL3NiaW4vc3BpbmR1bXAnLCA0MiwgMTAsIDEwLCAn LWZpbGUnLCAnL21vY2stYnVpbGQvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50 eHQnXVxuIgorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9zdWRvJywgJy1u JywgJy91c3Ivc2Jpbi9zcGluZHVtcCcsIDQyLCAxMCwgMTAsICctZmlsZScsICcvbW9jay1idWls ZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDItc3BpbmR1bXAudHh0J11cbiIKKyAgICAgICAg T3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3Ms IGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQorCisg ICAgZGVmIHRlc3Rfbm9fc3BpbmR1bXAoc2VsZik6CisgICAgICAgIGRlZiBsb2dnaW5nX3J1bl9j b21tYW5kKGFyZ3MpOgorICAgICAgICAgICAgcHJpbnQgYXJncworCisgICAgICAgIHBvcnQgPSBz ZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUy KHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdfcnVuX2NvbW1hbmQpCisgICAgICAgIGV4cGVjdGVkX3N0 ZG91dCA9ICJbJy91c3IvYmluL3NhbXBsZScsIDQyLCAxMCwgMTAsICctZmlsZScsICcvbW9jay1i dWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDItc2FtcGxlLnR4dCddXG4iCiAgICAgICAg IE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNz LCBhcmdzPVsndGVzdCcsIDQyXSwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKIAog ICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNzKHNlbGYpOgpAQCAtMjE2LDYgKzIyNiw3IEBAIGNs YXNzIE1hY1Rlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UKICAgICAgICAgICAgIHJldHVy biAwCiAKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgcG9ydC5zZXRf b3B0aW9uKCJ1c2Vfc3BpbmR1bXAiLCBUcnVlKQogICAgICAgICBwb3J0Ll9leGVjdXRpdmUgPSBN b2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQogICAgICAg ICBleHBlY3RlZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9zYW1wbGUnLCA0MiwgMTAsIDEwLCAnLWZp bGUnLCAnL21vY2stYnVpbGQvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQn XVxuIgogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5z YW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3Rl ZF9zdGRvdXQpCg== 287770 2016-09-02 10:17:12 -0700 2016-09-02 10:33:36 -0700 Patch bug-161507-20160902101456.patch text/plain 5500 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNTM0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE2LTA5LTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQcm92aWRlIGFkZGl0aW9uYWwgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3Igc3BpbmR1bXAvc2FtcGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjE1MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoZSDigJRuby1zYW1wbGUtb24tdGltZW91dCBm bGFnIGFuZCBjb3JyZWN0bHkgbmFtZXMgc3BpbmR1bXBzIGFzIHNwaW5kdW1wLnR4dC4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6 CisgICAgICAgIChwYXJzZV9hcmdzKTogRml4ZWQg4oCULW5vLXNhbXBsZS1vbi10aW1lb3V0Lgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9hcHBsZS5weToKKyAgICAgICAgKEFwcGxl UG9ydC5zYW1wbGVfcHJvY2Vzcyk6IFVzZSBjb3JyZWN0IGZpbGUgbmFtZS4KKyAgICAgICAgKEFw cGxlUG9ydC5zcGluZHVtcF9maWxlX3BhdGgpOiBTcGluZHVtcCBhbmQgc2FtcGxlIGZpbGUgbmFt ZXMgYXJlIGRpZmZlcmVudC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVy LnB5OgorICAgICAgICAoRHJpdmVyLl9jaGVja19mb3JfZHJpdmVyX3RpbWVvdXQpOiBDaGVjayDi gJxzYW1wbGVfb25fdGltZW91dOKAnSBmbGFnLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9tYWNfdW5pdHRlc3QucHk6CisgICAgICAgIChNYWNUZXN0LnRlc3Rfc3BpbmR1bXApOiBN b2RpZmllZCBmb3IgY29ycmVjdCBmaWxlbmFtZS4KKwogMjAxNi0wOS0wMiAgSm9uYXRoYW4gQmVk YXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZDogbW92ZWQgbXlz ZWxmIHRvIHRoZSByZXZpZXdlcnMgbGlzdC4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkocmV2aXNpb24g MjA1MzEzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weQkod29ya2luZyBjb3B5KQpAQCAtMTM5LDcgKzEzOSw3IEBAIGRlZiBwYXJzZV9h cmdzKGFyZ3MpOgogICAgICAgICAgICAgZGVzdD0icGl4ZWxfdGVzdHMiLCBoZWxwPSJFbmFibGUg cGl4ZWwtdG8tcGl4ZWwgUE5HIGNvbXBhcmlzb25zIiksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vf b3B0aW9uKCItLW5vLXBpeGVsIiwgIi0tbm8tcGl4ZWwtdGVzdHMiLCBhY3Rpb249InN0b3JlX2Zh bHNlIiwKICAgICAgICAgICAgIGRlc3Q9InBpeGVsX3Rlc3RzIiwgaGVscD0iRGlzYWJsZSBwaXhl bC10by1waXhlbCBQTkcgY29tcGFyaXNvbnMiKSwKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oIi0tbm8tc2FtcGxlLW9uLXRpbWVvdXQiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwKKyAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8tc2FtcGxlLW9uLXRpbWVvdXQiLCBhY3Rpb249 InN0b3JlX2ZhbHNlIiwgZGVmYXVsdD1UcnVlLAogICAgICAgICAgICAgZGVzdD0ic2FtcGxlX29u X3RpbWVvdXQiLCBoZWxwPSJEb24ndCBydW4gc2FtcGxlIG9uIHRpbWVvdXQgKE9TIFggb25seSki KSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8tcmVmLXRlc3RzIiwgYWN0aW9u PSJzdG9yZV90cnVlIiwKICAgICAgICAgICAgIGRlc3Q9Im5vX3JlZl90ZXN0cyIsIGhlbHA9IlNr aXAgYWxsIHJlZiB0ZXN0cyIpLApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Fw cGxlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9hcHBsZS5w eQkocmV2aXNpb24gMjA1MzEzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2FwcGxl LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xOTgsNyArMTk4LDYgQEAgY2xhc3MgQXBwbGVQb3J0KFBv cnQpOgogICAgICAgICByZXR1cm4gc2VsZi5fbWVyZ2VfY3Jhc2hfbG9ncyhjcmFzaF9sb2dzLCBh bGxfY3Jhc2hfbG9nLCBjcmFzaGVkX3Byb2Nlc3NlcykKIAogICAgIGRlZiBzYW1wbGVfcHJvY2Vz cyhzZWxmLCBuYW1lLCBwaWQpOgotICAgICAgICBoYW5nX3JlcG9ydCA9IHNlbGYuc2FtcGxlX2Zp bGVfcGF0aChuYW1lLCBwaWQpCiAgICAgICAgIGV4aXRfc3RhdHVzID0gc2VsZi5fZXhlY3V0aXZl LnJ1bl9jb21tYW5kKFsKICAgICAgICAgICAgICIvdXNyL2Jpbi9zdWRvIiwKICAgICAgICAgICAg ICItbiIsCkBAIC0yMDcsNyArMjA2LDcgQEAgY2xhc3MgQXBwbGVQb3J0KFBvcnQpOgogICAgICAg ICAgICAgMTAsCiAgICAgICAgICAgICAxMCwKICAgICAgICAgICAgICItZmlsZSIsCi0gICAgICAg ICAgICBoYW5nX3JlcG9ydCwKKyAgICAgICAgICAgIHNlbGYuc3BpbmR1bXBfZmlsZV9wYXRoKG5h bWUsIHBpZCksCiAgICAgICAgIF0sIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKICAgICAgICAgaWYg ZXhpdF9zdGF0dXM6CiAgICAgICAgICAgICB0cnk6CkBAIC0yMTcsNyArMjE2LDcgQEAgY2xhc3Mg QXBwbGVQb3J0KFBvcnQpOgogICAgICAgICAgICAgICAgICAgICAxMCwKICAgICAgICAgICAgICAg ICAgICAgMTAsCiAgICAgICAgICAgICAgICAgICAgICItZmlsZSIsCi0gICAgICAgICAgICAgICAg ICAgIGhhbmdfcmVwb3J0LAorICAgICAgICAgICAgICAgICAgICBzZWxmLnNhbXBsZV9maWxlX3Bh dGgobmFtZSwgcGlkKSwKICAgICAgICAgICAgICAgICBdKQogICAgICAgICAgICAgZXhjZXB0IFNj cmlwdEVycm9yIGFzIGU6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdVbmFibGUgdG8g c2FtcGxlIHByb2Nlc3M6JyArIHN0cihlKSkKQEAgLTIyNSw2ICsyMjQsOSBAQCBjbGFzcyBBcHBs ZVBvcnQoUG9ydCk6CiAgICAgZGVmIHNhbXBsZV9maWxlX3BhdGgoc2VsZiwgbmFtZSwgcGlkKToK ICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLnJlc3VsdHNfZGlyZWN0 b3J5KCksICJ7MH0tezF9LXNhbXBsZS50eHQiLmZvcm1hdChuYW1lLCBwaWQpKQogCisgICAgZGVm IHNwaW5kdW1wX2ZpbGVfcGF0aChzZWxmLCBuYW1lLCBwaWQpOgorICAgICAgICByZXR1cm4gc2Vs Zi5fZmlsZXN5c3RlbS5qb2luKHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSwgInswfS17MX0tc3Bp bmR1bXAudHh0Ii5mb3JtYXQobmFtZSwgcGlkKSkKKwogICAgIGRlZiBsb29rX2Zvcl9uZXdfc2Ft cGxlcyhzZWxmLCB1bnJlc3BvbnNpdmVfcHJvY2Vzc2VzLCBzdGFydF90aW1lKToKICAgICAgICAg c2FtcGxlX2ZpbGVzID0ge30KICAgICAgICAgZm9yICh0ZXN0X25hbWUsIHByb2Nlc3NfbmFtZSwg cGlkKSBpbiB1bnJlc3BvbnNpdmVfcHJvY2Vzc2VzOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2RyaXZlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvZHJpdmVyLnB5CShyZXZpc2lvbiAyMDUzMTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvZHJpdmVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MzAsNyArNDMwLDggQEAgY2xh c3MgRHJpdmVyKG9iamVjdCk6CiAgICAgICAgICAgICBlcnJfbGluZSA9ICdXYWl0IG9uIG5vdGlm eURvbmUgdGltZWQgb3V0LCBwcm9jZXNzICcgKyBjaGlsZF9wcm9jZXNzX25hbWUgKyAnIHBpZCA9 ICcgKyBzdHIoY2hpbGRfcHJvY2Vzc19waWQpCiAgICAgICAgICAgICBzZWxmLmVycm9yX2Zyb21f dGVzdCArPSBlcnJfbGluZQogICAgICAgICAgICAgX2xvZy5kZWJ1ZyhlcnJfbGluZSkKLSAgICAg ICAgICAgIHNlbGYuX3BvcnQuc2FtcGxlX3Byb2Nlc3MoY2hpbGRfcHJvY2Vzc19uYW1lLCBjaGls ZF9wcm9jZXNzX3BpZCkKKyAgICAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbigic2Ft cGxlX29uX3RpbWVvdXQiKToKKyAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnNhbXBsZV9wcm9j ZXNzKGNoaWxkX3Byb2Nlc3NfbmFtZSwgY2hpbGRfcHJvY2Vzc19waWQpCiAgICAgICAgIGlmIG91 dF9saW5lID09ICJGQUlMOiBUaW1lZCBvdXQgd2FpdGluZyBmb3Igbm90aWZ5RG9uZSB0byBiZSBj YWxsZWRcbiI6CiAgICAgICAgICAgICBzZWxmLl9kcml2ZXJfdGltZWRfb3V0ID0gVHJ1ZQogCklu ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHkJKHJldmlz aW9uIDIwNTMxMykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3Qu cHkJKHdvcmtpbmcgY29weSkKQEAgLTIwNCw3ICsyMDQsNyBAQCBjbGFzcyBNYWNUZXN0KHBvcnRf dGVzdGNhc2UuUG9ydFRlc3RDYXNlCiAKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkK ICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49 bG9nZ2luZ19ydW5fY29tbWFuZCkKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9i aW4vc3VkbycsICctbicsICcvdXNyL3NiaW4vc3BpbmR1bXAnLCA0MiwgMTAsIDEwLCAnLWZpbGUn LCAnL21vY2stYnVpbGQvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQnXVxu IgorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9zdWRvJywgJy1uJywgJy91 c3Ivc2Jpbi9zcGluZHVtcCcsIDQyLCAxMCwgMTAsICctZmlsZScsICcvbW9jay1idWlsZC9sYXlv dXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDItc3BpbmR1bXAudHh0J11cbiIKICAgICAgICAgT3V0cHV0 Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9 Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQogCiAgICAgZGVm IHRlc3Rfc2FtcGxlX3Byb2Nlc3Moc2VsZik6Cg== 287772 2016-09-02 10:33:41 -0700 2016-09-02 11:01:12 -0700 Patch bug-161507-20160902103124.patch text/plain 5492 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNTM0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE2LTA5LTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBGaXggLS1uby1zYW1wbGUtb24tdGltZW91dCBjb21tYW5kIGxpbmUgYXJn dW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 MTUwNworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCisKKyAgICAg ICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUg4oCUbm8tc2FtcGxlLW9uLXRpbWVvdXQgZmxhZyBhbmQg Y29ycmVjdGx5IG5hbWVzIHNwaW5kdW1wcyBhcyBzcGluZHVtcC50eHQuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAg ICAocGFyc2VfYXJncyk6IEZpeGVkIOKAlC1uby1zYW1wbGUtb24tdGltZW91dC4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYXBwbGUucHk6CisgICAgICAgIChBcHBsZVBvcnQuc2Ft cGxlX3Byb2Nlc3MpOiBVc2UgY29ycmVjdCBmaWxlIG5hbWUuCisgICAgICAgIChBcHBsZVBvcnQu c3BpbmR1bXBfZmlsZV9wYXRoKTogU3BpbmR1bXAgYW5kIHNhbXBsZSBmaWxlIG5hbWVzIGFyZSBk aWZmZXJlbnQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAg ICAgICAgKERyaXZlci5fY2hlY2tfZm9yX2RyaXZlcl90aW1lb3V0KTogQ2hlY2sg4oCcc2FtcGxl X29uX3RpbWVvdXTigJ0gZmxhZy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFj X3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFjVGVzdC50ZXN0X3NwaW5kdW1wKTogTW9kaWZpZWQg Zm9yIGNvcnJlY3QgZmlsZW5hbWUuCisKIDIwMTYtMDktMDIgIEpvbmF0aGFuIEJlZGFyZCAgPGpi ZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQ6IG1vdmVkIG15c2VsZiB0byB0 aGUgcmV2aWV3ZXJzIGxpc3QuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9uIDIwNTMxMykK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMu cHkJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw3ICsxMzksNyBAQCBkZWYgcGFyc2VfYXJncyhhcmdz KToKICAgICAgICAgICAgIGRlc3Q9InBpeGVsX3Rlc3RzIiwgaGVscD0iRW5hYmxlIHBpeGVsLXRv LXBpeGVsIFBORyBjb21wYXJpc29ucyIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigi LS1uby1waXhlbCIsICItLW5vLXBpeGVsLXRlc3RzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAg ICAgICAgICAgICBkZXN0PSJwaXhlbF90ZXN0cyIsIGhlbHA9IkRpc2FibGUgcGl4ZWwtdG8tcGl4 ZWwgUE5HIGNvbXBhcmlzb25zIiksCi0gICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5v LXNhbXBsZS1vbi10aW1lb3V0IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCisgICAgICAgIG9wdHBh cnNlLm1ha2Vfb3B0aW9uKCItLW5vLXNhbXBsZS1vbi10aW1lb3V0IiwgYWN0aW9uPSJzdG9yZV9m YWxzZSIsIGRlZmF1bHQ9VHJ1ZSwKICAgICAgICAgICAgIGRlc3Q9InNhbXBsZV9vbl90aW1lb3V0 IiwgaGVscD0iRG9uJ3QgcnVuIHNhbXBsZSBvbiB0aW1lb3V0IChPUyBYIG9ubHkpIiksCiAgICAg ICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5vLXJlZi10ZXN0cyIsIGFjdGlvbj0ic3RvcmVf dHJ1ZSIsCiAgICAgICAgICAgICBkZXN0PSJub19yZWZfdGVzdHMiLCBoZWxwPSJTa2lwIGFsbCBy ZWYgdGVzdHMiKSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9hcHBsZS5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYXBwbGUucHkJKHJldmlz aW9uIDIwNTMxMykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9hcHBsZS5weQkod29y a2luZyBjb3B5KQpAQCAtMTk4LDcgKzE5OCw2IEBAIGNsYXNzIEFwcGxlUG9ydChQb3J0KToKICAg ICAgICAgcmV0dXJuIHNlbGYuX21lcmdlX2NyYXNoX2xvZ3MoY3Jhc2hfbG9ncywgYWxsX2NyYXNo X2xvZywgY3Jhc2hlZF9wcm9jZXNzZXMpCiAKICAgICBkZWYgc2FtcGxlX3Byb2Nlc3Moc2VsZiwg bmFtZSwgcGlkKToKLSAgICAgICAgaGFuZ19yZXBvcnQgPSBzZWxmLnNhbXBsZV9maWxlX3BhdGgo bmFtZSwgcGlkKQogICAgICAgICBleGl0X3N0YXR1cyA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29t bWFuZChbCiAgICAgICAgICAgICAiL3Vzci9iaW4vc3VkbyIsCiAgICAgICAgICAgICAiLW4iLApA QCAtMjA3LDcgKzIwNiw3IEBAIGNsYXNzIEFwcGxlUG9ydChQb3J0KToKICAgICAgICAgICAgIDEw LAogICAgICAgICAgICAgMTAsCiAgICAgICAgICAgICAiLWZpbGUiLAotICAgICAgICAgICAgaGFu Z19yZXBvcnQsCisgICAgICAgICAgICBzZWxmLnNwaW5kdW1wX2ZpbGVfcGF0aChuYW1lLCBwaWQp LAogICAgICAgICBdLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCiAgICAgICAgIGlmIGV4aXRfc3Rh dHVzOgogICAgICAgICAgICAgdHJ5OgpAQCAtMjE3LDcgKzIxNiw3IEBAIGNsYXNzIEFwcGxlUG9y dChQb3J0KToKICAgICAgICAgICAgICAgICAgICAgMTAsCiAgICAgICAgICAgICAgICAgICAgIDEw LAogICAgICAgICAgICAgICAgICAgICAiLWZpbGUiLAotICAgICAgICAgICAgICAgICAgICBoYW5n X3JlcG9ydCwKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5zYW1wbGVfZmlsZV9wYXRoKG5hbWUs IHBpZCksCiAgICAgICAgICAgICAgICAgXSkKICAgICAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJv ciBhcyBlOgogICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygnVW5hYmxlIHRvIHNhbXBsZSBw cm9jZXNzOicgKyBzdHIoZSkpCkBAIC0yMjUsNiArMjI0LDkgQEAgY2xhc3MgQXBwbGVQb3J0KFBv cnQpOgogICAgIGRlZiBzYW1wbGVfZmlsZV9wYXRoKHNlbGYsIG5hbWUsIHBpZCk6CiAgICAgICAg IHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpLCAi ezB9LXsxfS1zYW1wbGUudHh0Ii5mb3JtYXQobmFtZSwgcGlkKSkKIAorICAgIGRlZiBzcGluZHVt cF9maWxlX3BhdGgoc2VsZiwgbmFtZSwgcGlkKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVz eXN0ZW0uam9pbihzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCksICJ7MH0tezF9LXNwaW5kdW1wLnR4 dCIuZm9ybWF0KG5hbWUsIHBpZCkpCisKICAgICBkZWYgbG9va19mb3JfbmV3X3NhbXBsZXMoc2Vs ZiwgdW5yZXNwb25zaXZlX3Byb2Nlc3Nlcywgc3RhcnRfdGltZSk6CiAgICAgICAgIHNhbXBsZV9m aWxlcyA9IHt9CiAgICAgICAgIGZvciAodGVzdF9uYW1lLCBwcm9jZXNzX25hbWUsIHBpZCkgaW4g dW5yZXNwb25zaXZlX3Byb2Nlc3NlczoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9kcml2ZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Ry aXZlci5weQkocmV2aXNpb24gMjA1MzEzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2RyaXZlci5weQkod29ya2luZyBjb3B5KQpAQCAtNDMwLDcgKzQzMCw4IEBAIGNsYXNzIERyaXZl cihvYmplY3QpOgogICAgICAgICAgICAgZXJyX2xpbmUgPSAnV2FpdCBvbiBub3RpZnlEb25lIHRp bWVkIG91dCwgcHJvY2VzcyAnICsgY2hpbGRfcHJvY2Vzc19uYW1lICsgJyBwaWQgPSAnICsgc3Ry KGNoaWxkX3Byb2Nlc3NfcGlkKQogICAgICAgICAgICAgc2VsZi5lcnJvcl9mcm9tX3Rlc3QgKz0g ZXJyX2xpbmUKICAgICAgICAgICAgIF9sb2cuZGVidWcoZXJyX2xpbmUpCi0gICAgICAgICAgICBz ZWxmLl9wb3J0LnNhbXBsZV9wcm9jZXNzKGNoaWxkX3Byb2Nlc3NfbmFtZSwgY2hpbGRfcHJvY2Vz c19waWQpCisgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oInNhbXBsZV9vbl90 aW1lb3V0Iik6CisgICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5zYW1wbGVfcHJvY2VzcyhjaGls ZF9wcm9jZXNzX25hbWUsIGNoaWxkX3Byb2Nlc3NfcGlkKQogICAgICAgICBpZiBvdXRfbGluZSA9 PSAiRkFJTDogVGltZWQgb3V0IHdhaXRpbmcgZm9yIG5vdGlmeURvbmUgdG8gYmUgY2FsbGVkXG4i OgogICAgICAgICAgICAgc2VsZi5fZHJpdmVyX3RpbWVkX291dCA9IFRydWUKIApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hY191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMDUz MTMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0yMDQsNyArMjA0LDcgQEAgY2xhc3MgTWFjVGVzdChwb3J0X3Rlc3RjYXNl LlBvcnRUZXN0Q2FzZQogCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAg IHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdf cnVuX2NvbW1hbmQpCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3N1ZG8n LCAnLW4nLCAnL3Vzci9zYmluL3NwaW5kdW1wJywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9tb2Nr LWJ1aWxkL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi1zYW1wbGUudHh0J11cbiIKKyAgICAg ICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc3VkbycsICctbicsICcvdXNyL3NiaW4v c3BpbmR1bXAnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVpbGQvbGF5b3V0LXRlc3Qt cmVzdWx0cy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddXG4iCiAgICAgICAgIE91dHB1dENhcHR1cmUo KS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcs IDQyXSwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKIAogICAgIGRlZiB0ZXN0X3Nh bXBsZV9wcm9jZXNzKHNlbGYpOgo=