47486 2010-10-11 02:26:51 -0700 WTR should accept relative paths 2010-10-13 07:07:27 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 kbalazs webkit-unassigned kling ossy oldest_to_newest 292445 0 kbalazs 2010-10-11 02:26:51 -0700 Since http://trac.webkit.org/changeset/69297 WTR does not accepts relative file paths (my fault). For manual testing this is uncomfortable and should be fixed. 292798 1 70505 kbalazs 2010-10-11 17:59:02 -0700 Created attachment 70505 Patch 292904 2 70505 ossy 2010-10-12 05:27:25 -0700 Comment on attachment 70505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70505&action=review > WebKitTools/ChangeLog:11 > + * WebKitTestRunner/TestInvocation.cpp: > + (WTR::createWKURL): Moved from StringFunctions.h since it is > + used only here. Extend relative paths to absolute. I don't think we need this move. WTR::createWKURL is a general function and not TestInvocation specific. Now only the TestInvocation.cpp uses it, but it can be changed in the future. > WebKitTools/WebKitTestRunner/TestInvocation.cpp:64 > +#if OS(WINDOWS) > + const char separator = '\\'; > + bool isAbsolutePath = length >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == separator; > +#else > + const char separator = '/'; > + bool isAbsolutePath = pathOrURL[0] == separator; > +#endif > + We don't need Windows case, because we run WTR inside CygWin where the paths are similar to paths on Linux (/cygdrive/c/....) 292917 3 70525 kbalazs 2010-10-12 06:00:48 -0700 Created attachment 70525 Patch 292919 4 kbalazs 2010-10-12 06:04:09 -0700 (In reply to comment #2) > (From update of attachment 70505 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=70505&action=review > > > WebKitTools/ChangeLog:11 > > + * WebKitTestRunner/TestInvocation.cpp: > > + (WTR::createWKURL): Moved from StringFunctions.h since it is > > + used only here. Extend relative paths to absolute. > > I don't think we need this move. WTR::createWKURL is a general function > and not TestInvocation specific. Now only the TestInvocation.cpp uses it, > but it can be changed in the future. > Then we can move back, but I am pretty sure that it would not be needed anywhere else. I believe that the mistake was to put in in the header. Actually it is not something we should inlineing. 292925 5 kbalazs 2010-10-12 06:52:32 -0700 Let's start the whole thing from the beginning. We are sending the url string to the web process. It does not matter that WTR is running in cygwin or not, the WebPage needs a native file system path in the url. I think the first patch is the right one, but the problem is that WTR does not working on our windows machine currently. I am going to try to making it work before setting r+ on the first one or uploading a new patch. Will be continued... 293398 6 kbalazs 2010-10-13 06:41:45 -0700 Finally I have found out that old-run-webkit-test gives absolute windows path to WTR and WTR never supported relative cygwin paths. That means that the first approach was the right one. 293403 7 70607 kbalazs 2010-10-13 06:53:39 -0700 Created attachment 70607 same as the first with a win build fix With this change relative paths works on *nix and on windows from cmd.exe. On windows from cygwin relative paths also work as long as the patch is just the filename (so the file is in the current directory). In summary the behavior is the same that it was before http://trac.webkit.org/changeset/69297. 293408 8 70607 ossy 2010-10-13 06:58:57 -0700 Comment on attachment 70607 same as the first with a win build fix LGTM, r=me. 293412 9 70607 kbalazs 2010-10-13 07:07:17 -0700 Comment on attachment 70607 same as the first with a win build fix Clearing flags on attachment: 70607 Committed r69657: <http://trac.webkit.org/changeset/69657> 293413 10 kbalazs 2010-10-13 07:07:27 -0700 All reviewed patches have been landed. Closing bug. 70505 2010-10-11 17:59:02 -0700 2010-10-12 06:00:42 -0700 Patch bug-47486-20101012025901.patch text/plain 4116 kbalazs ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0MmE1YjUxM2RlZDM2Mjc4YmI4ZGY5ZTM4ZDU2YTcxNDk0NTkwMmI2Li45ZjlhMTE0 MDAyNGQ2ZWJkOTdmYzk5NzU3YTgxN2U1OTkyNmEyNjdkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTAtMTEgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdUUiBzaG91bGQgYWNj ZXB0IHJlbGF0aXZlIHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NzQ4NgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9TdHJpbmdGdW5j dGlvbnMuaDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcDoK KyAgICAgICAgKFdUUjo6Y3JlYXRlV0tVUkwpOiBNb3ZlZCBmcm9tIFN0cmluZ0Z1bmN0aW9ucy5o IHNpbmNlIGl0IGlzCisgICAgICAgIHVzZWQgb25seSBoZXJlLiBFeHRlbmQgcmVsYXRpdmUgcGF0 aHMgdG8gYWJzb2x1dGUuCisKIDIwMTAtMTAtMTEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9TdHJpbmdGdW5jdGlvbnMuaCBiL1dlYktpdFRvb2xzL1dlYktpdFRlc3RS dW5uZXIvU3RyaW5nRnVuY3Rpb25zLmgKaW5kZXggODYyZGRlZWI1NjVkMWJmMzY4NjljYjQ2NTE2 YzAyMjI3NjBkN2NiNy4uMmQwY2E3MjE3NzFmZTgwZTFjMWVkMGYzYjcwNzQzOTI3OTdmNTIyZSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9TdHJpbmdGdW5jdGlvbnMu aAorKysgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL1N0cmluZ0Z1bmN0aW9ucy5oCkBA IC05MiwyMiArOTIsNiBAQCBpbmxpbmUgc3RkOjpvc3RyZWFtJiBvcGVyYXRvcjw8KHN0ZDo6b3N0 cmVhbSYgb3V0LCBjb25zdCBXS1JldGFpblB0cjxXS1N0cmluZ1JlZgogICAgIHJldHVybiBvdXQg PDwgc3RyaW5nUmVmLmdldCgpOwogfQogCi0vLyBVUkwgY3JlYXRpb24KLQotaW5saW5lIFdLVVJM UmVmIGNyZWF0ZVdLVVJMKGNvbnN0IGNoYXIqIHBhdGhPclVSTCkKLXsKLSAgICBpZiAoc3Ryc3Ry KHBhdGhPclVSTCwgImh0dHA6Ly8iKSB8fCBzdHJzdHIocGF0aE9yVVJMLCAiaHR0cHMiKSB8fCBz dHJzdHIocGF0aE9yVVJMLCAiZmlsZTovLyIpKQotICAgICAgICByZXR1cm4gV0tVUkxDcmVhdGVX aXRoVVRGOENTdHJpbmcocGF0aE9yVVJMKTsKLQotICAgIGNvbnN0IGNoYXIqIGZpbGVQcmVmaXgg PSAiZmlsZTovLyI7Ci0gICAgc3RhdGljIGNvbnN0IHNpemVfdCBwcmVmaXhMZW5ndGggPSBzdHJs ZW4oZmlsZVByZWZpeCk7Ci0gICAgc2l6ZV90IGxlbmd0aCA9IHN0cmxlbihwYXRoT3JVUkwpOwot ICAgIE93bkFycmF5UHRyPGNoYXI+IGJ1ZmZlciA9IGFkb3B0QXJyYXlQdHIobmV3IGNoYXJbbGVu Z3RoICsgcHJlZml4TGVuZ3RoICsgMV0pOwotICAgIHN0cmNweShidWZmZXIuZ2V0KCksIGZpbGVQ cmVmaXgpOwotICAgIHN0cmNhdChidWZmZXIuZ2V0KCksIHBhdGhPclVSTCk7Ci0gICAgcmV0dXJu IFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGJ1ZmZlci5nZXQoKSk7Ci19Ci0KIH0gLy8gbmFt ZXNwYWNlIFdUUgogCiAjZW5kaWYgLy8gU3RyaW5nRnVuY3Rpb25zX2gKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwIGIvV2ViS2l0VG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHAKaW5kZXggOTExNmMzZjVkNzM4 MjNjZDIxY2U5ZmU2YWFhMzE3NzA4MGJhNTUyMS4uOTMxNTA2YTg4NDhhOGM4Y2E1Zjg4YzdiOTlh YjZjMTI1OTZhZmQyZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0SW52b2NhdGlvbi5jcHAKKysrIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 SW52b2NhdGlvbi5jcHAKQEAgLTI4LDE3ICsyOCw1OSBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2Vi Vmlldy5oIgogI2luY2x1ZGUgIlN0cmluZ0Z1bmN0aW9ucy5oIgogI2luY2x1ZGUgIlRlc3RDb250 cm9sbGVyLmgiCisjaW5jbHVkZSA8Y2xpbWl0cz4KICNpbmNsdWRlIDxjc3RkaW8+CiAjaW5jbHVk ZSA8V2ViS2l0Mi9XS0NvbnRleHRQcml2YXRlLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1JldGFp blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgogI2luY2x1ZGUgPHd0Zi9QYXNz T3duQXJyYXlQdHIuaD4KIAorI2lmIE9TKFdJTkRPV1MpCisjaW5jbHVkZSA8ZGlyZWN0Lmg+IC8v IEZvciBfZ2V0Y3dkLgorI2RlZmluZSBnZXRjd2QgX2dldGN3ZCAvLyBNU0ROIHNheXMgZ2V0Y3dk IGlzIGRlcHJlY2F0ZWQuCisjZGVmaW5lIFBBVEhfTUFYIF9NQVhfUEFUSAorI2VuZGlmCisKIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2Ug V1RSIHsKIAorc3RhdGljIFdLVVJMUmVmIGNyZWF0ZVdLVVJMKGNvbnN0IGNoYXIqIHBhdGhPclVS TCkKK3sKKyAgICBpZiAoc3Ryc3RyKHBhdGhPclVSTCwgImh0dHA6Ly8iKSB8fCBzdHJzdHIocGF0 aE9yVVJMLCAiaHR0cHM6Ly8iKSB8fCBzdHJzdHIocGF0aE9yVVJMLCAiZmlsZTovLyIpKQorICAg ICAgICByZXR1cm4gV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcocGF0aE9yVVJMKTsKKworICAg IC8vIENyZWF0aW5nIGZyb20gZmlsZXN5dGVtIHBhdGguCisgICAgY29uc3QgY2hhciogZmlsZVBy ZWZpeCA9ICJmaWxlOi8vIjsKKyAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IHByZWZpeExlbmd0aCA9 IHN0cmxlbihmaWxlUHJlZml4KTsKKyNpZiBPUyhXSU5ET1dTKQorICAgIGNvbnN0IGNoYXIgc2Vw YXJhdG9yID0gJ1xcJzsKKyAgICBib29sIGlzQWJzb2x1dGVQYXRoID0gbGVuZ3RoID49IDMgJiYg cGF0aE9yVVJMWzFdID09ICc6JyAmJiBwYXRoT3JVUkxbMl0gPT0gc2VwYXJhdG9yOworI2Vsc2UK KyAgICBjb25zdCBjaGFyIHNlcGFyYXRvciA9ICcvJzsKKyAgICBib29sIGlzQWJzb2x1dGVQYXRo ID0gcGF0aE9yVVJMWzBdID09IHNlcGFyYXRvcjsKKyNlbmRpZgorCisgICAgc2l6ZV90IGxlbmd0 aCA9IHN0cmxlbihwYXRoT3JVUkwpOworICAgIE93bkFycmF5UHRyPGNoYXI+IGJ1ZmZlcjsKKyAg ICBpZiAoaXNBYnNvbHV0ZVBhdGgpIHsKKyAgICAgICAgYnVmZmVyID0gYWRvcHRBcnJheVB0cihu ZXcgY2hhcltwcmVmaXhMZW5ndGggKyBsZW5ndGggKyAxXSk7CisgICAgICAgIHN0cmNweShidWZm ZXIuZ2V0KCksIGZpbGVQcmVmaXgpOworICAgICAgICBzdHJjcHkoYnVmZmVyLmdldCgpICsgcHJl Zml4TGVuZ3RoLCBwYXRoT3JVUkwpOworICAgIH0gZWxzZSB7CisgICAgICAgIGJ1ZmZlciA9IGFk b3B0QXJyYXlQdHIobmV3IGNoYXJbcHJlZml4TGVuZ3RoICsgUEFUSF9NQVggKyBsZW5ndGggKyAy XSk7IC8vIDEgZm9yIHRoZSBzZXBhcmF0b3IKKyAgICAgICAgc3RyY3B5KGJ1ZmZlci5nZXQoKSwg ZmlsZVByZWZpeCk7CisgICAgICAgIGlmICghZ2V0Y3dkKGJ1ZmZlci5nZXQoKSArIHByZWZpeExl bmd0aCwgUEFUSF9NQVgpKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHNpemVfdCBu dW1DaGFyYWN0ZXJzID0gc3RybGVuKGJ1ZmZlci5nZXQoKSk7CisgICAgICAgIGJ1ZmZlcltudW1D aGFyYWN0ZXJzXSA9IHNlcGFyYXRvcjsKKyAgICAgICAgc3RyY3B5KGJ1ZmZlci5nZXQoKSArIG51 bUNoYXJhY3RlcnMgKyAxLCBwYXRoT3JVUkwpOworICAgIH0KKworICAgIHJldHVybiBXS1VSTENy ZWF0ZVdpdGhVVEY4Q1N0cmluZyhidWZmZXIuZ2V0KCkpOworfQorCiBUZXN0SW52b2NhdGlvbjo6 VGVzdEludm9jYXRpb24oY29uc3QgY2hhciogcGF0aE9yVVJMKQogICAgIDogbV91cmwoQWRvcHRX SywgY3JlYXRlV0tVUkwocGF0aE9yVVJMKSkKICAgICAsIG1fcGF0aE9yVVJMKGZhc3RTdHJEdXAo cGF0aE9yVVJMKSkK 70525 2010-10-12 06:00:48 -0700 2010-10-13 06:53:39 -0700 Patch bug-47486-20101012150046.patch text/plain 4085 kbalazs ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0MmE1YjUxM2RlZDM2Mjc4YmI4ZGY5ZTM4ZDU2YTcxNDk0NTkwMmI2Li42YjllNjE1 Nzc1OWNlZWIzODdkZDM4NmRjNTMzODlkMGM4YTYxMjU3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMTAtMTEgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdUUiBzaG91bGQgYWNj ZXB0IHJlbGF0aXZlIHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NzQ4NgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9TdHJpbmdGdW5j dGlvbnMuaDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcDoK KyAgICAgICAgKFdUUjo6Y3JlYXRlV0tVUkwpOiBNb3ZlZCBmcm9tIFN0cmluZ0Z1bmN0aW9ucy5o IHNpbmNlIGl0IGlzCisgICAgICAgIHVzZWQgb25seSBoZXJlLiBFeHRlbmQgcmVsYXRpdmUgcGF0 aHMgdG8gYWJzb2x1dGUuIEN1cnJlbnRseQorICAgICAgICBvbmx5IHVuaXggc3lzdGVtcyBhbmQg Y3lnd2luIGlzIHN1cHBvcnRlZC4KKwogMjAxMC0xMC0xMSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9XZWJLaXRUZXN0UnVubmVyL1N0cmluZ0Z1bmN0aW9ucy5oIGIvV2ViS2l0VG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9TdHJpbmdGdW5jdGlvbnMuaAppbmRleCA4NjJkZGVlYjU2NWQxYmYzNjg2OWNi NDY1MTZjMDIyMjc2MGQ3Y2I3Li4yZDBjYTcyMTc3MWZlODBlMWMxZWQwZjNiNzA3NDM5Mjc5N2Y1 MjJlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL1N0cmluZ0Z1bmN0 aW9ucy5oCisrKyBiL1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvU3RyaW5nRnVuY3Rpb25z LmgKQEAgLTkyLDIyICs5Miw2IEBAIGlubGluZSBzdGQ6Om9zdHJlYW0mIG9wZXJhdG9yPDwoc3Rk Ojpvc3RyZWFtJiBvdXQsIGNvbnN0IFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmCiAgICAgcmV0dXJu IG91dCA8PCBzdHJpbmdSZWYuZ2V0KCk7CiB9CiAKLS8vIFVSTCBjcmVhdGlvbgotCi1pbmxpbmUg V0tVUkxSZWYgY3JlYXRlV0tVUkwoY29uc3QgY2hhciogcGF0aE9yVVJMKQotewotICAgIGlmIChz dHJzdHIocGF0aE9yVVJMLCAiaHR0cDovLyIpIHx8IHN0cnN0cihwYXRoT3JVUkwsICJodHRwcyIp IHx8IHN0cnN0cihwYXRoT3JVUkwsICJmaWxlOi8vIikpCi0gICAgICAgIHJldHVybiBXS1VSTENy ZWF0ZVdpdGhVVEY4Q1N0cmluZyhwYXRoT3JVUkwpOwotCi0gICAgY29uc3QgY2hhciogZmlsZVBy ZWZpeCA9ICJmaWxlOi8vIjsKLSAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IHByZWZpeExlbmd0aCA9 IHN0cmxlbihmaWxlUHJlZml4KTsKLSAgICBzaXplX3QgbGVuZ3RoID0gc3RybGVuKHBhdGhPclVS TCk7Ci0gICAgT3duQXJyYXlQdHI8Y2hhcj4gYnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcgY2hh cltsZW5ndGggKyBwcmVmaXhMZW5ndGggKyAxXSk7Ci0gICAgc3RyY3B5KGJ1ZmZlci5nZXQoKSwg ZmlsZVByZWZpeCk7Ci0gICAgc3RyY2F0KGJ1ZmZlci5nZXQoKSwgcGF0aE9yVVJMKTsKLSAgICBy ZXR1cm4gV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYnVmZmVyLmdldCgpKTsKLX0KLQogfSAv LyBuYW1lc3BhY2UgV1RSCiAKICNlbmRpZiAvLyBTdHJpbmdGdW5jdGlvbnNfaApkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHAgYi9XZWJL aXRUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcAppbmRleCA5MTE2YzNm NWQ3MzgyM2NkMjFjZTlmZTZhYWEzMTc3MDgwYmE1NTIxLi43ZDVhMjQ1ZjBjYWEwOWE5MDI1Y2Zl MjI5OGEwZGQzY2RkOGViNjg1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVu bmVyL1Rlc3RJbnZvY2F0aW9uLmNwcAorKysgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVy L1Rlc3RJbnZvY2F0aW9uLmNwcApAQCAtMjgsMTcgKzI4LDU3IEBACiAjaW5jbHVkZSAiUGxhdGZv cm1XZWJWaWV3LmgiCiAjaW5jbHVkZSAiU3RyaW5nRnVuY3Rpb25zLmgiCiAjaW5jbHVkZSAiVGVz dENvbnRyb2xsZXIuaCIKKyNpbmNsdWRlIDxjbGltaXRzPgogI2luY2x1ZGUgPGNzdGRpbz4KICNp bmNsdWRlIDxXZWJLaXQyL1dLQ29udGV4dFByaXZhdGUuaD4KICNpbmNsdWRlIDxXZWJLaXQyL1dL UmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CiAjaW5jbHVkZSA8d3Rm L1Bhc3NPd25BcnJheVB0ci5oPgogCisjaWYgT1MoV0lORE9XUykKKyNpbmNsdWRlIDxkaXJlY3Qu aD4gLy8gRm9yIF9nZXRjd2QuCisjZGVmaW5lIGdldGN3ZCBfZ2V0Y3dkIC8vIE1TRE4gc2F5cyBn ZXRjd2QgaXMgZGVwcmVjYXRlZC4KKyNkZWZpbmUgUEFUSF9NQVggX01BWF9QQVRICisjZW5kaWYK KwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVz cGFjZSBXVFIgewogCitzdGF0aWMgV0tVUkxSZWYgY3JlYXRlV0tVUkwoY29uc3QgY2hhciogcGF0 aE9yVVJMKQoreworICAgIGlmIChzdHJzdHIocGF0aE9yVVJMLCAiaHR0cDovLyIpIHx8IHN0cnN0 cihwYXRoT3JVUkwsICJodHRwczovLyIpIHx8IHN0cnN0cihwYXRoT3JVUkwsICJmaWxlOi8vIikp CisgICAgICAgIHJldHVybiBXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0cmluZyhwYXRoT3JVUkwpOwor CisgICAgLy8gQ3JlYXRpbmcgZnJvbSBmaWxlc3l0ZW0gcGF0aC4KKworICAgIGNvbnN0IGNoYXIq IGZpbGVQcmVmaXggPSAiZmlsZTovLyI7CisgICAgc3RhdGljIGNvbnN0IHNpemVfdCBwcmVmaXhM ZW5ndGggPSBzdHJsZW4oZmlsZVByZWZpeCk7CisKKyAgICAvLyBDdXJyZW50bHkgb25seSB1bml4 IHN5c3RlbXMgYW5kIGN5Z3dpbiBpcyBzdXBwb3J0ZWQuCisgICAgY29uc3QgY2hhciBzZXBhcmF0 b3IgPSAnLyc7CisgICAgYm9vbCBpc0Fic29sdXRlUGF0aCA9IHBhdGhPclVSTFswXSA9PSBzZXBh cmF0b3I7CisKKyAgICBzaXplX3QgbGVuZ3RoID0gc3RybGVuKHBhdGhPclVSTCk7CisgICAgT3du QXJyYXlQdHI8Y2hhcj4gYnVmZmVyOworICAgIGlmIChpc0Fic29sdXRlUGF0aCkgeworICAgICAg ICBidWZmZXIgPSBhZG9wdEFycmF5UHRyKG5ldyBjaGFyW3ByZWZpeExlbmd0aCArIGxlbmd0aCAr IDFdKTsKKyAgICAgICAgc3RyY3B5KGJ1ZmZlci5nZXQoKSwgZmlsZVByZWZpeCk7CisgICAgICAg IHN0cmNweShidWZmZXIuZ2V0KCkgKyBwcmVmaXhMZW5ndGgsIHBhdGhPclVSTCk7CisgICAgfSBl bHNlIHsKKyAgICAgICAgYnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcgY2hhcltwcmVmaXhMZW5n dGggKyBQQVRIX01BWCArIGxlbmd0aCArIDJdKTsgLy8gMSBmb3IgdGhlIHNlcGFyYXRvcgorICAg ICAgICBzdHJjcHkoYnVmZmVyLmdldCgpLCBmaWxlUHJlZml4KTsKKyAgICAgICAgaWYgKCFnZXRj d2QoYnVmZmVyLmdldCgpICsgcHJlZml4TGVuZ3RoLCBQQVRIX01BWCkpCisgICAgICAgICAgICBy ZXR1cm4gMDsKKyAgICAgICAgc2l6ZV90IG51bUNoYXJhY3RlcnMgPSBzdHJsZW4oYnVmZmVyLmdl dCgpKTsKKyAgICAgICAgYnVmZmVyW251bUNoYXJhY3RlcnNdID0gc2VwYXJhdG9yOworICAgICAg ICBzdHJjcHkoYnVmZmVyLmdldCgpICsgbnVtQ2hhcmFjdGVycyArIDEsIHBhdGhPclVSTCk7Cisg ICAgfQorCisgICAgcmV0dXJuIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGJ1ZmZlci5nZXQo KSk7Cit9CisKIFRlc3RJbnZvY2F0aW9uOjpUZXN0SW52b2NhdGlvbihjb25zdCBjaGFyKiBwYXRo T3JVUkwpCiAgICAgOiBtX3VybChBZG9wdFdLLCBjcmVhdGVXS1VSTChwYXRoT3JVUkwpKQogICAg ICwgbV9wYXRoT3JVUkwoZmFzdFN0ckR1cChwYXRoT3JVUkwpKQo= 70607 2010-10-13 06:53:39 -0700 2010-10-13 07:07:17 -0700 same as the first with a win build fix land_wtr_relpath.diff text/plain 3990 kbalazs ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYTdlM2MyLi40MTcwZTE3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAt MTMgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdUUiBzaG91bGQgYWNjZXB0IHJlbGF0 aXZlIHBhdGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NzQ4NgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9TdHJpbmdGdW5jdGlvbnMuaDoK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcDoKKyAgICAgICAg KFdUUjo6Y3JlYXRlV0tVUkwpOiBNb3ZlZCBmcm9tIFN0cmluZ0Z1bmN0aW9ucy5oIHNpbmNlIGl0 IGlzCisgICAgICAgIHVzZWQgb25seSBoZXJlLiBFeHRlbmQgcmVsYXRpdmUgcGF0aHMgdG8gYWJz b2x1dGUuCisKIDIwMTAtMTAtMTIgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9TdHJpbmdGdW5jdGlvbnMuaCBi L1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvU3RyaW5nRnVuY3Rpb25zLmgKaW5kZXggMGVi MGViNi4uMmUxZDdkZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9T dHJpbmdGdW5jdGlvbnMuaAorKysgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL1N0cmlu Z0Z1bmN0aW9ucy5oCkBAIC05NCwyMiArOTQsNiBAQCBpbmxpbmUgc3RkOjpvc3RyZWFtJiBvcGVy YXRvcjw8KHN0ZDo6b3N0cmVhbSYgb3V0LCBjb25zdCBXS1JldGFpblB0cjxXS1N0cmluZ1JlZgog ICAgIHJldHVybiBvdXQgPDwgc3RyaW5nUmVmLmdldCgpOwogfQogCi0vLyBVUkwgY3JlYXRpb24K LQotaW5saW5lIFdLVVJMUmVmIGNyZWF0ZVdLVVJMKGNvbnN0IGNoYXIqIHBhdGhPclVSTCkKLXsK LSAgICBpZiAoc3Ryc3RyKHBhdGhPclVSTCwgImh0dHA6Ly8iKSB8fCBzdHJzdHIocGF0aE9yVVJM LCAiaHR0cHMiKSB8fCBzdHJzdHIocGF0aE9yVVJMLCAiZmlsZTovLyIpKQotICAgICAgICByZXR1 cm4gV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcocGF0aE9yVVJMKTsKLQotICAgIGNvbnN0IGNo YXIqIGZpbGVQcmVmaXggPSAiZmlsZTovLyI7Ci0gICAgc3RhdGljIGNvbnN0IHNpemVfdCBwcmVm aXhMZW5ndGggPSBzdHJsZW4oZmlsZVByZWZpeCk7Ci0gICAgc2l6ZV90IGxlbmd0aCA9IHN0cmxl bihwYXRoT3JVUkwpOwotICAgIE93bkFycmF5UHRyPGNoYXI+IGJ1ZmZlciA9IGFkb3B0QXJyYXlQ dHIobmV3IGNoYXJbbGVuZ3RoICsgcHJlZml4TGVuZ3RoICsgMV0pOwotICAgIHN0cmNweShidWZm ZXIuZ2V0KCksIGZpbGVQcmVmaXgpOwotICAgIHN0cmNhdChidWZmZXIuZ2V0KCksIHBhdGhPclVS TCk7Ci0gICAgcmV0dXJuIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGJ1ZmZlci5nZXQoKSk7 Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdUUgogCiAjZW5kaWYgLy8gU3RyaW5nRnVuY3Rpb25zX2gK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24u Y3BwIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHAKaW5k ZXggYzU3OTJkMi4uYjJmYmM0ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0SW52b2NhdGlvbi5jcHAKKysrIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0SW52b2NhdGlvbi5jcHAKQEAgLTI4LDE3ICsyOCw2MiBAQAogI2luY2x1ZGUgIlBsYXRm b3JtV2ViVmlldy5oIgogI2luY2x1ZGUgIlN0cmluZ0Z1bmN0aW9ucy5oIgogI2luY2x1ZGUgIlRl c3RDb250cm9sbGVyLmgiCisjaW5jbHVkZSA8Y2xpbWl0cz4KICNpbmNsdWRlIDxjc3RkaW8+CiAj aW5jbHVkZSA8V2ViS2l0Mi9XS0NvbnRleHRQcml2YXRlLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9X S1JldGFpblB0ci5oPgogI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgogI2luY2x1ZGUgPHd0 Zi9QYXNzT3duQXJyYXlQdHIuaD4KIAorI2lmIE9TKFdJTkRPV1MpCisjaW5jbHVkZSA8ZGlyZWN0 Lmg+IC8vIEZvciBfZ2V0Y3dkLgorI2RlZmluZSBnZXRjd2QgX2dldGN3ZCAvLyBNU0ROIHNheXMg Z2V0Y3dkIGlzIGRlcHJlY2F0ZWQuCisjZGVmaW5lIFBBVEhfTUFYIF9NQVhfUEFUSAorI2VuZGlm CisKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1l c3BhY2UgV1RSIHsKIAorc3RhdGljIFdLVVJMUmVmIGNyZWF0ZVdLVVJMKGNvbnN0IGNoYXIqIHBh dGhPclVSTCkKK3sKKyAgICBpZiAoc3Ryc3RyKHBhdGhPclVSTCwgImh0dHA6Ly8iKSB8fCBzdHJz dHIocGF0aE9yVVJMLCAiaHR0cHM6Ly8iKSB8fCBzdHJzdHIocGF0aE9yVVJMLCAiZmlsZTovLyIp KQorICAgICAgICByZXR1cm4gV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcocGF0aE9yVVJMKTsK KworICAgIC8vIENyZWF0aW5nIGZyb20gZmlsZXN5dGVtIHBhdGguCisgICAgc2l6ZV90IGxlbmd0 aCA9IHN0cmxlbihwYXRoT3JVUkwpOworICAgIGlmICghbGVuZ3RoKQorICAgICAgICByZXR1cm4g MDsKKworICAgIGNvbnN0IGNoYXIqIGZpbGVQcmVmaXggPSAiZmlsZTovLyI7CisgICAgc3RhdGlj IGNvbnN0IHNpemVfdCBwcmVmaXhMZW5ndGggPSBzdHJsZW4oZmlsZVByZWZpeCk7CisjaWYgT1Mo V0lORE9XUykKKyAgICBjb25zdCBjaGFyIHNlcGFyYXRvciA9ICdcXCc7CisgICAgYm9vbCBpc0Fi c29sdXRlUGF0aCA9IGxlbmd0aCA+PSAzICYmIHBhdGhPclVSTFsxXSA9PSAnOicgJiYgcGF0aE9y VVJMWzJdID09IHNlcGFyYXRvcjsKKyNlbHNlCisgICAgY29uc3QgY2hhciBzZXBhcmF0b3IgPSAn Lyc7CisgICAgYm9vbCBpc0Fic29sdXRlUGF0aCA9IHBhdGhPclVSTFswXSA9PSBzZXBhcmF0b3I7 CisjZW5kaWYKKworICAgIE93bkFycmF5UHRyPGNoYXI+IGJ1ZmZlcjsKKyAgICBpZiAoaXNBYnNv bHV0ZVBhdGgpIHsKKyAgICAgICAgYnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcgY2hhcltwcmVm aXhMZW5ndGggKyBsZW5ndGggKyAxXSk7CisgICAgICAgIHN0cmNweShidWZmZXIuZ2V0KCksIGZp bGVQcmVmaXgpOworICAgICAgICBzdHJjcHkoYnVmZmVyLmdldCgpICsgcHJlZml4TGVuZ3RoLCBw YXRoT3JVUkwpOworICAgIH0gZWxzZSB7CisgICAgICAgIGJ1ZmZlciA9IGFkb3B0QXJyYXlQdHIo bmV3IGNoYXJbcHJlZml4TGVuZ3RoICsgUEFUSF9NQVggKyBsZW5ndGggKyAyXSk7IC8vIDEgZm9y IHRoZSBzZXBhcmF0b3IKKyAgICAgICAgc3RyY3B5KGJ1ZmZlci5nZXQoKSwgZmlsZVByZWZpeCk7 CisgICAgICAgIGlmICghZ2V0Y3dkKGJ1ZmZlci5nZXQoKSArIHByZWZpeExlbmd0aCwgUEFUSF9N QVgpKQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHNpemVfdCBudW1DaGFyYWN0ZXJz ID0gc3RybGVuKGJ1ZmZlci5nZXQoKSk7CisgICAgICAgIGJ1ZmZlcltudW1DaGFyYWN0ZXJzXSA9 IHNlcGFyYXRvcjsKKyAgICAgICAgc3RyY3B5KGJ1ZmZlci5nZXQoKSArIG51bUNoYXJhY3RlcnMg KyAxLCBwYXRoT3JVUkwpOworICAgIH0KKworICAgIHJldHVybiBXS1VSTENyZWF0ZVdpdGhVVEY4 Q1N0cmluZyhidWZmZXIuZ2V0KCkpOworfQorCiBUZXN0SW52b2NhdGlvbjo6VGVzdEludm9jYXRp b24oY29uc3QgY2hhciogcGF0aE9yVVJMKQogICAgIDogbV91cmwoQWRvcHRXSywgY3JlYXRlV0tV UkwocGF0aE9yVVJMKSkKICAgICAsIG1fcGF0aE9yVVJMKGZhc3RTdHJEdXAocGF0aE9yVVJMKSkK