97380 2012-09-21 17:05:52 -0700 nrwt: don't require additional-platform-directory to be an abspath or live under LayoutTests 2012-12-18 11:22:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ojan rniwa wangxianzhu oldest_to_newest 725987 0 dpranke 2012-09-21 17:05:52 -0700 nrwt: don't require additional-platform-directory to be an abspath or live under LayoutTests 725989 1 165231 dpranke 2012-09-21 17:07:15 -0700 Created attachment 165231 Patch 726015 2 dpranke 2012-09-21 18:00:06 -0700 Committed r129285: <http://trac.webkit.org/changeset/129285> 793404 3 165231 rniwa 2012-12-17 23:36:07 -0800 Comment on attachment 165231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165231&action=review > Tools/Scripts/webkitpy/layout_tests/port/base.py:802 > + if filename.startswith(self.perf_tests_dir()): > + return self.host.filesystem.relpath(filename, self.perf_tests_dir()) > + else: > + return self.filesystem.abspath(filename) This doesn't work for performance tests because this relative path is used elsewhere as the test name after split by /. 793858 4 dpranke 2012-12-18 11:19:58 -0800 (In reply to comment #3) > (From update of attachment 165231 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=165231&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/base.py:802 > > + if filename.startswith(self.perf_tests_dir()): > > + return self.host.filesystem.relpath(filename, self.perf_tests_dir()) > > + else: > > + return self.filesystem.abspath(filename) > > This doesn't work for performance tests because this relative path is used elsewhere as the test name after split by /. I don't follow you ... can you explain further? 793860 5 rniwa 2012-12-18 11:22:44 -0800 (In reply to comment #4) > (In reply to comment #3) > > > > This doesn't work for performance tests because this relative path is used elsewhere as the test name after split by /. > > I don't follow you ... can you explain further? All test names (this is human-readable name re-formatted by the script), etc... are computed from this relative test name so the rest of run-perf-tests will just blow up if you use an absolute path. I got rid of this function in https://bugs.webkit.org/show_bug.cgi?id=105219. 165231 2012-09-21 17:07:15 -0700 2012-12-17 23:36:06 -0800 Patch bug-97380-20120921170639.patch text/plain 6688 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MjY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTAzMjFiNWNiMDNhNzBlNzhmOWY0OTliNDI1NWUwNmM5 NmExZDJiYS4uMDFmZTBmZmU3OWEzMmY3NmVlZGVjOGE3NDNjYzRmYTY5ZTIxOWNiOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3 IEBACiAyMDEyLTA5LTIxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGRvbid0IHJlcXVpcmUgYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3Rvcnkg dG8gYmUgYW4gYWJzcGF0aCBvciBsaXZlIHVuZGVyIExheW91dFRlc3RzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzM4MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIGRvZXNuJ3Qgc2VlbSB0byBi ZSBhIGdvb2QgcmVhc29uIGZvciB0aGlzIHJlc3RyaWN0aW9uIGFuZAorICAgICAgICBpdCdzIHVz ZWZ1bCB0byBiZSBhYmxlIHRvIHBvaW50IHRvIGRpcmVjdG9yaWVzIG91dHNpZGUgdGhlCisgICAg ICAgIGNoZWNrb3V0IGZvciByZXN1bHRzIChlLmcuLCBmb3IgbG9jYWwgZmFpbHVyZXMgZHVlIHRv IGEgMTAuNy40CisgICAgICAgIGluc3RhbGwgOykuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LnJlbGF0aXZlX3Rl c3RfZmlsZW5hbWUpOgorICAgICAgICAoUG9ydC5yZWxhdGl2ZV9wZXJmX3Rlc3RfZmlsZW5hbWUp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f YW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fY29tbWFuZF9mcm9t X2RyaXZlcl9pbnB1dCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz X2ludGVncmF0aW9udGVzdC5weToKKyAgICAgICAgKE1haW5UZXN0LnRlc3RfYWRkaXRpb25hbF9w bGF0Zm9ybV9kaXJlY3RvcnkpOgorCisyMDEyLTA5LTIxICBEaXJrIFByYW5rZSAgPGRwcmFua2VA Y2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtpdHB5OiBkcm9wIHN1cHBvcnQgZm9yIG9sZCBU ZXN0RXhwZWN0YXRpb25zIHN5bnRheAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTczNjQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDg5OTdhNWZlOGUyNzdiMjFlM2RlODg4YWZiNGU3 ZjRkOGYyZmM4ZDQuLjhjMzZlMzIwMjNkMTQwOTU2N2ZmZWU1MWRiMzI4YThjYWJiODEwNTIgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkK QEAgLTc4NiwxNyArNzg2LDIwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgcmV0dXJu IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aChwb3J0X25h bWUpLCAnVGVzdEV4cGVjdGF0aW9ucycpCiAKICAgICBkZWYgcmVsYXRpdmVfdGVzdF9maWxlbmFt ZShzZWxmLCBmaWxlbmFtZSk6Ci0gICAgICAgICIiIlJldHVybnMgYSB0ZXN0X25hbWUgYSByZWFs dGl2ZSB1bml4LXN0eWxlIHBhdGggZm9yIGEgZmlsZW5hbWUgdW5kZXIgdGhlIExheW91dFRlc3Rz Ci0gICAgICAgIGRpcmVjdG9yeS4gRmlsZW5hbWVzIG91dHNpZGUgdGhlIExheW91dFRlc3RzIGRp cmVjdG9yeSBzaG91bGQgcmFpc2UKLSAgICAgICAgYW4gZXJyb3IuIiIiCisgICAgICAgICIiIlJl dHVybnMgYSB0ZXN0X25hbWUgYSByZWxhdGl2ZSB1bml4LXN0eWxlIHBhdGggZm9yIGEgZmlsZW5h bWUgdW5kZXIgdGhlIExheW91dFRlc3RzCisgICAgICAgIGRpcmVjdG9yeS4gUG9ydHMgbWF5IGxl Z2l0aW1hdGVseSByZXR1cm4gYWJzcGF0aHMgaGVyZSBpZiBubyByZWxwYXRoIG1ha2VzIHNlbnNl LiIiIgogICAgICAgICAjIFBvcnRzIHRoYXQgcnVuIG9uIHdpbmRvd3MgbmVlZCB0byBvdmVycmlk ZSB0aGlzIG1ldGhvZCB0byBkZWFsIHdpdGgKICAgICAgICAgIyBmaWxlbmFtZXMgd2l0aCBiYWNr c2xhc2hlcyBpbiB0aGVtLgotICAgICAgICBhc3NlcnQgZmlsZW5hbWUuc3RhcnRzd2l0aChzZWxm LmxheW91dF90ZXN0c19kaXIoKSksICIlcyBkaWQgbm90IHN0YXJ0IHdpdGggJXMiICUgKGZpbGVu YW1lLCBzZWxmLmxheW91dF90ZXN0c19kaXIoKSkKLSAgICAgICAgcmV0dXJuIGZpbGVuYW1lW2xl bihzZWxmLmxheW91dF90ZXN0c19kaXIoKSkgKyAxOl0KKyAgICAgICAgaWYgZmlsZW5hbWUuc3Rh cnRzd2l0aChzZWxmLmxheW91dF90ZXN0c19kaXIoKSk6CisgICAgICAgICAgICByZXR1cm4gc2Vs Zi5ob3N0LmZpbGVzeXN0ZW0ucmVscGF0aChmaWxlbmFtZSwgc2VsZi5sYXlvdXRfdGVzdHNfZGly KCkpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5maWxlc3lzdGVtLmFi c3BhdGgoZmlsZW5hbWUpCiAKICAgICBkZWYgcmVsYXRpdmVfcGVyZl90ZXN0X2ZpbGVuYW1lKHNl bGYsIGZpbGVuYW1lKToKLSAgICAgICAgYXNzZXJ0IGZpbGVuYW1lLnN0YXJ0c3dpdGgoc2VsZi5w ZXJmX3Rlc3RzX2RpcigpKSwgIiVzIGRpZCBub3Qgc3RhcnQgd2l0aCAlcyIgJSAoZmlsZW5hbWUs IHNlbGYucGVyZl90ZXN0c19kaXIoKSkKLSAgICAgICAgcmV0dXJuIGZpbGVuYW1lW2xlbihzZWxm LnBlcmZfdGVzdHNfZGlyKCkpICsgMTpdCisgICAgICAgIGlmIGZpbGVuYW1lLnN0YXJ0c3dpdGgo c2VsZi5wZXJmX3Rlc3RzX2RpcigpKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLmhvc3QuZmls ZXN5c3RlbS5yZWxwYXRoKGZpbGVuYW1lLCBzZWxmLnBlcmZfdGVzdHNfZGlyKCkpCisgICAgICAg IGVsc2U6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5maWxlc3lzdGVtLmFic3BhdGgoZmlsZW5h bWUpCiAKICAgICBAbWVtb2l6ZWQKICAgICBkZWYgYWJzcGF0aF9mb3JfdGVzdChzZWxmLCB0ZXN0 X25hbWUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CmluZGV4IGVmNmIzMWVhNTZlYzM2ZDIzOTg5 NmFiNjIzNzc2ZGJlYzZjMzA1YTcuLjNkZmVhYjdhM2IzYmIxYTUyMmJmOTNmNWM4NWIzMGQ4ZTRj M2RjZDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fYW5kcm9pZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKQEAgLTY2Myw2ICs2NjMsNyBAQCBjbGFz cyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAgIGlmIGNvbW1h bmQuc3RhcnRzd2l0aCgnLycpOgogICAgICAgICAgICAgIyBDb252ZXJ0IHRoZSBob3N0IGZpbGUg cGF0aCB0byBhIGRldmljZSBmaWxlIHBhdGguIFNlZSBjb21tZW50IG9mCiAgICAgICAgICAgICAj IERFVklDRV9MQVlPVVRfVEVTVFNfRElSIGZvciBkZXRhaWxzLgorICAgICAgICAgICAgIyBGSVhN RTogd2hhdCBoYXBwZW5zIGlmIGNvbW1hbmQgbGllcyBvdXRzaWRlIG9mIHRoZSBsYXlvdXRfdGVz dHNfZGlyIG9uIHRoZSBob3N0PwogICAgICAgICAgICAgY29tbWFuZCA9IERFVklDRV9MQVlPVVRf VEVTVFNfRElSICsgc2VsZi5fcG9ydC5yZWxhdGl2ZV90ZXN0X2ZpbGVuYW1lKGNvbW1hbmQpCiAg ICAgICAgIHJldHVybiBjb21tYW5kCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IGE3OWFiM2NlM2FkYzU4 OTM3YmJkYmQ2NjA4YjAzYmJkMDFjMWUxZjkuLmU3ODRjYjYxZGU1YjM1MmMzZTc1YTc0YjgxYjBl OTg2NjNjZDI4MjIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMTQyLDEzICsxNDIsMTAgQEAgZGVmIF9z ZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnQsIG9wdGlvbnMpOgogICAgIG9wdGlvbnMuc2xvd190 aW1lX291dF9tcyA9IHN0cig1ICogaW50KG9wdGlvbnMudGltZV9vdXRfbXMpKQogCiAgICAgaWYg b3B0aW9ucy5hZGRpdGlvbmFsX3BsYXRmb3JtX2RpcmVjdG9yeToKLSAgICAgICAgbm9ybWFsaXpl ZF9wbGF0Zm9ybV9kaXJlY3RvcmllcyA9IFtdCisgICAgICAgIGFkZGl0aW9uYWxfcGxhdGZvcm1f ZGlyZWN0b3JpZXMgPSBbXQogICAgICAgICBmb3IgcGF0aCBpbiBvcHRpb25zLmFkZGl0aW9uYWxf cGxhdGZvcm1fZGlyZWN0b3J5OgotICAgICAgICAgICAgaWYgbm90IHBvcnQuaG9zdC5maWxlc3lz dGVtLmlzYWJzKHBhdGgpOgotICAgICAgICAgICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1hZGRp dGlvbmFsLXBsYXRmb3JtLWRpcmVjdG9yeT0lcyBpcyBpZ25vcmVkIHNpbmNlIGl0IGlzIG5vdCBh YnNvbHV0ZSIgJSBwYXRoKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBu b3JtYWxpemVkX3BsYXRmb3JtX2RpcmVjdG9yaWVzLmFwcGVuZChwb3J0Lmhvc3QuZmlsZXN5c3Rl bS5ub3JtcGF0aChwYXRoKSkKLSAgICAgICAgb3B0aW9ucy5hZGRpdGlvbmFsX3BsYXRmb3JtX2Rp cmVjdG9yeSA9IG5vcm1hbGl6ZWRfcGxhdGZvcm1fZGlyZWN0b3JpZXMKKyAgICAgICAgICAgIGFk ZGl0aW9uYWxfcGxhdGZvcm1fZGlyZWN0b3JpZXMuYXBwZW5kKHBvcnQuaG9zdC5maWxlc3lzdGVt LmFic3BhdGgocGF0aCkpCisgICAgICAgIG9wdGlvbnMuYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJl Y3RvcnkgPSBhZGRpdGlvbmFsX3BsYXRmb3JtX2RpcmVjdG9yaWVzCiAKICAgICBpZiBub3Qgb3B0 aW9ucy5odHRwIGFuZCBvcHRpb25zLnNraXBwZWQgaW4gKCdpZ25vcmUnLCAnb25seScpOgogICAg ICAgICB3YXJuaW5ncy5hcHBlbmQoIi0tZm9yY2UvLS1za2lwcGVkPSVzIG92ZXJyaWRlcyAtLW5v LWh0dHAuIiAlIChvcHRpb25zLnNraXBwZWQpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2lu dGVncmF0aW9udGVzdC5weQppbmRleCA3MzgwMWQxOWQwYzk0NzEwMWM4ZWUxNDU1YWM4ZDUwYzI4 MGQyODcxLi41ZTZlNDIyZWJhYmFlNTU5NjZjODFlZWYzNDNmMmU1MGM0YjQ4ZDRjIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz X2ludGVncmF0aW9udGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQpAQCAtODUxLDkgKzg1MSw3 IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1UZXN0aW5nTWl4aW4p OgogICAgICAgICBzZWxmLmFzc2VydFRydWUocGFzc2luZ19ydW4oWyctLWFkZGl0aW9uYWwtcGxh dGZvcm0tZGlyZWN0b3J5JywgJy90bXAvZm9vJ10pKQogICAgICAgICBzZWxmLmFzc2VydFRydWUo cGFzc2luZ19ydW4oWyctLWFkZGl0aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5JywgJy90bXAvLi4v Zm9vJ10pKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocGFzc2luZ19ydW4oWyctLWFkZGl0aW9u YWwtcGxhdGZvcm0tZGlyZWN0b3J5JywgJy90bXAvZm9vJywgJy0tYWRkaXRpb25hbC1wbGF0Zm9y bS1kaXJlY3RvcnknLCAnL3RtcC9iYXInXSkpCi0KLSAgICAgICAgcmVzLCBidWlsZGJvdF9vdXRw dXQsIHJlZ3VsYXJfb3V0cHV0LCB1c2VyID0gbG9nZ2luZ19ydW4oWyctLWFkZGl0aW9uYWwtcGxh dGZvcm0tZGlyZWN0b3J5JywgJ2ZvbyddKQotICAgICAgICBzZWxmLmFzc2VydENvbnRhaW5zKHJl Z3VsYXJfb3V0cHV0LCAnLS1hZGRpdGlvbmFsLXBsYXRmb3JtLWRpcmVjdG9yeT1mb28gaXMgaWdu b3JlZCBzaW5jZSBpdCBpcyBub3QgYWJzb2x1dGVcbicpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShwYXNzaW5nX3J1bihbJy0tYWRkaXRpb25hbC1wbGF0Zm9ybS1kaXJlY3RvcnknLCAnZm9vJ10p KQogCiAgICAgZGVmIHRlc3RfYWRkaXRpb25hbF9leHBlY3RhdGlvbnMoc2VsZik6CiAgICAgICAg IGhvc3QgPSBNb2NrSG9zdCgpCg==