217151 2020-09-30 16:07:10 -0700 [webkitscmpy] Support git-svn committers 2020-10-01 14:53:06 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1693560 0 jbedard 2020-09-30 16:07:10 -0700 git-svn styles committers in a way that breaks our regex extracting the committer. We should support git-svn's commit message style. 1693561 1 webkit-bug-importer 2020-09-30 16:07:23 -0700 <rdar://problem/69812996> 1693564 2 410163 jbedard 2020-09-30 16:12:09 -0700 Created attachment 410163 Patch 1693568 3 410166 jbedard 2020-09-30 16:14:55 -0700 Created attachment 410166 Patch 1693765 4 410237 jbedard 2020-10-01 09:16:06 -0700 Created attachment 410237 Patch 1693790 5 aakash_jain 2020-10-01 10:36:43 -0700 rs=me Can you also check the error in https://ews-build.webkit.org/#/builders/5/builds/35586/steps/7/logs/stdio IOError: [Errno 2] No such file or directory: u'/Volumes/Data/worker/WebKitPy-Tests-EWS/build/WebKitBuild/Release/layout-test-results/35417-python_stack_trace.txt' 1693812 6 jbedard 2020-10-01 11:40:07 -0700 (In reply to Aakash Jain from comment #5) > rs=me > > Can you also check the error in > https://ews-build.webkit.org/#/builders/5/builds/35586/steps/7/logs/stdio > > IOError: [Errno 2] No such file or directory: > u'/Volumes/Data/worker/WebKitPy-Tests-EWS/build/WebKitBuild/Release/layout- > test-results/35417-python_stack_trace.txt' Will keep watching EWS for that, but it looks like we have a test that interrupts a subprocess which logs the stacktrace of the interrupted process to layout-test-results, but we aren't running layout tests, so the directory doesn't exist. What's surprising is that this error seems to be a one-off (the fact that it is not fatal is pretty common), will keep an eye on things to see if this is reoccurring issue. 1693817 7 410253 jbedard 2020-10-01 11:49:05 -0700 Created attachment 410253 Patch for landing 1693888 8 ews-feeder 2020-10-01 14:53:05 -0700 Committed r267853: <https://trac.webkit.org/changeset/267853> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410253. 410163 2020-09-30 16:12:09 -0700 2020-09-30 16:14:53 -0700 Patch bug-217151-20200930161208.patch text/plain 4422 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NzgwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTA5LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgZ2l0LXN2biBjb21taXR0ZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcxNTEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5ODEyOTk2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvY29udHJpYnV0b3IucHk6CisgICAgICAgIChDb250cmlidXRvcik6CisgICAg ICAgIChDb250cmlidXRvci5mcm9tX3NjbV9sb2cpOiBIYW5kbGUgY2FzZSB3aGVyZSBhIGNvbW1p dCBkb2VzIG5vdCBjb250YWluIGFuIGF1dGhvci4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoVGVzdENvbnRyaWJ1dG9yKToKKyAgICAgICAgKFRlc3RDb250cmlidXRvci50ZXN0 X2dpdF9ub19hdXRob3IpOgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfZ2l0X3N2bl9u b19hdXRob3IpOgorCiAyMDIwLTA5LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl LmNvbT4KIAogICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3Rh bGxlciBmb3IgaHRtbDVsaWIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CShyZXZp c2lvbiAyNjc4MDcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9jb250cmlidXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtMjQsNyArMjQsOCBAQCBp bXBvcnQgcmUKIAogCiBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgotICAgIEdJVF9BVVRIT1Jf UkUgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPi4qKT4n KQorICAgIEdJVF9BVVRIT1JfUkUgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4q KSA8KD9QPGVtYWlsPlteQF0rQFteQF0rKShALiopPz4nKQorICAgIEFVVE9NQVRFRF9DSEVDS0lO X1JFID0gcmUuY29tcGlsZShyJ0F1dGhvcjogKD9QPGF1dGhvcj4uKikgPGRldm51bGw+JykKICAg ICBTVk5fQVVUSE9SX1JFID0gcmUuY29tcGlsZShyJ3JcZCsgXHwgKD9QPGVtYWlsPi4qKSBcfCAo P1A8ZGF0ZT4uKikgXHwgXGQrIGxpbmVzJykKICAgICBTVk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNv bXBpbGUocidQYXRjaCBieSAoP1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxk Ky1cZCsnKQogCkBAIC0zOCwxNyArMzksMjYgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToK IAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBmcm9tX3NjbV9sb2coY2xzLCBsaW5lKToKKyAg ICAgICAgZW1haWwgPSBOb25lCiAgICAgICAgIGF1dGhvciA9IE5vbmUKIAotICAgICAgICBmb3Ig ZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9BVVRIT1JfUkUsIGNscy5TVk5fQVVUSE9SX1JFLCBjbHMu U1ZOX1BBVENIX0ZST01fUkVdOgorICAgICAgICBmb3IgZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9B VVRIT1JfUkUsIGNscy5TVk5fQVVUSE9SX1JFLCBjbHMuU1ZOX1BBVENIX0ZST01fUkUsIGNscy5B VVRPTUFURURfQ0hFQ0tJTl9SRV06CiAgICAgICAgICAgICBtYXRjaCA9IGV4cHJlc3Npb24ubWF0 Y2gobGluZSkKICAgICAgICAgICAgIGlmIG1hdGNoOgogICAgICAgICAgICAgICAgIGlmICdhdXRo b3InIGluIGV4cHJlc3Npb24uZ3JvdXBpbmRleDoKICAgICAgICAgICAgICAgICAgICAgYXV0aG9y ID0gbWF0Y2guZ3JvdXAoJ2F1dGhvcicpCi0gICAgICAgICAgICAgICAgZW1haWwgPSBtYXRjaC5n cm91cCgnZW1haWwnKQorICAgICAgICAgICAgICAgICAgICBpZiAnKG5vIGF1dGhvciknIGluIGF1 dGhvciBvciAnQXV0b21hdGVkIENoZWNraW4nIGluIGF1dGhvcjoKKyAgICAgICAgICAgICAgICAg ICAgICAgIGF1dGhvciA9IE5vbmUKKyAgICAgICAgICAgICAgICBpZiAnZW1haWwnIGluIGV4cHJl c3Npb24uZ3JvdXBpbmRleDoKKyAgICAgICAgICAgICAgICAgICAgZW1haWwgPSBtYXRjaC5ncm91 cCgnZW1haWwnKQorICAgICAgICAgICAgICAgICAgICBpZiAnKG5vIGF1dGhvciknIGluIGVtYWls OgorICAgICAgICAgICAgICAgICAgICAgICAgZW1haWwgPSBOb25lCiAgICAgICAgICAgICAgICAg YnJlYWsKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScg ZG9lcyBub3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIikKKyAgICAgICAgICAgIHJhaXNlIFZhbHVl RXJyb3IoIid7fScgZG9lcyBub3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIi5mb3JtYXQobGluZSkp CisKKyAgICAgICAgaWYgbm90IGVtYWlsOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAg ICAgICBjb250cmlidXRvciA9IGNscy5ieV9uYW1lLmdldChhdXRob3Igb3IgZW1haWwpCiAgICAg ICAgIGlmIG5vdCBjb250cmlidXRvcjoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQkocmV2aXNpb24gMjY3ODA3KQorKysgVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRv cl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsMjMgQEAgY2xhc3MgVGVz dENvbnRyaWJ1dG9yKHVuaXR0ZXN0LlRlc3RDYXNlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNvbnRyaWJ1dG9yLm5hbWUsICdKb25hdGhhbiBCZWRhcmQnKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGNvbnRyaWJ1dG9yLmVtYWlscywgWydqYmVkYXJkQGFwcGxlLmNvbSddKQogCisgICAg ZGVmIHRlc3RfZ2l0X3N2bl9sb2coc2VsZik6CisgICAgICAgIENvbnRyaWJ1dG9yLmNsZWFyKCkK KyAgICAgICAgY29udHJpYnV0b3IgPSBDb250cmlidXRvci5mcm9tX3NjbV9sb2coJ0F1dGhvcjog Sm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbUAyNjhmNDVjYy1jZDA5LTA0MTAtYWIz Yy1kNTI2OTFiNGRiZmM+JykKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRyaWJ1dG9y Lm5hbWUsICdKb25hdGhhbiBCZWRhcmQnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRy aWJ1dG9yLmVtYWlscywgWydqYmVkYXJkQGFwcGxlLmNvbSddKQorCisgICAgZGVmIHRlc3RfZ2l0 X25vX2F1dGhvcihzZWxmKToKKyAgICAgICAgQ29udHJpYnV0b3IuY2xlYXIoKQorICAgICAgICBj b250cmlidXRvciA9IENvbnRyaWJ1dG9yLmZyb21fc2NtX2xvZygnQXV0aG9yOiBBdXRvbWF0ZWQg Q2hlY2tpbiA8ZGV2bnVsbD4nKQorICAgICAgICBzZWxmLmFzc2VydElzTm9uZShjb250cmlidXRv cikKKworICAgIGRlZiB0ZXN0X2dpdF9zdm5fbm9fYXV0aG9yKHNlbGYpOgorICAgICAgICBDb250 cmlidXRvci5jbGVhcigpCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IuZnJvbV9z Y21fbG9nKCdBdXRob3I6IChubyBhdXRob3IpIDwobm8gYXV0aG9yKUAyNjhmNDVjYy1jZDA5LTA0 MTAtYWIzYy1kNTI2OTFiNGRiZmM+JykKKyAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUoY29udHJp YnV0b3IpCisKICAgICBkZWYgdGVzdF9zdm5fbG9nKHNlbGYpOgogICAgICAgICBDb250cmlidXRv ci5jbGVhcigpCiAgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IuZnJvbV9zY21fbG9n KCdyMjY2NzUxIHwgamJlZGFyZEBhcHBsZS5jb20gfCAyMDIwLTA5LTA4IDE0OjMzOjQyIC0wNzAw IChUdWUsIDA4IFNlcCAyMDIwKSB8IDEwIGxpbmVzJykK 410166 2020-09-30 16:14:55 -0700 2020-10-01 09:16:04 -0700 Patch bug-217151-20200930161454.patch text/plain 4437 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NzgwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTA5LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgZ2l0LXN2biBjb21taXR0ZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcxNTEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5ODEyOTk2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvY29udHJpYnV0b3IucHk6CisgICAgICAgIChDb250cmlidXRvcik6CisgICAg ICAgIChDb250cmlidXRvci5mcm9tX3NjbV9sb2cpOiBIYW5kbGUgY2FzZSB3aGVyZSBhIGNvbW1p dCBkb2VzIG5vdCBjb250YWluIGFuIGF1dGhvci4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoVGVzdENvbnRyaWJ1dG9yKToKKyAgICAgICAgKFRlc3RDb250cmlidXRvci50ZXN0 X2dpdF9ub19hdXRob3IpOgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfZ2l0X3N2bl9u b19hdXRob3IpOgorCiAyMDIwLTA5LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxl LmNvbT4KIAogICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3Rh bGxlciBmb3IgaHRtbDVsaWIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CShyZXZp c2lvbiAyNjc4MDcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9jb250cmlidXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtMjQsNyArMjQsOCBAQCBp bXBvcnQgcmUKIAogCiBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgotICAgIEdJVF9BVVRIT1Jf UkUgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPi4qKT4n KQorICAgIEdJVF9BVVRIT1JfUkUgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4q KSA8KD9QPGVtYWlsPlteQF0rQFteQF0rKShALiopPz4nKQorICAgIEFVVE9NQVRFRF9DSEVDS0lO X1JFID0gcmUuY29tcGlsZShyJ0F1dGhvcjogKD9QPGF1dGhvcj4uKikgPGRldm51bGw+JykKICAg ICBTVk5fQVVUSE9SX1JFID0gcmUuY29tcGlsZShyJ3JcZCsgXHwgKD9QPGVtYWlsPi4qKSBcfCAo P1A8ZGF0ZT4uKikgXHwgXGQrIGxpbmVzJykKICAgICBTVk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNv bXBpbGUocidQYXRjaCBieSAoP1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxk Ky1cZCsnKQogCkBAIC0zOCwxNyArMzksMjYgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToK IAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBmcm9tX3NjbV9sb2coY2xzLCBsaW5lKToKKyAg ICAgICAgZW1haWwgPSBOb25lCiAgICAgICAgIGF1dGhvciA9IE5vbmUKIAotICAgICAgICBmb3Ig ZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9BVVRIT1JfUkUsIGNscy5TVk5fQVVUSE9SX1JFLCBjbHMu U1ZOX1BBVENIX0ZST01fUkVdOgorICAgICAgICBmb3IgZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9B VVRIT1JfUkUsIGNscy5TVk5fQVVUSE9SX1JFLCBjbHMuU1ZOX1BBVENIX0ZST01fUkUsIGNscy5B VVRPTUFURURfQ0hFQ0tJTl9SRV06CiAgICAgICAgICAgICBtYXRjaCA9IGV4cHJlc3Npb24ubWF0 Y2gobGluZSkKICAgICAgICAgICAgIGlmIG1hdGNoOgogICAgICAgICAgICAgICAgIGlmICdhdXRo b3InIGluIGV4cHJlc3Npb24uZ3JvdXBpbmRleDoKICAgICAgICAgICAgICAgICAgICAgYXV0aG9y ID0gbWF0Y2guZ3JvdXAoJ2F1dGhvcicpCi0gICAgICAgICAgICAgICAgZW1haWwgPSBtYXRjaC5n cm91cCgnZW1haWwnKQorICAgICAgICAgICAgICAgICAgICBpZiAnKG5vIGF1dGhvciknIGluIGF1 dGhvciBvciAnQXV0b21hdGVkIENoZWNraW4nIGluIGF1dGhvcjoKKyAgICAgICAgICAgICAgICAg ICAgICAgIGF1dGhvciA9IE5vbmUKKyAgICAgICAgICAgICAgICBpZiAnZW1haWwnIGluIGV4cHJl c3Npb24uZ3JvdXBpbmRleDoKKyAgICAgICAgICAgICAgICAgICAgZW1haWwgPSBtYXRjaC5ncm91 cCgnZW1haWwnKQorICAgICAgICAgICAgICAgICAgICBpZiAnKG5vIGF1dGhvciknIGluIGVtYWls OgorICAgICAgICAgICAgICAgICAgICAgICAgZW1haWwgPSBOb25lCiAgICAgICAgICAgICAgICAg YnJlYWsKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScg ZG9lcyBub3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIikKKyAgICAgICAgICAgIHJhaXNlIFZhbHVl RXJyb3IoIid7fScgZG9lcyBub3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIi5mb3JtYXQobGluZSkp CisKKyAgICAgICAgaWYgbm90IGVtYWlsIGFuZCBub3QgYXV0aG9yOgorICAgICAgICAgICAgcmV0 dXJuIE5vbmUKIAogICAgICAgICBjb250cmlidXRvciA9IGNscy5ieV9uYW1lLmdldChhdXRob3Ig b3IgZW1haWwpCiAgICAgICAgIGlmIG5vdCBjb250cmlidXRvcjoKSW5kZXg6IFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29udHJpYnV0b3JfdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQkocmV2aXNpb24gMjY3 ODA3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMs MjMgQEAgY2xhc3MgVGVzdENvbnRyaWJ1dG9yKHVuaXR0ZXN0LlRlc3RDYXNlKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNvbnRyaWJ1dG9yLm5hbWUsICdKb25hdGhhbiBCZWRhcmQnKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRyaWJ1dG9yLmVtYWlscywgWydqYmVkYXJkQGFwcGxl LmNvbSddKQogCisgICAgZGVmIHRlc3RfZ2l0X3N2bl9sb2coc2VsZik6CisgICAgICAgIENvbnRy aWJ1dG9yLmNsZWFyKCkKKyAgICAgICAgY29udHJpYnV0b3IgPSBDb250cmlidXRvci5mcm9tX3Nj bV9sb2coJ0F1dGhvcjogSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbUAyNjhmNDVj Yy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmM+JykKKworICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGNvbnRyaWJ1dG9yLm5hbWUsICdKb25hdGhhbiBCZWRhcmQnKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGNvbnRyaWJ1dG9yLmVtYWlscywgWydqYmVkYXJkQGFwcGxlLmNvbSddKQorCisg ICAgZGVmIHRlc3RfZ2l0X25vX2F1dGhvcihzZWxmKToKKyAgICAgICAgQ29udHJpYnV0b3IuY2xl YXIoKQorICAgICAgICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9yLmZyb21fc2NtX2xvZygnQXV0 aG9yOiBBdXRvbWF0ZWQgQ2hlY2tpbiA8ZGV2bnVsbD4nKQorICAgICAgICBzZWxmLmFzc2VydElz Tm9uZShjb250cmlidXRvcikKKworICAgIGRlZiB0ZXN0X2dpdF9zdm5fbm9fYXV0aG9yKHNlbGYp OgorICAgICAgICBDb250cmlidXRvci5jbGVhcigpCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29u dHJpYnV0b3IuZnJvbV9zY21fbG9nKCdBdXRob3I6IChubyBhdXRob3IpIDwobm8gYXV0aG9yKUAy NjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmM+JykKKyAgICAgICAgc2VsZi5hc3Nl cnRJc05vbmUoY29udHJpYnV0b3IpCisKICAgICBkZWYgdGVzdF9zdm5fbG9nKHNlbGYpOgogICAg ICAgICBDb250cmlidXRvci5jbGVhcigpCiAgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0 b3IuZnJvbV9zY21fbG9nKCdyMjY2NzUxIHwgamJlZGFyZEBhcHBsZS5jb20gfCAyMDIwLTA5LTA4 IDE0OjMzOjQyIC0wNzAwIChUdWUsIDA4IFNlcCAyMDIwKSB8IDEwIGxpbmVzJykK 410237 2020-10-01 09:16:06 -0700 2020-10-01 11:49:02 -0700 Patch bug-217151-20201001091605.patch text/plain 5119 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NzgzNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTEwLTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgZ2l0LXN2biBjb21taXR0ZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcxNTEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5ODEyOTk2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbiBudW1iZXIuCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHk6 CisgICAgICAgIChDb250cmlidXRvcik6CisgICAgICAgIChDb250cmlidXRvci5mcm9tX3NjbV9s b2cpOiBIYW5kbGUgY2FzZSB3aGVyZSBhIGNvbW1pdCBkb2VzIG5vdCBjb250YWluIGFuIGF1dGhv ci4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90 ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9yKToK KyAgICAgICAgKFRlc3RDb250cmlidXRvci50ZXN0X2dpdF9ub19hdXRob3IpOgorICAgICAgICAo VGVzdENvbnRyaWJ1dG9yLnRlc3RfZ2l0X3N2bl9ub19hdXRob3IpOgorCiAyMDIwLTEwLTAxICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLiBVcGRhdGUgVzNDIFdlYkRyaXZlciBpbXBvcnRlZCB0ZXN0cy4KSW5kZXg6IFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNjc4MzUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpA QCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5z dGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEt aW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNp b24oMCwgMCwgNikKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDAsIDcpCiAKIGZyb20gd2Via2l0c2Nt cHkuY29udHJpYnV0b3IgaW1wb3J0IENvbnRyaWJ1dG9yCiBmcm9tIHdlYmtpdHNjbXB5LmNvbW1p dCBpbXBvcnQgQ29tbWl0CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9jb250cmlidXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weQkocmV2aXNp b24gMjY3ODM1KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvY29udHJpYnV0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTI0LDcgKzI0LDggQEAgaW1w b3J0IHJlCiAKIAogY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKLSAgICBHSVRfQVVUSE9SX1JF ID0gcmUuY29tcGlsZShyJ0F1dGhvcjogKD9QPGF1dGhvcj4uKikgPCg/UDxlbWFpbD4uKik+JykK KyAgICBHSVRfQVVUSE9SX1JFID0gcmUuY29tcGlsZShyJ0F1dGhvcjogKD9QPGF1dGhvcj4uKikg PCg/UDxlbWFpbD5bXkBdK0BbXkBdKykoQC4qKT8+JykKKyAgICBBVVRPTUFURURfQ0hFQ0tJTl9S RSA9IHJlLmNvbXBpbGUocidBdXRob3I6ICg/UDxhdXRob3I+LiopIDxkZXZudWxsPicpCiAgICAg U1ZOX0FVVEhPUl9SRSA9IHJlLmNvbXBpbGUocidyXGQrIFx8ICg/UDxlbWFpbD4uKikgXHwgKD9Q PGRhdGU+LiopIFx8IFxkKyBsaW5lcycpCiAgICAgU1ZOX1BBVENIX0ZST01fUkUgPSByZS5jb21w aWxlKHInUGF0Y2ggYnkgKD9QPGF1dGhvcj4uKikgPCg/UDxlbWFpbD4uKik+IG9uIFxkKy1cZCst XGQrJykKIApAQCAtMzgsMTcgKzM5LDI2IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAK ICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgZnJvbV9zY21fbG9nKGNscywgbGluZSk6CisgICAg ICAgIGVtYWlsID0gTm9uZQogICAgICAgICBhdXRob3IgPSBOb25lCiAKLSAgICAgICAgZm9yIGV4 cHJlc3Npb24gaW4gW2Nscy5HSVRfQVVUSE9SX1JFLCBjbHMuU1ZOX0FVVEhPUl9SRSwgY2xzLlNW Tl9QQVRDSF9GUk9NX1JFXToKKyAgICAgICAgZm9yIGV4cHJlc3Npb24gaW4gW2Nscy5HSVRfQVVU SE9SX1JFLCBjbHMuU1ZOX0FVVEhPUl9SRSwgY2xzLlNWTl9QQVRDSF9GUk9NX1JFLCBjbHMuQVVU T01BVEVEX0NIRUNLSU5fUkVdOgogICAgICAgICAgICAgbWF0Y2ggPSBleHByZXNzaW9uLm1hdGNo KGxpbmUpCiAgICAgICAgICAgICBpZiBtYXRjaDoKICAgICAgICAgICAgICAgICBpZiAnYXV0aG9y JyBpbiBleHByZXNzaW9uLmdyb3VwaW5kZXg6CiAgICAgICAgICAgICAgICAgICAgIGF1dGhvciA9 IG1hdGNoLmdyb3VwKCdhdXRob3InKQotICAgICAgICAgICAgICAgIGVtYWlsID0gbWF0Y2guZ3Jv dXAoJ2VtYWlsJykKKyAgICAgICAgICAgICAgICAgICAgaWYgJyhubyBhdXRob3IpJyBpbiBhdXRo b3Igb3IgJ0F1dG9tYXRlZCBDaGVja2luJyBpbiBhdXRob3I6CisgICAgICAgICAgICAgICAgICAg ICAgICBhdXRob3IgPSBOb25lCisgICAgICAgICAgICAgICAgaWYgJ2VtYWlsJyBpbiBleHByZXNz aW9uLmdyb3VwaW5kZXg6CisgICAgICAgICAgICAgICAgICAgIGVtYWlsID0gbWF0Y2guZ3JvdXAo J2VtYWlsJykKKyAgICAgICAgICAgICAgICAgICAgaWYgJyhubyBhdXRob3IpJyBpbiBlbWFpbDoK KyAgICAgICAgICAgICAgICAgICAgICAgIGVtYWlsID0gTm9uZQogICAgICAgICAgICAgICAgIGJy ZWFrCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCIne30nIGRv ZXMgbm90IG1hdGNoIGEga25vd24gU0NNIGxvZyIpCisgICAgICAgICAgICByYWlzZSBWYWx1ZUVy cm9yKCIne30nIGRvZXMgbm90IG1hdGNoIGEga25vd24gU0NNIGxvZyIuZm9ybWF0KGxpbmUpKQor CisgICAgICAgIGlmIG5vdCBlbWFpbCBhbmQgbm90IGF1dGhvcjoKKyAgICAgICAgICAgIHJldHVy biBOb25lCiAKICAgICAgICAgY29udHJpYnV0b3IgPSBjbHMuYnlfbmFtZS5nZXQoYXV0aG9yIG9y IGVtYWlsKQogICAgICAgICBpZiBub3QgY29udHJpYnV0b3I6CkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2Nzgz NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDIz IEBAIGNsYXNzIFRlc3RDb250cmlidXRvcih1bml0dGVzdC5UZXN0Q2FzZSkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb250cmlidXRvci5uYW1lLCAnSm9uYXRoYW4gQmVkYXJkJykKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjb250cmlidXRvci5lbWFpbHMsIFsnamJlZGFyZEBhcHBsZS5j b20nXSkKIAorICAgIGRlZiB0ZXN0X2dpdF9zdm5fbG9nKHNlbGYpOgorICAgICAgICBDb250cmli dXRvci5jbGVhcigpCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IuZnJvbV9zY21f bG9nKCdBdXRob3I6IEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb21AMjY4ZjQ1Y2Mt Y2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjPicpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChjb250cmlidXRvci5uYW1lLCAnSm9uYXRoYW4gQmVkYXJkJykKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChjb250cmlidXRvci5lbWFpbHMsIFsnamJlZGFyZEBhcHBsZS5jb20nXSkKKworICAg IGRlZiB0ZXN0X2dpdF9ub19hdXRob3Ioc2VsZik6CisgICAgICAgIENvbnRyaWJ1dG9yLmNsZWFy KCkKKyAgICAgICAgY29udHJpYnV0b3IgPSBDb250cmlidXRvci5mcm9tX3NjbV9sb2coJ0F1dGhv cjogQXV0b21hdGVkIENoZWNraW4gPGRldm51bGw+JykKKyAgICAgICAgc2VsZi5hc3NlcnRJc05v bmUoY29udHJpYnV0b3IpCisKKyAgICBkZWYgdGVzdF9naXRfc3ZuX25vX2F1dGhvcihzZWxmKToK KyAgICAgICAgQ29udHJpYnV0b3IuY2xlYXIoKQorICAgICAgICBjb250cmlidXRvciA9IENvbnRy aWJ1dG9yLmZyb21fc2NtX2xvZygnQXV0aG9yOiAobm8gYXV0aG9yKSA8KG5vIGF1dGhvcilAMjY4 ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjPicpCisgICAgICAgIHNlbGYuYXNzZXJ0 SXNOb25lKGNvbnRyaWJ1dG9yKQorCiAgICAgZGVmIHRlc3Rfc3ZuX2xvZyhzZWxmKToKICAgICAg ICAgQ29udHJpYnV0b3IuY2xlYXIoKQogICAgICAgICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9y LmZyb21fc2NtX2xvZygncjI2Njc1MSB8IGpiZWRhcmRAYXBwbGUuY29tIHwgMjAyMC0wOS0wOCAx NDozMzo0MiAtMDcwMCAoVHVlLCAwOCBTZXAgMjAyMCkgfCAxMCBsaW5lcycpCg== 410253 2020-10-01 11:49:05 -0700 2020-10-01 14:53:05 -0700 Patch for landing bug-217151-20201001114904.patch text/plain 5160 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2Nzg0NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTEwLTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgZ2l0LXN2biBjb21taXR0ZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcxNTEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5ODEyOTk2PgorCisgICAgICAgIFJ1YmJlci1zdGFtcGVk IGJ5IEFha2FzaCBKYWluLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbiBudW1iZXIuCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3Iu cHk6CisgICAgICAgIChDb250cmlidXRvcik6CisgICAgICAgIChDb250cmlidXRvci5mcm9tX3Nj bV9sb2cpOiBIYW5kbGUgY2FzZSB3aGVyZSBhIGNvbW1pdCBkb2VzIG5vdCBjb250YWluIGFuIGF1 dGhvci4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9y KToKKyAgICAgICAgKFRlc3RDb250cmlidXRvci50ZXN0X2dpdF9ub19hdXRob3IpOgorICAgICAg ICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfZ2l0X3N2bl9ub19hdXRob3IpOgorCiAyMDIwLTEwLTAx ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFByZXZl bnQgbWVkaWEgY2FwdHVyZSB1bmxlc3MgdGhlIGFwcGxpY2F0aW9uIGhhcyBjb3JyZWN0IGRhdGEg Zm9yIHN5c3RlbSBwZXJtaXNzaW9uIHByb21wdApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJ KHJldmlzaW9uIDI2Nzg0NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBA IGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVw eSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2th Z2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAwLCA2KQordmVy c2lvbiA9IFZlcnNpb24oMCwgMCwgNykKIAogZnJvbSB3ZWJraXRzY21weS5jb250cmlidXRvciBp bXBvcnQgQ29udHJpYnV0b3IKIGZyb20gd2Via2l0c2NtcHkuY29tbWl0IGltcG9ydCBDb21taXQK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2Nv bnRyaWJ1dG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CShyZXZpc2lvbiAyNjc4NDUpCisrKyBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRv ci5weQkod29ya2luZyBjb3B5KQpAQCAtMjQsNyArMjQsOCBAQCBpbXBvcnQgcmUKIAogCiBjbGFz cyBDb250cmlidXRvcihvYmplY3QpOgotICAgIEdJVF9BVVRIT1JfUkUgPSByZS5jb21waWxlKHIn QXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPi4qKT4nKQorICAgIEdJVF9BVVRIT1Jf UkUgPSByZS5jb21waWxlKHInQXV0aG9yOiAoP1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPlteQF0r QFteQF0rKShALiopPz4nKQorICAgIEFVVE9NQVRFRF9DSEVDS0lOX1JFID0gcmUuY29tcGlsZShy J0F1dGhvcjogKD9QPGF1dGhvcj4uKikgPGRldm51bGw+JykKICAgICBTVk5fQVVUSE9SX1JFID0g cmUuY29tcGlsZShyJ3JcZCsgXHwgKD9QPGVtYWlsPi4qKSBcfCAoP1A8ZGF0ZT4uKikgXHwgXGQr IGxpbmVzJykKICAgICBTVk5fUEFUQ0hfRlJPTV9SRSA9IHJlLmNvbXBpbGUocidQYXRjaCBieSAo P1A8YXV0aG9yPi4qKSA8KD9QPGVtYWlsPi4qKT4gb24gXGQrLVxkKy1cZCsnKQogCkBAIC0zOCwx NyArMzksMjYgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKIAogICAgIEBjbGFzc21ldGhv ZAogICAgIGRlZiBmcm9tX3NjbV9sb2coY2xzLCBsaW5lKToKKyAgICAgICAgZW1haWwgPSBOb25l CiAgICAgICAgIGF1dGhvciA9IE5vbmUKIAotICAgICAgICBmb3IgZXhwcmVzc2lvbiBpbiBbY2xz LkdJVF9BVVRIT1JfUkUsIGNscy5TVk5fQVVUSE9SX1JFLCBjbHMuU1ZOX1BBVENIX0ZST01fUkVd OgorICAgICAgICBmb3IgZXhwcmVzc2lvbiBpbiBbY2xzLkdJVF9BVVRIT1JfUkUsIGNscy5TVk5f QVVUSE9SX1JFLCBjbHMuU1ZOX1BBVENIX0ZST01fUkUsIGNscy5BVVRPTUFURURfQ0hFQ0tJTl9S RV06CiAgICAgICAgICAgICBtYXRjaCA9IGV4cHJlc3Npb24ubWF0Y2gobGluZSkKICAgICAgICAg ICAgIGlmIG1hdGNoOgogICAgICAgICAgICAgICAgIGlmICdhdXRob3InIGluIGV4cHJlc3Npb24u Z3JvdXBpbmRleDoKICAgICAgICAgICAgICAgICAgICAgYXV0aG9yID0gbWF0Y2guZ3JvdXAoJ2F1 dGhvcicpCi0gICAgICAgICAgICAgICAgZW1haWwgPSBtYXRjaC5ncm91cCgnZW1haWwnKQorICAg ICAgICAgICAgICAgICAgICBpZiAnKG5vIGF1dGhvciknIGluIGF1dGhvciBvciAnQXV0b21hdGVk IENoZWNraW4nIGluIGF1dGhvcjoKKyAgICAgICAgICAgICAgICAgICAgICAgIGF1dGhvciA9IE5v bmUKKyAgICAgICAgICAgICAgICBpZiAnZW1haWwnIGluIGV4cHJlc3Npb24uZ3JvdXBpbmRleDoK KyAgICAgICAgICAgICAgICAgICAgZW1haWwgPSBtYXRjaC5ncm91cCgnZW1haWwnKQorICAgICAg ICAgICAgICAgICAgICBpZiAnKG5vIGF1dGhvciknIGluIGVtYWlsOgorICAgICAgICAgICAgICAg ICAgICAgICAgZW1haWwgPSBOb25lCiAgICAgICAgICAgICAgICAgYnJlYWsKICAgICAgICAgZWxz ZToKLSAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScgZG9lcyBub3QgbWF0Y2ggYSBr bm93biBTQ00gbG9nIikKKyAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScgZG9lcyBu b3QgbWF0Y2ggYSBrbm93biBTQ00gbG9nIi5mb3JtYXQobGluZSkpCisKKyAgICAgICAgaWYgbm90 IGVtYWlsIGFuZCBub3QgYXV0aG9yOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgICAg ICBjb250cmlidXRvciA9IGNscy5ieV9uYW1lLmdldChhdXRob3Igb3IgZW1haWwpCiAgICAgICAg IGlmIG5vdCBjb250cmlidXRvcjoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVz dC9jb250cmlidXRvcl91bml0dGVzdC5weQkocmV2aXNpb24gMjY3ODQ1KQorKysgVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91 bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsMjMgQEAgY2xhc3MgVGVzdENv bnRyaWJ1dG9yKHVuaXR0ZXN0LlRlc3RDYXNlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNv bnRyaWJ1dG9yLm5hbWUsICdKb25hdGhhbiBCZWRhcmQnKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGNvbnRyaWJ1dG9yLmVtYWlscywgWydqYmVkYXJkQGFwcGxlLmNvbSddKQogCisgICAgZGVm IHRlc3RfZ2l0X3N2bl9sb2coc2VsZik6CisgICAgICAgIENvbnRyaWJ1dG9yLmNsZWFyKCkKKyAg ICAgICAgY29udHJpYnV0b3IgPSBDb250cmlidXRvci5mcm9tX3NjbV9sb2coJ0F1dGhvcjogSm9u YXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbUAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1k NTI2OTFiNGRiZmM+JykKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRyaWJ1dG9yLm5h bWUsICdKb25hdGhhbiBCZWRhcmQnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRyaWJ1 dG9yLmVtYWlscywgWydqYmVkYXJkQGFwcGxlLmNvbSddKQorCisgICAgZGVmIHRlc3RfZ2l0X25v X2F1dGhvcihzZWxmKToKKyAgICAgICAgQ29udHJpYnV0b3IuY2xlYXIoKQorICAgICAgICBjb250 cmlidXRvciA9IENvbnRyaWJ1dG9yLmZyb21fc2NtX2xvZygnQXV0aG9yOiBBdXRvbWF0ZWQgQ2hl Y2tpbiA8ZGV2bnVsbD4nKQorICAgICAgICBzZWxmLmFzc2VydElzTm9uZShjb250cmlidXRvcikK KworICAgIGRlZiB0ZXN0X2dpdF9zdm5fbm9fYXV0aG9yKHNlbGYpOgorICAgICAgICBDb250cmli dXRvci5jbGVhcigpCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IuZnJvbV9zY21f bG9nKCdBdXRob3I6IChubyBhdXRob3IpIDwobm8gYXV0aG9yKUAyNjhmNDVjYy1jZDA5LTA0MTAt YWIzYy1kNTI2OTFiNGRiZmM+JykKKyAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUoY29udHJpYnV0 b3IpCisKICAgICBkZWYgdGVzdF9zdm5fbG9nKHNlbGYpOgogICAgICAgICBDb250cmlidXRvci5j bGVhcigpCiAgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IuZnJvbV9zY21fbG9nKCdy MjY2NzUxIHwgamJlZGFyZEBhcHBsZS5jb20gfCAyMDIwLTA5LTA4IDE0OjMzOjQyIC0wNzAwIChU dWUsIDA4IFNlcCAyMDIwKSB8IDEwIGxpbmVzJykK