33554 2010-01-12 14:59:52 -0800 run-webkit-tests fails on Ruby 1.9 2010-01-22 10:23:33 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Minor --- 0 lew21 webkit-unassigned hamaji oldest_to_newest 179989 0 lew21 2010-01-12 14:59:52 -0800 inject does not work with strings any more, so BugsSite/PrettyPatch/PrettyPatch.rb prints lots of errors. 179997 1 46402 lew21 2010-01-12 15:13:24 -0800 Created attachment 46402 Bugfix 180104 2 46402 hamaji 2010-01-12 23:52:57 -0800 Comment on attachment 46402 Bugfix > def self.parse(string) > haveSeenDiffHeader = false > - linesForDiffs = string.inject([]) do |diffChunks, line| > + diffChunks = linesForDiffs = [] > + string.each_line do |line| > if (PrettyPatch.diff_header?(line)) > diffChunks << [] > haveSeenDiffHeader = true I think the local variable diffChunks isn't necessary anymore? 180370 3 46496 lew21 2010-01-13 13:09:10 -0800 Created attachment 46496 Corrected fix 180384 4 46496 lew21 2010-01-13 13:30:08 -0800 Comment on attachment 46496 Corrected fix Patch regressed... I'll try to do something with it. 183445 5 47171 hamaji 2010-01-21 19:02:21 -0800 Created attachment 47171 Revised patch 183446 6 hamaji 2010-01-21 19:03:13 -0800 I meant the use of diffChunks can be replaced by linesForDiffs. Sorry for confusing you. I revised the patch based on Janusz's patch. I confirmed my patch works with both ruby 1.8 and 1.9. I used this file as the example input: https://bug-31395-attachments.webkit.org/attachment.cgi?id=43039 Thanks Janusz for finding this issue and submitting patches! 183549 7 47171 mjs 2010-01-22 01:57:50 -0800 Comment on attachment 47171 Revised patch r=me 183619 8 47171 hamaji 2010-01-22 06:13:40 -0800 Comment on attachment 47171 Revised patch Clearing flags on attachment: 47171 Committed r53700: <http://trac.webkit.org/changeset/53700> 183620 9 hamaji 2010-01-22 06:13:48 -0800 All reviewed patches have been landed. Closing bug. 183692 10 lew21 2010-01-22 10:23:33 -0800 Thanks Shinichiro, I've got lost in Ruby's syntax... 46402 2010-01-12 15:13:24 -0800 2010-01-13 13:09:10 -0800 Bugfix 0001-run-webkit-tests-fails-on-Ruby-1.9.patch text/plain 1761 lew21 RnJvbSA5ODQ2MDgyMGZlODkzNDQ2NDQzOWNhZDExYjY0NWMxM2MzZWY3MWJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYW51c3ogTGV3YW5kb3dza2kgPGxldzIxQHh0cmVlbWUub3Jn PgpEYXRlOiBXZWQsIDEzIEphbiAyMDEwIDAwOjAwOjAzICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cnVuLXdlYmtpdC10ZXN0cyBmYWlscyBvbiBSdWJ5IDEuOQogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMzNTU0CiBpbmplY3QgZG9lcyBub3Qgd29yayB3aXRoIHN0cmlu Z3MgYW55IG1vcmUsIHNvIEJ1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiIHByaW50 cyBsb3RzIG9mIGVycm9ycy4KCi0tLQogQnVnc1NpdGUvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgfCAgIDEwICsrKysrKysrKysKIEJ1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJi IHwgICAgMyArKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9DaGFuZ2VMb2cgYi9CdWdzU2l0ZS9DaGFuZ2VM b2cKaW5kZXggODUxMjY3Ni4uNzdmYzdiNCAxMDA2NDQKLS0tIGEvQnVnc1NpdGUvQ2hhbmdlTG9n CisrKyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTAxLTEyICBK YW51c3ogTGV3YW5kb3dza2kgIDxsZXcyMUB4dHJlZW1lLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIGZhaWxzIG9u IFJ1YnkgMS45CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMzU1NAorICAgICAgICBpbmplY3QgZG9lcyBub3Qgd29yayB3aXRoIHN0cmluZ3MgYW55IG1v cmUsIHNvIEJ1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiIHByaW50cyBsb3RzIG9m IGVycm9ycy4KKworICAgICAgICAqIFByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiOgorCiAyMDEw LTAxLTA4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgPGh0 dHA6Ly93ZWJraXQub3JnL2IvMzM0MTA+IEZpeCAiVmlldyBQbGFpbiBEaWZmIi8iVmlldyBGb3Jt YXR0ZWQgRGlmZiIgYnV0dG9uCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0 dHlQYXRjaC5yYiBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCmluZGV4IGI2 OGNkOGMuLjAwNjYxZDQgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBh dGNoLnJiCisrKyBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCkBAIC0yOTQs NyArMjk0LDggQEAgRU9GCiAKICAgICAgICAgZGVmIHNlbGYucGFyc2Uoc3RyaW5nKQogICAgICAg ICAgICAgaGF2ZVNlZW5EaWZmSGVhZGVyID0gZmFsc2UKLSAgICAgICAgICAgIGxpbmVzRm9yRGlm ZnMgPSBzdHJpbmcuaW5qZWN0KFtdKSBkbyB8ZGlmZkNodW5rcywgbGluZXwKKyAgICAgICAgICAg IGRpZmZDaHVua3MgPSBsaW5lc0ZvckRpZmZzID0gW10KKyAgICAgICAgICAgIHN0cmluZy5lYWNo X2xpbmUgZG8gfGxpbmV8CiAgICAgICAgICAgICAgICAgaWYgKFByZXR0eVBhdGNoLmRpZmZfaGVh ZGVyPyhsaW5lKSkKICAgICAgICAgICAgICAgICAgICAgZGlmZkNodW5rcyA8PCBbXQogICAgICAg ICAgICAgICAgICAgICBoYXZlU2VlbkRpZmZIZWFkZXIgPSB0cnVlCi0tIAoxLjYuNgoK 46496 2010-01-13 13:09:10 -0800 2010-01-21 19:02:16 -0800 Corrected fix 0001-run-webkit-tests-fails-on-Ruby-1.9.patch text/plain 2108 lew21 RnJvbSBlYTgzZDZkODUyMjU4OWFjZDhlNTgxMGZlZWQ3OWRlZTJjNjYwYmNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYW51c3ogTGV3YW5kb3dza2kgPGxldzIxQHh0cmVlbWUub3Jn PgpEYXRlOiBXZWQsIDEzIEphbiAyMDEwIDAwOjAwOjAzICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cnVuLXdlYmtpdC10ZXN0cyBmYWlscyBvbiBSdWJ5IDEuOQogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMzNTU0CiBpbmplY3QgZG9lcyBub3Qgd29yayB3aXRoIHN0cmlu Z3MgYW55IG1vcmUsIHNvIEJ1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiIHByaW50 cyBsb3RzIG9mIGVycm9ycy4KCi0tLQogQnVnc1NpdGUvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgfCAgIDEwICsrKysrKysrKysKIEJ1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJi IHwgICAgNyArKy0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvQ2hhbmdlTG9nIGIvQnVnc1NpdGUvQ2hh bmdlTG9nCmluZGV4IDg1MTI2NzYuLjc3ZmM3YjQgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL0NoYW5n ZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wMS0x MiAgSmFudXN6IExld2FuZG93c2tpICA8bGV3MjFAeHRyZWVtZS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcnVuLXdlYmtpdC10ZXN0cyBmYWls cyBvbiBSdWJ5IDEuOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzM1NTQKKyAgICAgICAgaW5qZWN0IGRvZXMgbm90IHdvcmsgd2l0aCBzdHJpbmdzIGFu eSBtb3JlLCBzbyBCdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiBwcmludHMgbG90 cyBvZiBlcnJvcnMuCisKKyAgICAgICAgKiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjoKKwog MjAxMC0wMS0wOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAg IDxodHRwOi8vd2Via2l0Lm9yZy9iLzMzNDEwPiBGaXggIlZpZXcgUGxhaW4gRGlmZiIvIlZpZXcg Rm9ybWF0dGVkIERpZmYiIGJ1dHRvbgpkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvUHJldHR5UGF0Y2gv UHJldHR5UGF0Y2gucmIgYi9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgppbmRl eCBiNjhjZDhjLi43MDQxZWJiIDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0 dHlQYXRjaC5yYgorKysgYi9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgpAQCAt Mjk0LDE2ICsyOTQsMTMgQEAgRU9GCiAKICAgICAgICAgZGVmIHNlbGYucGFyc2Uoc3RyaW5nKQog ICAgICAgICAgICAgaGF2ZVNlZW5EaWZmSGVhZGVyID0gZmFsc2UKLSAgICAgICAgICAgIGxpbmVz Rm9yRGlmZnMgPSBzdHJpbmcuaW5qZWN0KFtdKSBkbyB8ZGlmZkNodW5rcywgbGluZXwKKyAgICAg ICAgICAgIGxpbmVzRm9yRGlmZnMgPSBbXQorICAgICAgICAgICAgc3RyaW5nLmVhY2hfbGluZSBk byB8bGluZXwKICAgICAgICAgICAgICAgICBpZiAoUHJldHR5UGF0Y2guZGlmZl9oZWFkZXI/KGxp bmUpKQotICAgICAgICAgICAgICAgICAgICBkaWZmQ2h1bmtzIDw8IFtdCiAgICAgICAgICAgICAg ICAgICAgIGhhdmVTZWVuRGlmZkhlYWRlciA9IHRydWUKICAgICAgICAgICAgICAgICBlbHNpZiAo IWhhdmVTZWVuRGlmZkhlYWRlciAmJiBsaW5lID1+IC9eLS0tIC8pCi0gICAgICAgICAgICAgICAg ICAgIGRpZmZDaHVua3MgPDwgW10KICAgICAgICAgICAgICAgICAgICAgaGF2ZVNlZW5EaWZmSGVh ZGVyID0gZmFsc2UKICAgICAgICAgICAgICAgICBlbmQKLSAgICAgICAgICAgICAgICBkaWZmQ2h1 bmtzLmxhc3QgPDwgbGluZSB1bmxlc3MgZGlmZkNodW5rcy5sYXN0Lm5pbD8KLSAgICAgICAgICAg ICAgICBkaWZmQ2h1bmtzCiAgICAgICAgICAgICBlbmQKIAogICAgICAgICAgICAgbGluZXNGb3JE aWZmcy5jb2xsZWN0IHsgfGxpbmVzfCBGaWxlRGlmZi5uZXcobGluZXMpIH0KLS0gCjEuNi42Cgo= 47171 2010-01-21 19:02:21 -0800 2010-01-22 06:13:40 -0800 Revised patch bug-33554-20100122120219.patch text/plain 1686 hamaji ZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL0NoYW5nZUxvZyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwppbmRl eCA4YWZlMTU2Li5iMTNkN2MzIDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9DaGFuZ2VMb2cKKysrIGIv QnVnc1NpdGUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDEtMjEgIEphbnVzeiBM ZXdhbmRvd3NraSAgPGxldzIxQHh0cmVlbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgZmFpbHMgb24gUnVieSAx LjkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzNTU0 CisgICAgICAgIGluamVjdCBkb2VzIG5vdCB3b3JrIHdpdGggc3RyaW5ncyBhbnkgbW9yZSwgc28g QnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIgcHJpbnRzIGxvdHMgb2YgZXJyb3Jz LgorCisgICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmI6CisKIDIwMTAtMDEtMjAg IFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9CdWdzU2l0ZS9QcmV0dHlQYXRj aC9QcmV0dHlQYXRjaC5yYiBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCmlu ZGV4IGI2OGNkOGMuLjBiNDExMDQgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1By ZXR0eVBhdGNoLnJiCisrKyBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCkBA IC0yOTQsMTYgKzI5NCwxNiBAQCBFT0YKIAogICAgICAgICBkZWYgc2VsZi5wYXJzZShzdHJpbmcp CiAgICAgICAgICAgICBoYXZlU2VlbkRpZmZIZWFkZXIgPSBmYWxzZQotICAgICAgICAgICAgbGlu ZXNGb3JEaWZmcyA9IHN0cmluZy5pbmplY3QoW10pIGRvIHxkaWZmQ2h1bmtzLCBsaW5lfAorICAg ICAgICAgICAgbGluZXNGb3JEaWZmcyA9IFtdCisgICAgICAgICAgICBzdHJpbmcuZWFjaF9saW5l IGRvIHxsaW5lfAogICAgICAgICAgICAgICAgIGlmIChQcmV0dHlQYXRjaC5kaWZmX2hlYWRlcj8o bGluZSkpCi0gICAgICAgICAgICAgICAgICAgIGRpZmZDaHVua3MgPDwgW10KKyAgICAgICAgICAg ICAgICAgICAgbGluZXNGb3JEaWZmcyA8PCBbXQogICAgICAgICAgICAgICAgICAgICBoYXZlU2Vl bkRpZmZIZWFkZXIgPSB0cnVlCiAgICAgICAgICAgICAgICAgZWxzaWYgKCFoYXZlU2VlbkRpZmZI ZWFkZXIgJiYgbGluZSA9fiAvXi0tLSAvKQotICAgICAgICAgICAgICAgICAgICBkaWZmQ2h1bmtz IDw8IFtdCisgICAgICAgICAgICAgICAgICAgIGxpbmVzRm9yRGlmZnMgPDwgW10KICAgICAgICAg ICAgICAgICAgICAgaGF2ZVNlZW5EaWZmSGVhZGVyID0gZmFsc2UKICAgICAgICAgICAgICAgICBl bmQKLSAgICAgICAgICAgICAgICBkaWZmQ2h1bmtzLmxhc3QgPDwgbGluZSB1bmxlc3MgZGlmZkNo dW5rcy5sYXN0Lm5pbD8KLSAgICAgICAgICAgICAgICBkaWZmQ2h1bmtzCisgICAgICAgICAgICAg ICAgbGluZXNGb3JEaWZmcy5sYXN0IDw8IGxpbmUgdW5sZXNzIGxpbmVzRm9yRGlmZnMubGFzdC5u aWw/CiAgICAgICAgICAgICBlbmQKIAogICAgICAgICAgICAgbGluZXNGb3JEaWZmcy5jb2xsZWN0 IHsgfGxpbmVzfCBGaWxlRGlmZi5uZXcobGluZXMpIH0K