38552 2010-05-04 15:48:34 -0700 PrettyPatch.pretty_diff("") should not hang 2010-05-04 23:06:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 38505 1 eric webkit-unassigned abarth cjerdonek commit-queue dpranke ojan oldest_to_newest 220839 0 eric 2010-05-04 15:48:34 -0700 Disable pretty patch on Chromium Mac to see if that resolves some hangs seen on the Mac Canary 220841 1 55066 eric 2010-05-04 15:52:48 -0700 Created attachment 55066 Patch 220846 2 55066 dpranke 2010-05-04 16:01:23 -0700 Comment on attachment 55066 Patch Can we just make the Mac port set _pretty_patch_available to false instead of returning a dummy text string? 220847 3 eric 2010-05-04 16:02:19 -0700 That will cause it to return a different dummy text string, but that's totally doable too. 220853 4 eric 2010-05-04 16:12:41 -0700 Dirk the change you're suggesting would look like this: chromium_mac.py: import base __init__... # FIXME: Remove this hack. _log.warn("Disabling pretty patch support due to bug 38552"); base._pretty_patch_available = False I'm happy to make such. But I think it's kinda a wash. They're both pretty hackish. 220909 5 dpranke 2010-05-04 17:52:16 -0700 Ah, I see. It would be nice if there was an overridable way of determining if pretty patch was available, but there isn't. Also, I see that what you return from pretty_diff_text() - an error string -- is different than what we return from wdiff_text() -- an empty string -- if it isn't available. So your first change is fine. 220943 6 eric 2010-05-04 19:32:11 -0700 Just going to fix the pretty_diff hang for now. 220944 7 55085 eric 2010-05-04 19:39:25 -0700 Created attachment 55085 Patch 220947 8 55085 dpranke 2010-05-04 19:57:29 -0700 Comment on attachment 55085 Patch LGTM (although I'm not a reviewer). 220967 9 55085 hamaji 2010-05-04 22:48:54 -0700 Comment on attachment 55085 Patch Looks like a nice fix. 220968 10 55085 commit-queue 2010-05-04 23:06:37 -0700 Comment on attachment 55085 Patch Clearing flags on attachment: 55085 Committed r58803: <http://trac.webkit.org/changeset/58803> 220969 11 commit-queue 2010-05-04 23:06:44 -0700 All reviewed patches have been landed. Closing bug. 55066 2010-05-04 15:52:48 -0700 2010-05-04 19:39:15 -0700 Patch bug-38552-20100504155246.patch text/plain 5433 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5MGNhYmE2NjdiOWM4MDIyOGMzMzEyMmFlNmVkNDc1MDU3NTI0OGJiLi4zYzA2NmJm NGEyZWIxOTEzOGRkNmIwYmM0NTRmYWQ1NThjMTA5MDc5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAK KzIwMTAtMDUtMDQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc2FibGUgcHJldHR5IHBhdGNo IG9uIENocm9taXVtIE1hYyB0byBzZWUgaWYgdGhhdCByZXNvbHZlcyBzb21lIGhhbmdzIHNlZW4g b24gdGhlIE1hYyBDYW5hcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM4NTUyCisKKyAgICAgICAgQWxzbyBmb3VuZCBhIGJ1ZyBpbiBQcmV0dHlQYXRj aC5wcmV0dHlfZGlmZiB3aGVyZSBpdCB3b3VsZAorICAgICAgICBoYW5nIHdoZW4gcGFzc2VkICIi IGFzIGlucHV0LgorCisgICAgICAgIEkgc3VzcGVjdCB0aGVyZSBtYXkgYmUgYnVncyBpbiBwcmV0 dGlmeS5yYiAob3Igb3VyIHVzZSB0aGVyZS1vZikKKyAgICAgICAgd2hlcmUgaXQgY2FuIGhhbmcs IHdoaWNoIHdvdWxkIHRoZW4gY2F1c2UgdGhlIHRlc3RpbmcgdGhyZWFkIHRvIGhhbmcuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaC5weToKKyAgICAgICAg IC0gRG9uJ3QgaGFuZyB3aGVuIHBhc3NlZCAiIgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3ByZXR0eXBhdGNoX3VuaXR0ZXN0LnB5OgorICAgICAgICAgLSBUZXN0IHRoYXQgd2Ug ZG9uJ3QgaGFuZyB3aGVuIHBhc3NlZCAiIgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgIC0gQWRkIGEgRklYTUUgdGhhdCB3ZSBz aG91bGQgc2hhcmUgY29kZSB3aXRoIHByZXR0eXBhdGNoLnJiCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHk6CisgICAgICAgICAtIERp c2FibGUgcHJldHR5IHBhdGNoIGRpZmZzIGZvciBub3cuCisKIDIwMTAtMDUtMDMgIERpcmsgUHJh bmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQg Zml4LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJl dHR5cGF0Y2gucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlw YXRjaC5weQppbmRleCA0YjA0NGVkNWRkN2IyYzIwOTcwY2Y5NWY5ZDhiNzVhOGI1Y2ZiNjY5Li40 ZTkyYTUzM2Q3MzM3ZDdkOWY3ZTljZTNjZjE3MzM3NTFjNDNiYzJkIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaC5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaC5weQpAQCAtMzEsNiAr MzEsNyBAQCBpbXBvcnQgdGVtcGZpbGUKIAogCiBjbGFzcyBQcmV0dHlQYXRjaChvYmplY3QpOgor ICAgICMgRklYTUU6IFByZXR0eVBhdGNoIHNob3VsZCBub3QgcmVxdWlyZSBjaGVja291dF9yb290 LgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBleGVjdXRpdmUsIGNoZWNrb3V0X3Jvb3QpOgogICAg ICAgICBzZWxmLl9leGVjdXRpdmUgPSBleGVjdXRpdmUKICAgICAgICAgc2VsZi5fY2hlY2tvdXRf cm9vdCA9IGNoZWNrb3V0X3Jvb3QKQEAgLTQ2LDYgKzQ3LDExIEBAIGNsYXNzIFByZXR0eVBhdGNo KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBkaWZmX2ZpbGUKIAogICAgIGRlZiBwcmV0dHlfZGlm ZihzZWxmLCBkaWZmKToKKyAgICAgICAgIyBwcmV0aWZ5LnJiIHdpbGwgaGFuZyBmb3JldmVyIGlm IGdpdmVuIG5vIGlucHV0LgorICAgICAgICAjIEF2b2lkIHRoZSBoYW5nIGJ5IHJldHVybmluZyBh biBlbXB0eSBzdHJpbmcuCisgICAgICAgIGlmIG5vdCBkaWZmOgorICAgICAgICAgICAgcmV0dXJu ICIiCisKICAgICAgICAgcHJldHR5X3BhdGNoX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5fY2hl Y2tvdXRfcm9vdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkJ1 Z3NTaXRlIiwgIlByZXR0eVBhdGNoIikKICAgICAgICAgcHJldHRpZnlfcGF0aCA9IG9zLnBhdGgu am9pbihwcmV0dHlfcGF0Y2hfcGF0aCwgInByZXR0aWZ5LnJiIikKZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ByZXR0eXBhdGNoX3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hfdW5pdHRlc3Qu cHkKaW5kZXggZjcyNzE3ZjYxMzZmY2YwMDg2ZGZlZjlhNmQxMGQ4ZTU4MjU2N2MzZi4uMTMwNzg1 NmMxZjk5MDljMmM4YjU0ZTg4MzIxYzk0MzQyODYzYmU2ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hfdW5pdHRlc3QucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hfdW5pdHRlc3Qu cHkKQEAgLTUwLDE2ICs1MCwyMSBAQCBJbmRleDogbGF0aW4xX3Rlc3QKICtsYXRpbjEgdGVzdDog XHhhMAogIiIiCiAKLSAgICBkZWYgdGVzdF9wcmV0dHlfZGlmZl9lbmNvZGluZ3Moc2VsZik6Ci0g ICAgICAgICMgVGhpcyBpcyBzbGlnaHRseSBsYW1lIHRoYXQgUHJldHR5UGF0Y2ggcmVxdWlyZXMK LSAgICAgICAgIyBjaGVja291dF9yb290IHRvIGJlIHBhc3NlZCB0byBpdC4KKyAgICBkZWYgX3dl YmtpdF9yb290KHNlbGYpOgogICAgICAgICB3ZWJraXRweV9jb21tb24gPSBvcy5wYXRoLmRpcm5h bWUoX19maWxlX18pCiAgICAgICAgIHdlYmtpdHB5ID0gb3MucGF0aC5kaXJuYW1lKHdlYmtpdHB5 X2NvbW1vbikKICAgICAgICAgc2NyaXB0cyA9IG9zLnBhdGguZGlybmFtZSh3ZWJraXRweSkKICAg ICAgICAgd2Via2l0X3Rvb2xzID0gb3MucGF0aC5kaXJuYW1lKHNjcmlwdHMpCiAgICAgICAgIHdl YmtpdF9yb290ID0gb3MucGF0aC5kaXJuYW1lKHdlYmtpdF90b29scykKKyAgICAgICAgcmV0dXJu IHdlYmtpdF9yb290CiAKLSAgICAgICAgcHJldHR5X3BhdGNoID0gUHJldHR5UGF0Y2goRXhlY3V0 aXZlKCksIHdlYmtpdF9yb290KQorICAgIGRlZiB0ZXN0X3ByZXR0eV9kaWZmX2VuY29kaW5ncyhz ZWxmKToKKyAgICAgICAgcHJldHR5X3BhdGNoID0gUHJldHR5UGF0Y2goRXhlY3V0aXZlKCksIHNl bGYuX3dlYmtpdF9yb290KCkpCiAgICAgICAgIHByZXR0eSA9IHByZXR0eV9wYXRjaC5wcmV0dHlf ZGlmZihzZWxmLl9kaWZmX3dpdGhfbXVsdGlwbGVfZW5jb2RpbmdzKQogICAgICAgICBzZWxmLmFz c2VydFRydWUocHJldHR5KSAgIyBXZSBnb3Qgc29tZSBvdXRwdXQKICAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKGlzaW5zdGFuY2UocHJldHR5LCBzdHIpKSAgIyBJdCdzIGEgYnl0ZSBhcnJheSwgbm90 IHVuaWNvZGUKKworICAgIGRlZiB0ZXN0X3ByZXR0eV9wcmludF9lbXB0eV9zdHJpbmcoc2VsZik6 CisgICAgICAgICMgTWFrZSBzdXJlIHRoYXQgYW4gZW1wdHkgZGlmZiBkb2VzIG5vdCBoYW5nIHRo ZSBwcm9jZXNzLgorICAgICAgICBwcmV0dHlfcGF0Y2ggPSBQcmV0dHlQYXRjaChFeGVjdXRpdmUo KSwgc2VsZi5fd2Via2l0X3Jvb3QoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcmV0dHlf cGF0Y2gucHJldHR5X2RpZmYoIiIpLCAiIikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCBiZjQ2YzlmNmQ4NjM3 Y2FjYjJmMmQxYTNjZWRhYTIyOGQzZDMyZmZjLi4yNTk0NmFmMWFiY2NlZjYzNTNkMzZkMTJiYjg4 NmI5OWY4NDc1NTg2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC01OTEsNiArNTkxLDcgQEAgY2xhc3MgUG9y dChvYmplY3QpOgogICAgIF9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbCA9ICJGYWlsZWQgdG8gcnVu IFByZXR0eVBhdGNoLCBzZWUgZXJyb3IgY29uc29sZS4iCiAKICAgICBkZWYgcHJldHR5X3BhdGNo X3RleHQoc2VsZiwgZGlmZl9wYXRoKToKKyAgICAgICAgIyBGSVhNRTogTXVjaCBvZiB0aGlzIGZ1 bmN0aW9uIGNvdWxkIG1vdmUgdG8gcHJldHR5cGF0Y2gucmIKICAgICAgICAgZ2xvYmFsIF9wcmV0 dHlfcGF0Y2hfYXZhaWxhYmxlCiAgICAgICAgIGlmIG5vdCBfcHJldHR5X3BhdGNoX2F2YWlsYWJs ZToKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbApkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX21hYy5weQppbmRleCAwZDFkMjdiYjExN2U4NzBkYTYyNjg3OTkwYjc3 YmQzNmIwYTZhMTI2Li4wYjIyZDhhYmUzYjA0NTMwYzQwMzZkNDk3ZDAwNDBjZDM1NmNkZDliIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX21hYy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQpAQCAtNTEsNiArNTEsMTAgQEAgY2xhc3MgQ2hy b21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICAgICBvcHRpb25z LmNvbmZpZ3VyYXRpb24gPSAnUmVsZWFzZScKICAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0 Ll9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZSwgb3B0aW9ucykKIAorICAgIGRlZiBwcmV0dHlfcGF0 Y2hfdGV4dChzZWxmLCBkaWZmKToKKyAgICAgICAgIyBGSVhNRTogUmVtb3ZlIHRoaXMgY29kZS4K KyAgICAgICAgcmV0dXJuICJwcmV0dHkgZGlmZiBkaXNhYmxlZCB0ZW1wb3JhcmlseSBhcyBpdCBt YXkgYmUgY2F1c2luZyB3ZWJraXQgYnVnIDM4NTA1IgorCiAgICAgZGVmIGJhc2VsaW5lX3NlYXJj aF9wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gW3NlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRo KCdjaHJvbWl1bS1tYWMnKSwKICAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgnY2hyb21pdW0nKSwK 55085 2010-05-04 19:39:25 -0700 2010-05-04 23:06:37 -0700 Patch bug-38552-20100504193923.patch text/plain 4394 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5MGNhYmE2NjdiOWM4MDIyOGMzMzEyMmFlNmVkNDc1MDU3NTI0OGJiLi5jYTg4MTBi ZjA3ZWIwY2MyYzk3Y2FhODE0NmU2MjJlNDAyNzA2MjM2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTAtMDUtMDQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXR0eVBhdGNoLnByZXR0eV9k aWZmKCIiKSBzaG91bGQgbm90IGhhbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM4NTUyCisKKyAgICAgICAgQWxzbyBmb3VuZCBhIGJ1ZyBpbiBQcmV0 dHlQYXRjaC5wcmV0dHlfZGlmZiB3aGVyZSBpdCB3b3VsZAorICAgICAgICBoYW5nIHdoZW4gcGFz c2VkICIiIGFzIGlucHV0LgorCisgICAgICAgIEkgc3VzcGVjdCB0aGVyZSBtYXkgYmUgYnVncyBp biBwcmV0dGlmeS5yYiAob3Igb3VyIHVzZSB0aGVyZS1vZikKKyAgICAgICAgd2hlcmUgaXQgY2Fu IGhhbmcsIHdoaWNoIHdvdWxkIHRoZW4gY2F1c2UgdGhlIHRlc3RpbmcgdGhyZWFkIHRvIGhhbmcu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaC5weToKKyAg ICAgICAgIC0gRG9uJ3QgaGFuZyB3aGVuIHBhc3NlZCAiIgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3ByZXR0eXBhdGNoX3VuaXR0ZXN0LnB5OgorICAgICAgICAgLSBUZXN0IHRo YXQgd2UgZG9uJ3QgaGFuZyB3aGVuIHBhc3NlZCAiIgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgIC0gQWRkIGEgRklYTUUgdGhh dCB3ZSBzaG91bGQgc2hhcmUgY29kZSB3aXRoIHByZXR0eXBhdGNoLnJiCisKIDIwMTAtMDUtMDMg IERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vcHJldHR5cGF0Y2gucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9wcmV0dHlwYXRjaC5weQppbmRleCA0YjA0NGVkNWRkN2IyYzIwOTcwY2Y5NWY5ZDhiNzVhOGI1 Y2ZiNjY5Li40ZTkyYTUzM2Q3MzM3ZDdkOWY3ZTljZTNjZjE3MzM3NTFjNDNiYzJkIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9wcmV0dHlwYXRjaC5weQpA QCAtMzEsNiArMzEsNyBAQCBpbXBvcnQgdGVtcGZpbGUKIAogCiBjbGFzcyBQcmV0dHlQYXRjaChv YmplY3QpOgorICAgICMgRklYTUU6IFByZXR0eVBhdGNoIHNob3VsZCBub3QgcmVxdWlyZSBjaGVj a291dF9yb290LgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBleGVjdXRpdmUsIGNoZWNrb3V0X3Jv b3QpOgogICAgICAgICBzZWxmLl9leGVjdXRpdmUgPSBleGVjdXRpdmUKICAgICAgICAgc2VsZi5f Y2hlY2tvdXRfcm9vdCA9IGNoZWNrb3V0X3Jvb3QKQEAgLTQ2LDYgKzQ3LDExIEBAIGNsYXNzIFBy ZXR0eVBhdGNoKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBkaWZmX2ZpbGUKIAogICAgIGRlZiBw cmV0dHlfZGlmZihzZWxmLCBkaWZmKToKKyAgICAgICAgIyBwcmV0aWZ5LnJiIHdpbGwgaGFuZyBm b3JldmVyIGlmIGdpdmVuIG5vIGlucHV0LgorICAgICAgICAjIEF2b2lkIHRoZSBoYW5nIGJ5IHJl dHVybmluZyBhbiBlbXB0eSBzdHJpbmcuCisgICAgICAgIGlmIG5vdCBkaWZmOgorICAgICAgICAg ICAgcmV0dXJuICIiCisKICAgICAgICAgcHJldHR5X3BhdGNoX3BhdGggPSBvcy5wYXRoLmpvaW4o c2VsZi5fY2hlY2tvdXRfcm9vdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIkJ1Z3NTaXRlIiwgIlByZXR0eVBhdGNoIikKICAgICAgICAgcHJldHRpZnlfcGF0aCA9 IG9zLnBhdGguam9pbihwcmV0dHlfcGF0Y2hfcGF0aCwgInByZXR0aWZ5LnJiIikKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ByZXR0eXBhdGNoX3VuaXR0 ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hf dW5pdHRlc3QucHkKaW5kZXggZjcyNzE3ZjYxMzZmY2YwMDg2ZGZlZjlhNmQxMGQ4ZTU4MjU2N2Mz Zi4uMTMwNzg1NmMxZjk5MDljMmM4YjU0ZTg4MzIxYzk0MzQyODYzYmU2ZiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hfdW5pdHRlc3Qu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vcHJldHR5cGF0Y2hf dW5pdHRlc3QucHkKQEAgLTUwLDE2ICs1MCwyMSBAQCBJbmRleDogbGF0aW4xX3Rlc3QKICtsYXRp bjEgdGVzdDogXHhhMAogIiIiCiAKLSAgICBkZWYgdGVzdF9wcmV0dHlfZGlmZl9lbmNvZGluZ3Mo c2VsZik6Ci0gICAgICAgICMgVGhpcyBpcyBzbGlnaHRseSBsYW1lIHRoYXQgUHJldHR5UGF0Y2gg cmVxdWlyZXMKLSAgICAgICAgIyBjaGVja291dF9yb290IHRvIGJlIHBhc3NlZCB0byBpdC4KKyAg ICBkZWYgX3dlYmtpdF9yb290KHNlbGYpOgogICAgICAgICB3ZWJraXRweV9jb21tb24gPSBvcy5w YXRoLmRpcm5hbWUoX19maWxlX18pCiAgICAgICAgIHdlYmtpdHB5ID0gb3MucGF0aC5kaXJuYW1l KHdlYmtpdHB5X2NvbW1vbikKICAgICAgICAgc2NyaXB0cyA9IG9zLnBhdGguZGlybmFtZSh3ZWJr aXRweSkKICAgICAgICAgd2Via2l0X3Rvb2xzID0gb3MucGF0aC5kaXJuYW1lKHNjcmlwdHMpCiAg ICAgICAgIHdlYmtpdF9yb290ID0gb3MucGF0aC5kaXJuYW1lKHdlYmtpdF90b29scykKKyAgICAg ICAgcmV0dXJuIHdlYmtpdF9yb290CiAKLSAgICAgICAgcHJldHR5X3BhdGNoID0gUHJldHR5UGF0 Y2goRXhlY3V0aXZlKCksIHdlYmtpdF9yb290KQorICAgIGRlZiB0ZXN0X3ByZXR0eV9kaWZmX2Vu Y29kaW5ncyhzZWxmKToKKyAgICAgICAgcHJldHR5X3BhdGNoID0gUHJldHR5UGF0Y2goRXhlY3V0 aXZlKCksIHNlbGYuX3dlYmtpdF9yb290KCkpCiAgICAgICAgIHByZXR0eSA9IHByZXR0eV9wYXRj aC5wcmV0dHlfZGlmZihzZWxmLl9kaWZmX3dpdGhfbXVsdGlwbGVfZW5jb2RpbmdzKQogICAgICAg ICBzZWxmLmFzc2VydFRydWUocHJldHR5KSAgIyBXZSBnb3Qgc29tZSBvdXRwdXQKICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKGlzaW5zdGFuY2UocHJldHR5LCBzdHIpKSAgIyBJdCdzIGEgYnl0ZSBh cnJheSwgbm90IHVuaWNvZGUKKworICAgIGRlZiB0ZXN0X3ByZXR0eV9wcmludF9lbXB0eV9zdHJp bmcoc2VsZik6CisgICAgICAgICMgTWFrZSBzdXJlIHRoYXQgYW4gZW1wdHkgZGlmZiBkb2VzIG5v dCBoYW5nIHRoZSBwcm9jZXNzLgorICAgICAgICBwcmV0dHlfcGF0Y2ggPSBQcmV0dHlQYXRjaChF eGVjdXRpdmUoKSwgc2VsZi5fd2Via2l0X3Jvb3QoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChwcmV0dHlfcGF0Y2gucHJldHR5X2RpZmYoIiIpLCAiIikKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCBiZjQ2 YzlmNmQ4NjM3Y2FjYjJmMmQxYTNjZWRhYTIyOGQzZDMyZmZjLi4yNTk0NmFmMWFiY2NlZjYzNTNk MzZkMTJiYjg4NmI5OWY4NDc1NTg2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC01OTEsNiArNTkxLDcgQEAg Y2xhc3MgUG9ydChvYmplY3QpOgogICAgIF9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbCA9ICJGYWls ZWQgdG8gcnVuIFByZXR0eVBhdGNoLCBzZWUgZXJyb3IgY29uc29sZS4iCiAKICAgICBkZWYgcHJl dHR5X3BhdGNoX3RleHQoc2VsZiwgZGlmZl9wYXRoKToKKyAgICAgICAgIyBGSVhNRTogTXVjaCBv ZiB0aGlzIGZ1bmN0aW9uIGNvdWxkIG1vdmUgdG8gcHJldHR5cGF0Y2gucmIKICAgICAgICAgZ2xv YmFsIF9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlCiAgICAgICAgIGlmIG5vdCBfcHJldHR5X3BhdGNo X2F2YWlsYWJsZToKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlfcGF0Y2hfZXJyb3Jf aHRtbAo=