148746 2015-09-03 12:19:48 -0700 DumpRenderTree should automatically compute HTTP URLs for HTTP tests 2015-09-03 17:54:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca commit-queue glenn oldest_to_newest 1123116 0 andersca 2015-09-03 12:19:48 -0700 DumpRenderTree should automatically compute HTTP URLs for HTTP tests 1123119 1 260509 andersca 2015-09-03 12:26:08 -0700 Created attachment 260509 Patch 1123210 2 andersca 2015-09-03 16:30:12 -0700 Committed r189311: <http://trac.webkit.org/changeset/189311> 1123244 3 webkit-bug-importer 2015-09-03 17:54:29 -0700 <rdar://problem/22569989> 260509 2015-09-03 12:26:08 -0700 2015-09-03 16:12:10 -0700 Patch bug-148746-20150903122608.patch text/plain 5893 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5Mjc0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTZjNjNiNGI4OGI4NzUwYjVhYmZlMWZhODFlNDYyMjMw YzJiNDlhNy4uMjdmMTE2MThmNWI5ZjRkMDUwMjRlYTJiNjhjYjVlY2YwY2ZiNTZkNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE1LTA5LTAzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK KyAgICAgICAgRHVtcFJlbmRlclRyZWUgc2hvdWxkIGF1dG9tYXRpY2FsbHkgY29tcHV0ZSBIVFRQ IFVSTHMgZm9yIEhUVFAgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0ODc0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAg ICAgICAoY29tcHV0ZVRlc3RVUkwpOgorICAgICAgICBDb21wdXRlIHRoZSB0ZXN0IFVSTCBmcm9t IHRoZSBwYXNzZWQgaW4gcGF0aCBvciBVUkwuIFNwZWNpYWwtY2FzZSBwYXRocyB0aGF0IGNvbnRh aW4gL0xheW91dFRlc3RzL2h0dHAvdGVzdHMuIAorCisgICAgICAgIChydW5UZXN0KToKKyAgICAg ICAgQ2FsbCBjb21wdXRlVGVzdFVSTC4KKworICAgICAgICAodGVzdFBhdGhGcm9tVVJMKToKKyAg ICAgICAgR2V0IHJpZCBvZiB0aGlzOyBjb21wdXRlVGVzdFVSTCBkb2VzIHRoaXMgZm9yIHVzIG5v dy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHk6CisgICAgICAg IChEcml2ZXIuX2NvbW1hbmRfZnJvbV9kcml2ZXJfaW5wdXQpOgorICAgICAgICBEb24ndCBjb252 ZXJ0IEhUVFAgdGVzdCBwYXRocyB0byBVUkxTIGJlZm9yZSBwYXNzaW5nIHRoZW0gdG8gRHVtcFJl bmRlclRyZWUgb24gTWFjLiBUaGF0J3MgaGFuZGxlZCBieSBEUlQgaXRzZWxmIG5vdy4KKwogMjAx NS0wOS0wMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAg ICBBZGQgYSBtb2Rlcm4gQVBJIHdheSB0byBrbm93IHRoYXQgdGhlIG5hdmlnYXRpb24gZ2VzdHVy ZSBzbmFwc2hvdCB3YXMgcmVtb3ZlZCwgZm9yIFdlYktpdFRlc3RSdW5uZXIKZGlmZiAtLWdpdCBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbSBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQppbmRleCAwYjU2ZWRiOWRiNjRjZWU5MDQ2 M2E2MjQyNGVmZjFjNzBkYmNlNzMzLi40OTI2MjJlNGEyZDQ0NWZjNGI0YjhiZDMzOWRiYzJmNDc4 YmUzMTk0IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRy ZWUubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCkBA IC0xODk2LDI1ICsxODk2LDQwIEBAIHN0YXRpYyB2b2lkIFdlYlRocmVhZExvY2tBZnRlckRlbGVn YXRlQ2FsbGJhY2tzSGF2ZUNvbXBsZXRlZCgpCiB9CiAjZW5kaWYKIAotc3RhdGljIE5TU3RyaW5n ICp0ZXN0UGF0aEZyb21VUkwoTlNVUkwqIHVybCkKK3N0YXRpYyBOU1VSTCAqY29tcHV0ZVRlc3RV UkwoTlNTdHJpbmcgKnBhdGhPclVSTFN0cmluZywgTlNTdHJpbmcgKipyZWxhdGl2ZVRlc3RQYXRo KQogewotICAgIGlmIChbdXJsIGlzRmlsZVVSTF0pIHsKLSAgICAgICAgTlNTdHJpbmcgKmZpbGVQ YXRoID0gW3VybCBwYXRoXTsKLSAgICAgICAgTlNSYW5nZSBsYXlvdXRUZXN0c1JhbmdlID0gW2Zp bGVQYXRoIHJhbmdlT2ZTdHJpbmc6QCIvTGF5b3V0VGVzdHMvIl07Ci0gICAgICAgIGlmIChsYXlv dXRUZXN0c1JhbmdlLmxvY2F0aW9uID09IE5TTm90Rm91bmQpCi0gICAgICAgICAgICByZXR1cm4g bmlsOworICAgICpyZWxhdGl2ZVRlc3RQYXRoID0gbmlsOwogCi0gICAgICAgIHJldHVybiBbZmls ZVBhdGggc3Vic3RyaW5nRnJvbUluZGV4Ok5TTWF4UmFuZ2UobGF5b3V0VGVzdHNSYW5nZSldOwot ICAgIH0KLSAgICAKLSAgICAvLyBIVFRQIHRlc3QgVVJMcyBsb29rIGxpa2U6IGh0dHA6Ly8xMjcu MC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJjZS1yZXF1ZXN0LWNvbnRl bnQtYWZ0ZXItbG9hZGluZy1hbmQtY2xlYXJpbmctY2FjaGUuaHRtbAotICAgIGlmICghW1t1cmwg c2NoZW1lXSBpc0VxdWFsVG9TdHJpbmc6QCJodHRwIl0gJiYgIVtbdXJsIHNjaGVtZV0gaXNFcXVh bFRvU3RyaW5nOkAiaHR0cHMiXSkKLSAgICAgICAgcmV0dXJuIG5pbDsKKyAgICBpZiAoW3BhdGhP clVSTFN0cmluZyBoYXNQcmVmaXg6QCJodHRwOi8vIl0gfHwgW3BhdGhPclVSTFN0cmluZyBoYXNQ cmVmaXg6QCJodHRwczovLyJdIHx8IFtwYXRoT3JVUkxTdHJpbmcgaGFzUHJlZml4OkAiZmlsZTov LyJdKQorICAgICAgICByZXR1cm4gW05TVVJMIFVSTFdpdGhTdHJpbmc6cGF0aE9yVVJMU3RyaW5n XTsKIAotICAgIGlmIChbW3VybCBob3N0XSBpc0VxdWFsVG9TdHJpbmc6QCIxMjcuMC4wLjEiXSAm JiAoW1t1cmwgcG9ydF0gaW50VmFsdWVdID09IDgwMDAgfHwgW1t1cmwgcG9ydF0gaW50VmFsdWVd ID09IDg0NDMpKQotICAgICAgICByZXR1cm4gW3VybCBwYXRoXTsKKyAgICBOU1JhbmdlIGxheW91 dFRlc3RzUmFuZ2UgPSBbcGF0aE9yVVJMU3RyaW5nIHJhbmdlT2ZTdHJpbmc6QCIvTGF5b3V0VGVz dHMvIl07CisgICAgaWYgKGxheW91dFRlc3RzUmFuZ2UubG9jYXRpb24gPT0gTlNOb3RGb3VuZCkK KyAgICAgICAgcmV0dXJuIFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6cGF0aE9yVVJMU3RyaW5nXTsK IAotICAgIHJldHVybiBuaWw7CisgICAgKnJlbGF0aXZlVGVzdFBhdGggPSBbcGF0aE9yVVJMU3Ry aW5nIHN1YnN0cmluZ0Zyb21JbmRleDpOU01heFJhbmdlKGxheW91dFRlc3RzUmFuZ2UpXTsKKwor ICAgIC8vIENvbnZlcnQgZmlsZSBVUkxzIGluIExheW91dFRlc3RzL2h0dHAvdGVzdHMgdG8gSFRU UCBVUkxzLCBleGNlcHQgZm9yIGZpbGUgVVJMcyBpbiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xv Y2FsLgorCisgICAgTlNSYW5nZSBodHRwVGVzdHNSYW5nZSA9IFtwYXRoT3JVUkxTdHJpbmcgcmFu Z2VPZlN0cmluZzpAIi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzLyJdOworICAgIGlmIChodHRwVGVz dHNSYW5nZS5sb2NhdGlvbiA9PSBOU05vdEZvdW5kIHx8IFtwYXRoT3JVUkxTdHJpbmcgcmFuZ2VP ZlN0cmluZzpAIi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvY2FsLyJdLmxvY2F0aW9uICE9IE5T Tm90Rm91bmQpCisgICAgICAgIHJldHVybiBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnBhdGhPclVS TFN0cmluZ107CisKKyAgICBhdXRvIGNvbXBvbmVudHMgPSBhZG9wdE5TKFtbTlNVUkxDb21wb25l bnRzIGFsbG9jXSBpbml0XSk7CisgICAgW2NvbXBvbmVudHMgc2V0UGF0aDpbcGF0aE9yVVJMU3Ry aW5nIHN1YnN0cmluZ0Zyb21JbmRleDpOU01heFJhbmdlKGh0dHBUZXN0c1JhbmdlKSAtIDFdXTsK KyAgICBbY29tcG9uZW50cyBzZXRIb3N0OkAiMTI3LjAuMC4xIl07CisKKyAgICAvLyBQYXRocyB1 bmRlciAvc3NsLyBzaG91bGQgYmUgbG9hZGVkIHVzaW5nIEhUVFBTLgorICAgIEJPT0wgaXNTZWN1 cmUgPSBbW2NvbXBvbmVudHMgcGF0aF0gaGFzUHJlZml4OkAiL3NzbC8iXTsKKyAgICBpZiAoaXNT ZWN1cmUpIHsKKyAgICAgICAgW2NvbXBvbmVudHMgc2V0U2NoZW1lOkAiaHR0cHMiXTsKKyAgICAg ICAgW2NvbXBvbmVudHMgc2V0UG9ydDpAKDg0NDMpXTsKKyAgICB9IGVsc2UgeworICAgICAgICBb Y29tcG9uZW50cyBzZXRTY2hlbWU6QCJodHRwIl07CisgICAgICAgIFtjb21wb25lbnRzIHNldFBv cnQ6QCg4MDAwKV07CisgICAgfQorCisgICAgcmV0dXJuIFtjb21wb25lbnRzIFVSTF07CiB9CiAK IHN0YXRpYyB2b2lkIHJ1blRlc3QoY29uc3Qgc3RyaW5nJiBpbnB1dExpbmUpCkBAIC0xOTMxLDE5 ICsxOTQ2LDE1IEBAIHN0YXRpYyB2b2lkIHJ1blRlc3QoY29uc3Qgc3RyaW5nJiBpbnB1dExpbmUp CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBOU1VSTCAqdXJsOwotICAgIGlmIChbcGF0 aE9yVVJMU3RyaW5nIGhhc1ByZWZpeDpAImh0dHA6Ly8iXSB8fCBbcGF0aE9yVVJMU3RyaW5nIGhh c1ByZWZpeDpAImh0dHBzOi8vIl0gfHwgW3BhdGhPclVSTFN0cmluZyBoYXNQcmVmaXg6QCJmaWxl Oi8vIl0pCi0gICAgICAgIHVybCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnBhdGhPclVSTFN0cmlu Z107Ci0gICAgZWxzZQotICAgICAgICB1cmwgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnBhdGhP clVSTFN0cmluZ107CisgICAgTlNTdHJpbmcgKnRlc3RQYXRoOworICAgIE5TVVJMICp1cmwgPSBj b21wdXRlVGVzdFVSTChwYXRoT3JVUkxTdHJpbmcsICZ0ZXN0UGF0aCk7CiAgICAgaWYgKCF1cmwp IHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gcGFyc2UgXCIlc1wiIGFzIGEg VVJMXG4iLCBwYXRoT3JVUkwuY19zdHIoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0KLSAg ICBOU1N0cmluZyAqdGVzdFBhdGggPSB0ZXN0UGF0aEZyb21VUkwodXJsKTsKICAgICBpZiAoIXRl c3RQYXRoKQogICAgICAgICB0ZXN0UGF0aCA9IFt1cmwgYWJzb2x1dGVTdHJpbmddOworCiAgICAg TlNTdHJpbmcgKmluZm9ybWF0aW9uU3RyaW5nID0gW0AiQ1JBU0hJTkcgVEVTVDogIiBzdHJpbmdC eUFwcGVuZGluZ1N0cmluZzp0ZXN0UGF0aF07CiAgICAgV0tTZXRDcmFzaFJlcG9ydEFwcGxpY2F0 aW9uU3BlY2lmaWNJbmZvcm1hdGlvbigoQ0ZTdHJpbmdSZWYpaW5mb3JtYXRpb25TdHJpbmcpOwog CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQppbmRleCA2MDU4NGFlNjA1NTQ4YTRh OTMzY2JlNmYzMjMyODBiYTk2YWE4NWYzLi4wMjM4YmQ5MThjNzhjNGZkZDM2OTEwNjhkYWRmMWQy Mjc3NzQzOGUyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVy LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKQEAgLTQyMiw3 ICs0MjIsNyBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgIyBGSVhNRTogcGVyZm9y bWFuY2UgdGVzdHMgcGFzcyBpbiBmdWxsIFVSTHMgaW5zdGVhZCBvZiB0ZXN0IG5hbWVzLgogICAg ICAgICBpZiBkcml2ZXJfaW5wdXQudGVzdF9uYW1lLnN0YXJ0c3dpdGgoJ2h0dHA6Ly8nKSBvciBk cml2ZXJfaW5wdXQudGVzdF9uYW1lLnN0YXJ0c3dpdGgoJ2h0dHBzOi8vJykgIG9yIGRyaXZlcl9p bnB1dC50ZXN0X25hbWUgPT0gKCdhYm91dDpibGFuaycpOgogICAgICAgICAgICAgY29tbWFuZCA9 IGRyaXZlcl9pbnB1dC50ZXN0X25hbWUKLSAgICAgICAgZWxpZiBzZWxmLmlzX2h0dHBfdGVzdChk cml2ZXJfaW5wdXQudGVzdF9uYW1lKSBvciBzZWxmLmlzX3dlYl9wbGF0Zm9ybV90ZXN0KGRyaXZl cl9pbnB1dC50ZXN0X25hbWUpOgorICAgICAgICBlbGlmIHNlbGYuaXNfd2ViX3BsYXRmb3JtX3Rl c3QoZHJpdmVyX2lucHV0LnRlc3RfbmFtZSkgb3IgKHNlbGYuaXNfaHR0cF90ZXN0KGRyaXZlcl9p bnB1dC50ZXN0X25hbWUpIGFuZCAoc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9y dW5uZXInKSBvciBzeXMucGxhdGZvcm0gPT0gImN5Z3dpbiIpKToKICAgICAgICAgICAgIGNvbW1h bmQgPSBzZWxmLnRlc3RfdG9fdXJpKGRyaXZlcl9pbnB1dC50ZXN0X25hbWUpCiAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICBjb21tYW5kID0gc2VsZi5fcG9ydC5hYnNwYXRoX2Zvcl90ZXN0KGRy aXZlcl9pbnB1dC50ZXN0X25hbWUpCg==