206542 2020-01-21 10:50:50 -0800 webkitpy: Make logging during ImageDiff crashes accurate 2020-01-22 10:56:24 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap commit-queue ews-watchlist glenn slewis webkit-bug-importer oldest_to_newest 1609137 0 jbedard 2020-01-21 10:50:50 -0800 Part of trying to debug various failures with ImageDiff, such as https://build.webkit.org/builders/Apple-Catalina-Release-WK2-Tests/builds/2243. The logging when ImageDiff crashes is not accurate. 1609140 1 388322 jbedard 2020-01-21 10:52:17 -0800 Created attachment 388322 Patch 1609247 2 aakash_jain 2020-01-21 13:37:08 -0800 (In reply to Jonathan Bedard from comment #0) > The logging when ImageDiff crashes is not accurate. Can you provide some example/explanation? 1609249 3 jbedard 2020-01-21 13:43:58 -0800 (In reply to Aakash Jain from comment #2) > (In reply to Jonathan Bedard from comment #0) > > The logging when ImageDiff crashes is not accurate. > Can you provide some example/explanation? ImageDiff uses the same process runner that WebKitTestRunner uses. The log messages for this process runner were designed for WebKitTestRunner, but they aren't accurate when ImageDiff crashes. Take a look at https://build.webkit.org/builders/Apple-Catalina-Release-WK2-Tests/builds/2243/steps/layout-test/logs/stdio and what's printed right after 'ImageDiff crashed'. The log reads 'This test marked as a crash because of a broken pipe when writing to stdin of the server process.', that's just not correct. The test will be marked as an Image failure, not a crash. 1609531 4 aakash_jain 2020-01-22 07:37:38 -0800 (In reply to Jonathan Bedard from comment #3) > The log reads 'This test marked as a crash because of a broken > pipe when writing to stdin of the server process.', that's just not correct. > The test will be marked as an Image failure, not a crash. So what would the new log look like? Are we only changing the logs or is there any behavior change as well? 1609540 5 jbedard 2020-01-22 07:51:23 -0800 (In reply to Aakash Jain from comment #4) > (In reply to Jonathan Bedard from comment #3) > > The log reads 'This test marked as a crash because of a broken > > pipe when writing to stdin of the server process.', that's just not correct. > > The test will be marked as an Image failure, not a crash. > So what would the new log look like? > > Are we only changing the logs or is there any behavior change as well? New log here would read: Test marked as failed, ImageDiff crashed because of a broken pipe when writing to stdin of the server process. There are not behavior changes. Generally, this allows us to swap 'This test marked as a crash' for anything. At the moment, the only thing we're swapping it with is 'Test marked as failed, ImageDiff crashed' for ImageDiff 1609547 6 388322 aakash_jain 2020-01-22 08:20:36 -0800 Comment on attachment 388322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388322&action=review > Tools/ChangeLog:10 > + With an Image failure. The owner of a ServerProcess should be able Nit: 'With' -> 'with' > Tools/ChangeLog:11 > + To customize this error message. Nit: 'To' -> 'to' > Tools/Scripts/webkitpy/port/port_testcase.py:281 > + def make_proc(port, nm, cmd, env, crash_message=None): why is make_proc being modified? > Tools/Scripts/webkitpy/port/server_process.py:68 > + self._crash_message = crash_message or 'This test marked as a crash' Shouldn't this go in crash_message default value of this function? 1609559 7 388322 jbedard 2020-01-22 08:51:02 -0800 Comment on attachment 388322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388322&action=review >> Tools/Scripts/webkitpy/port/port_testcase.py:281 >> + def make_proc(port, nm, cmd, env, crash_message=None): > > why is make_proc being modified? This file is use for unit testing. make_proc is set as the _server_process_constructor, so it needs to accept crash_message since image_diff.py passes it. >> Tools/Scripts/webkitpy/port/server_process.py:68 >> + self._crash_message = crash_message or 'This test marked as a crash' > > Shouldn't this go in crash_message default value of this function? No, that messes up default values in classes which inherit from this one. 1609584 8 388430 jbedard 2020-01-22 09:28:05 -0800 Created attachment 388430 Patch 1609605 9 388430 commit-queue 2020-01-22 10:32:25 -0800 Comment on attachment 388430 Patch Rejecting attachment 388430 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 388430, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=388430&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=206542&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 388430 from bug 206542. Fetching: https://bugs.webkit.org/attachment.cgi?id=388430 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Password for 'buildbot': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: Use of uninitialized value $ret in chomp at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git.pm line 596. Use of uninitialized value in concatenation (.) or string at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN/Prompt.pm line 20. Password for '': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: Use of uninitialized value $ret in chomp at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git.pm line 596. Use of uninitialized value in concatenation (.) or string at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN/Prompt.pm line 20. Password for '': ERROR from SVN: Authentication failed: No more credentials or we tried too many times. Authentication failed W: 7d7995cb0a3630e79821782749e5354039b6eb98 and refs/remotes/origin/master differ, using rebase: :040000 040000 b990f9a9fc2a5c55979c35f707b3c1b7dab82fbe 46931ca19b994042b0685b510bddb4e4d99ae614 M Tools Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Password for 'buildbot': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: Use of uninitialized value $ret in chomp at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git.pm line 596. Use of uninitialized value in concatenation (.) or string at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN/Prompt.pm line 20. Password for '': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: Use of uninitialized value $ret in chomp at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git.pm line 596. Use of uninitialized value in concatenation (.) or string at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN/Prompt.pm line 20. Password for '': ERROR from SVN: Authentication failed: No more credentials or we tried too many times. Authentication failed W: 7d7995cb0a3630e79821782749e5354039b6eb98 and refs/remotes/origin/master differ, using rebase: :040000 040000 b990f9a9fc2a5c55979c35f707b3c1b7dab82fbe 46931ca19b994042b0685b510bddb4e4d99ae614 M Tools Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From git://git.webkit.org/WebKit 3cf18bc55f0..29ac667b9f1 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 254927 = 3cf18bc55f006c19b0ab50af977b8c94166859b6 r254928 = 29ac667b9f17a47576cb1d74c1458f039261efe1 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13309824 1609620 10 388430 commit-queue 2020-01-22 10:55:51 -0800 Comment on attachment 388430 Patch Clearing flags on attachment: 388430 Committed r254929: <https://trac.webkit.org/changeset/254929> 1609621 11 commit-queue 2020-01-22 10:55:53 -0800 All reviewed patches have been landed. Closing bug. 1609622 12 webkit-bug-importer 2020-01-22 10:56:24 -0800 <rdar://problem/58802650> 388322 2020-01-21 10:52:17 -0800 2020-01-22 09:28:03 -0800 Patch bug-206542-20200121105216.patch text/plain 9786 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDg2MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDIwLTAxLTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogTWFrZSBsb2dnaW5nIGR1cmluZyBJbWFnZURpZmYgY3Jh c2hlcyBhY2N1cmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA2NTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hlbiBJbWFnZURpZmYgY3Jhc2hlcywgdGhlIGdlbmVyYXRlZCBsb2dzIGFyZSBub3Qg YWNjdXJhdGUsIHRoZXkKKyAgICAgICAgcmVmZXJlbmNlIGEgY3Jhc2ggaW4gdGVzdCBvdXRwdXQg d2hlbiB0aGUgdGVzdCB3aWxsIGFjdHVhbGx5IGZhaWwKKyAgICAgICAgV2l0aCBhbiBJbWFnZSBm YWlsdXJlLiBUaGUgb3duZXIgb2YgYSBTZXJ2ZXJQcm9jZXNzIHNob3VsZCBiZSBhYmxlCisgICAg ICAgIFRvIGN1c3RvbWl6ZSB0aGlzIGVycm9yIG1lc3NhZ2UuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weToKKyAgICAgICAgKEltYWdlRGlmZmVyLl9zdGFy dCk6IFBhc3MgSW1hZ2VEaWZmIHNwZWNpZmljIGNyYXNoIG1lc3NhZ2UuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAgIChQb3J0VGVzdENh c2UudGVzdF9kaWZmX2ltYWdlLm1ha2VfcHJvYyk6IE1hdGNoIEltYWdlRGlmZiBjYWxjaXRlLgor ICAgICAgICAoUG9ydFRlc3RDYXNlLnRlc3RfZGlmZl9pbWFnZV9wYXNzZWQpOiBEaXR0by4KKyAg ICAgICAgKFBvcnRUZXN0Q2FzZS50ZXN0X2RpZmZfaW1hZ2VfZmFpbGVkKTogRGl0dG8uCisgICAg ICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX2NyYXNoZWQubWFrZV9wcm9jKTogRGl0 dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5Ogor ICAgICAgICAoU2VydmVyUHJvY2Vzcy5fX2luaXRfXyk6IFN1cHBvcnQgYSBjdXN0b20gbWVzc2Fn ZSB3aGVuIHRoZSBwcm9jZXNzIGNyYXNoZXMuCisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLndyaXRl KTogRGl0dG8uCisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl93YWl0X2Zvcl9kYXRhX2FuZF91cGRh dGVfYnVmZmVyc191c2luZ19zZWxlY3QpOiBEaXR0by4KKyAgICAgICAgKFNlcnZlclByb2Nlc3Mu aGFzX2NyYXNoZWQpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2Vy dmVyX3Byb2Nlc3NfbW9jay5weToKKyAgICAgICAgKE1vY2tTZXJ2ZXJQcm9jZXNzLl9faW5pdF9f KTogTWF0Y2ggdGhlIFNlcnZlclByb2Nlc3MgY29uc3RydWN0b3IuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wb3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2ltdWxhdG9y UHJvY2Vzcy5fX2luaXRfXyk6IFN1cHBvcnQgYSBjdXN0b20gbWVzc2FnZSB3aGVuIHRoZSBwcm9j ZXNzIGNyYXNoZXMuCisKIDIwMjAtMDEtMjEgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5j b20+CiAKICAgICAgICAgRGlzYWJsZSBXZWJTUUwgZXZlcnl3aGVyZSBieSBkZWZhdWx0IGV4Y2Vw dCBpbiB0ZXN0cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYu cHkJKHJldmlzaW9uIDI1NDg1NCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFn ZV9kaWZmLnB5CSh3b3JraW5nIGNvcHkpCkBAIC03Myw3ICs3Myw3IEBAIGNsYXNzIEltYWdlRGlm ZmVyKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuX3BvcnQuX3Nob3VsZF91c2VfamhidWlsZCgp OgogICAgICAgICAgICAgY29tbWFuZCA9IHNlbGYuX3BvcnQuX2poYnVpbGRfd3JhcHBlciArIGNv bW1hbmQKICAgICAgICAgZW52aXJvbm1lbnQgPSBzZWxmLl9wb3J0LnNldHVwX2Vudmlyb25fZm9y X3NlcnZlcignSW1hZ2VEaWZmJykKLSAgICAgICAgc2VsZi5fcHJvY2VzcyA9IHNlbGYuX3BvcnQu X3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yKHNlbGYuX3BvcnQsICdJbWFnZURpZmYnLCBjb21t YW5kLCBlbnZpcm9ubWVudCkKKyAgICAgICAgc2VsZi5fcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3Nl cnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yKHNlbGYuX3BvcnQsICdJbWFnZURpZmYnLCBjb21tYW5k LCBlbnZpcm9ubWVudCwgY3Jhc2hfbWVzc2FnZT0nVGVzdCBtYXJrZWQgYXMgZmFpbGVkLCBJbWFn ZURpZmYgY3Jhc2hlZCcpCiAgICAgICAgIHNlbGYuX3Byb2Nlc3Muc3RhcnQoKQogICAgICAgICBz ZWxmLl90b2xlcmFuY2UgPSB0b2xlcmFuY2UKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L3BvcnRfdGVzdGNhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHkJKHJldmlzaW9uIDI1NDg1NCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y NzgsNyArMjc4LDcgQEAgY2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgc2VsZi5wcm9jID0gTm9uZQog Ci0gICAgICAgIGRlZiBtYWtlX3Byb2MocG9ydCwgbm0sIGNtZCwgZW52KToKKyAgICAgICAgZGVm IG1ha2VfcHJvYyhwb3J0LCBubSwgY21kLCBlbnYsIGNyYXNoX21lc3NhZ2U9Tm9uZSk6CiAgICAg ICAgICAgICBzZWxmLnByb2MgPSBNb2NrU2VydmVyUHJvY2Vzcyhwb3J0LCBubSwgY21kLCBlbnYs IGxpbmVzPVsnZGlmZjogMTAwJSBmYWlsZWRcbicsICdkaWZmOiAxMDAlIGZhaWxlZFxuJ10pCiAg ICAgICAgICAgICByZXR1cm4gc2VsZi5wcm9jCiAKQEAgLTMxNiwxMyArMzE2LDEzIEBAIGNsYXNz IFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9kaWZmX2lt YWdlX3Bhc3NlZChzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKLSAgICAg ICAgcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IgPSBsYW1iZGEgcG9ydCwgbm0sIGNt ZCwgZW52OiBNb2NrU2VydmVyUHJvY2VzcyhsaW5lcz1bJ2RpZmY6IDAlIHBhc3NlZFxuJ10pCisg ICAgICAgIHBvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yID0gbGFtYmRhIHBvcnQsIG5t LCBjbWQsIGVudiwgY3Jhc2hfbWVzc2FnZT1Ob25lOiBNb2NrU2VydmVyUHJvY2VzcyhsaW5lcz1b J2RpZmY6IDAlIHBhc3NlZFxuJ10pCiAgICAgICAgIGltYWdlX2RpZmZlciA9IEltYWdlRGlmZmVy KHBvcnQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoaW1hZ2VfZGlmZmVyLmRpZmZfaW1hZ2Uo Yidmb28nLCBiJ2JhcicsIDAuMSksIChOb25lLCAwLCBOb25lKSkKIAogICAgIGRlZiB0ZXN0X2Rp ZmZfaW1hZ2VfZmFpbGVkKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQot ICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IGxhbWJkYSBwb3J0LCBu bSwgY21kLCBlbnY6IE1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPVsnZGlmZjogMTAwJSBmYWlsZWRc biddKQorICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IGxhbWJkYSBw b3J0LCBubSwgY21kLCBlbnYsIGNyYXNoX21lc3NhZ2U9Tm9uZTogTW9ja1NlcnZlclByb2Nlc3Mo bGluZXM9WydkaWZmOiAxMDAlIGZhaWxlZFxuJ10pCiAgICAgICAgIGltYWdlX2RpZmZlciA9IElt YWdlRGlmZmVyKHBvcnQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoaW1hZ2VfZGlmZmVyLmRp ZmZfaW1hZ2UoYidmb28nLCBiJ2JhcicsIDAuMSksIChiJycsIDEwMC4wLCBOb25lKSkKIApAQCAt MzMwLDcgKzMzMCw3IEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgIHNlbGYucHJvYyA9IE5vbmUK IAotICAgICAgICBkZWYgbWFrZV9wcm9jKHBvcnQsIG5tLCBjbWQsIGVudik6CisgICAgICAgIGRl ZiBtYWtlX3Byb2MocG9ydCwgbm0sIGNtZCwgZW52LCBjcmFzaF9tZXNzYWdlPU5vbmUpOgogICAg ICAgICAgICAgc2VsZi5wcm9jID0gTW9ja1NlcnZlclByb2Nlc3MocG9ydCwgbm0sIGNtZCwgZW52 LCBjcmFzaGVkPVRydWUpCiAgICAgICAgICAgICByZXR1cm4gc2VsZi5wcm9jCiAKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3Byb2Nlc3MucHkJKHJldmlzaW9u IDI1NDg1NCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5w eQkod29ya2luZyBjb3B5KQpAQCAtNjEsMTAgKzYxLDExIEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mo b2JqZWN0KToKICAgICBpbmRlZmluaXRlbHkuIFRoZSBjbGFzcyBhbHNvIGhhbmRsZXMgdHJhbnNw YXJlbnRseSByZXN0YXJ0aW5nIHByb2Nlc3NlcwogICAgIGFzIG5lY2Vzc2FyeSB0byBrZWVwIGlz c3VpbmcgY29tbWFuZHMuIiIiCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9vYmosIG5h bWUsIGNtZCwgZW52PU5vbmUsIHVuaXZlcnNhbF9uZXdsaW5lcz1GYWxzZSwgdHJlYXRfbm9fZGF0 YV9hc19jcmFzaD1GYWxzZSwgdGFyZ2V0X2hvc3Q9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBvcnRfb2JqLCBuYW1lLCBjbWQsIGVudj1Ob25lLCB1bml2ZXJzYWxfbmV3bGluZXM9RmFs c2UsIHRyZWF0X25vX2RhdGFfYXNfY3Jhc2g9RmFsc2UsIHRhcmdldF9ob3N0PU5vbmUsIGNyYXNo X21lc3NhZ2U9Tm9uZSk6CiAgICAgICAgIHNlbGYuX3BvcnQgPSBwb3J0X29iagogICAgICAgICBz ZWxmLl9uYW1lID0gbmFtZSAgIyBTaG91bGQgYmUgdGhlIGNvbW1hbmQgbmFtZSAoZS5nLiBEdW1w UmVuZGVyVHJlZSwgSW1hZ2VEaWZmKQogICAgICAgICBzZWxmLl9jbWQgPSBjbWQKKyAgICAgICAg c2VsZi5fY3Jhc2hfbWVzc2FnZSA9IGNyYXNoX21lc3NhZ2Ugb3IgJ1RoaXMgdGVzdCBtYXJrZWQg YXMgYSBjcmFzaCcKIAogICAgICAgICAjIFdpbmRvd3MgZG9lcyBub3QgYWxsb3cgdW5pY29kZSB2 YWx1ZXMgaW4gdGhlIGVudmlyb25tZW50CiAgICAgICAgIGlmIGVudiBhbmQgc2VsZi5fcG9ydC5o b3N0LnBsYXRmb3JtLmlzX25hdGl2ZV93aW4oKToKQEAgLTE4Niw3ICsxODcsNyBAQCBjbGFzcyBT ZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgICAgICAjIHN0b3AoKSBjYWxscyBfcmVzZXQo KSwgc28gd2UgaGF2ZSB0byBzZXQgY3Jhc2hlZCB0byBUcnVlIGFmdGVyIGNhbGxpbmcgc3RvcCgp CiAgICAgICAgICAgICAjIHVubGVzcyB3ZSBhbHJlYWR5IGtub3cgdGhhdCB0aGlzIGlzIGEgdGlt ZW91dC4KICAgICAgICAgICAgIGlmIG5vdCBpZ25vcmVfY3Jhc2g6Ci0gICAgICAgICAgICAgICAg X2xvZy5kZWJ1ZygnVGhpcyB0ZXN0IG1hcmtlZCBhcyBhIGNyYXNoIGJlY2F1c2Ugb2YgYSBicm9r ZW4gcGlwZSB3aGVuIHdyaXRpbmcgdG8gc3RkaW4gb2YgdGhlIHNlcnZlciBwcm9jZXNzLicpCisg ICAgICAgICAgICAgICAgX2xvZy5kZWJ1Zygne30gYmVjYXVzZSBvZiBhIGJyb2tlbiBwaXBlIHdo ZW4gd3JpdGluZyB0byBzdGRpbiBvZiB0aGUgc2VydmVyIHByb2Nlc3MuJy5mb3JtYXQoc2VsZi5f Y3Jhc2hfbWVzc2FnZSkpCiAgICAgICAgICAgICAgICAgc2VsZi5fY3Jhc2hlZCA9IFRydWUKIAog ICAgIGRlZiBfcG9wX3N0ZG91dF9saW5lX2lmX3JlYWR5KHNlbGYpOgpAQCAtMjk5LDE0ICszMDAs MTQgQEAgY2xhc3MgU2VydmVyUHJvY2VzcyhvYmplY3QpOgogICAgICAgICAgICAgaWYgb3V0X2Zk IGluIHJlYWRfZmRzOgogICAgICAgICAgICAgICAgIGRhdGEgPSBzZWxmLl9wcm9jLnN0ZG91dC5y ZWFkKCkKICAgICAgICAgICAgICAgICBpZiBub3QgZGF0YSBhbmQgbm90IHN0b3BwaW5nIGFuZCAo c2VsZi5fdHJlYXRfbm9fZGF0YV9hc19jcmFzaCBvciBzZWxmLl9wcm9jLnBvbGwoKSk6Ci0gICAg ICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJ1RoaXMgdGVzdCBtYXJrZWQgYXMgYSBjcmFzaCBi ZWNhdXNlIG9mIG5vIGRhdGEgd2hpbGUgcmVhZGluZyBzdGRvdXQgZm9yIHRoZSBzZXJ2ZXIgcHJv Y2Vzcy4nKQorICAgICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCd7fSBiZWNhdXNlIG9mIG5v IGRhdGEgd2hpbGUgcmVhZGluZyBzdGRvdXQgZm9yIHRoZSBzZXJ2ZXIgcHJvY2Vzcy4nLmZvcm1h dChzZWxmLl9jcmFzaF9tZXNzYWdlKSkKICAgICAgICAgICAgICAgICAgICAgc2VsZi5fY3Jhc2hl ZCA9IFRydWUKICAgICAgICAgICAgICAgICBzZWxmLl9vdXRwdXQgKz0gZGF0YQogCiAgICAgICAg ICAgICBpZiBlcnJfZmQgaW4gcmVhZF9mZHM6CiAgICAgICAgICAgICAgICAgZGF0YSA9IHNlbGYu X3Byb2Muc3RkZXJyLnJlYWQoKQogICAgICAgICAgICAgICAgIGlmIG5vdCBkYXRhIGFuZCBub3Qg c3RvcHBpbmcgYW5kIChzZWxmLl90cmVhdF9ub19kYXRhX2FzX2NyYXNoIG9yIHNlbGYuX3Byb2Mu cG9sbCgpKToKLSAgICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygnVGhpcyB0ZXN0IG1hcmtl ZCBhcyBhIGNyYXNoIGJlY2F1c2Ugb2Ygbm8gZGF0YSB3aGlsZSByZWFkaW5nIHN0ZG91dCBmb3Ig dGhlIHNlcnZlciBwcm9jZXNzLicpCisgICAgICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJ3t9 IGJlY2F1c2Ugb2Ygbm8gZGF0YSB3aGlsZSByZWFkaW5nIHN0ZG91dCBmb3IgdGhlIHNlcnZlciBw cm9jZXNzLicuZm9ybWF0KHNlbGYuX2NyYXNoX21lc3NhZ2UpKQogICAgICAgICAgICAgICAgICAg ICBzZWxmLl9jcmFzaGVkID0gVHJ1ZQogICAgICAgICAgICAgICAgIHNlbGYuX2Vycm9yICs9IGRh dGEKICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKQEAgLTM1MSw3ICszNTIsNyBAQCBjbGFz cyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAKICAgICBkZWYgaGFzX2NyYXNoZWQoc2VsZik6CiAg ICAgICAgIGlmIG5vdCBzZWxmLl9jcmFzaGVkIGFuZCBzZWxmLnBvbGwoKToKLSAgICAgICAgICAg IF9sb2cuZGVidWcoJ1RoaXMgdGVzdCBtYXJrZWQgYXMgYSBjcmFzaCBiZWNhdXNlIG9mIGZhaWx1 cmUgdG8gcG9sbCB0aGUgc2VydmVyIHByb2Nlc3MgKHJldHVybiBjb2RlIHdhcyAlcykuJyAlIHNl bGYuX3Byb2MucmV0dXJuY29kZSkKKyAgICAgICAgICAgIF9sb2cuZGVidWcoJ3t9IGJlY2F1c2Ug b2YgZmFpbHVyZSB0byBwb2xsIHRoZSBzZXJ2ZXIgcHJvY2VzcyAocmV0dXJuIGNvZGUgd2FzIHt9 KS4nLmZvcm1hdChzZWxmLl9jcmFzaF9tZXNzYWdlLCBzZWxmLl9wcm9jLnJldHVybmNvZGUpKQog ICAgICAgICAgICAgc2VsZi5fY3Jhc2hlZCA9IFRydWUKICAgICAgICAgICAgIHNlbGYuX2hhbmRs ZV9wb3NzaWJsZV9pbnRlcnJ1cHQoKQogICAgICAgICByZXR1cm4gc2VsZi5fY3Jhc2hlZApJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzX21vY2sucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzX21v Y2sucHkJKHJldmlzaW9uIDI1NDg1NCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9z ZXJ2ZXJfcHJvY2Vzc19tb2NrLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw3IEBAIGZy b20gd2Via2l0cHkuY29tbW9uLnVuaWNvZGVfY29tcGF0aWJpbGkKIAogCiBjbGFzcyBNb2NrU2Vy dmVyUHJvY2VzcyhvYmplY3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X29iaj1Ob25l LCBuYW1lPU5vbmUsIGNtZD1Ob25lLCBlbnY9Tm9uZSwgdW5pdmVyc2FsX25ld2xpbmVzPUZhbHNl LCBsaW5lcz1Ob25lLCBjcmFzaGVkPUZhbHNlLCB0YXJnZXRfaG9zdD1Ob25lKToKKyAgICBkZWYg X19pbml0X18oc2VsZiwgcG9ydF9vYmo9Tm9uZSwgbmFtZT1Ob25lLCBjbWQ9Tm9uZSwgZW52PU5v bmUsIHVuaXZlcnNhbF9uZXdsaW5lcz1GYWxzZSwgbGluZXM9Tm9uZSwgY3Jhc2hlZD1GYWxzZSwg dGFyZ2V0X2hvc3Q9Tm9uZSwgY3Jhc2hfbWVzc2FnZT1Ob25lKToKICAgICAgICAgc2VsZi50aW1l ZF9vdXQgPSBGYWxzZQogICAgICAgICBzZWxmLmxpbmVzID0gW2VuY29kZV9pZl9uZWNlc3Nhcnko bGluZSkgZm9yIGxpbmUgaW4gKGxpbmVzIG9yIFtdKV0KICAgICAgICAgc2VsZi5jcmFzaGVkID0g Y3Jhc2hlZApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NpbXVsYXRvcl9wcm9j ZXNzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zaW11bGF0 b3JfcHJvY2Vzcy5weQkocmV2aXNpb24gMjU0ODU0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC03Myw5ICs3Myw5 IEBAIGNsYXNzIFNpbXVsYXRvclByb2Nlc3MoU2VydmVyUHJvY2Vzcyk6CiAgICAgICAgICAgICAg ICAgc2VsZi5zb2NrZXQuY2xvc2UoKQogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdAogCi0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfb2JqLCBuYW1lLCBjbWQsIGVudj1Ob25lLCB1bml2ZXJz YWxfbmV3bGluZXM9RmFsc2UsIHRyZWF0X25vX2RhdGFfYXNfY3Jhc2g9RmFsc2UsIHRhcmdldF9o b3N0PU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X29iaiwgbmFtZSwgY21kLCBl bnY9Tm9uZSwgdW5pdmVyc2FsX25ld2xpbmVzPUZhbHNlLCB0cmVhdF9ub19kYXRhX2FzX2NyYXNo PUZhbHNlLCB0YXJnZXRfaG9zdD1Ob25lLCBjcmFzaF9tZXNzYWdlPU5vbmUpOgogICAgICAgICBl bnZbJ1BPUlQnXSA9IHN0cih0YXJnZXRfaG9zdC5saXN0ZW5pbmdfcG9ydCgpKSAgIyBUaGUgdGFy Z2V0X2hvc3Qgc2hvdWxkIGJlIGEgZGV2aWNlLgotICAgICAgICBzdXBlcihTaW11bGF0b3JQcm9j ZXNzLCBzZWxmKS5fX2luaXRfXyhwb3J0X29iaiwgbmFtZSwgY21kLCBlbnYsIHVuaXZlcnNhbF9u ZXdsaW5lcywgdHJlYXRfbm9fZGF0YV9hc19jcmFzaCwgdGFyZ2V0X2hvc3QpCisgICAgICAgIHN1 cGVyKFNpbXVsYXRvclByb2Nlc3MsIHNlbGYpLl9faW5pdF9fKHBvcnRfb2JqLCBuYW1lLCBjbWQs IGVudiwgdW5pdmVyc2FsX25ld2xpbmVzLCB0cmVhdF9ub19kYXRhX2FzX2NyYXNoLCB0YXJnZXRf aG9zdCwgY3Jhc2hfbWVzc2FnZSkKIAogICAgICAgICBzZWxmLl9idW5kbGVfaWQgPSBwb3J0X29i ai5hcHBfaWRlbnRpZmllcl9mcm9tX2J1bmRsZShjbWRbMF0pCiAK 388430 2020-01-22 09:28:05 -0800 2020-01-22 10:55:51 -0800 Patch bug-206542-20200122092804.patch text/plain 9803 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDkyNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDIwLTAxLTIyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogTWFrZSBsb2dnaW5nIGR1cmluZyBJbWFnZURpZmYgY3Jh c2hlcyBhY2N1cmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA2NTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAg ICAgV2hlbiBJbWFnZURpZmYgY3Jhc2hlcywgdGhlIGdlbmVyYXRlZCBsb2dzIGFyZSBub3QgYWNj dXJhdGUsIHRoZXkKKyAgICAgICAgcmVmZXJlbmNlIGEgY3Jhc2ggaW4gdGVzdCBvdXRwdXQgd2hl biB0aGUgdGVzdCB3aWxsIGFjdHVhbGx5IGZhaWwKKyAgICAgICAgd2l0aCBhbiBJbWFnZSBmYWls dXJlLiBUaGUgb3duZXIgb2YgYSBTZXJ2ZXJQcm9jZXNzIHNob3VsZCBiZSBhYmxlCisgICAgICAg IHRvIGN1c3RvbWl6ZSB0aGlzIGVycm9yIG1lc3NhZ2UuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weToKKyAgICAgICAgKEltYWdlRGlmZmVyLl9zdGFydCk6 IFBhc3MgSW1hZ2VEaWZmIHNwZWNpZmljIGNyYXNoIG1lc3NhZ2UuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAgIChQb3J0VGVzdENhc2Uu dGVzdF9kaWZmX2ltYWdlLm1ha2VfcHJvYyk6IE1hdGNoIEltYWdlRGlmZiBjYWxjaXRlLgorICAg ICAgICAoUG9ydFRlc3RDYXNlLnRlc3RfZGlmZl9pbWFnZV9wYXNzZWQpOiBEaXR0by4KKyAgICAg ICAgKFBvcnRUZXN0Q2FzZS50ZXN0X2RpZmZfaW1hZ2VfZmFpbGVkKTogRGl0dG8uCisgICAgICAg IChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX2NyYXNoZWQubWFrZV9wcm9jKTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5OgorICAg ICAgICAoU2VydmVyUHJvY2Vzcy5fX2luaXRfXyk6IFN1cHBvcnQgYSBjdXN0b20gbWVzc2FnZSB3 aGVuIHRoZSBwcm9jZXNzIGNyYXNoZXMuCisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLndyaXRlKTog RGl0dG8uCisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl93YWl0X2Zvcl9kYXRhX2FuZF91cGRhdGVf YnVmZmVyc191c2luZ19zZWxlY3QpOiBEaXR0by4KKyAgICAgICAgKFNlcnZlclByb2Nlc3MuaGFz X2NyYXNoZWQpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVy X3Byb2Nlc3NfbW9jay5weToKKyAgICAgICAgKE1vY2tTZXJ2ZXJQcm9jZXNzLl9faW5pdF9fKTog TWF0Y2ggdGhlIFNlcnZlclByb2Nlc3MgY29uc3RydWN0b3IuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2ltdWxhdG9yUHJv Y2Vzcy5fX2luaXRfXyk6IFN1cHBvcnQgYSBjdXN0b20gbWVzc2FnZSB3aGVuIHRoZSBwcm9jZXNz IGNyYXNoZXMuCisKIDIwMjAtMDEtMjEgIE1hdHQgTGV3aXMgIDxqbGV3aXMzQGFwcGxlLmNvbT4K IAogICAgICAgICBUZXN0IGhpc3RvcnkgbGlua3Mgb24gdGhlIGRhc2hib2FyZCBzaG91bGQgZ28g dG8gdGhlIG5ldyByZXN1bHRzIGRhdGFiYXNlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvaW1hZ2VfZGlmZi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvaW1hZ2VfZGlmZi5weQkocmV2aXNpb24gMjU0OTI3KQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkJKHdvcmtpbmcgY29weSkKQEAgLTczLDcgKzczLDcg QEAgY2xhc3MgSW1hZ2VEaWZmZXIob2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5fcG9ydC5fc2hv dWxkX3VzZV9qaGJ1aWxkKCk6CiAgICAgICAgICAgICBjb21tYW5kID0gc2VsZi5fcG9ydC5famhi dWlsZF93cmFwcGVyICsgY29tbWFuZAogICAgICAgICBlbnZpcm9ubWVudCA9IHNlbGYuX3BvcnQu c2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKCdJbWFnZURpZmYnKQotICAgICAgICBzZWxmLl9wcm9j ZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3Ioc2VsZi5fcG9ydCwg J0ltYWdlRGlmZicsIGNvbW1hbmQsIGVudmlyb25tZW50KQorICAgICAgICBzZWxmLl9wcm9jZXNz ID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3Ioc2VsZi5fcG9ydCwgJ0lt YWdlRGlmZicsIGNvbW1hbmQsIGVudmlyb25tZW50LCBjcmFzaF9tZXNzYWdlPSdUZXN0IG1hcmtl ZCBhcyBmYWlsZWQsIEltYWdlRGlmZiBjcmFzaGVkJykKICAgICAgICAgc2VsZi5fcHJvY2Vzcy5z dGFydCgpCiAgICAgICAgIHNlbGYuX3RvbGVyYW5jZSA9IHRvbGVyYW5jZQogCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0Y2FzZS5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0Y2FzZS5weQkocmV2aXNpb24gMjU0 OTI3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3BvcnRfdGVzdGNhc2UucHkJKHdv cmtpbmcgY29weSkKQEAgLTI3OCw3ICsyNzgsNyBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRl c3QuVGVzdENhc2UpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICBz ZWxmLnByb2MgPSBOb25lCiAKLSAgICAgICAgZGVmIG1ha2VfcHJvYyhwb3J0LCBubSwgY21kLCBl bnYpOgorICAgICAgICBkZWYgbWFrZV9wcm9jKHBvcnQsIG5tLCBjbWQsIGVudiwgY3Jhc2hfbWVz c2FnZT1Ob25lKToKICAgICAgICAgICAgIHNlbGYucHJvYyA9IE1vY2tTZXJ2ZXJQcm9jZXNzKHBv cnQsIG5tLCBjbWQsIGVudiwgbGluZXM9WydkaWZmOiAxMDAlIGZhaWxlZFxuJywgJ2RpZmY6IDEw MCUgZmFpbGVkXG4nXSkKICAgICAgICAgICAgIHJldHVybiBzZWxmLnByb2MKIApAQCAtMzE2LDEz ICszMTYsMTMgQEAgY2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAg IGRlZiB0ZXN0X2RpZmZfaW1hZ2VfcGFzc2VkKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5t YWtlX3BvcnQoKQotICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IGxh bWJkYSBwb3J0LCBubSwgY21kLCBlbnY6IE1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPVsnZGlmZjog MCUgcGFzc2VkXG4nXSkKKyAgICAgICAgcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3Ig PSBsYW1iZGEgcG9ydCwgbm0sIGNtZCwgZW52LCBjcmFzaF9tZXNzYWdlPU5vbmU6IE1vY2tTZXJ2 ZXJQcm9jZXNzKGxpbmVzPVsnZGlmZjogMCUgcGFzc2VkXG4nXSkKICAgICAgICAgaW1hZ2VfZGlm ZmVyID0gSW1hZ2VEaWZmZXIocG9ydCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbWFnZV9k aWZmZXIuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJywgMC4xKSwgKE5vbmUsIDAsIE5vbmUpKQog CiAgICAgZGVmIHRlc3RfZGlmZl9pbWFnZV9mYWlsZWQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBz ZWxmLm1ha2VfcG9ydCgpCi0gICAgICAgIHBvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9y ID0gbGFtYmRhIHBvcnQsIG5tLCBjbWQsIGVudjogTW9ja1NlcnZlclByb2Nlc3MobGluZXM9Wydk aWZmOiAxMDAlIGZhaWxlZFxuJ10pCisgICAgICAgIHBvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0 cnVjdG9yID0gbGFtYmRhIHBvcnQsIG5tLCBjbWQsIGVudiwgY3Jhc2hfbWVzc2FnZT1Ob25lOiBN b2NrU2VydmVyUHJvY2VzcyhsaW5lcz1bJ2RpZmY6IDEwMCUgZmFpbGVkXG4nXSkKICAgICAgICAg aW1hZ2VfZGlmZmVyID0gSW1hZ2VEaWZmZXIocG9ydCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChpbWFnZV9kaWZmZXIuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJywgMC4xKSwgKGInJywgMTAw LjAsIE5vbmUpKQogCkBAIC0zMzAsNyArMzMwLDcgQEAgY2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAg c2VsZi5wcm9jID0gTm9uZQogCi0gICAgICAgIGRlZiBtYWtlX3Byb2MocG9ydCwgbm0sIGNtZCwg ZW52KToKKyAgICAgICAgZGVmIG1ha2VfcHJvYyhwb3J0LCBubSwgY21kLCBlbnYsIGNyYXNoX21l c3NhZ2U9Tm9uZSk6CiAgICAgICAgICAgICBzZWxmLnByb2MgPSBNb2NrU2VydmVyUHJvY2Vzcyhw b3J0LCBubSwgY21kLCBlbnYsIGNyYXNoZWQ9VHJ1ZSkKICAgICAgICAgICAgIHJldHVybiBzZWxm LnByb2MKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNz LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zZXJ2ZXJfcHJv Y2Vzcy5weQkocmV2aXNpb24gMjU0OTI3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3NlcnZlcl9wcm9jZXNzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MSwxMCArNjEsMTEgQEAgY2xh c3MgU2VydmVyUHJvY2VzcyhvYmplY3QpOgogICAgIGluZGVmaW5pdGVseS4gVGhlIGNsYXNzIGFs c28gaGFuZGxlcyB0cmFuc3BhcmVudGx5IHJlc3RhcnRpbmcgcHJvY2Vzc2VzCiAgICAgYXMgbmVj ZXNzYXJ5IHRvIGtlZXAgaXNzdWluZyBjb21tYW5kcy4iIiIKIAotICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBwb3J0X29iaiwgbmFtZSwgY21kLCBlbnY9Tm9uZSwgdW5pdmVyc2FsX25ld2xpbmVzPUZh bHNlLCB0cmVhdF9ub19kYXRhX2FzX2NyYXNoPUZhbHNlLCB0YXJnZXRfaG9zdD1Ob25lKToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9vYmosIG5hbWUsIGNtZCwgZW52PU5vbmUsIHVuaXZl cnNhbF9uZXdsaW5lcz1GYWxzZSwgdHJlYXRfbm9fZGF0YV9hc19jcmFzaD1GYWxzZSwgdGFyZ2V0 X2hvc3Q9Tm9uZSwgY3Jhc2hfbWVzc2FnZT1Ob25lKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBv cnRfb2JqCiAgICAgICAgIHNlbGYuX25hbWUgPSBuYW1lICAjIFNob3VsZCBiZSB0aGUgY29tbWFu ZCBuYW1lIChlLmcuIER1bXBSZW5kZXJUcmVlLCBJbWFnZURpZmYpCiAgICAgICAgIHNlbGYuX2Nt ZCA9IGNtZAorICAgICAgICBzZWxmLl9jcmFzaF9tZXNzYWdlID0gY3Jhc2hfbWVzc2FnZSBvciAn VGhpcyB0ZXN0IG1hcmtlZCBhcyBhIGNyYXNoJwogCiAgICAgICAgICMgV2luZG93cyBkb2VzIG5v dCBhbGxvdyB1bmljb2RlIHZhbHVlcyBpbiB0aGUgZW52aXJvbm1lbnQKICAgICAgICAgaWYgZW52 IGFuZCBzZWxmLl9wb3J0Lmhvc3QucGxhdGZvcm0uaXNfbmF0aXZlX3dpbigpOgpAQCAtMTg2LDcg KzE4Nyw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgICMgc3Rv cCgpIGNhbGxzIF9yZXNldCgpLCBzbyB3ZSBoYXZlIHRvIHNldCBjcmFzaGVkIHRvIFRydWUgYWZ0 ZXIgY2FsbGluZyBzdG9wKCkKICAgICAgICAgICAgICMgdW5sZXNzIHdlIGFscmVhZHkga25vdyB0 aGF0IHRoaXMgaXMgYSB0aW1lb3V0LgogICAgICAgICAgICAgaWYgbm90IGlnbm9yZV9jcmFzaDoK LSAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCdUaGlzIHRlc3QgbWFya2VkIGFzIGEgY3Jhc2gg YmVjYXVzZSBvZiBhIGJyb2tlbiBwaXBlIHdoZW4gd3JpdGluZyB0byBzdGRpbiBvZiB0aGUgc2Vy dmVyIHByb2Nlc3MuJykKKyAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCd7fSBiZWNhdXNlIG9m IGEgYnJva2VuIHBpcGUgd2hlbiB3cml0aW5nIHRvIHN0ZGluIG9mIHRoZSBzZXJ2ZXIgcHJvY2Vz cy4nLmZvcm1hdChzZWxmLl9jcmFzaF9tZXNzYWdlKSkKICAgICAgICAgICAgICAgICBzZWxmLl9j cmFzaGVkID0gVHJ1ZQogCiAgICAgZGVmIF9wb3Bfc3Rkb3V0X2xpbmVfaWZfcmVhZHkoc2VsZik6 CkBAIC0yOTksMTQgKzMwMCwxNCBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAg ICAgICAgICBpZiBvdXRfZmQgaW4gcmVhZF9mZHM6CiAgICAgICAgICAgICAgICAgZGF0YSA9IHNl bGYuX3Byb2Muc3Rkb3V0LnJlYWQoKQogICAgICAgICAgICAgICAgIGlmIG5vdCBkYXRhIGFuZCBu b3Qgc3RvcHBpbmcgYW5kIChzZWxmLl90cmVhdF9ub19kYXRhX2FzX2NyYXNoIG9yIHNlbGYuX3By b2MucG9sbCgpKToKLSAgICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygnVGhpcyB0ZXN0IG1h cmtlZCBhcyBhIGNyYXNoIGJlY2F1c2Ugb2Ygbm8gZGF0YSB3aGlsZSByZWFkaW5nIHN0ZG91dCBm b3IgdGhlIHNlcnZlciBwcm9jZXNzLicpCisgICAgICAgICAgICAgICAgICAgIF9sb2cuZGVidWco J3t9IGJlY2F1c2Ugb2Ygbm8gZGF0YSB3aGlsZSByZWFkaW5nIHN0ZG91dCBmb3IgdGhlIHNlcnZl ciBwcm9jZXNzLicuZm9ybWF0KHNlbGYuX2NyYXNoX21lc3NhZ2UpKQogICAgICAgICAgICAgICAg ICAgICBzZWxmLl9jcmFzaGVkID0gVHJ1ZQogICAgICAgICAgICAgICAgIHNlbGYuX291dHB1dCAr PSBkYXRhCiAKICAgICAgICAgICAgIGlmIGVycl9mZCBpbiByZWFkX2ZkczoKICAgICAgICAgICAg ICAgICBkYXRhID0gc2VsZi5fcHJvYy5zdGRlcnIucmVhZCgpCiAgICAgICAgICAgICAgICAgaWYg bm90IGRhdGEgYW5kIG5vdCBzdG9wcGluZyBhbmQgKHNlbGYuX3RyZWF0X25vX2RhdGFfYXNfY3Jh c2ggb3Igc2VsZi5fcHJvYy5wb2xsKCkpOgotICAgICAgICAgICAgICAgICAgICBfbG9nLmRlYnVn KCdUaGlzIHRlc3QgbWFya2VkIGFzIGEgY3Jhc2ggYmVjYXVzZSBvZiBubyBkYXRhIHdoaWxlIHJl YWRpbmcgc3Rkb3V0IGZvciB0aGUgc2VydmVyIHByb2Nlc3MuJykKKyAgICAgICAgICAgICAgICAg ICAgX2xvZy5kZWJ1Zygne30gYmVjYXVzZSBvZiBubyBkYXRhIHdoaWxlIHJlYWRpbmcgc3Rkb3V0 IGZvciB0aGUgc2VydmVyIHByb2Nlc3MuJy5mb3JtYXQoc2VsZi5fY3Jhc2hfbWVzc2FnZSkpCiAg ICAgICAgICAgICAgICAgICAgIHNlbGYuX2NyYXNoZWQgPSBUcnVlCiAgICAgICAgICAgICAgICAg c2VsZi5fZXJyb3IgKz0gZGF0YQogICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBlOgpAQCAtMzUx LDcgKzM1Miw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKIAogICAgIGRlZiBoYXNf Y3Jhc2hlZChzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYuX2NyYXNoZWQgYW5kIHNlbGYucG9s bCgpOgotICAgICAgICAgICAgX2xvZy5kZWJ1ZygnVGhpcyB0ZXN0IG1hcmtlZCBhcyBhIGNyYXNo IGJlY2F1c2Ugb2YgZmFpbHVyZSB0byBwb2xsIHRoZSBzZXJ2ZXIgcHJvY2VzcyAocmV0dXJuIGNv ZGUgd2FzICVzKS4nICUgc2VsZi5fcHJvYy5yZXR1cm5jb2RlKQorICAgICAgICAgICAgX2xvZy5k ZWJ1Zygne30gYmVjYXVzZSBvZiBmYWlsdXJlIHRvIHBvbGwgdGhlIHNlcnZlciBwcm9jZXNzIChy ZXR1cm4gY29kZSB3YXMge30pLicuZm9ybWF0KHNlbGYuX2NyYXNoX21lc3NhZ2UsIHNlbGYuX3By b2MucmV0dXJuY29kZSkpCiAgICAgICAgICAgICBzZWxmLl9jcmFzaGVkID0gVHJ1ZQogICAgICAg ICAgICAgc2VsZi5faGFuZGxlX3Bvc3NpYmxlX2ludGVycnVwdCgpCiAgICAgICAgIHJldHVybiBz ZWxmLl9jcmFzaGVkCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2VydmVyX3By b2Nlc3NfbW9jay5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv c2VydmVyX3Byb2Nlc3NfbW9jay5weQkocmV2aXNpb24gMjU0OTI3KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L3NlcnZlcl9wcm9jZXNzX21vY2sucHkJKHdvcmtpbmcgY29weSkKQEAg LTMwLDcgKzMwLDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24udW5pY29kZV9jb21wYXRpYmlsaQog CiAKIGNsYXNzIE1vY2tTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNl bGYsIHBvcnRfb2JqPU5vbmUsIG5hbWU9Tm9uZSwgY21kPU5vbmUsIGVudj1Ob25lLCB1bml2ZXJz YWxfbmV3bGluZXM9RmFsc2UsIGxpbmVzPU5vbmUsIGNyYXNoZWQ9RmFsc2UsIHRhcmdldF9ob3N0 PU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X29iaj1Ob25lLCBuYW1lPU5vbmUs IGNtZD1Ob25lLCBlbnY9Tm9uZSwgdW5pdmVyc2FsX25ld2xpbmVzPUZhbHNlLCBsaW5lcz1Ob25l LCBjcmFzaGVkPUZhbHNlLCB0YXJnZXRfaG9zdD1Ob25lLCBjcmFzaF9tZXNzYWdlPU5vbmUpOgog ICAgICAgICBzZWxmLnRpbWVkX291dCA9IEZhbHNlCiAgICAgICAgIHNlbGYubGluZXMgPSBbZW5j b2RlX2lmX25lY2Vzc2FyeShsaW5lKSBmb3IgbGluZSBpbiAobGluZXMgb3IgW10pXQogICAgICAg ICBzZWxmLmNyYXNoZWQgPSBjcmFzaGVkCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvc2ltdWxhdG9yX3Byb2Nlc3MucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5CShyZXZpc2lvbiAyNTQ5MjcpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2ltdWxhdG9yX3Byb2Nlc3MucHkJKHdvcmtpbmcgY29w eSkKQEAgLTczLDkgKzczLDkgQEAgY2xhc3MgU2ltdWxhdG9yUHJvY2VzcyhTZXJ2ZXJQcm9jZXNz KToKICAgICAgICAgICAgICAgICBzZWxmLnNvY2tldC5jbG9zZSgpCiAgICAgICAgICAgICByZXR1 cm4gcmVzdWx0CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9vYmosIG5hbWUsIGNtZCwg ZW52PU5vbmUsIHVuaXZlcnNhbF9uZXdsaW5lcz1GYWxzZSwgdHJlYXRfbm9fZGF0YV9hc19jcmFz aD1GYWxzZSwgdGFyZ2V0X2hvc3Q9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRf b2JqLCBuYW1lLCBjbWQsIGVudj1Ob25lLCB1bml2ZXJzYWxfbmV3bGluZXM9RmFsc2UsIHRyZWF0 X25vX2RhdGFfYXNfY3Jhc2g9RmFsc2UsIHRhcmdldF9ob3N0PU5vbmUsIGNyYXNoX21lc3NhZ2U9 Tm9uZSk6CiAgICAgICAgIGVudlsnUE9SVCddID0gc3RyKHRhcmdldF9ob3N0Lmxpc3RlbmluZ19w b3J0KCkpICAjIFRoZSB0YXJnZXRfaG9zdCBzaG91bGQgYmUgYSBkZXZpY2UuCi0gICAgICAgIHN1 cGVyKFNpbXVsYXRvclByb2Nlc3MsIHNlbGYpLl9faW5pdF9fKHBvcnRfb2JqLCBuYW1lLCBjbWQs IGVudiwgdW5pdmVyc2FsX25ld2xpbmVzLCB0cmVhdF9ub19kYXRhX2FzX2NyYXNoLCB0YXJnZXRf aG9zdCkKKyAgICAgICAgc3VwZXIoU2ltdWxhdG9yUHJvY2Vzcywgc2VsZikuX19pbml0X18ocG9y dF9vYmosIG5hbWUsIGNtZCwgZW52LCB1bml2ZXJzYWxfbmV3bGluZXMsIHRyZWF0X25vX2RhdGFf YXNfY3Jhc2gsIHRhcmdldF9ob3N0LCBjcmFzaF9tZXNzYWdlKQogCiAgICAgICAgIHNlbGYuX2J1 bmRsZV9pZCA9IHBvcnRfb2JqLmFwcF9pZGVudGlmaWVyX2Zyb21fYnVuZGxlKGNtZFswXSkKIAo=