50197 2010-11-29 18:01:36 -0800 config.webkit_base_dir returns a path with a trailing slash 2010-11-30 11:27:53 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip dpranke tony oldest_to_newest 314782 0 mihaip 2010-11-29 18:01:36 -0800 config.webkit_base_dir returns a path with a trailing slash 314783 1 75094 mihaip 2010-11-29 18:03:37 -0800 Created attachment 75094 Patch 314803 2 75094 dpranke 2010-11-29 18:40:31 -0800 Comment on attachment 75094 Patch Ah. Yep, that would do it. LGTM! 315093 3 75094 tony 2010-11-30 09:21:26 -0800 Comment on attachment 75094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75094&action=review > WebKitTools/Scripts/webkitpy/layout_tests/port/config.py:135 > + self._webkit_base_dir = abspath[0:abspath.find('WebKitTools') - 1] Seems like I could construct cases where this would break, but this seems good enough and concise. 315190 4 75094 mihaip 2010-11-30 11:26:20 -0800 Comment on attachment 75094 Patch Commit queue is pretty backed up, will land this manually. 315191 5 mihaip 2010-11-30 11:27:53 -0800 Committed r72940: <http://trac.webkit.org/changeset/72940> 75094 2010-11-29 18:03:37 -0800 2010-11-30 11:26:20 -0800 Patch bug-50197-20101129180336.patch text/plain 4473 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiMGVmMTEwYjM4NzFlNTA1ZDJlMDc2YTFiODU3MGY1NDZhOGJiOTlmLi41NDI2ZjNm NWI0MmVmMDA3NDNiNzQzMTcwN2FmYzZlNTQyMDliZGE1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMTEtMjkgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY29uZmlnLndlYmtp dF9iYXNlX2RpciByZXR1cm5zIGEgcGF0aCB3aXRoIGEgdHJhaWxpbmcgc2xhc2gKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMTk3CisgICAgICAgIAor ICAgICAgICBjb25maWcud2Via2l0X2Jhc2VfZGlyKCkgc2hvdWxkIHJldHVybiBhIHBhdGggd2l0 aG91dCBhIHRyYWlsaW5nIHNsYXNoLAorICAgICAgICBsaWtlIGFsbCB0aGUgb3RoZXIgbWV0aG9k cyB0aGF0IHJldHVybiBwYXRocy4KKyAgICAgICAgCisgICAgICAgIFVuZG9lcyBNb2NrRmlsZVN5 dGVtIGNoYW5nZXMgYnkgcjcyNjQwLCBzaW5jZSB0aGV5J3JlIG5vIGxvbmdlcgorICAgICAgICBu ZWNlc3NhcnkgZm9yIEdldEJhc2VsaW5lc1Rlc3QgdG8gcGFzcy4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY29uZmlnX3VuaXR0ZXN0LnB5OgorCiAy MDEwLTExLTI5ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9j ay5weQppbmRleCA0ZTZkM2RhOTMyNDc4OTQyNDBkNzU5M2Q5YmE4MTc2ZDBkMDdiNWJkLi4yZGJj MWU4Y2NjZWQzYWVhZDYwMGEyYWMzZjNhMWIxNmRhMzE4NjMzIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVt X21vY2sucHkKQEAgLTQ5LDE2ICs0OSw3IEBAIGNsYXNzIE1vY2tGaWxlU3lzdGVtKG9iamVjdCk6 CiAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgZGVmIGpvaW4oc2VsZiwgKmNvbXBzKToKLSAg ICAgICAgIyBvcy5wYXRoLmpvaW4gaWdub3JlcyB0cmFpbGluZyBzbGFzaGVzIG9uIGNvbXBvbmVu dHMgKGkuZS4KLSAgICAgICAgIyBqb2luKCdmb28vJywgJ2JhcicpIGFuZCBqb2luKCdmb28nLCAn YmFyJykgcHJvZHVjZSB0aGUgc2FtZSByZXN1bHQpLAotICAgICAgICAjIHdlIGVtdWxhdGUgdGhh dCBiZWhhdmlvci4KLSAgICAgICAgdHJpbW1lZF9jb21wcyA9IFtdCi0gICAgICAgIGZvciBjb21w IGluIGNvbXBzOgotICAgICAgICAgICAgaWYgbGVuKGNvbXApIGFuZCBjb21wWy0xXSA9PSAnLyc6 Ci0gICAgICAgICAgICAgICAgdHJpbW1lZF9jb21wcy5hcHBlbmQoY29tcFswOi0xXSkKLSAgICAg ICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgdHJpbW1lZF9jb21wcy5hcHBlbmQoY29tcCkK LSAgICAgICAgcmV0dXJuICcvJy5qb2luKHRyaW1tZWRfY29tcHMpCisgICAgICAgIHJldHVybiAn Lycuam9pbihjb21wcykKIAogICAgIGRlZiBtYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLCAqcGF0 aCk6CiAgICAgICAgICMgRklYTUU6IEltcGxlbWVudCBzdWNoIHRoYXQgc3Vic2VxdWVudCBjYWxs cyB0byBpc2RpcigpIHdvcms/CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggNzU3MzE4ZDEzODA1YmM3ZGE5YTc3 ZjM4MzAyYzU1MDE4ZTBhMmJiNi4uYmM1YTlhYTNlNGQyNTVjMWY3NDkyMTI5ZDA0Y2QyNjY0Yzg3 NjIwOCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYmFzZS5weQpAQCAtNDkyLDcgKzQ5Miw3IEBAIGNsYXNzIFBvcnQob2JqZWN0 KToKICAgICAgICAgIiIiUmVsYXRpdmUgdW5peC1zdHlsZSBwYXRoIGZvciBhIGZpbGVuYW1lIHVu ZGVyIHRoZSBMYXlvdXRUZXN0cwogICAgICAgICBkaXJlY3RvcnkuIEZpbGVuYW1lcyBvdXRzaWRl IHRoZSBMYXlvdXRUZXN0cyBkaXJlY3Rvcnkgc2hvdWxkIHJhaXNlCiAgICAgICAgIGFuIGVycm9y LiIiIgotICAgICAgICAjYXNzZXJ0KGZpbGVuYW1lLnN0YXJ0c3dpdGgoc2VsZi5sYXlvdXRfdGVz dHNfZGlyKCkpKQorICAgICAgICBhc3NlcnQgZmlsZW5hbWUuc3RhcnRzd2l0aChzZWxmLmxheW91 dF90ZXN0c19kaXIoKSksICIlcyBkaWQgbm90IHN0YXJ0IHdpdGggJXMiICUgKGZpbGVuYW1lLCBz ZWxmLmxheW91dF90ZXN0c19kaXIoKSkKICAgICAgICAgcmV0dXJuIGZpbGVuYW1lW2xlbihzZWxm LmxheW91dF90ZXN0c19kaXIoKSkgKyAxOl0KIAogICAgIGRlZiByZXN1bHRzX2RpcmVjdG9yeShz ZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY29uZmlnLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jb25maWcucHkKaW5kZXggOWFlYzYzN2FiZGY1NTMzNmUzMmU5Nzg3MjI5Y2Uw NTQ1ZTdmNzNmNS4uODhmMTE0NmVkNjgzYWIyYmE5ZjkxYjlhNTllZWQwYjA2MWJjMWM4YiAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j b25maWcucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jb25maWcucHkKQEAgLTEzMiw3ICsxMzIsNyBAQCBjbGFzcyBDb25maWcob2JqZWN0KToK ICAgICAgICAgIyBUaGlzIGNvZGUgd2lsbCBhbHNvIHdvcmsgaWYgdGhlcmUgaXMgbm8gU0NNIHN5 c3RlbSBhdCBhbGwuCiAgICAgICAgIGlmIG5vdCBzZWxmLl93ZWJraXRfYmFzZV9kaXI6CiAgICAg ICAgICAgICBhYnNwYXRoID0gb3MucGF0aC5hYnNwYXRoKF9fZmlsZV9fKQotICAgICAgICAgICAg c2VsZi5fd2Via2l0X2Jhc2VfZGlyID0gYWJzcGF0aFswOmFic3BhdGguZmluZCgnV2ViS2l0VG9v bHMnKV0KKyAgICAgICAgICAgIHNlbGYuX3dlYmtpdF9iYXNlX2RpciA9IGFic3BhdGhbMDphYnNw YXRoLmZpbmQoJ1dlYktpdFRvb2xzJykgLSAxXQogICAgICAgICByZXR1cm4gc2VsZi5fd2Via2l0 X2Jhc2VfZGlyCiAKICAgICBkZWYgX3NjcmlwdF9wYXRoKHNlbGYsIHNjcmlwdF9uYW1lKToKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y29uZmlnX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jb25maWdfdW5pdHRlc3QucHkKaW5kZXggMmQyMzY5MTA4ZWEzYWU3MGY5YTU4 ZDJlMWVkYTIwZWUyNzM3N2UwMi4uOGVjMjhmYzE4OGM5MWFjM2MzMTc2N2Q0YzFlMGNkYmU2ZTg0 ZjgzZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jb25maWdfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jb25maWdfdW5pdHRlc3QucHkKQEAgLTE4Niw2ICsxODYs NyBAQCBjbGFzcyBDb25maWdUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgYyA9IGNv bmZpZy5Db25maWcoZXhlY3V0aXZlLkV4ZWN1dGl2ZSgpLCBmaWxlc3lzdGVtLkZpbGVTeXN0ZW0o KSkKICAgICAgICAgYmFzZV9kaXIgPSBjLndlYmtpdF9iYXNlX2RpcigpCiAgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShiYXNlX2RpcikKKyAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbChiYXNlX2Rp clstMV0sICcvJykKIAogICAgICAgICBvcmlnX2N3ZCA9IG9zLmdldGN3ZCgpCiAgICAgICAgIG9z LmNoZGlyKG9zLmVudmlyb25bJ0hPTUUnXSkK