125357 2013-12-06 11:40:16 -0800 Strip out extraneous logging from AppleGVA in media tests. 2014-07-17 10:29:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn oldest_to_newest 957325 0 jer.noble 2013-12-06 11:40:16 -0800 Strip out extraneous logging from AppleGVA in media tests. 957327 1 218608 jer.noble 2013-12-06 11:44:57 -0800 Created attachment 218608 Patch 957328 2 218608 ap 2013-12-06 11:48:10 -0800 Comment on attachment 218608 Patch Cool. Please also roll out r160233 with this. 957329 3 218608 simon.fraser 2013-12-06 11:52:29 -0800 Comment on attachment 218608 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218608&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:294 > + test_input.is_media_test = self._port.is_media_test(test_input) I don't think this logging filtering needs to be restricted to media tests. > Tools/Scripts/webkitpy/port/driver.py:81 > + strip_media_logging_patterns.append((re.compile('AVF info:.*\n'), '')) > + strip_media_logging_patterns.append((re.compile('GVA info:.*\n'), '')) You could fold these two regexps together. I think these regexps should go into a platform-specific python file, since it's platform logging that you're filtering. 957369 4 218616 jer.noble 2013-12-06 13:22:41 -0800 Created attachment 218616 Patch 957370 5 218617 jer.noble 2013-12-06 13:23:58 -0800 Created attachment 218617 Patch Added a FIXME, as suggested by bdash over IRC. 957390 6 218617 buildbot 2013-12-06 14:07:16 -0800 Comment on attachment 218617 Patch Attachment 218617 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/45808111 957395 7 jer.noble 2013-12-06 14:19:28 -0800 Committed r160247: <http://trac.webkit.org/changeset/160247> 1023037 8 ap 2014-07-17 10:29:25 -0700 *** Bug 125356 has been marked as a duplicate of this bug. *** 218608 2013-12-06 11:44:57 -0800 2013-12-06 13:22:40 -0800 Patch bug-125357-20131206114456.patch text/plain 5452 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTdjNjY5OGNhMDI3ZThmOGU5YTk3NTUzMWYwOTMzMjZi ZWUxMmVlOS4uNjc1OTJlYTFhMjMxZmMwNmZkMjNhNGQ0ZjIwNzlmMGJmOWJiOGI2NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTEyLTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAg ICAgIFN0cmlwIG91dCBleHRyYW5lb3VzIGxvZ2dpbmcgZnJvbSBBcHBsZUdWQSBpbiBtZWRpYSB0 ZXN0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NTM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyLnB5OgorICAgICAgICAoV29ya2VyLl91cGRhdGVfdGVzdF9pbnB1dCk6IFNldCBpc19tZWRp YV90ZXN0LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weToKKyAgICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX19p bml0X18pOiBTZXQgaXNfbWVkaWFfdGVzdC4KKyAgICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX3J1 bl9jb21wYXJlX3Rlc3QpOiBTdHJpcCBvdXQgbG9nZ2luZyBpZiB0aGUgdGVzdCBpcyBhIG1lZGlh IHRlc3QuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHk6CisgICAgICAg IChQb3J0LmlzX21lZGlhX3Rlc3QpOiBJbmNsdWRlIGFsbCB0ZXN0cyBpbiBtZWRpYS8sIGh0dHAv dGVzdHMvbWVkaWEvLCBhbmQgcGx1Z2lucy8KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvZHJpdmVyLnB5OgorICAgICAgICAoRHJpdmVyT3V0cHV0KTogRGVmaW5lIHRoZSBzdHJpcF9t ZWRpYV9sb2dnaW5nX3BhdHRlcm5zLgorICAgICAgICAoRHJpdmVyT3V0cHV0LnN0cmlwX21lZGlh X2xvZ2dpbmcpOiBTdHJpcCBvdXQgdGhlIHN0cmlwX21lZGlhX2xvZ2dpbmdfcGF0dGVybnMuCisK IDIwMTMtMTEtMTkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAg W1dURl0gQ2xlYW4gdXAgdGhlIGNvbnN0cnVjdG9ycyBpbiBNZWRpYVRpbWUKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90 ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL2xheW91dF90ZXN0X3J1bm5lci5weQppbmRleCAzZmQ0MGUzOGZlYzc2NjhkYTcyZDI3 YzY5OGI4NzJlZDg4ZGIzY2ViLi45ZjA4ZWVjNWU0MGMxMzhiYzM5MjZmYzI4ZjFjYWU1M2UyYThj ODBlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5CkBAIC0yOTEs NiArMjkxLDcgQEAgY2xhc3MgV29ya2VyKG9iamVjdCk6CiAgICAgICAgICAgICB0ZXN0X2lucHV0 LnNob3VsZF9ydW5fcGl4ZWxfdGVzdCA9IFRydWUKICAgICAgICAgZWxzZToKICAgICAgICAgICAg IHRlc3RfaW5wdXQuc2hvdWxkX3J1bl9waXhlbF90ZXN0ID0gc2VsZi5fcG9ydC5zaG91bGRfcnVu X2FzX3BpeGVsX3Rlc3QodGVzdF9pbnB1dCkKKyAgICAgICAgdGVzdF9pbnB1dC5pc19tZWRpYV90 ZXN0ID0gc2VsZi5fcG9ydC5pc19tZWRpYV90ZXN0KHRlc3RfaW5wdXQpCiAKICAgICBkZWYgX3J1 bl90ZXN0KHNlbGYsIHRlc3RfaW5wdXQsIHNoYXJkX25hbWUpOgogICAgICAgICBzZWxmLl9iYXRj aF9jb3VudCArPSAxCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkKaW5k ZXggNTNmMjVjZTNiZTQzMWRiZTExMzA3ZmYzNzllNjdlYzNiMjU3ZjI3ZS4uNGM3N2YzMzk0ZGFl NGMxNzE2MWFjYzliMjU1NWUwMWMxNTJlYTNmMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Npbmds ZV90ZXN0X3J1bm5lci5weQpAQCAtNjEsNiArNjEsNyBAQCBjbGFzcyBTaW5nbGVUZXN0UnVubmVy KG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3Nob3VsZF9ydW5fcGl4ZWxfdGVzdCA9IHRlc3RfaW5w dXQuc2hvdWxkX3J1bl9waXhlbF90ZXN0CiAgICAgICAgIHNlbGYuX3JlZmVyZW5jZV9maWxlcyA9 IHRlc3RfaW5wdXQucmVmZXJlbmNlX2ZpbGVzCiAgICAgICAgIHNlbGYuX3N0b3Bfd2hlbl9kb25l ID0gc3RvcF93aGVuX2RvbmUKKyAgICAgICAgc2VsZi5faXNfbWVkaWFfdGVzdCA9IHRlc3RfaW5w dXQuaXNfbWVkaWFfdGVzdAogCiAgICAgICAgIGlmIHNlbGYuX3JlZmVyZW5jZV9maWxlczoKICAg ICAgICAgICAgICMgRGV0ZWN0IGFuZCByZXBvcnQgYSB0ZXN0IHdoaWNoIGhhcyBhIHdyb25nIGNv bWJpbmF0aW9uIG9mIGV4cGVjdGF0aW9uIGZpbGVzLgpAQCAtMTEyLDYgKzExMywxMCBAQCBjbGFz cyBTaW5nbGVUZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICBleHBlY3RlZF9kcml2ZXJf b3V0cHV0LnN0cmlwX21ldHJpY3MoKQogICAgICAgICAgICAgZHJpdmVyX291dHB1dC5zdHJpcF9t ZXRyaWNzKCkKIAorICAgICAgICBpZiBzZWxmLl9pc19tZWRpYV90ZXN0OgorICAgICAgICAgICAg ZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5zdHJpcF9tZWRpYV9sb2dnaW5nKCkKKyAgICAgICAgICAg IGRyaXZlcl9vdXRwdXQuc3RyaXBfbWVkaWFfbG9nZ2luZygpCisKICAgICAgICAgdGVzdF9yZXN1 bHQgPSBzZWxmLl9jb21wYXJlX291dHB1dChleHBlY3RlZF9kcml2ZXJfb3V0cHV0LCBkcml2ZXJf b3V0cHV0KQogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm5ld190ZXN0X3Jlc3VsdHM6CiAgICAg ICAgICAgICBzZWxmLl9hZGRfbWlzc2luZ19iYXNlbGluZXModGVzdF9yZXN1bHQsIGRyaXZlcl9v dXRwdXQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CmluZGV4IDMxMThiMzM4NTBlOWZk NzE0NzBhYzNjMzgxZmYyNDg5NGE0OGM4OTEuLmFiMzU2Yzk3Y2M1MjA3OWJjMjBmODExYzBjOWM1 NmE4ZGRiMWE2NmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNl LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CkBAIC0xNDEzLDYg KzE0MTMsOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICMgLS1waXhlbC10ZXN0LWRp cmVjdG9yeSBpcyBub3Qgc3BlY2lmaWVkLgogICAgICAgICByZXR1cm4gVHJ1ZQogCisgICAgZGVm IGlzX21lZGlhX3Rlc3Qoc2VsZiwgdGVzdF9pbnB1dCk6CisgICAgICAgIHJldHVybiBhbnkodGVz dF9pbnB1dC50ZXN0X25hbWUuc3RhcnRzd2l0aChkaXJlY3RvcnkpIGZvciBkaXJlY3RvcnkgaW4g WydtZWRpYScsICdodHRwL3Rlc3RzL21lZGlhJywgJ3BsdWdpbnMnXSkKKwogICAgICMgRklYTUU6 IEV2ZW50dWFsbHkgd2Ugc2hvdWxkIHN0YW5kYXJpemUgcG9ydCBuYW1pbmcsIGFuZCBtYWtlIHRo aXMgbWV0aG9kIHNtYXJ0IGVub3VnaAogICAgICMgdG8gdXNlIGZvciBhbGwgcG9ydCBjb25maWd1 cmF0aW9ucyAoaW5jbHVkaW5nIGFyY2hpdGVjdHVyZXMsIGdyYXBoaWNzIHR5cGVzLCBldGMpLgog ICAgIGRlZiBfcG9ydF9mbGFnX2Zvcl9zY3JpcHRzKHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kcml2ZXIucHkKaW5kZXggMzYyMjI4YWFkNjRhYTA1Mjg3YzdiNWMyMTIyZThiODNjYWRk ZTA2Zi4uOWE1YjRhODdhMTFjNWQ2Njk1NmVhNzJhODJkOTMyZGEwOWZjOTVhOCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CkBAIC03Niw2ICs3NiwxMCBAQCBjbGFzcyBEcml2 ZXJPdXRwdXQob2JqZWN0KToKICAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUo J3Njcm9sbFkgWzAtOV0rJyksICdzY3JvbGxZJykpCiAgICAgc3RyaXBfcGF0dGVybnMuYXBwZW5k KChyZS5jb21waWxlKCdzY3JvbGxlZCB0byBbMC05XSssWzAtOV0rJyksICdzY3JvbGxlZCcpKQog CisgICAgc3RyaXBfbWVkaWFfbG9nZ2luZ19wYXR0ZXJucyA9IFtdCisgICAgc3RyaXBfbWVkaWFf bG9nZ2luZ19wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ0FWRiBpbmZvOi4qXG4nKSwgJycp KQorICAgIHN0cmlwX21lZGlhX2xvZ2dpbmdfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdH VkEgaW5mbzouKlxuJyksICcnKSkKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXh0LCBpbWFn ZSwgaW1hZ2VfaGFzaCwgYXVkaW8sIGNyYXNoPUZhbHNlLAogICAgICAgICAgICAgdGVzdF90aW1l PTAsIG1lYXN1cmVtZW50cz1Ob25lLCB0aW1lb3V0PUZhbHNlLCBlcnJvcj0nJywgY3Jhc2hlZF9w cm9jZXNzX25hbWU9Jz8/JywKICAgICAgICAgICAgIGNyYXNoZWRfcGlkPU5vbmUsIGNyYXNoX2xv Zz1Ob25lLCBwaWQ9Tm9uZSk6CkBAIC0xMDQsNiArMTA4LDExIEBAIGNsYXNzIERyaXZlck91dHB1 dChvYmplY3QpOgogICAgICAgICBmb3IgcGF0dGVybiBpbiBzZWxmLnN0cmlwX3BhdHRlcm5zOgog ICAgICAgICAgICAgc2VsZi50ZXh0ID0gcmUuc3ViKHBhdHRlcm5bMF0sIHBhdHRlcm5bMV0sIHNl bGYudGV4dCkKIAorICAgIGRlZiBzdHJpcF9tZWRpYV9sb2dnaW5nKHNlbGYpOgorICAgICAgICBp ZiBub3Qgc2VsZi50ZXh0OgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGZvciBwYXR0ZXJu IGluIHNlbGYuc3RyaXBfbWVkaWFfbG9nZ2luZ19wYXR0ZXJuczoKKyAgICAgICAgICAgIHNlbGYu dGV4dCA9IHJlLnN1YihwYXR0ZXJuWzBdLCBwYXR0ZXJuWzFdLCBzZWxmLnRleHQpCiAKIGNsYXNz IERyaXZlcihvYmplY3QpOgogICAgICIiIm9iamVjdCBmb3IgcnVubmluZyB0ZXN0KHMpIHVzaW5n IER1bXBSZW5kZXJUcmVlL1dlYktpdFRlc3RSdW5uZXIuIiIiCg== 218616 2013-12-06 13:22:41 -0800 2013-12-06 13:23:57 -0800 Patch bug-125357-20131206132241.patch text/plain 7435 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTdjNjY5OGNhMDI3ZThmOGU5YTk3NTUzMWYwOTMzMjZi ZWUxMmVlOS4uNTQzOGM1NWQ1Mzk3NDI4YzkzNTE3Mjg1ZDk2ZDQyOTYyMWI1ZTc2NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTEyLTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAg ICAgIFN0cmlwIG91dCBleHRyYW5lb3VzIGxvZ2dpbmcgZnJvbSBBcHBsZUdWQSBpbiBtZWRpYSB0 ZXN0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NTM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhIG1lY2hhbmlzbSBmb3Igc3RyaXBwaW5nIG91dCBhYnJpdHJhcnkgcmVndWxhciBleHByZXNz aW9ucyBmcm9tIHRlc3QgaW5wdXQgYW5kIG91dHB1dC4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weToKKyAg ICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX3J1bl9jb21wYXJlX3Rlc3QpOiBTdHJpcCBvdXQgbG9n Z2luZworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAo UG9ydC5sb2dnaW5nX3BhdHRlcm5zX3RvX3N0cmlwKTogUmV0dXJuIGFuIGVtcHR5IGxpc3QgYnkg ZGVmYXVsdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5OgorICAg ICAgICAoRHJpdmVyT3V0cHV0LnN0cmlwX3BhdHRlcm5zKTogQXBwbHkgdGhlIHBvcnQgc3BlY2lm aWMgcGF0dGVybnMgdG8gdGhlIHRleHQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L21hYy5weToKKyAgICAgICAgKE1hY1BvcnQubG9nZ2luZ19wYXR0ZXJuc190b19zdHJpcCk6IFJl dHVybiBhIGNvbXBsZXRlIGxpc3QuCisKIDIwMTMtMTEtMTkgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dURl0gQ2xlYW4gdXAgdGhlIGNvbnN0cnVjdG9ycyBp biBNZWRpYVRpbWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRl eCA1M2YyNWNlM2JlNDMxZGJlMTEzMDdmZjM3OWU2N2VjM2IyNTdmMjdlLi4yZTVmZWZkOTJkYmM4 NzEzOTgzMzI2MmQxZTkwZmVmY2EzMGRhZGY3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xl X3Rlc3RfcnVubmVyLnB5CkBAIC0xMTIsNiArMTEyLDEwIEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5u ZXIob2JqZWN0KToKICAgICAgICAgICAgIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQuc3RyaXBfbWV0 cmljcygpCiAgICAgICAgICAgICBkcml2ZXJfb3V0cHV0LnN0cmlwX21ldHJpY3MoKQogCisgICAg ICAgIHBhdHRlcm5zID0gc2VsZi5fcG9ydC5sb2dnaW5nX3BhdHRlcm5zX3RvX3N0cmlwKCkKKyAg ICAgICAgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5zdHJpcF9wYXR0ZXJucyhwYXR0ZXJucykKKyAg ICAgICAgZHJpdmVyX291dHB1dC5zdHJpcF9wYXR0ZXJucyhwYXR0ZXJucykKKwogICAgICAgICB0 ZXN0X3Jlc3VsdCA9IHNlbGYuX2NvbXBhcmVfb3V0cHV0KGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQs IGRyaXZlcl9vdXRwdXQpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMubmV3X3Rlc3RfcmVzdWx0 czoKICAgICAgICAgICAgIHNlbGYuX2FkZF9taXNzaW5nX2Jhc2VsaW5lcyh0ZXN0X3Jlc3VsdCwg ZHJpdmVyX291dHB1dCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKaW5kZXggMzExOGIz Mzg1MGU5ZmQ3MTQ3MGFjM2MzODFmZjI0ODk0YTQ4Yzg5MS4uOGIxYmRhYzNlMWFiN2Q3Y2JkM2Ix OTI4NmE5OWExNGExMGQ0MTRkNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAg LTE1NDEsNiArMTU0MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIyBCeSBjdXJy ZW50IGNvbnZlbnRpb24sIHRoZSBXZWJLaXQyIG5hbWUgaXMgYWx3YXlzIG1hYy13azIsIHdpbi13 azIsIG5vdCBtYWMtbGVvcGFyZC13azIsIGV0YywKICAgICAgICAgcmV0dXJuICIlcy13azIiICUg c2VsZi5wb3J0X25hbWUKIAorICAgIGRlZiBsb2dnaW5nX3BhdHRlcm5zX3RvX3N0cmlwKHNlbGYp OgorICAgICAgICByZXR1cm4gW10KIAogY2xhc3MgVmlydHVhbFRlc3RTdWl0ZShvYmplY3QpOgog ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBiYXNlLCBhcmdzLCB0ZXN0cz1Ob25lKToKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CmluZGV4IDM2MjIyOGFhZDY0YWEwNTI4N2M3 YjVjMjEyMmU4YjgzY2FkZGUwNmYuLjA2MDYwNjlmZmFhYzAzNDcxYTdhZjFhNTM1NmJjZmFhYmEx N2U4ZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQpAQCAtNTUsMjYgKzU1 LDI2IEBAIGNsYXNzIERyaXZlck91dHB1dChvYmplY3QpOgogICAgICIiIkdyb3VwcyBpbmZvcm1h dGlvbiBhYm91dCBhIG91dHB1dCBmcm9tIGRyaXZlciBmb3IgZWFzeSBwYXNzaW5nCiAgICAgYW5k IHBvc3QtcHJvY2Vzc2luZyBvZiBkYXRhLiIiIgogCi0gICAgc3RyaXBfcGF0dGVybnMgPSBbXQot ICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnYXQgXCgtP1swLTldKywtP1sw LTldK1wpIConKSwgJycpKQotICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgn c2l6ZSAtP1swLTldK3gtP1swLTldKyAqJyksICcnKSkKLSAgICBzdHJpcF9wYXR0ZXJucy5hcHBl bmQoKHJlLmNvbXBpbGUoJ3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAnKSwgJycpKQotICAgIHN0 cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgndGV4dCBydW4gd2lkdGggLT9bMC05XSsg W2EtekEtWiBdKzogJyksICcnKSkKLSAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBp bGUoJ1JlbmRlckJ1dHRvbiB7QlVUVE9OfSAuKicpLCAnUmVuZGVyQnV0dG9uIHtCVVRUT059Jykp Ci0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJJbWFnZSB7SU5Q VVR9IC4qJyksICdSZW5kZXJJbWFnZSB7SU5QVVR9JykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBw ZW5kKChyZS5jb21waWxlKCdSZW5kZXJCbG9jayB7SU5QVVR9IC4qJyksICdSZW5kZXJCbG9jayB7 SU5QVVR9JykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJU ZXh0Q29udHJvbCB7SU5QVVR9IC4qJyksICdSZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9JykpCi0g ICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdcKFswLTldK3B4JyksICdweCcp KQotICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnICoiICpcbiArIiAqJyks ICcgJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCciICskJyksICci JykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCctICcpLCAnLScpKQot ICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXG4oICopIlxzKycpLCAnXG5c ZzwxPiInKSkKLSAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1xzKyJcbicp LCAnIlxuJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdzY3JvbGxX aWR0aCBbMC05XSsnKSwgJ3Njcm9sbFdpZHRoJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5k KChyZS5jb21waWxlKCdzY3JvbGxIZWlnaHQgWzAtOV0rJyksICdzY3JvbGxIZWlnaHQnKSkKLSAg ICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ3Njcm9sbFggWzAtOV0rJyksICdz Y3JvbGxYJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdzY3JvbGxZ IFswLTldKycpLCAnc2Nyb2xsWScpKQotICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29t cGlsZSgnc2Nyb2xsZWQgdG8gWzAtOV0rLFswLTldKycpLCAnc2Nyb2xsZWQnKSkKKyAgICBtZXRy aWNzX3BhdHRlcm5zID0gW10KKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGls ZSgnYXQgXCgtP1swLTldKywtP1swLTldK1wpIConKSwgJycpKQorICAgIG1ldHJpY3NfcGF0dGVy bnMuYXBwZW5kKChyZS5jb21waWxlKCdzaXplIC0/WzAtOV0reC0/WzAtOV0rIConKSwgJycpKQor ICAgIG1ldHJpY3NfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCd0ZXh0IHJ1biB3aWR0aCAt P1swLTldKzogJyksICcnKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGls ZSgndGV4dCBydW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogJyksICcnKSkKKyAgICBtZXRy aWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnUmVuZGVyQnV0dG9uIHtCVVRUT059IC4q JyksICdSZW5kZXJCdXR0b24ge0JVVFRPTn0nKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVu ZCgocmUuY29tcGlsZSgnUmVuZGVySW1hZ2Uge0lOUFVUfSAuKicpLCAnUmVuZGVySW1hZ2Uge0lO UFVUfScpKQorICAgIG1ldHJpY3NfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJC bG9jayB7SU5QVVR9IC4qJyksICdSZW5kZXJCbG9jayB7SU5QVVR9JykpCisgICAgbWV0cmljc19w YXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0gLion KSwgJ1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0nKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFw cGVuZCgocmUuY29tcGlsZSgnXChbMC05XStweCcpLCAncHgnKSkKKyAgICBtZXRyaWNzX3BhdHRl cm5zLmFwcGVuZCgocmUuY29tcGlsZSgnICoiICpcbiArIiAqJyksICcgJykpCisgICAgbWV0cmlj c19wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJyIgKyQnKSwgJyInKSkKKyAgICBtZXRyaWNz X3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnLSAnKSwgJy0nKSkKKyAgICBtZXRyaWNzX3Bh dHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXG4oICopIlxzKycpLCAnXG5cZzwxPiInKSkKKyAg ICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXHMrIlxuJyksICciXG4nKSkK KyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsV2lkdGggWzAt OV0rJyksICdzY3JvbGxXaWR0aCcpKQorICAgIG1ldHJpY3NfcGF0dGVybnMuYXBwZW5kKChyZS5j b21waWxlKCdzY3JvbGxIZWlnaHQgWzAtOV0rJyksICdzY3JvbGxIZWlnaHQnKSkKKyAgICBtZXRy aWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsWCBbMC05XSsnKSwgJ3Njcm9s bFgnKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsWSBb MC05XSsnKSwgJ3Njcm9sbFknKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29t cGlsZSgnc2Nyb2xsZWQgdG8gWzAtOV0rLFswLTldKycpLCAnc2Nyb2xsZWQnKSkKIAogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCB0ZXh0LCBpbWFnZSwgaW1hZ2VfaGFzaCwgYXVkaW8sIGNyYXNoPUZh bHNlLAogICAgICAgICAgICAgdGVzdF90aW1lPTAsIG1lYXN1cmVtZW50cz1Ob25lLCB0aW1lb3V0 PUZhbHNlLCBlcnJvcj0nJywgY3Jhc2hlZF9wcm9jZXNzX25hbWU9Jz8/JywKQEAgLTk5LDEyICs5 OSwxNCBAQCBjbGFzcyBEcml2ZXJPdXRwdXQob2JqZWN0KToKICAgICAgICAgcmV0dXJuIGJvb2wo c2VsZi5lcnJvcikKIAogICAgIGRlZiBzdHJpcF9tZXRyaWNzKHNlbGYpOgorICAgICAgICBzZWxm LnN0cmlwX3BhdHRlcm5zKHNlbGYubWV0cmljc19wYXR0ZXJucykKKworICAgIGRlZiBzdHJpcF9w YXR0ZXJucyhzZWxmLCBwYXR0ZXJucyk6CiAgICAgICAgIGlmIG5vdCBzZWxmLnRleHQ6CiAgICAg ICAgICAgICByZXR1cm4KLSAgICAgICAgZm9yIHBhdHRlcm4gaW4gc2VsZi5zdHJpcF9wYXR0ZXJu czoKKyAgICAgICAgZm9yIHBhdHRlcm4gaW4gcGF0dGVybnM6CiAgICAgICAgICAgICBzZWxmLnRl eHQgPSByZS5zdWIocGF0dGVyblswXSwgcGF0dGVyblsxXSwgc2VsZi50ZXh0KQogCi0KIGNsYXNz IERyaXZlcihvYmplY3QpOgogICAgICIiIm9iamVjdCBmb3IgcnVubmluZyB0ZXN0KHMpIHVzaW5n IER1bXBSZW5kZXJUcmVlL1dlYktpdFRlc3RSdW5uZXIuIiIiCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvbWFjLnB5CmluZGV4IDJjYmI2MDFhMmNhN2VlYjY5NTFkZWNlYzc3YzE1OWMwZDMwOWZjMmEu LjRiNzc0M2RlZWZmMWM2NGZmNDE5MThkMzhkMzg4MTEwMDVhMTQxNGMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L21hYy5weQpAQCAtMzAsNiArMzAsNyBAQAogaW1wb3J0IGxvZ2dpbmcKIGltcG9y dCBvcwogaW1wb3J0IHRpbWUKK2ltcG9ydCByZQogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0uY3Jhc2hsb2dzIGltcG9ydCBDcmFzaExvZ3MKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCkBAIC0zMTgsMyArMzE5LDYgQEAgY2xhc3Mg TWFjUG9ydChBcHBsZVBvcnQpOgogICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3I6CiAgICAgICAg ICAgICBfbG9nLndhcm4oInhjcnVuIGZhaWxlZDsgZmFsbGluZyBiYWNrIHRvICclcycuIiAlIGZh bGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuIGZhbGxiYWNrCisKKyAgICBkZWYgbG9nZ2luZ19w YXR0ZXJuc190b19zdHJpcChzZWxmKToKKyAgICAgICAgcmV0dXJuIFsocmUuY29tcGlsZSgnKEFW RnxHVkEpIGluZm86LipcbicpLCAnJyldCg== 218617 2013-12-06 13:23:58 -0800 2013-12-06 14:07:16 -0800 Patch bug-125357-20131206132358.patch text/plain 7506 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTdjNjY5OGNhMDI3ZThmOGU5YTk3NTUzMWYwOTMzMjZi ZWUxMmVlOS4uNTQzOGM1NWQ1Mzk3NDI4YzkzNTE3Mjg1ZDk2ZDQyOTYyMWI1ZTc2NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTEyLTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAg ICAgIFN0cmlwIG91dCBleHRyYW5lb3VzIGxvZ2dpbmcgZnJvbSBBcHBsZUdWQSBpbiBtZWRpYSB0 ZXN0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NTM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhIG1lY2hhbmlzbSBmb3Igc3RyaXBwaW5nIG91dCBhYnJpdHJhcnkgcmVndWxhciBleHByZXNz aW9ucyBmcm9tIHRlc3QgaW5wdXQgYW5kIG91dHB1dC4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weToKKyAg ICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX3J1bl9jb21wYXJlX3Rlc3QpOiBTdHJpcCBvdXQgbG9n Z2luZworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5OgorICAgICAgICAo UG9ydC5sb2dnaW5nX3BhdHRlcm5zX3RvX3N0cmlwKTogUmV0dXJuIGFuIGVtcHR5IGxpc3QgYnkg ZGVmYXVsdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5OgorICAg ICAgICAoRHJpdmVyT3V0cHV0LnN0cmlwX3BhdHRlcm5zKTogQXBwbHkgdGhlIHBvcnQgc3BlY2lm aWMgcGF0dGVybnMgdG8gdGhlIHRleHQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L21hYy5weToKKyAgICAgICAgKE1hY1BvcnQubG9nZ2luZ19wYXR0ZXJuc190b19zdHJpcCk6IFJl dHVybiBhIGNvbXBsZXRlIGxpc3QuCisKIDIwMTMtMTEtMTkgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dURl0gQ2xlYW4gdXAgdGhlIGNvbnN0cnVjdG9ycyBp biBNZWRpYVRpbWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQppbmRl eCA1M2YyNWNlM2JlNDMxZGJlMTEzMDdmZjM3OWU2N2VjM2IyNTdmMjdlLi4yZTVmZWZkOTJkYmM4 NzEzOTgzMzI2MmQxZTkwZmVmY2EzMGRhZGY3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xl X3Rlc3RfcnVubmVyLnB5CkBAIC0xMTIsNiArMTEyLDEwIEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5u ZXIob2JqZWN0KToKICAgICAgICAgICAgIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQuc3RyaXBfbWV0 cmljcygpCiAgICAgICAgICAgICBkcml2ZXJfb3V0cHV0LnN0cmlwX21ldHJpY3MoKQogCisgICAg ICAgIHBhdHRlcm5zID0gc2VsZi5fcG9ydC5sb2dnaW5nX3BhdHRlcm5zX3RvX3N0cmlwKCkKKyAg ICAgICAgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5zdHJpcF9wYXR0ZXJucyhwYXR0ZXJucykKKyAg ICAgICAgZHJpdmVyX291dHB1dC5zdHJpcF9wYXR0ZXJucyhwYXR0ZXJucykKKwogICAgICAgICB0 ZXN0X3Jlc3VsdCA9IHNlbGYuX2NvbXBhcmVfb3V0cHV0KGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQs IGRyaXZlcl9vdXRwdXQpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMubmV3X3Rlc3RfcmVzdWx0 czoKICAgICAgICAgICAgIHNlbGYuX2FkZF9taXNzaW5nX2Jhc2VsaW5lcyh0ZXN0X3Jlc3VsdCwg ZHJpdmVyX291dHB1dCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKaW5kZXggMzExOGIz Mzg1MGU5ZmQ3MTQ3MGFjM2MzODFmZjI0ODk0YTQ4Yzg5MS4uOGIxYmRhYzNlMWFiN2Q3Y2JkM2Ix OTI4NmE5OWExNGExMGQ0MTRkNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAg LTE1NDEsNiArMTU0MSw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIyBCeSBjdXJy ZW50IGNvbnZlbnRpb24sIHRoZSBXZWJLaXQyIG5hbWUgaXMgYWx3YXlzIG1hYy13azIsIHdpbi13 azIsIG5vdCBtYWMtbGVvcGFyZC13azIsIGV0YywKICAgICAgICAgcmV0dXJuICIlcy13azIiICUg c2VsZi5wb3J0X25hbWUKIAorICAgIGRlZiBsb2dnaW5nX3BhdHRlcm5zX3RvX3N0cmlwKHNlbGYp OgorICAgICAgICByZXR1cm4gW10KIAogY2xhc3MgVmlydHVhbFRlc3RTdWl0ZShvYmplY3QpOgog ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBiYXNlLCBhcmdzLCB0ZXN0cz1Ob25lKToKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CmluZGV4IDM2MjIyOGFhZDY0YWEwNTI4N2M3 YjVjMjEyMmU4YjgzY2FkZGUwNmYuLjA2MDYwNjlmZmFhYzAzNDcxYTdhZjFhNTM1NmJjZmFhYmEx N2U4ZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQpAQCAtNTUsMjYgKzU1 LDI2IEBAIGNsYXNzIERyaXZlck91dHB1dChvYmplY3QpOgogICAgICIiIkdyb3VwcyBpbmZvcm1h dGlvbiBhYm91dCBhIG91dHB1dCBmcm9tIGRyaXZlciBmb3IgZWFzeSBwYXNzaW5nCiAgICAgYW5k IHBvc3QtcHJvY2Vzc2luZyBvZiBkYXRhLiIiIgogCi0gICAgc3RyaXBfcGF0dGVybnMgPSBbXQot ICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnYXQgXCgtP1swLTldKywtP1sw LTldK1wpIConKSwgJycpKQotICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgn c2l6ZSAtP1swLTldK3gtP1swLTldKyAqJyksICcnKSkKLSAgICBzdHJpcF9wYXR0ZXJucy5hcHBl bmQoKHJlLmNvbXBpbGUoJ3RleHQgcnVuIHdpZHRoIC0/WzAtOV0rOiAnKSwgJycpKQotICAgIHN0 cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgndGV4dCBydW4gd2lkdGggLT9bMC05XSsg W2EtekEtWiBdKzogJyksICcnKSkKLSAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBp bGUoJ1JlbmRlckJ1dHRvbiB7QlVUVE9OfSAuKicpLCAnUmVuZGVyQnV0dG9uIHtCVVRUT059Jykp Ci0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJJbWFnZSB7SU5Q VVR9IC4qJyksICdSZW5kZXJJbWFnZSB7SU5QVVR9JykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBw ZW5kKChyZS5jb21waWxlKCdSZW5kZXJCbG9jayB7SU5QVVR9IC4qJyksICdSZW5kZXJCbG9jayB7 SU5QVVR9JykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJU ZXh0Q29udHJvbCB7SU5QVVR9IC4qJyksICdSZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9JykpCi0g ICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdcKFswLTldK3B4JyksICdweCcp KQotICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnICoiICpcbiArIiAqJyks ICcgJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCciICskJyksICci JykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCctICcpLCAnLScpKQot ICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXG4oICopIlxzKycpLCAnXG5c ZzwxPiInKSkKLSAgICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1xzKyJcbicp LCAnIlxuJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdzY3JvbGxX aWR0aCBbMC05XSsnKSwgJ3Njcm9sbFdpZHRoJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5k KChyZS5jb21waWxlKCdzY3JvbGxIZWlnaHQgWzAtOV0rJyksICdzY3JvbGxIZWlnaHQnKSkKLSAg ICBzdHJpcF9wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ3Njcm9sbFggWzAtOV0rJyksICdz Y3JvbGxYJykpCi0gICAgc3RyaXBfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdzY3JvbGxZ IFswLTldKycpLCAnc2Nyb2xsWScpKQotICAgIHN0cmlwX3BhdHRlcm5zLmFwcGVuZCgocmUuY29t cGlsZSgnc2Nyb2xsZWQgdG8gWzAtOV0rLFswLTldKycpLCAnc2Nyb2xsZWQnKSkKKyAgICBtZXRy aWNzX3BhdHRlcm5zID0gW10KKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGls ZSgnYXQgXCgtP1swLTldKywtP1swLTldK1wpIConKSwgJycpKQorICAgIG1ldHJpY3NfcGF0dGVy bnMuYXBwZW5kKChyZS5jb21waWxlKCdzaXplIC0/WzAtOV0reC0/WzAtOV0rIConKSwgJycpKQor ICAgIG1ldHJpY3NfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCd0ZXh0IHJ1biB3aWR0aCAt P1swLTldKzogJyksICcnKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGls ZSgndGV4dCBydW4gd2lkdGggLT9bMC05XSsgW2EtekEtWiBdKzogJyksICcnKSkKKyAgICBtZXRy aWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnUmVuZGVyQnV0dG9uIHtCVVRUT059IC4q JyksICdSZW5kZXJCdXR0b24ge0JVVFRPTn0nKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVu ZCgocmUuY29tcGlsZSgnUmVuZGVySW1hZ2Uge0lOUFVUfSAuKicpLCAnUmVuZGVySW1hZ2Uge0lO UFVUfScpKQorICAgIG1ldHJpY3NfcGF0dGVybnMuYXBwZW5kKChyZS5jb21waWxlKCdSZW5kZXJC bG9jayB7SU5QVVR9IC4qJyksICdSZW5kZXJCbG9jayB7SU5QVVR9JykpCisgICAgbWV0cmljc19w YXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJ1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0gLion KSwgJ1JlbmRlclRleHRDb250cm9sIHtJTlBVVH0nKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFw cGVuZCgocmUuY29tcGlsZSgnXChbMC05XStweCcpLCAncHgnKSkKKyAgICBtZXRyaWNzX3BhdHRl cm5zLmFwcGVuZCgocmUuY29tcGlsZSgnICoiICpcbiArIiAqJyksICcgJykpCisgICAgbWV0cmlj c19wYXR0ZXJucy5hcHBlbmQoKHJlLmNvbXBpbGUoJyIgKyQnKSwgJyInKSkKKyAgICBtZXRyaWNz X3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnLSAnKSwgJy0nKSkKKyAgICBtZXRyaWNzX3Bh dHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXG4oICopIlxzKycpLCAnXG5cZzwxPiInKSkKKyAg ICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnXHMrIlxuJyksICciXG4nKSkK KyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsV2lkdGggWzAt OV0rJyksICdzY3JvbGxXaWR0aCcpKQorICAgIG1ldHJpY3NfcGF0dGVybnMuYXBwZW5kKChyZS5j b21waWxlKCdzY3JvbGxIZWlnaHQgWzAtOV0rJyksICdzY3JvbGxIZWlnaHQnKSkKKyAgICBtZXRy aWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsWCBbMC05XSsnKSwgJ3Njcm9s bFgnKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29tcGlsZSgnc2Nyb2xsWSBb MC05XSsnKSwgJ3Njcm9sbFknKSkKKyAgICBtZXRyaWNzX3BhdHRlcm5zLmFwcGVuZCgocmUuY29t cGlsZSgnc2Nyb2xsZWQgdG8gWzAtOV0rLFswLTldKycpLCAnc2Nyb2xsZWQnKSkKIAogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCB0ZXh0LCBpbWFnZSwgaW1hZ2VfaGFzaCwgYXVkaW8sIGNyYXNoPUZh bHNlLAogICAgICAgICAgICAgdGVzdF90aW1lPTAsIG1lYXN1cmVtZW50cz1Ob25lLCB0aW1lb3V0 PUZhbHNlLCBlcnJvcj0nJywgY3Jhc2hlZF9wcm9jZXNzX25hbWU9Jz8/JywKQEAgLTk5LDEyICs5 OSwxNCBAQCBjbGFzcyBEcml2ZXJPdXRwdXQob2JqZWN0KToKICAgICAgICAgcmV0dXJuIGJvb2wo c2VsZi5lcnJvcikKIAogICAgIGRlZiBzdHJpcF9tZXRyaWNzKHNlbGYpOgorICAgICAgICBzZWxm LnN0cmlwX3BhdHRlcm5zKHNlbGYubWV0cmljc19wYXR0ZXJucykKKworICAgIGRlZiBzdHJpcF9w YXR0ZXJucyhzZWxmLCBwYXR0ZXJucyk6CiAgICAgICAgIGlmIG5vdCBzZWxmLnRleHQ6CiAgICAg ICAgICAgICByZXR1cm4KLSAgICAgICAgZm9yIHBhdHRlcm4gaW4gc2VsZi5zdHJpcF9wYXR0ZXJu czoKKyAgICAgICAgZm9yIHBhdHRlcm4gaW4gcGF0dGVybnM6CiAgICAgICAgICAgICBzZWxmLnRl eHQgPSByZS5zdWIocGF0dGVyblswXSwgcGF0dGVyblsxXSwgc2VsZi50ZXh0KQogCi0KIGNsYXNz IERyaXZlcihvYmplY3QpOgogICAgICIiIm9iamVjdCBmb3IgcnVubmluZyB0ZXN0KHMpIHVzaW5n IER1bXBSZW5kZXJUcmVlL1dlYktpdFRlc3RSdW5uZXIuIiIiCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvbWFjLnB5CmluZGV4IDJjYmI2MDFhMmNhN2VlYjY5NTFkZWNlYzc3YzE1OWMwZDMwOWZjMmEu LjRiZmQ5NDY3ZjQ2YTY1MzhjMGE5NWMxYWMyNGM3YmEwOThlYzdiNGQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L21hYy5weQpAQCAtMzAsNiArMzAsNyBAQAogaW1wb3J0IGxvZ2dpbmcKIGltcG9y dCBvcwogaW1wb3J0IHRpbWUKK2ltcG9ydCByZQogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0uY3Jhc2hsb2dzIGltcG9ydCBDcmFzaExvZ3MKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCkBAIC0zMTgsMyArMzE5LDcgQEAgY2xhc3Mg TWFjUG9ydChBcHBsZVBvcnQpOgogICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3I6CiAgICAgICAg ICAgICBfbG9nLndhcm4oInhjcnVuIGZhaWxlZDsgZmFsbGluZyBiYWNrIHRvICclcycuIiAlIGZh bGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuIGZhbGxiYWNrCisKKyAgICBkZWYgbG9nZ2luZ19w YXR0ZXJuc190b19zdHJpcChzZWxmKToKKyAgICAgICAgIyBGSVhNRTogUmVtb3ZlIHRoaXMgYWZ0 ZXIgPHJkYXI6Ly9wcm9ibGVtLzE1NjA1MDA3PiBpcyBmaXhlZAorICAgICAgICByZXR1cm4gWyhy ZS5jb21waWxlKCcoQVZGfEdWQSkgaW5mbzouKlxuJyksICcnKV0K