98039 2012-10-01 09:06:02 -0700 [webkitpy] Detect the multiple names of the wdiff binary in the Port class. 2012-10-01 12:22:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rakuco rakuco abarth dpranke gustavo mrobinson ojan webkit.review.bot oldest_to_newest 731731 0 rakuco 2012-10-01 09:06:02 -0700 [webkitpy] Detect the multiple names of the wdiff binary in the Port class. 731740 1 166491 rakuco 2012-10-01 09:24:10 -0700 Created attachment 166491 Patch 731744 2 166491 rakuco 2012-10-01 09:27:19 -0700 Comment on attachment 166491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166491&action=review > Tools/Scripts/webkitpy/layout_tests/port/base.py:1234 > + for path in ("/usr/bin/wdiff", "/usr/bin/dwdiff"): Ideally, we should just check for 'wdiff' and 'dwdiff' to be able to also remove the implementation in chromium_mac.py, but I couldn't think of a portable way of getting a full path from that. 731827 3 166491 dpranke 2012-10-01 11:28:50 -0700 Comment on attachment 166491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166491&action=review >> Tools/Scripts/webkitpy/layout_tests/port/base.py:1234 >> + for path in ("/usr/bin/wdiff", "/usr/bin/dwdiff"): > > Ideally, we should just check for 'wdiff' and 'dwdiff' to be able to also remove the implementation in chromium_mac.py, but I couldn't think of a portable way of getting a full path from that. perhaps we should have an is_in_the_path() abstraction somewhere that we can reuse for things like this ... 731892 4 166522 rakuco 2012-10-01 12:19:33 -0700 Created attachment 166522 Patch for landing 731896 5 rakuco 2012-10-01 12:22:11 -0700 Committed r130065: <http://trac.webkit.org/changeset/130065> 166491 2012-10-01 09:24:10 -0700 2012-10-01 12:19:19 -0700 Patch bug-98039-20121001192322.patch text/plain 3356 rakuco SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzMDA1MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEyLTEwLTAxICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYXBoYWVsLmt1 Ym8uZGEuY29zdGFAaW50ZWwuY29tPgorCisgICAgICAgIFt3ZWJraXRweV0gRGV0ZWN0IHRoZSBt dWx0aXBsZSBuYW1lcyBvZiB0aGUgd2RpZmYgYmluYXJ5IGluIHRoZSBQb3J0IGNsYXNzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgwMzkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbmlmeSB0aGUgZHVw bGljYXRlIGNoZWNrcyBmb3IgdGhlIHdkaWZmIGJpbmFyeSBwcmVzZW50IGluCisgICAgICAgIGRp ZmZlcmVudCBwb3J0cyBpbnRvIHRoZSBiYXNlIFBvcnQgY2xhc3MuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0KToK KyAgICAgICAgKFBvcnQuX3BhdGhfdG9fd2RpZmYpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHk6CisgICAgICAgIChDaHJvbWl1 bUxpbnV4UG9ydC5fcGF0aF90b193ZGlmZik6IFJlbW92ZWQuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAgIChHdGtQb3J0Ll9wYXRo X3RvX3dkaWZmKTogUmVtb3ZlZC4KKwogMjAxMi0xMC0wMSAgUmFwaGFlbCBLdWJvIGRhIENvc3Rh ICA8cmFwaGFlbC5rdWJvLmRhLmNvc3RhQGludGVsLmNvbT4KIAogICAgICAgICBbR1RLXSBSZWx5 IG9uIHRoZSBnZW5lcmFsIGltcGxlbWVudGF0aW9uIGZvciBkZXRlY3RpbmcgdGhlIEFwYWNoZSBz ZXJ2ZXIgcGF0aC4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDEzMDA0OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtMTIyNiwx MSArMTIyNiwxNSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIFRoaXMgaXMgbmVlZGVk IG9ubHkgYnkgcG9ydHMgdGhhdCB1c2UgdGhlIGh0dHBfc2VydmVyLnB5IG1vZHVsZS4iIiIKICAg ICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcignUG9ydC5fcGF0aF90b19saWdodHRwZF9w aHAnKQogCisgICAgQG1lbW9pemVkCiAgICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNlbGYpOgogICAg ICAgICAiIiJSZXR1cm5zIHRoZSBmdWxsIHBhdGggdG8gdGhlIHdkaWZmIGJpbmFyeSwgb3IgTm9u ZSBpZiBpdCBpcyBub3QgYXZhaWxhYmxlLgogCiAgICAgICAgIFRoaXMgaXMgbGlrZWx5IHVzZWQg b25seSBieSB3ZGlmZl90ZXh0KCkiIiIKLSAgICAgICAgcmV0dXJuICd3ZGlmZicKKyAgICAgICAg Zm9yIHBhdGggaW4gKCIvdXNyL2Jpbi93ZGlmZiIsICIvdXNyL2Jpbi9kd2RpZmYiKToKKyAgICAg ICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKHBhdGgpOgorICAgICAgICAgICAgICAg IHJldHVybiBwYXRoCisgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgX3dlYmtpdF9iYXNl bGluZV9wYXRoKHNlbGYsIHBsYXRmb3JtKToKICAgICAgICAgIiIiUmV0dXJuIHRoZSAgZnVsbCBw YXRoIHRvIHRoZSB0b3Agb2YgdGhlIGJhc2VsaW5lIHRyZWUgZm9yIGEKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9saW51eC5weQkocmV2aXNpb24gMTMwMDQ4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQkod29ya2luZyBjb3B5KQpAQCAtMTc5 LDExICsxNzksNSBAQCBjbGFzcyBDaHJvbWl1bUxpbnV4UG9ydChjaHJvbWl1bS5DaHJvbWl1CiAg ICAgZGVmIF9wYXRoX3RvX2hlbHBlcihzZWxmKToKICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAg IGRlZiBfcGF0aF90b193ZGlmZihzZWxmKToKLSAgICAgICAgaWYgc2VsZi5faXNfcmVkaGF0X2Jh c2VkKCk6Ci0gICAgICAgICAgICByZXR1cm4gJy91c3IvYmluL2R3ZGlmZicKLSAgICAgICAgZWxz ZToKLSAgICAgICAgICAgIHJldHVybiAnL3Vzci9iaW4vd2RpZmYnCi0KICAgICBkZWYgX2lzX3Jl ZGhhdF9iYXNlZChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3Rz KHNlbGYuX2ZpbGVzeXN0ZW0uam9pbignL2V0YycsICdyZWRoYXQtcmVsZWFzZScpKQpJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkJKHJl dmlzaW9uIDEzMDA1MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvZ3RrLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04OSwxMiArODksNiBAQCBjbGFzcyBHdGtQb3J0 KFBvcnQsIFB1bHNlQXVkaW9TYW5pdGl6ZXIpCiAgICAgZGVmIF9wYXRoX3RvX2ltYWdlX2RpZmYo c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKCdQcm9ncmFtcycsICdJbWFn ZURpZmYnKQogCi0gICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNlbGYpOgotICAgICAgICBpZiBzZWxm Ll9pc19yZWRoYXRfYmFzZWQoKToKLSAgICAgICAgICAgIHJldHVybiAnL3Vzci9iaW4vZHdkaWZm JwotICAgICAgICBlbHNlOgotICAgICAgICAgICAgcmV0dXJuICcvdXNyL2Jpbi93ZGlmZicKLQog ICAgIGRlZiBfcGF0aF90b193ZWJjb3JlX2xpYnJhcnkoc2VsZik6CiAgICAgICAgIGd0a19saWJy YXJ5X25hbWVzID0gWwogICAgICAgICAgICAgImxpYndlYmtpdGd0ay0xLjAuc28iLAo= 166522 2012-10-01 12:19:33 -0700 2012-10-01 12:19:33 -0700 Patch for landing bug-98039-20121001221839.patch text/plain 3241 rakuco SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzMDA2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEyLTEwLTAxICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYXBoYWVsLmt1 Ym8uZGEuY29zdGFAaW50ZWwuY29tPgorCisgICAgICAgIFt3ZWJraXRweV0gRGV0ZWN0IHRoZSBt dWx0aXBsZSBuYW1lcyBvZiB0aGUgd2RpZmYgYmluYXJ5IGluIHRoZSBQb3J0IGNsYXNzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgwMzkKKworICAg ICAgICBSZXZpZXdlZCBieSBEaXJrIFByYW5rZS4KKworICAgICAgICBVbmlmeSB0aGUgZHVwbGlj YXRlIGNoZWNrcyBmb3IgdGhlIHdkaWZmIGJpbmFyeSBwcmVzZW50IGluCisgICAgICAgIGRpZmZl cmVudCBwb3J0cyBpbnRvIHRoZSBiYXNlIFBvcnQgY2xhc3MuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0KToKKyAg ICAgICAgKFBvcnQuX3BhdGhfdG9fd2RpZmYpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHk6CisgICAgICAgIChDaHJvbWl1bUxp bnV4UG9ydC5fcGF0aF90b193ZGlmZik6IFJlbW92ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAgIChHdGtQb3J0Ll9wYXRoX3Rv X3dkaWZmKTogUmVtb3ZlZC4KKwogMjAxMi0xMC0wMSAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8 cmFwaGFlbC5rdWJvLmRhLmNvc3RhQGludGVsLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFJl bW92ZSBjdXN0b20gaW1wbGVtZW50YXRpb24gb2YgX3BhdGhfdG9fYXBhY2hlX2NvbmZpZ19maWxl IGluIGNocm9taXVtX2xpbnV4LgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQkocmV2aXNpb24gMTMwMDY0KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0xMjI2LDExICsxMjI2LDE1IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgVGhpcyBp cyBuZWVkZWQgb25seSBieSBwb3J0cyB0aGF0IHVzZSB0aGUgaHR0cF9zZXJ2ZXIucHkgbW9kdWxl LiIiIgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdQb3J0Ll9wYXRoX3RvX2xp Z2h0dHBkX3BocCcpCiAKKyAgICBAbWVtb2l6ZWQKICAgICBkZWYgX3BhdGhfdG9fd2RpZmYoc2Vs Zik6CiAgICAgICAgICIiIlJldHVybnMgdGhlIGZ1bGwgcGF0aCB0byB0aGUgd2RpZmYgYmluYXJ5 LCBvciBOb25lIGlmIGl0IGlzIG5vdCBhdmFpbGFibGUuCiAKICAgICAgICAgVGhpcyBpcyBsaWtl bHkgdXNlZCBvbmx5IGJ5IHdkaWZmX3RleHQoKSIiIgotICAgICAgICByZXR1cm4gJ3dkaWZmJwor ICAgICAgICBmb3IgcGF0aCBpbiAoIi91c3IvYmluL3dkaWZmIiwgIi91c3IvYmluL2R3ZGlmZiIp OgorICAgICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMocGF0aCk6CisgICAgICAg ICAgICAgICAgcmV0dXJuIHBhdGgKKyAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGRlZiBfd2Vi a2l0X2Jhc2VsaW5lX3BhdGgoc2VsZiwgcGxhdGZvcm0pOgogICAgICAgICAiIiJSZXR1cm4gdGhl ICBmdWxsIHBhdGggdG8gdGhlIHRvcCBvZiB0aGUgYmFzZWxpbmUgdHJlZSBmb3IgYQpJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2xpbnV4LnB5CShyZXZpc2lvbiAxMzAwNjQpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CSh3b3JraW5nIGNvcHkp CkBAIC0xNzAsOSArMTcwLDMgQEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hy b21pdQogCiAgICAgZGVmIF9wYXRoX3RvX2hlbHBlcihzZWxmKToKICAgICAgICAgcmV0dXJuIE5v bmUKLQotICAgIGRlZiBfcGF0aF90b193ZGlmZihzZWxmKToKLSAgICAgICAgaWYgc2VsZi5faXNf cmVkaGF0X2Jhc2VkKCk6Ci0gICAgICAgICAgICByZXR1cm4gJy91c3IvYmluL2R3ZGlmZicKLSAg ICAgICAgZWxzZToKLSAgICAgICAgICAgIHJldHVybiAnL3Vzci9iaW4vd2RpZmYnCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQkocmV2 aXNpb24gMTMwMDY0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9ndGsucHkJKHdvcmtpbmcgY29weSkKQEAgLTg5LDEyICs4OSw2IEBAIGNsYXNzIEd0a1BvcnQo UG9ydCwgUHVsc2VBdWRpb1Nhbml0aXplcikKICAgICBkZWYgX3BhdGhfdG9faW1hZ2VfZGlmZihz ZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoJ1Byb2dyYW1zJywgJ0ltYWdl RGlmZicpCiAKLSAgICBkZWYgX3BhdGhfdG9fd2RpZmYoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYu X2lzX3JlZGhhdF9iYXNlZCgpOgotICAgICAgICAgICAgcmV0dXJuICcvdXNyL2Jpbi9kd2RpZmYn Ci0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICByZXR1cm4gJy91c3IvYmluL3dkaWZmJwotCiAg ICAgZGVmIF9wYXRoX3RvX3dlYmNvcmVfbGlicmFyeShzZWxmKToKICAgICAgICAgZ3RrX2xpYnJh cnlfbmFtZXMgPSBbCiAgICAgICAgICAgICAibGlid2Via2l0Z3RrLTEuMC5zbyIsCg==