64471 2011-07-13 11:23:46 -0700 WIN: editing tests fail under NRWT because editing delegate callbacks aren't stripped 2011-10-25 06:48:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 38756 1 aroben eric abarth dpranke eric ojan webkit.review.bot oldest_to_newest 436544 0 aroben 2011-07-13 11:23:46 -0700 Apple's Windows port of DRT doesn't have support for editing delegate callbacks. (I don't think we even have an editing delegate API in WebKit1 on Windows.) old-run-webkit-tests strips out these callbacks before comparing actual and expected results. new-run-webkit-tests doesn't do this, which causes all editing tests to fail. 436609 1 aroben 2011-07-13 12:41:13 -0700 The relevant code in ORWT is here: <http://trac.webkit.org/browser/trunk/Tools/Scripts/old-run-webkit-tests?rev=90125#L858>. 436706 2 eric 2011-07-13 15:32:45 -0700 OK. This is easy to fix. The question is at what layer to fix it. Is this only a hack for Apple Win, or do other ports want to use it? SingleTestRunner already has a _get_normalized_output_text method which it uses to fix newlines before comparing results. Port already has a compare_text method, which we could override in the WinPort to do this special compare, but then the "expected" results spit out would still have the editing callbacks. (are they supposed to?) 437081 3 aroben 2011-07-14 07:37:13 -0700 (In reply to comment #2) > Is this only a hack for Apple Win, or do other ports want to use it? ORWT exposes a --[no-]strip-editing-callbacks, which defaults to true on Apple's Windows port. I don't know if anyone else uses that option. > Port already has a compare_text method, which we could override in the WinPort to do this special compare, but then the "expected" results spit out would still have the editing callbacks. (are they supposed to?) In ORWT, the expected results still contain editing callbacks (unless the expected results were generated on Windows, of course). This is a little confusing when looking at diffs, but of course removing the editing callbacks from the expected output would also be confusing. I think either way is fine, but matching ORWT is probably a teensy bit better. 489714 4 112264 eric 2011-10-24 15:47:18 -0700 Created attachment 112264 Patch 489723 5 112264 aroben 2011-10-24 15:51:58 -0700 Comment on attachment 112264 Patch Note that ORWT doesn't do this for WebKit2 on Windows, only for WebKit1. NRWT should do the same. 489725 6 eric 2011-10-24 15:54:41 -0700 Oh goodie. :) 489737 7 112268 eric 2011-10-24 16:01:34 -0700 Created attachment 112268 Patch 489758 8 112268 aroben 2011-10-24 16:17:33 -0700 Comment on attachment 112268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112268&action=review > Tools/Scripts/webkitpy/layout_tests/port/win.py:84 > + deletate_regxp = re.compile("^EDITING DELEGATE: .*?\n", re.MULTILINE) Mmmmmm, deletate. > Tools/Scripts/webkitpy/layout_tests/port/win.py:88 > + # FIXME: Why this is != is unclear from the design. This matches base.Port > + return expected_text != actual_text I'm not sure what this FIXME is saying. What do you think we should be using instead of != ? 489760 9 eric 2011-10-24 16:18:29 -0700 (In reply to comment #8) > (From update of attachment 112268 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=112268&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/win.py:84 > > + deletate_regxp = re.compile("^EDITING DELEGATE: .*?\n", re.MULTILINE) > > Mmmmmm, deletate. Will fix. > > Tools/Scripts/webkitpy/layout_tests/port/win.py:88 > > + # FIXME: Why this is != is unclear from the design. This matches base.Port > > + return expected_text != actual_text > > I'm not sure what this FIXME is saying. What do you think we should be using instead of != ? I'll just remove the fixme. I would expect it to say ==. 489777 10 112276 eric 2011-10-24 16:56:58 -0700 Created attachment 112276 Patch 490011 11 112276 webkit.review.bot 2011-10-25 06:48:47 -0700 Comment on attachment 112276 Patch Clearing flags on attachment: 112276 Committed r98340: <http://trac.webkit.org/changeset/98340> 490012 12 webkit.review.bot 2011-10-25 06:48:52 -0700 All reviewed patches have been landed. Closing bug. 112264 2011-10-24 15:47:18 -0700 2011-10-24 16:01:30 -0700 Patch bug-64471-20111024154717.patch text/plain 3071 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTgyODgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlNjlkMWIzNWY2NGEwNjllMDMyMTBkMjExNDNlNmZmMjk5 MmRiZDc5Li5mODNmZDkxOTZiZmUyYTRlN2U2MzI2OWQxOTA2Y2QwMDgzMjRiMDZiIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTEtMTAtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAg IFdJTjogZWRpdGluZyB0ZXN0cyBmYWlsIHVuZGVyIE5SV1QgYmVjYXVzZSBlZGl0aW5nIGRlbGVn YXRlIGNhbGxiYWNrcyBhcmVuJ3Qgc3RyaXBwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3BlY3VsYXRpdmUgZml4LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHk6CisKKzIwMTEtMTAtMjQg IEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAgICAgIFBsdWdpbiB0ZXN0cyBh cmUgZmFpbGluZyBhZnRlciBzd2l0Y2hpbmcgV0syIHRvIE5SV1QKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNzYwCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKaW5kZXggNzQxOGMyZmI5YzU5YjY5 ZGRjMTE2MmJmNDAwODUwNDM3NTYzNmJlYi4uY2ZhNmVlODgyYjJjNzQ0ODc5NjRhNjQyNmRiMWYy YjJmNGE0MDE1YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC93aW4ucHkKQEAgLTcyLDYgKzcyLDE3IEBAIGNsYXNzIFdpblBvcnQoQXBwbGVQb3J0KToK ICAgICAgICAgQXBwbGVQb3J0Ll9faW5pdF9fKHNlbGYsICoqa3dhcmdzKQogICAgICAgICBzZWxm Ll9vcGVyYXRpbmdfc3lzdGVtID0gJ3dpbicKIAorICAgIGRlZiBjb21wYXJlX3RleHQoc2VsZiwg ZXhwZWN0ZWRfdGV4dCwgYWN0dWFsX3RleHQpOgorICAgICAgICAjIFRoaXMgaXMgYSBoYWNrICh3 aGljaCBkYXRlcyBiYWNrIHRvIE9SV1QpLgorICAgICAgICAjIFdpbmRvd3MgZG9lcyBub3QgaGF2 ZSBhbiBFRElUSU5HIERFTEVHQVRFLCBzbyB3ZSBzdHJpcCBhbnkgRURJVElORyBERUxFR0FURQor ICAgICAgICAjIG1lc3NhZ2VzIHRvIG1ha2UgbW9yZSBvZiB0aGUgdGVzdHMgcGFzcy4KKyAgICAg ICAgIyBJdCdzIHBvc3NpYmxlIG1vcmUgb2YgdGhlIHBvcnRzIG1pZ2h0IHdhbnQgdGhpcyBhbmQg dGhpcyBjb3VsZCBtb3ZlIGRvd24gaW50byBXZWJLaXRQb3J0LgorICAgICAgICBkZWxldGF0ZV9y ZWd4cCA9IHJlLmNvbXBpbGUoIl5FRElUSU5HIERFTEVHQVRFOiAuKj9cbiIsIHJlLk1VTFRJTElO RSkKKyAgICAgICAgZXhwZWN0ZWRfdGV4dCA9IGRlbGV0YXRlX3JlZ3hwLnN1YigiIiwgZXhwZWN0 ZWRfdGV4dCkKKyAgICAgICAgYWN0dWFsX3RleHQgPSBkZWxldGF0ZV9yZWd4cC5zdWIoIiIsIGFj dHVhbF90ZXh0KQorICAgICAgICAjIEZJWE1FOiBXaHkgdGhpcyBpcyAhPSBpcyB1bmNsZWFyIGZy b20gdGhlIGRlc2lnbi4gIFRoaXMgbWF0Y2hlcyBiYXNlLlBvcnQKKyAgICAgICAgcmV0dXJuIGV4 cGVjdGVkX3RleHQgIT0gYWN0dWFsX3RleHQKKwogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0 aChzZWxmKToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgZmFsbGJhY2tfaW5kZXggPSBzZWxm LlZFUlNJT05fRkFMTEJBQ0tfT1JERVIuaW5kZXgoc2VsZi5fcG9ydF9uYW1lX3dpdGhfdmVyc2lv bigpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC93aW5fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dpbl91bml0dGVzdC5weQppbmRleCBhNDhhZGUyMjA2ODc2MDQ4YmYzMGYyNjY3MDExN2Y4 MzUyNDg4ZWQ1Li41ZTMwOWM3MDA2ZjRlN2VjNDk1MTM2YmIwODU1ZjY5NDkwMWE5Y2Q3IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0 dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dp bl91bml0dGVzdC5weQpAQCAtOTQsMyArOTQsMTAgQEAgY2xhc3MgV2luUG9ydFRlc3QocG9ydF90 ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBzZWxmLl9hc3NlcnRfdmVyc2lvbignd2lu LXhwJywgJ3hwJykKICAgICAgICAgc2VsZi5fYXNzZXJ0X3ZlcnNpb24oJ3dpbi12aXN0YScsICd2 aXN0YScpCiAgICAgICAgIHNlbGYuX2Fzc2VydF92ZXJzaW9uKCd3aW4tN3NwMCcsICc3c3AwJykK KworICAgIGRlZiB0ZXN0X2NvbXBhcmVfdGV4dChzZWxmKToKKyAgICAgICAgZXhwZWN0ZWQgPSAi RURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hh bmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uXG5mb29cbkVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdE aWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvblxu IgorICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAgICAgICBzZWxmLmFzc2VydEZh bHNlKHBvcnQuY29tcGFyZV90ZXh0KGV4cGVjdGVkLCAiZm9vXG4iKSkKKyAgICAgICAgc2VsZi5h c3NlcnRUcnVlKHBvcnQuY29tcGFyZV90ZXh0KGV4cGVjdGVkLCAiZm9vIikpCisgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZShwb3J0LmNvbXBhcmVfdGV4dChleHBlY3RlZCwgImJhciIpKQo= 112268 2011-10-24 16:01:34 -0700 2011-10-24 16:56:53 -0700 Patch bug-64471-20111024160133.patch text/plain 3388 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTgyOTMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiMTI5ZmVhNTM2YzQ5ZGE1YWNkNTgzODVkODQxZThmMzA0 ZGEwZTVjLi40M2IxYTA0NGExYWNlMTZhOTA4YThmODI5ZjVmY2Q4YmQ4YWEzNDE1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMTAtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFdJTjogZWRpdGluZyB0ZXN0cyBmYWlsIHVuZGVyIE5SV1QgYmVjYXVzZSBlZGl0aW5nIGRlbGVn YXRlIGNhbGxiYWNrcyBhcmVuJ3Qgc3RyaXBwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3BlY3VsYXRpdmUgZml4LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHk6CisKIDIwMTEtMTAtMjQg IEl2YW4gQnJpYW5vICA8aXZhbkBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBbRUZMXSBCdWls ZCBmaXguIEFkZCBpbmNsdWRlIHBhdGggdG8gZmluZCBucGFwaS5oCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5CmluZGV4IDc0MThjMmZiOWM1OWI2 OWRkYzExNjJiZjQwMDg1MDQzNzU2MzZiZWIuLmI4NzI1Nzg0NDYzODZlMmU1YzIwOTAyYWM2MTI0 MmMxYWRjMTgxNzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2luLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2luLnB5CkBAIC03Miw2ICs3MiwyMSBAQCBjbGFzcyBXaW5Qb3J0KEFwcGxlUG9ydCk6 CiAgICAgICAgIEFwcGxlUG9ydC5fX2luaXRfXyhzZWxmLCAqKmt3YXJncykKICAgICAgICAgc2Vs Zi5fb3BlcmF0aW5nX3N5c3RlbSA9ICd3aW4nCiAKKyAgICBkZWYgY29tcGFyZV90ZXh0KHNlbGYs IGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KToKKyAgICAgICAgIyBTYW5pdHkgd2FzIHJlc3Rv cmVkIGluIFdLMiwgc28gd2UgZG9uJ3QgbmVlZCB0aGlzIGhhY2sgdGhlcmUuCisgICAgICAgIGlm IHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAgICByZXR1 cm4gQXBwbGVQb3J0LmNvbXBhcmVfdGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4 dCkKKworICAgICAgICAjIFRoaXMgaXMgYSBoYWNrICh3aGljaCBkYXRlcyBiYWNrIHRvIE9SV1Qp LgorICAgICAgICAjIFdpbmRvd3MgZG9lcyBub3QgaGF2ZSBhbiBFRElUSU5HIERFTEVHQVRFLCBz byB3ZSBzdHJpcCBhbnkgRURJVElORyBERUxFR0FURQorICAgICAgICAjIG1lc3NhZ2VzIHRvIG1h a2UgbW9yZSBvZiB0aGUgdGVzdHMgcGFzcy4KKyAgICAgICAgIyBJdCdzIHBvc3NpYmxlIG1vcmUg b2YgdGhlIHBvcnRzIG1pZ2h0IHdhbnQgdGhpcyBhbmQgdGhpcyBjb3VsZCBtb3ZlIGRvd24gaW50 byBXZWJLaXRQb3J0LgorICAgICAgICBkZWxldGF0ZV9yZWd4cCA9IHJlLmNvbXBpbGUoIl5FRElU SU5HIERFTEVHQVRFOiAuKj9cbiIsIHJlLk1VTFRJTElORSkKKyAgICAgICAgZXhwZWN0ZWRfdGV4 dCA9IGRlbGV0YXRlX3JlZ3hwLnN1YigiIiwgZXhwZWN0ZWRfdGV4dCkKKyAgICAgICAgYWN0dWFs X3RleHQgPSBkZWxldGF0ZV9yZWd4cC5zdWIoIiIsIGFjdHVhbF90ZXh0KQorICAgICAgICAjIEZJ WE1FOiBXaHkgdGhpcyBpcyAhPSBpcyB1bmNsZWFyIGZyb20gdGhlIGRlc2lnbi4gIFRoaXMgbWF0 Y2hlcyBiYXNlLlBvcnQKKyAgICAgICAgcmV0dXJuIGV4cGVjdGVkX3RleHQgIT0gYWN0dWFsX3Rl eHQKKwogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgdHJ5Ogog ICAgICAgICAgICAgZmFsbGJhY2tfaW5kZXggPSBzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVIu aW5kZXgoc2VsZi5fcG9ydF9uYW1lX3dpdGhfdmVyc2lvbigpKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQppbmRl eCBhNDhhZGUyMjA2ODc2MDQ4YmYzMGYyNjY3MDExN2Y4MzUyNDg4ZWQ1Li5lMzA1ZGJjMDljMTYw M2VkNjgzZmMwYTA3YWZmNjdmNDk5YzlmZDg4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weQpAQCAtOTQsMyAr OTQsMTQgQEAgY2xhc3MgV2luUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgog ICAgICAgICBzZWxmLl9hc3NlcnRfdmVyc2lvbignd2luLXhwJywgJ3hwJykKICAgICAgICAgc2Vs Zi5fYXNzZXJ0X3ZlcnNpb24oJ3dpbi12aXN0YScsICd2aXN0YScpCiAgICAgICAgIHNlbGYuX2Fz c2VydF92ZXJzaW9uKCd3aW4tN3NwMCcsICc3c3AwJykKKworICAgIGRlZiB0ZXN0X2NvbXBhcmVf dGV4dChzZWxmKToKKyAgICAgICAgZXhwZWN0ZWQgPSAiRURJVElORyBERUxFR0FURTogd2ViVmll d0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9u XG5mb29cbkVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmll d0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvblxuIgorICAgICAgICBwb3J0ID0gc2VsZi5t YWtlX3BvcnQoKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBvcnQuY29tcGFyZV90ZXh0KGV4 cGVjdGVkLCAiZm9vXG4iKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuY29tcGFyZV90 ZXh0KGV4cGVjdGVkLCAiZm9vIikpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmNvbXBh cmVfdGV4dChleHBlY3RlZCwgImJhciIpKQorCisgICAgICAgICMgVGhpcyBoYWNrIGRvZXNuJ3Qg ZXhpc3QgaW4gV0syLgorICAgICAgICBwb3J0Ll9vcHRpb25zID0gTW9ja09wdGlvbnMod2Via2l0 X3Rlc3RfcnVubmVyPVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmNvbXBhcmVf dGV4dChleHBlY3RlZCwgImZvb1xuIikpCg== 112276 2011-10-24 16:56:58 -0700 2011-10-25 06:48:46 -0700 Patch bug-64471-20111024165656.patch text/plain 3306 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTgyOTMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiMTI5ZmVhNTM2YzQ5ZGE1YWNkNTgzODVkODQxZThmMzA0 ZGEwZTVjLi40M2IxYTA0NGExYWNlMTZhOTA4YThmODI5ZjVmY2Q4YmQ4YWEzNDE1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMTAtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFdJTjogZWRpdGluZyB0ZXN0cyBmYWlsIHVuZGVyIE5SV1QgYmVjYXVzZSBlZGl0aW5nIGRlbGVn YXRlIGNhbGxiYWNrcyBhcmVuJ3Qgc3RyaXBwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3BlY3VsYXRpdmUgZml4LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5fdW5pdHRlc3QucHk6CisKIDIwMTEtMTAtMjQg IEl2YW4gQnJpYW5vICA8aXZhbkBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBbRUZMXSBCdWls ZCBmaXguIEFkZCBpbmNsdWRlIHBhdGggdG8gZmluZCBucGFwaS5oCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5CmluZGV4IDc0MThjMmZiOWM1OWI2 OWRkYzExNjJiZjQwMDg1MDQzNzU2MzZiZWIuLmQ1YmQwZjQwOTdiMmFjMzc3MGJhZmE2NTdlYjEw Yzg4Mjc5NmE5NTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2luLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2luLnB5CkBAIC03Miw2ICs3MiwyMCBAQCBjbGFzcyBXaW5Qb3J0KEFwcGxlUG9ydCk6 CiAgICAgICAgIEFwcGxlUG9ydC5fX2luaXRfXyhzZWxmLCAqKmt3YXJncykKICAgICAgICAgc2Vs Zi5fb3BlcmF0aW5nX3N5c3RlbSA9ICd3aW4nCiAKKyAgICBkZWYgY29tcGFyZV90ZXh0KHNlbGYs IGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KToKKyAgICAgICAgIyBTYW5pdHkgd2FzIHJlc3Rv cmVkIGluIFdLMiwgc28gd2UgZG9uJ3QgbmVlZCB0aGlzIGhhY2sgdGhlcmUuCisgICAgICAgIGlm IHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAgICByZXR1 cm4gQXBwbGVQb3J0LmNvbXBhcmVfdGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4 dCkKKworICAgICAgICAjIFRoaXMgaXMgYSBoYWNrICh3aGljaCBkYXRlcyBiYWNrIHRvIE9SV1Qp LgorICAgICAgICAjIFdpbmRvd3MgZG9lcyBub3QgaGF2ZSBhbiBFRElUSU5HIERFTEVHQVRFLCBz byB3ZSBzdHJpcCBhbnkgRURJVElORyBERUxFR0FURQorICAgICAgICAjIG1lc3NhZ2VzIHRvIG1h a2UgbW9yZSBvZiB0aGUgdGVzdHMgcGFzcy4KKyAgICAgICAgIyBJdCdzIHBvc3NpYmxlIG1vcmUg b2YgdGhlIHBvcnRzIG1pZ2h0IHdhbnQgdGhpcyBhbmQgdGhpcyBjb3VsZCBtb3ZlIGRvd24gaW50 byBXZWJLaXRQb3J0LgorICAgICAgICBkZWxlZ2F0ZV9yZWdleHAgPSByZS5jb21waWxlKCJeRURJ VElORyBERUxFR0FURTogLio/XG4iLCByZS5NVUxUSUxJTkUpCisgICAgICAgIGV4cGVjdGVkX3Rl eHQgPSBkZWxlZ2F0ZV9yZWdleHAuc3ViKCIiLCBleHBlY3RlZF90ZXh0KQorICAgICAgICBhY3R1 YWxfdGV4dCA9IGRlbGVnYXRlX3JlZ2V4cC5zdWIoIiIsIGFjdHVhbF90ZXh0KQorICAgICAgICBy ZXR1cm4gZXhwZWN0ZWRfdGV4dCAhPSBhY3R1YWxfdGV4dAorCiAgICAgZGVmIGJhc2VsaW5lX3Nl YXJjaF9wYXRoKHNlbGYpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBmYWxsYmFja19pbmRl eCA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUi5pbmRleChzZWxmLl9wb3J0X25hbWVfd2l0 aF92ZXJzaW9uKCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvd2luX3VuaXR0ZXN0LnB5CmluZGV4IGE0OGFkZTIyMDY4NzYwNDhiZjMwZjI2 NjcwMTE3ZjgzNTI0ODhlZDUuLmUzMDVkYmMwOWMxNjAzZWQ2ODNmYzBhMDdhZmY2N2Y0OTljOWZk ODggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv d2luX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2luX3VuaXR0ZXN0LnB5CkBAIC05NCwzICs5NCwxNCBAQCBjbGFzcyBXaW5Qb3J0VGVz dChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuX2Fzc2VydF92ZXJz aW9uKCd3aW4teHAnLCAneHAnKQogICAgICAgICBzZWxmLl9hc3NlcnRfdmVyc2lvbignd2luLXZp c3RhJywgJ3Zpc3RhJykKICAgICAgICAgc2VsZi5fYXNzZXJ0X3ZlcnNpb24oJ3dpbi03c3AwJywg JzdzcDAnKQorCisgICAgZGVmIHRlc3RfY29tcGFyZV90ZXh0KHNlbGYpOgorICAgICAgICBleHBl Y3RlZCA9ICJFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZp ZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb25cbmZvb1xuRURJVElORyBERUxFR0FURTog d2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZp Y2F0aW9uXG4iCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHNlbGYu YXNzZXJ0RmFsc2UocG9ydC5jb21wYXJlX3RleHQoZXhwZWN0ZWQsICJmb29cbiIpKQorICAgICAg ICBzZWxmLmFzc2VydFRydWUocG9ydC5jb21wYXJlX3RleHQoZXhwZWN0ZWQsICJmb28iKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuY29tcGFyZV90ZXh0KGV4cGVjdGVkLCAiYmFyIikp CisKKyAgICAgICAgIyBUaGlzIGhhY2sgZG9lc24ndCBleGlzdCBpbiBXSzIuCisgICAgICAgIHBv cnQuX29wdGlvbnMgPSBNb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9VHJ1ZSkKKyAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuY29tcGFyZV90ZXh0KGV4cGVjdGVkLCAiZm9vXG4iKSkK