72813 2011-11-19 16:47:30 -0800 Remove the dependence on jsonp from more of new-run-webkit-tests and the test results server 2011-11-19 17:18:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth webkit.review.bot oldest_to_newest 506452 0 ojan 2011-11-19 16:47:30 -0800 Remove the dependence on jsonp from more of new-run-webkit-tests and the test results server 506453 1 115963 ojan 2011-11-19 16:50:47 -0800 Created attachment 115963 Patch 506454 2 115963 abarth 2011-11-19 16:57:28 -0800 Comment on attachment 115963 Patch Do we need to change anything in garden-o-matic? It has some code to strip off the JSONP wrapper. We might need to change it to detect whether the wrapper is there in the first place (or maybe it already does that). 506455 3 115963 ojan 2011-11-19 17:00:15 -0800 Comment on attachment 115963 Patch I'll just commit this now. 506456 4 ojan 2011-11-19 17:00:48 -0800 I think garden-o-matic is OK, but I'll double-check before commiting. 506457 5 ojan 2011-11-19 17:03:54 -0800 As best I can tell, garden-o-matic only reads full_results.json, which is the only one that's not changing (i.e. it's keeping the jsonp wrapper). 506458 6 abarth 2011-11-19 17:09:25 -0800 Ok. Should we remove the wrapper from that one too? 506459 7 ojan 2011-11-19 17:13:34 -0800 Committed r100862: <http://trac.webkit.org/changeset/100862> 506461 8 ojan 2011-11-19 17:18:12 -0800 (In reply to comment #6) > Ok. Should we remove the wrapper from that one too? There's a comment in the code about why we can't. After run-webkit-tests, we load results.html as a file URL in the browser. results.html pulls in full_results.json as a file URL. This doesn't work in chromium. So, I'm not really sure how we could fix this without running a local server, which I don't think people would be happy about for run-webkit-tests. 115963 2011-11-19 16:50:47 -0800 2011-11-19 17:00:15 -0800 Patch bug-72813-20111119165046.patch text/plain 6403 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwODYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzcyMTc2ZDU2ZGQ2ZTk0ZTg2NDRjNTE4MTE1MjEyMWZh NGU4NGI2Zi4uMTZlZGIxMGRiYjRjYWU0YWNiNjFiYzQxMWUyZTZhYjRiODJkNjY3MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDExLTExLTE5ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmVtb3ZlIHRoZSBkZXBlbmRlbmNlIG9uIGpzb25wIGZyb20gbW9yZSBvZiBuZXctcnVuLXdl YmtpdC10ZXN0cyBhbmQgdGhlIHRlc3QgcmVzdWx0cyBzZXJ2ZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25jZSB0aGlzIGxhbmRzLCB3ZSBjYW4gc3Rh cnQgc3RvcmluZyBwdXJlIGpzb24gaW4gdGhlIHRlc3QgcmVzdWx0cyBzZXJ2ZXIgYW5kIHRoZW4K KyAgICAgICAgd2UgY2FuIGRlbGV0ZSB0aGUgY29kZSB3aXRoIGFsbCB0aGUgRklYTUVzIGFkZGVk IGhlcmUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHk6CisgICAgICAgIE9ubHkg YWRkIGpzb25wIGZvciBmdWxsX3Jlc3VsdHMuanNvbi4KKyAgICAgICAgKiBUZXN0UmVzdWx0U2Vy dmVyL21vZGVsL2pzb25yZXN1bHRzLnB5OgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2ZXIvbW9k ZWwvanNvbnJlc3VsdHNfdW5pdHRlc3QucHk6CisgICAgICAgIEFjY2VwdCBwdXJlIGpzb24gdXBs b2Fkcy4KKyAgICAgICAgKiBUZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2Rhc2hi b2FyZF9iYXNlLmpzOgorICAgICAgICAoYXBwZW5kSlNPTlNjcmlwdEVsZW1lbnRGb3IpOgorICAg ICAgICBVc2UgdGhlIGNhbGxiYWNrIHBhcmFtZXRlciBzbyB0aGF0IHRoZSBzZXJ2ZXIgY2FuIHN0 YXJ0IHJldHVybmluZyBwdXJlIGpzb24gaWYgaXQncyBsZWZ0IG91dC4KKworMjAxMS0xMS0xOSAg T2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIEFsbG93IGpzb24gTlJX VCBkb3dubG9hZHMgdG8gYmUgcHVyZSBqc29uIGFuZCBub3QganNvbnAKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODA5CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy LnB5CmluZGV4IGQ3MzQ3YTAyNzQ2NDM2Y2JhYTQyYjJiZGU0MDkxMGEyNDI5ZTNkODguLmFkNGJl MmM4YWJjNDRmYTVkNTlhYTZjM2Q3ZmE1OWRhMzZhNmUwNDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w eQpAQCAtMTA4MSw3ICsxMDgxLDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBq c29uX3Jlc3VsdHNfZ2VuZXJhdG9yLndyaXRlX2pzb24oc2VsZi5fZnMsIHRpbWVzX3RyaWUsIHRp bWVzX2pzb25fcGF0aCkKIAogICAgICAgICBmdWxsX3Jlc3VsdHNfcGF0aCA9IHNlbGYuX2ZzLmpv aW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJmdWxsX3Jlc3VsdHMuanNvbiIpCi0gICAgICAg IGpzb25fcmVzdWx0c19nZW5lcmF0b3Iud3JpdGVfanNvbihzZWxmLl9mcywgc3VtbWFyaXplZF9y ZXN1bHRzLCBmdWxsX3Jlc3VsdHNfcGF0aCkKKyAgICAgICAgIyBXZSB3cml0ZSBmdWxsX3Jlc3Vs dHMuanNvbiBvdXQgYXMganNvbnAgYmVjYXVzZSB3ZSBuZWVkIHRvIGxvYWQgaXQgZnJvbSBhIGZp bGUgdXJsIGFuZCBDaHJvbWl1bSBkb2Vzbid0IGFsbG93IHRoYXQuCisgICAgICAgIGpzb25fcmVz dWx0c19nZW5lcmF0b3Iud3JpdGVfanNvbihzZWxmLl9mcywgc3VtbWFyaXplZF9yZXN1bHRzLCBm dWxsX3Jlc3VsdHNfcGF0aCwgY2FsbGJhY2s9IkFERF9SRVNVTFRTIikKIAogICAgICAgICBnZW5l cmF0b3IgPSBqc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5KU09OTGF5b3V0UmVzdWx0c0dl bmVyYXRvcigKICAgICAgICAgICAgIHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMuYnVpbGRlcl9u YW1lLCBzZWxmLl9vcHRpb25zLmJ1aWxkX25hbWUsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJh dG9yLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQppbmRleCBjZjU4NDk4YmQ1MjQzMTkzY2U3Y2Ey NTczOGNlZTY5YjMyMWNkZmQwLi4yNWMzZjUyNTAzN2E5ZWVlOTc2YzRhZWQ0NGNlYTNmMTBhNDU3 ZGNiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0 b3IucHkKQEAgLTU2LDYgKzU2LDcgQEAgZGVmIGhhc19qc29uX3dyYXBwZXIoc3RyaW5nKToKIAog CiBkZWYgc3RyaXBfanNvbl93cmFwcGVyKGpzb25fY29udGVudCk6CisgICAgIyBGSVhNRTogS2ls bCB0aGlzIGNvZGUgb25jZSB0aGUgc2VydmVyIHJldHVybnMganNvbiBpbnN0ZWFkIG9mIGpzb25w LgogICAgIGlmIGhhc19qc29uX3dyYXBwZXIoanNvbl9jb250ZW50KToKICAgICAgICAgcmV0dXJu IGpzb25fY29udGVudFtsZW4oX0pTT05fUFJFRklYKTpsZW4oanNvbl9jb250ZW50KSAtIGxlbihf SlNPTl9TVUZGSVgpXQogICAgIHJldHVybiBqc29uX2NvbnRlbnQKQEAgLTY3LDEwICs2OCwxMSBA QCBkZWYgbG9hZF9qc29uKGZpbGVzeXN0ZW0sIGZpbGVfcGF0aCk6CiAgICAgcmV0dXJuIGpzb24u bG9hZHMoY29udGVudCkKIAogCi1kZWYgd3JpdGVfanNvbihmaWxlc3lzdGVtLCBqc29uX29iamVj dCwgZmlsZV9wYXRoKToKK2RlZiB3cml0ZV9qc29uKGZpbGVzeXN0ZW0sIGpzb25fb2JqZWN0LCBm aWxlX3BhdGgsIGNhbGxiYWNrPU5vbmUpOgogICAgICMgU3BlY2lmeSBzZXBhcmF0b3JzIGluIG9y ZGVyIHRvIGdldCBjb21wYWN0IGVuY29kaW5nLgotICAgIGpzb25fZGF0YSA9IGpzb24uZHVtcHMo anNvbl9vYmplY3QsIHNlcGFyYXRvcnM9KCcsJywgJzonKSkKLSAgICBqc29uX3N0cmluZyA9IF9K U09OX1BSRUZJWCArIGpzb25fZGF0YSArIF9KU09OX1NVRkZJWAorICAgIGpzb25fc3RyaW5nID0g anNvbi5kdW1wcyhqc29uX29iamVjdCwgc2VwYXJhdG9ycz0oJywnLCAnOicpKQorICAgIGlmIGNh bGxiYWNrOgorICAgICAgICBqc29uX3N0cmluZyA9IGNhbGxiYWNrICsgIigiICsganNvbl9zdHJp bmcgKyAiKTsiCiAgICAgZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoZmlsZV9wYXRoLCBqc29u X3N0cmluZykKIAogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pz b25yZXN1bHRzLnB5IGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0cy5w eQppbmRleCA0OGRhZmNlMTliNDFlMjJkM2E2NDRlZjNhNThhZjE2OTgwZjZmM2QwLi5jMjAxMjY0 NTA3YWI2MmE5N2M5ZmIxMjFiOGYwZTlhYTRkY2U4NDAyIDEwMDc1NQotLS0gYS9Ub29scy9UZXN0 UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzLnB5CisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRT ZXJ2ZXIvbW9kZWwvanNvbnJlc3VsdHMucHkKQEAgLTUzLDEwICs1MywxMCBAQCBKU09OX1JFU1VM VFNfTUFYX0JVSUxEU19TTUFMTCA9IDIwMAogY2xhc3MgSnNvblJlc3VsdHMob2JqZWN0KToKICAg ICBAY2xhc3NtZXRob2QKICAgICBkZWYgX3N0cmlwX3ByZWZpeF9zdWZmaXgoY2xzLCBkYXRhKToK LSAgICAgICAgYXNzZXJ0KGRhdGEuc3RhcnRzd2l0aChKU09OX1JFU1VMVFNfUFJFRklYKSkKLSAg ICAgICAgYXNzZXJ0KGRhdGEuZW5kc3dpdGgoSlNPTl9SRVNVTFRTX1NVRkZJWCkpCi0KLSAgICAg ICAgcmV0dXJuIGRhdGFbbGVuKEpTT05fUkVTVUxUU19QUkVGSVgpOmxlbihkYXRhKSAtIGxlbihK U09OX1JFU1VMVFNfU1VGRklYKV0KKyAgICAgICAgIyBGSVhNRTogU3RvcCBzdHJpcHBpbmcganNv bnAgY2FsbGJhY2sgb25jZSB3ZSB1cGxvYWQgcHVyZSBqc29uIGV2ZXJ5d2hlcmUuCisgICAgICAg IGlmIGRhdGEuc3RhcnRzd2l0aChKU09OX1JFU1VMVFNfUFJFRklYKSBhbmQgZGF0YS5lbmRzd2l0 aChKU09OX1JFU1VMVFNfU1VGRklYKToKKyAgICAgICAgICAgIHJldHVybiBkYXRhW2xlbihKU09O X1JFU1VMVFNfUFJFRklYKTpsZW4oZGF0YSkgLSBsZW4oSlNPTl9SRVNVTFRTX1NVRkZJWCldCisg ICAgICAgIHJldHVybiBkYXRhCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgX2dlbmVyYXRl X2ZpbGVfZGF0YShjbHMsIGpzb24sIHNvcnRfa2V5cz1GYWxzZSk6CmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzX3VuaXR0ZXN0LnB5IGIvVG9vbHMv VGVzdFJlc3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0c191bml0dGVzdC5weQppbmRleCAxZjQ5 N2U5MDdmMDYwYjY5NDBlMzIwOGIyNjRkZmFlZTg2YjdiZDE4Li45ZGViZWVlNmM2OTM2YTlkNTli NDkzOTQwMzk4ZThkNjk4MmJhN2IxIDEwMDc1NQotLS0gYS9Ub29scy9UZXN0UmVzdWx0U2VydmVy L21vZGVsL2pzb25yZXN1bHRzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2 ZXIvbW9kZWwvanNvbnJlc3VsdHNfdW5pdHRlc3QucHkKQEAgLTgxLDYgKzgxLDExIEBAIGNsYXNz IEpzb25SZXN1bHRzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNlbGYp OgogICAgICAgICBzZWxmLl9idWlsZGVyID0gIldlYmtpdCIKIAorICAgIGRlZiB0ZXN0X3N0cmlw X3ByZWZpeF9zdWZmaXgoc2VsZik6CisgICAgICAgIGpzb24gPSAiWydjb250ZW50cyddIgorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKEpzb25SZXN1bHRzLl9zdHJpcF9wcmVmaXhfc3VmZml4KEpT T05fUkVTVUxUU19QUkVGSVggKyBqc29uICsgSlNPTl9SRVNVTFRTX1NVRkZJWCksIGpzb24pCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoSnNvblJlc3VsdHMuX3N0cmlwX3ByZWZpeF9zdWZmaXgo anNvbiksIGpzb24pCisKICAgICBkZWYgX21ha2VfdGVzdF9qc29uKHNlbGYsIHRlc3RfZGF0YSk6 CiAgICAgICAgIGlmIG5vdCB0ZXN0X2RhdGE6CiAgICAgICAgICAgICByZXR1cm4gSlNPTl9SRVNV TFRTX1BSRUZJWCArIEpTT05fUkVTVUxUU19TVUZGSVgKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RS ZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZGFzaGJvYXJkX2Jhc2UuanMgYi9Ub29scy9U ZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2Rhc2hib2FyZF9iYXNlLmpzCmluZGV4 IDhkMWQwYTI5YzhjNzQwM2NlNWQ0ZGIxMmQ3NDA5MTM3MmQ4ZWYxMmQuLjUyMDQzNDQxZTI2NzQ2 YTU5YTU3MjcxMDRiNTRlMmRjYWYxMDcwN2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRT ZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZGFzaGJvYXJkX2Jhc2UuanMKKysrIGIvVG9vbHMvVGVz dFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9kYXNoYm9hcmRfYmFzZS5qcwpAQCAtNTI2 LDcgKzUyNiw3IEBAIGZ1bmN0aW9uIGFwcGVuZEpTT05TY3JpcHRFbGVtZW50Rm9yKGJ1aWxkZXJO YW1lKQogICAgIGVsc2UKICAgICAgICAgcmVzdWx0c0ZpbGVuYW1lID0gJ3Jlc3VsdHMtc21hbGwu anNvbic7CiAKLSAgICBhcHBlbmRTY3JpcHQocGF0aFRvQnVpbGRlclJlc3VsdHNGaWxlKGJ1aWxk ZXJOYW1lKSArIHJlc3VsdHNGaWxlbmFtZSwKKyAgICBhcHBlbmRTY3JpcHQocGF0aFRvQnVpbGRl clJlc3VsdHNGaWxlKGJ1aWxkZXJOYW1lKSArIHJlc3VsdHNGaWxlbmFtZSArICcmY2FsbGJhY2s9 QUREX1JFU1VMVFMnLAogICAgICAgICAgICAgcGFydGlhbChoYW5kbGVSZXNvdXJjZUxvYWRFcnJv ciwgYnVpbGRlck5hbWUpLAogICAgICAgICAgICAgcGFydGlhbChoYW5kbGVTY3JpcHRMb2FkZWQs IGJ1aWxkZXJOYW1lKSk7CiB9Cg==