95842 2012-09-05 05:23:20 -0700 [EFL][WK2] Provide implementation for TestRunner::pathToLocalResource() 2012-09-05 09:33:32 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 1 cdumez cdumez gyuyoung.kim kenneth tonikitoo webkit.review.bot oldest_to_newest 711969 0 cdumez 2012-09-05 05:23:20 -0700 WK2 EFL WebKitTestRunner currently has a very basic implementation of TestRunner::pathToLocalResource() method (it merely returns the argument). We need to map /tmp to ${DUMPRENDERTREE_TEMP} envar and /tmp/LayoutTests to ${LOCAL_RESOURCE_ROOT} envar as we do for WK1 EFL DumpRenderTree. This causes some test cases for fail for WK2-EFL, including: fast/dom/frame-loading-via-document-write.html 711980 1 162228 cdumez 2012-09-05 05:34:48 -0700 Created attachment 162228 Patch 711987 2 162228 kenneth 2012-09-05 05:44:29 -0700 Comment on attachment 162228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162228&action=review > Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp:62 > JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url) > { > - return url; > + String requestedUrl(url->characters(), url->length()); Shouldn't you verify it is local? assert? > Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp:66 > + if (requestedUrl.find("LayoutTests") != notFound) { Shouldn't it start with it? or is that not needed 711992 3 162228 cdumez 2012-09-05 05:55:20 -0700 Comment on attachment 162228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162228&action=review >> Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp:62 >> + String requestedUrl(url->characters(), url->length()); > > Shouldn't you verify it is local? assert? The function is called pathTo*Local*Resource() so I assumed it was not needed. FYI, I merely copied the implementation from DumpRenderTree. >> Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp:66 >> + if (requestedUrl.find("LayoutTests") != notFound) { > > Shouldn't it start with it? or is that not needed Technically, it needs to start with file:///tmp/LayoutTests. This is a copy of the DRT implementation but I can improve it. 712142 4 162228 webkit.review.bot 2012-09-05 09:33:28 -0700 Comment on attachment 162228 Patch Clearing flags on attachment: 162228 Committed r127602: <http://trac.webkit.org/changeset/127602> 712143 5 webkit.review.bot 2012-09-05 09:33:32 -0700 All reviewed patches have been landed. Closing bug. 162228 2012-09-05 05:34:48 -0700 2012-09-05 09:33:28 -0700 Patch 95842_pathToLocalResource.patch text/plain 4388 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzEyMTMwLi4yYTM0NjlkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTItMDkt MDUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAorICAg ICAgICBbRUZMXVtXSzJdIFByb3ZpZGUgaW1wbGVtZW50YXRpb24gZm9yIFRlc3RSdW5uZXI6OnBh dGhUb0xvY2FsUmVzb3VyY2UoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTU4NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVbnNraXAgZmFzdC9kb20vZnJhbWUtbG9hZGluZy12aWEtZG9jdW1lbnQtd3Jp dGUuaHRtbCB0aGF0CisgICAgICAgIHdhcyBmYWlsaW5nIGR1ZSB0byBpbmNvbXBsZXRlIGltcGxl bWVudGF0aW9uIGZvcgorICAgICAgICBUZXN0UnVubmVyOjpwYXRoVG9Mb2NhbFJlc291cmNlKCkg aW4gRUZMIFdLVFIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwtd2syL1Rlc3RFeHBlY3RhdGlv bnM6CisKKzIwMTItMDktMDUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGlu dGVsLmNvbT4KKwogICAgICAgICBXS1RSIGRvZXNuJ3QgaW1wbGVtZW50IGR1bXBXaWxsQ2FjaGVS ZXNwb25zZSgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05NDYwNwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwtd2syL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwtd2syL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggYTBjYmM5OS4uYTYwMDA5OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vZWZsLXdrMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Vm bC13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMjQ1LDcgKzI0NSw2IEBAIEJVR1dLRUZMIDogZmFz dC9jc3MvYmlkaS1vdmVycmlkZS1pbi1hbm9ueW1vdXMtYmxvY2suaHRtbCA9IFRFWFQKIEJVR1dL RUZMIDogZmFzdC9jc3MvcmVsYXRpdmUtcG9zaXRpb25lZC1ibG9jay1jcmFzaC5odG1sID0gVEVY VAogQlVHV0tFRkwgOiBmYXN0L2RvbS9XaW5kb3cvbW96aWxsYS1mb2N1cy1ibHVyLmh0bWwgPSBU RVhUCiBCVUdXS0VGTCA6IGZhc3QvZG9tL1dpbmRvdy90aW1lci1yZXN1bWUtb24tbmF2aWdhdGlv bi1iYWNrLmh0bWwgPSBURVhUCi1CVUdXS0VGTCA6IGZhc3QvZG9tL2ZyYW1lLWxvYWRpbmctdmlh LWRvY3VtZW50LXdyaXRlLmh0bWwgPSBURVhUCiBCVUdXS0VGTCA6IGZhc3QvZXZlbnRzL25vZGUt ZXZlbnQtYW5jaG9yLWxvY2suaHRtbCA9IFRFWFQKIEJVR1dLRUZMIDogZmFzdC9ldmVudHMvcGFn ZWhpZGUtdGltZW91dC5odG1sID0gVEVYVAogQlVHV0tFRkwgOiBmYXN0L2V2ZW50cy9wYWdlaGlk ZS14aHItb3Blbi5odG1sID0gVEVYVApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDU3Yzc5MzEuLjM2ZWY0MTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAxMi0wOS0w NSAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCisgICAg ICAgIFtFRkxdW1dLMl0gUHJvdmlkZSBpbXBsZW1lbnRhdGlvbiBmb3IgVGVzdFJ1bm5lcjo6cGF0 aFRvTG9jYWxSZXNvdXJjZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05NTg0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByb3ZpZGUgcHJvcGVyIGltcGxlbWVudGF0aW9uIGZvciBUZXN0UnVubmVyOjpw YXRoVG9Mb2NhbFJlc291cmNlKCkKKyAgICAgICAgaW4gRUZMIFdLVFIsIGlkZW50aWNhbCB0byB0 aGUgb25lIGZvciBEdW1wUmVuZGVyVHJlZS4KKworICAgICAgICBNYXAgL3RtcCB0byAke0RVTVBS RU5ERVJUUkVFX1RFTVB9IGVudmlyb25tZW50IHZhcmlhYmxlIGFuZAorICAgICAgICAvdG1wL0xh eW91dFRlc3RzIHRvICR7TE9DQUxfUkVTT1VSQ0VfUk9PVH0gc28gdGhhdCBsb2NhbCByZXNvdXJj ZXMKKyAgICAgICAgYXJlIGZvdW5kIG15IFdlYktpdFRlc3RSdW5uZXIuCisKKyAgICAgICAgKiBX ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2VmbC9UZXN0UnVubmVyRWZsLmNwcDoKKyAg ICAgICAgKFdUUjo6VGVzdFJ1bm5lcjo6cGF0aFRvTG9jYWxSZXNvdXJjZSk6CisKKzIwMTItMDkt MDUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKwogICAg ICAgICBXS1RSIGRvZXNuJ3QgaW1wbGVtZW50IGR1bXBXaWxsQ2FjaGVSZXNwb25zZSgpCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDYwNwogCmRpZmYg LS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2VmbC9UZXN0UnVu bmVyRWZsLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL1Rl c3RSdW5uZXJFZmwuY3BwCmluZGV4IDRjMGVhMjIuLjk2ODE2MTEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL1Rlc3RSdW5uZXJFZmwuY3BwCisr KyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL1Rlc3RSdW5uZXJF ZmwuY3BwCkBAIC0yMiw2ICsyMiw5IEBACiAKICNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZS5oIgog I2luY2x1ZGUgPEVjb3JlLmg+CisjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvT3BhcXVlSlNTdHJp bmcuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXVFIgewogCkBAIC01Niw3ICs1OSwyOCBAQCB2b2lk IFRlc3RSdW5uZXI6OmluaXRpYWxpemVXYWl0VG9EdW1wV2F0Y2hkb2dUaW1lcklmTmVlZGVkKCkK IAogSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IFRlc3RSdW5uZXI6OnBhdGhUb0xvY2FsUmVzb3Vy Y2UoSlNTdHJpbmdSZWYgdXJsKQogewotICAgIHJldHVybiB1cmw7CisgICAgU3RyaW5nIHJlcXVl c3RlZFVybCh1cmwtPmNoYXJhY3RlcnMoKSwgdXJsLT5sZW5ndGgoKSk7CisgICAgU3RyaW5nIHJl c291cmNlUm9vdDsKKyAgICBTdHJpbmcgcmVxdWVzdGVkUm9vdDsKKworICAgIGlmIChyZXF1ZXN0 ZWRVcmwuZmluZCgiTGF5b3V0VGVzdHMiKSAhPSBub3RGb3VuZCkgeworICAgICAgICAvLyBJZiB0 aGUgVVJMIGNvbnRhaW5zIExheW91dFRlc3RzIHdlIG5lZWQgdG8gcmVtYXAgdGhhdCB0bworICAg ICAgICAvLyBMT0NBTF9SRVNPVVJDRV9ST09UIHdoaWNoIGlzIHRoZSBwYXRoIG9mIHRoZSBMYXlv dXRUZXN0cyBkaXJlY3RvcnkKKyAgICAgICAgLy8gd2l0aGluIHRoZSBXZWJLaXQgc291cmNlIHRy ZWUuCisgICAgICAgIHJlcXVlc3RlZFJvb3QgPSAiL3RtcC9MYXlvdXRUZXN0cyI7CisgICAgICAg IHJlc291cmNlUm9vdCA9IGdldGVudigiTE9DQUxfUkVTT1VSQ0VfUk9PVCIpOworICAgIH0gZWxz ZSBpZiAocmVxdWVzdGVkVXJsLmZpbmQoInRtcCIpICE9IG5vdEZvdW5kKSB7CisgICAgICAgIC8v IElmIHRoZSBVUkwgaXMgYSBjaGlsZCBvZiAvdG1wIHdlIG5lZWQgdG8gY29udmVydCBpdCB0byBi ZSBhIGNoaWxkCisgICAgICAgIC8vIERVTVBSRU5ERVJUUkVFX1RFTVAgcmVwbGFjZSB0bXAgd2l0 aCBEVU1QUkVOREVSVFJFRV9URU1QCisgICAgICAgIHJlcXVlc3RlZFJvb3QgPSAiL3RtcCI7Cisg ICAgICAgIHJlc291cmNlUm9vdCA9IGdldGVudigiRFVNUFJFTkRFUlRSRUVfVEVNUCIpOworICAg IH0KKworICAgIHNpemVfdCBpbmRleE9mUm9vdFN0YXJ0ID0gcmVxdWVzdGVkVXJsLnJldmVyc2VG aW5kKHJlcXVlc3RlZFJvb3QpOworICAgIHNpemVfdCBpbmRleE9mU2VwYXJhdG9yQWZ0ZXJSb290 ID0gaW5kZXhPZlJvb3RTdGFydCArIHJlcXVlc3RlZFJvb3QubGVuZ3RoKCk7CisgICAgU3RyaW5n IGZ1bGxQYXRoVG9VcmwgPSAiZmlsZTovLyIgKyByZXNvdXJjZVJvb3QgKyByZXF1ZXN0ZWRVcmwu c3Vic3RyaW5nKGluZGV4T2ZTZXBhcmF0b3JBZnRlclJvb3QpOworCisgICAgcmV0dXJuIEpTU3Ry aW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGZ1bGxQYXRoVG9VcmwudXRmOCgpLmRhdGEoKSk7CiB9 CiAKIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBUZXN0UnVubmVyOjpwbGF0Zm9ybU5hbWUoKQo=