91212 2012-07-13 03:58:17 -0700 ruby1.9 fails in PrettyPatch.rb with invalid byte sequence in UTF-8 2012-10-03 04:53:48 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 spena spena cmarcelo morrita webkit.review.bot oldest_to_newest 668831 0 spena 2012-07-13 03:58:17 -0700 After upgrading the setup in one of the GTK 64bits bots, we found that if ruby1.9 is used instead of ruby1.8, the following error happens when running test-webkitpy: /home/spenap/Projects/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:108:in `gsub': invalid byte sequence in UTF-8 (ArgumentError) from /home/spenap/Projects/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:108:in `normalize_line_ending' from /home/spenap/Projects/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:19:in `prettify' from /home/spenap/Projects/WebKit/Websites/bugs.webkit.org/PrettyPatch/prettify.rb:26:in `<main>' This is caused by the new encoding engine that Ruby 1.9 uses (see http://blog.grayproductions.net/articles/ruby_19s_string) I took a look at http://smyck.net/2011/05/13/files-with-mixed-and-invalid-encodings-in-ruby/ to work around it, but iconv will be deprecated in the future, and String#encode is recommended instead. However, by looking at http://blog.segment7.net/2010/12/17/from-iconv-iconv-to-string-encode, the new alternative is not as straight-forward as using iconv. We're currently keeping ruby in version 1.8, which works as expected. 668837 1 spena 2012-07-13 04:03:55 -0700 CCing Caio, who added the normalize_line_ending method originally. 668845 2 152212 spena 2012-07-13 04:16:13 -0700 Created attachment 152212 Patch 668849 3 spena 2012-07-13 04:17:48 -0700 (In reply to comment #2) > Created an attachment (id=152212) [details] > Patch I've attached a patch using Iconv, although, as mentioned in comment #0, it should be better to use String#encode. 673092 4 morrita 2012-07-18 19:25:09 -0700 (In reply to comment #3) > (In reply to comment #2) > > Created an attachment (id=152212) [details] [details] > > Patch > > I've attached a patch using Iconv, although, as mentioned in comment #0, it should be better to use String#encode. Let's do what you think the best :-) 673301 5 152212 spena 2012-07-19 01:38:04 -0700 Comment on attachment 152212 Patch OK, I'll try to come up with a proper fix later. 732366 6 166628 spena 2012-10-02 00:20:17 -0700 Created attachment 166628 Patch 732368 7 spena 2012-10-02 00:23:30 -0700 This new version of the patch uses the "proper" implementation when Ruby's version is >= 1.9 (using the string encode method) and keeps the current one for 1.8. 733357 8 166628 morrita 2012-10-02 22:04:04 -0700 Comment on attachment 166628 Patch Wow, I didn't know that encode() support :fallback option. 733569 9 166628 webkit.review.bot 2012-10-03 04:53:45 -0700 Comment on attachment 166628 Patch Clearing flags on attachment: 166628 Committed r130276: <http://trac.webkit.org/changeset/130276> 733570 10 webkit.review.bot 2012-10-03 04:53:48 -0700 All reviewed patches have been landed. Closing bug. 152212 2012-07-13 04:16:13 -0700 2012-10-02 00:20:12 -0700 Patch bug-91212-20120713131611.patch text/plain 2015 spena U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTYxCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBkYjU2YTkzMTZhOGEzOGI4YjJlM2UwZWRlNTVhYzhhYzlkNmNmNTAzLi45MjM5MDcyMzg0 NWU0NTAyNzUzZjM2NTNjZjI0ZDI3NjZjZDM2ZWJiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNy0xMyAgU2ltb24gUGVuYSAgPHNwZW5hQGln YWxpYS5jb20+CisKKyAgICAgICAgcnVieTEuOSBmYWlscyBpbiBQcmV0dHlQYXRjaC5yYiB3aXRo IGludmFsaWQgYnl0ZSBzZXF1ZW5jZSBpbiBVVEYtOAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBydWJ5MS45IGNoYW5nZWQgdGhlIHdheSBpdCBoYW5kbGVz IGVuY29kaW5nLCBzbyB0aGUgZ3N1YiBtZXRob2QgdXNlZAorICAgICAgICB3aGVuIG5vcm1hbGl6 aW5nIGxpbmUgZW5kaW5nIGNvbXBsYWlucyBvZiBpbnZhbGlkIGJ5dGUgc2VxdWVuY2UgaW4gVVRG LTguCisgICAgICAgIFVzaW5nICJpY29udiIgdG8gaGFuZGxlIHRoZSBzdHJpbmcgZW5jb2Rpbmcg d29ya3MgZmluZSBpbiBib3RoIHJ1YnkgMS44IGFuZCAxLjksCisgICAgICAgIGFsdGhvdWdoIGl0 IGlzIGRlcHJlY2F0ZWQgYW5kIG1pZ2h0IGJlIHVuYXZhaWxhYmxlIGluIGxhdGVyIHZlcnNpb25z LgorCisgICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmI6IFVzZSBpY29udiB0byBo YW5kbGUgc3RyaW5nIGVuY29kaW5nIHdoZW4gbm9ybWFsaXppbmcKKyAgICAgICAgbGluZSBlbmRp bmcuCisKIDIwMTItMDctMTEgIEFsaWNlIENoZW5nICA8YWxpY2VfY2hlbmdAYXBwbGUuY29tPgog CiAgICAgICAgIERlbGV0aW5nIGNvbnRlbnQgYXQgdGhlIHRvcCBvZiBwcmV0dHlwYXRjaCBlbWFp bHMgZGVzdHJveXMgSFRNTCBmb3JtYXR0aW5nCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIgYi9XZWJzaXRlcy9idWdzLndlYmtp dC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKaW5kZXggNjBjZDc2MjQ4OGFhODNlMGY4 ZjAzODQ4ODk5YmU4MWZjMWQ5ODgzYS4uMzg2NDMzMjQ2Nzk3MzY3YmFiOTk4YzUwYzk3M2U4NmFk MDk2MjI5NCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNo L1ByZXR0eVBhdGNoLnJiCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRj aC9QcmV0dHlQYXRjaC5yYgpAQCAtMSw1ICsxLDYgQEAKIHJlcXVpcmUgJ2NnaScKIHJlcXVpcmUg J2RpZmYnCityZXF1aXJlICdpY29udicKIHJlcXVpcmUgJ29wZW4zJwogcmVxdWlyZSAnb3Blbi11 cmknCiByZXF1aXJlICdwcCcKQEAgLTEwMiw3ICsxMDMsOSBAQCBwcml2YXRlCiAgICAgSU1BR0Vf Q0hFQ0tTVU1fRVJST1IgPSAiSU5WQUxJRDogSW1hZ2UgbGFja3MgYSBjaGVja3N1bS4gVGhpcyB3 aWxsIGZhaWwgd2l0aCBhIE1JU1NJTkcgZXJyb3IgaW4gcnVuLXdlYmtpdC10ZXN0cy4gQWx3YXlz IGdlbmVyYXRlIG5ldyBwbmcgZmlsZXMgdXNpbmcgcnVuLXdlYmtpdC10ZXN0cy4iCiAKICAgICBk ZWYgc2VsZi5ub3JtYWxpemVfbGluZV9lbmRpbmcocykKLSAgICAgICAgcy5nc3ViIC9cclxuPy8s ICJcbiIKKyAgICAgICAgaWMgPSBJY29udi5uZXcoJ1VURi04Ly9JR05PUkUnLCAnVVRGLTgnKQor ICAgICAgICBlbmNvZGVkX3N0cmluZyA9IGljLmljb252KHMpCisgICAgICAgIGVuY29kZWRfc3Ry aW5nLmdzdWIgL1xyXG4/LywgIlxuIgogICAgIGVuZAogCiAgICAgZGVmIHNlbGYuZmluZF91cmxf YW5kX3BhdGgoZmlsZV9wYXRoKQo= 166628 2012-10-02 00:20:17 -0700 2012-10-03 04:53:45 -0700 Patch bug-91212-20121002091929.patch text/plain 3988 spena U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NTk3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAxZGI3M2U5NGQyZWYwNTM5Y2E4YjdkMTY4YWIzYzY4N2RhMzk1NmFhLi42OGExYWI5YTg0 NWE0MGQ5OTdhMjE4MDk4NTlkMzM2MzA2MzkyYzlhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wNy0xMyAgU2ltb24gUGVuYSAgPHNwZW5hQGln YWxpYS5jb20+CisKKyAgICAgICAgcnVieTEuOSBmYWlscyBpbiBQcmV0dHlQYXRjaC5yYiB3aXRo IGludmFsaWQgYnl0ZSBzZXF1ZW5jZSBpbiBVVEYtOAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEyMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBydWJ5MS45IGNoYW5nZWQgdGhlIHdheSBpdCBoYW5kbGVz IGVuY29kaW5nLCBzbyB0aGUgZ3N1YiBtZXRob2QgdXNlZAorICAgICAgICB3aGVuIG5vcm1hbGl6 aW5nIGxpbmUgZW5kaW5nIGNvbXBsYWlucyBvZiBpbnZhbGlkIGJ5dGUgc2VxdWVuY2UgaW4gVVRG LTguCisgICAgICAgIFRoaXMgcGF0Y2ggdXNlcyB0aGUgImVuY29kZSIgc3RyaW5nIG1ldGhvZCBm b3IgdmVyc2lvbnMgb2YgUnVieSA+PSAxLjkKKyAgICAgICAgdG8gcHJvdmlkZSB0aGUgZW5jb2Rp bmcgY29udmVyc2lvbiAoa2VlcGluZyB0aGUgY3VycmVudCBpbXBsZW1lbnRhdGlvbiBpbgorICAg ICAgICBSdWJ5IDEuOCkuCisKKyAgICAgICAgKiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjog VXNlIHRoZSAiZW5jb2RlIiBzdHJpbmcgbWV0aG9kIGZvciBlbmNvZGluZworICAgICAgICBjb252 ZXJzaW9uIHdoZW4gdGhlIFJ1YnkgdmVyc2lvbiBpcyA+PSAxLjkuCisKIDIwMTItMDktMjUgIFBl dGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBjb21taXR0ZXJz LWF1dG9jb21wbGV0ZS5qcyB3b3JrcyBvbmx5IHdpdGggV2ViS2l0IGJhc2VkIGJyb3dzZXJzCmRp ZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0 Y2gucmIgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gu cmIKaW5kZXggMzYwYzJiMjM1YmFjYWJjOTJiN2FmZTBjMjQwZmY4OWUwNWM4MGMyZi4uNjY4ZjMz MWE2NTQwNTU0NzFmZGEyNmUzZDg0Y2ZiNjhiYmNiZThkZiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMv YnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCisrKyBiL1dlYnNpdGVz L2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgpAQCAtMTAyLDcgKzEw MiwzNiBAQCBwcml2YXRlCiAgICAgSU1BR0VfQ0hFQ0tTVU1fRVJST1IgPSAiSU5WQUxJRDogSW1h Z2UgbGFja3MgYSBjaGVja3N1bS4gVGhpcyB3aWxsIGZhaWwgd2l0aCBhIE1JU1NJTkcgZXJyb3Ig aW4gcnVuLXdlYmtpdC10ZXN0cy4gQWx3YXlzIGdlbmVyYXRlIG5ldyBwbmcgZmlsZXMgdXNpbmcg cnVuLXdlYmtpdC10ZXN0cy4iCiAKICAgICBkZWYgc2VsZi5ub3JtYWxpemVfbGluZV9lbmRpbmco cykKLSAgICAgICAgcy5nc3ViIC9cclxuPy8sICJcbiIKKyAgICAgICAgaWYgUlVCWV9WRVJTSU9O ID49ICIxLjkiCisgICAgICAgICAgICAjIFRyYW5zbGl0ZXJhdGlvbiB0YWJsZSBmcm9tIGh0dHA6 Ly9zdGFja292ZXJmbG93LmNvbS9hLzY2MDk5OTgKKyAgICAgICAgICAgIHRyYW5zbGl0ZXJhdGlv bl90YWJsZSA9IHsgJ1x4YzJceDgyJyA9PiAnLCcsICAgICAgICAjIEhpZ2ggY29kZSBjb21tYQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnXHhjMlx4ODQnID0+ICcsLCcs ICAgICAgICMgSGlnaCBjb2RlIGRvdWJsZSBjb21tYQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnXHhjMlx4ODUnID0+ICcuLi4nLCAgICAgICMgVHJpcHBsZSBkb3QKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1x4YzJceDg4JyA9PiAnXicsICAg ICAgICAjIEhpZ2ggY2FyYXQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J1x4YzJceDkxJyA9PiAnXHgyNycsICAgICAjIEZvcndhcmQgc2luZ2xlIHF1b3RlCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdceGMyXHg5MicgPT4gJ1x4MjcnLCAgICAg IyBSZXZlcnNlIHNpbmdsZSBxdW90ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnXHhjMlx4OTMnID0+ICdceDIyJywgICAgICMgRm9yd2FyZCBkb3VibGUgcXVvdGUKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1x4YzJceDk0JyA9PiAnXHgyMics ICAgICAjIFJldmVyc2UgZG91YmxlIHF1b3RlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdceGMyXHg5NScgPT4gJyAnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnXHhjMlx4OTYnID0+ICctJywgICAgICAgICMgSGlnaCBoeXBoZW4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1x4YzJceDk3JyA9PiAnLS0nLCAgICAg ICAjIERvdWJsZSBoeXBoZW4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J1x4YzJceDk5JyA9PiAnICcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdceGMyXHhhMCcgPT4gJyAnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnXHhjMlx4YTYnID0+ICd8JywgICAgICAgICMgU3BsaXQgdmVydGljYWwgYmFyCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdceGMyXHhhYicgPT4gJzw8JywgICAgICAg IyBEb3VibGUgbGVzcyB0aGFuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdceGMyXHhiYicgPT4gJz4+JywgICAgICAgIyBEb3VibGUgZ3JlYXRlciB0aGFuCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdceGMyXHhiYycgPT4gJzEvNCcsICAgICAg IyBvbmUgcXVhcnRlcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnXHhj Mlx4YmQnID0+ICcxLzInLCAgICAgICMgb25lIGhhbGYKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ1x4YzJceGJlJyA9PiAnMy80JywgICAgICAjIHRocmVlIHF1YXJ0ZXJz CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdceGNhXHhiZicgPT4gJ1x4 MjcnLCAgICAgIyBjLXNpbmdsZSBxdW90ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnXHhjY1x4YTgnID0+ICcnLCAgICAgICAgICMgbW9kaWZpZXIgLSB1bmRlciBjdXJ2 ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnXHhjY1x4YjEnID0+ICcn ICAgICAgICAgICMgbW9kaWZpZXIgLSB1bmRlciBsaW5lCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGVuY29kZWRfc3RyaW5nID0gcy5mb3JjZV9lbmNv ZGluZygnVVRGLTgnKS5lbmNvZGUoJ1VURi0xNicsIDppbnZhbGlkID0+IDpyZXBsYWNlLCA6cmVw bGFjZSA9PiAnJywgOmZhbGxiYWNrID0+IHRyYW5zbGl0ZXJhdGlvbl90YWJsZSkuZW5jb2RlKCdV VEYtOCcpCisgICAgICAgICAgICBlbmNvZGVkX3N0cmluZy5nc3ViIC9cclxuPy8sICJcbiIKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgcy5nc3ViIC9cclxuPy8sICJcbiIKKyAgICAgICAgZW5k CiAgICAgZW5kCiAKICAgICBkZWYgc2VsZi5maW5kX3VybF9hbmRfcGF0aChmaWxlX3BhdGgpCg==