119802 2013-08-14 09:53:56 -0700 Don't copy js-test-pre in cookies-test-pre 2013-08-14 23:11:50 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue oldest_to_newest 917160 0 ap 2013-08-14 09:53:56 -0700 There is an unnecessary copy of js-test-pre.js inside cookies tests. We should just use the real thing. 917161 1 208738 ap 2013-08-14 09:56:02 -0700 Created attachment 208738 proposed patch 917431 2 208738 commit-queue 2013-08-14 23:11:48 -0700 Comment on attachment 208738 proposed patch Clearing flags on attachment: 208738 Committed r154090: <http://trac.webkit.org/changeset/154090> 917432 3 commit-queue 2013-08-14 23:11:50 -0700 All reviewed patches have been landed. Closing bug. 208738 2013-08-14 09:56:02 -0700 2013-08-14 23:11:48 -0700 proposed patch cookies-test-pre.txt text/plain 6091 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDA1MykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA4LTE0ICBBbGV4ZXkgUHJvc2t1cnlh a292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGNvcHkganMtdGVzdC1wcmUgaW4g Y29va2llcy10ZXN0LXByZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE5ODAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBodHRwL3Rlc3RzL2Nvb2tpZXMvcmVzb3VyY2VzL2Nvb2tpZXMtdGVzdC1wb3N0 LmpzOgorICAgICAgICAqIGh0dHAvdGVzdHMvY29va2llcy9yZXNvdXJjZXMvY29va2llcy10ZXN0 LXByZS5qczoKKwogMjAxMy0wOC0xNCAgQmVuamFtaW4gRHVwb250ICAgPGJkdXBvbnRAbmRzLmNv bT4KIAogICAgICAgICBbUXRdIEFjdGl2YXRlIHZpc2liaWxpdHkgQVBJIGxheW91dCB0ZXN0cwpJ bmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb29raWVzL3Jlc291cmNlcy9jb29raWVzLXRl c3QtcG9zdC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nvb2tpZXMv cmVzb3VyY2VzL2Nvb2tpZXMtdGVzdC1wb3N0LmpzCShyZXZpc2lvbiAxNTQwMDYpCisrKyBMYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2Nvb2tpZXMvcmVzb3VyY2VzL2Nvb2tpZXMtdGVzdC1wb3N0Lmpz CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNCBAQAotc2hvdWxkQmVUcnVlKCJzdWNjZXNzZnVs bHlQYXJzZWQiKTsKLWRlYnVnKCc8YnIgLz48c3BhbiBjbGFzcz0icGFzcyI+VEVTVCBDT01QTEVU RTwvc3Bhbj4nKTsKK2RvY3VtZW50LndyaXRlKCI8c2NyaXB0IHNyYz0nL3Jlc291cmNlcy9qcy10 ZXN0LXBvc3QuanMnPjwvc2NyaXB0PiIpOwogCiAvLyBNYWtlIHN1cmUgdGhhdCB3ZSBkbyBub3Qg bGVhayBhbnkgY29va2llcy4KIGNsZWFyQ29va2llcygpOwpJbmRleDogTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9jb29raWVzL3Jlc291cmNlcy9jb29raWVzLXRlc3QtcHJlLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY29va2llcy9yZXNvdXJjZXMvY29va2llcy10ZXN0 LXByZS5qcwkocmV2aXNpb24gMTU0MDA2KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb29r aWVzL3Jlc291cmNlcy9jb29raWVzLXRlc3QtcHJlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xLDE1 MyArMSw0IEBACi1pZiAod2luZG93LnRlc3RSdW5uZXIpCi0gICAgdGVzdFJ1bm5lci5kdW1wQXNU ZXh0KCk7Ci0KLWZ1bmN0aW9uIGRlc2NyaXB0aW9uKG1zZykKLXsKLSAgICAvLyBGb3IgTVNJRSA2 IGNvbXBhdGliaWxpdHkKLSAgICB2YXIgc3BhbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw YW4iKTsKLSAgICBzcGFuLmlubmVySFRNTCA9ICc8cD4nICsgbXNnICsgJzwvcD48cD5PbiBzdWNj ZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIjxzcGFuIGNsYXNzPSJwYXNzIj5QQVNTPC9z cGFuPiIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICI8c3BhbiBjbGFzcz0icGFzcyI+VEVTVCBDT01Q TEVURTwvc3Bhbj4iLjwvcD4nOwotICAgIHZhciBkZXNjcmlwdGlvbiA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJkZXNjcmlwdGlvbiIpOwotICAgIGlmIChkZXNjcmlwdGlvbi5maXJzdENoaWxk KQotICAgICAgICBkZXNjcmlwdGlvbi5yZXBsYWNlQ2hpbGQoc3BhbiwgZGVzY3JpcHRpb24uZmly c3RDaGlsZCk7Ci0gICAgZWxzZQotICAgICAgICBkZXNjcmlwdGlvbi5hcHBlbmRDaGlsZChzcGFu KTsKLX0KLQotZnVuY3Rpb24gZGVidWcobXNnKQotewotICAgIHZhciBzcGFuID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25z b2xlIikuYXBwZW5kQ2hpbGQoc3Bhbik7IC8vIGluc2VydCBpdCBmaXJzdCBzbyBYSFRNTCBrbm93 cyB0aGUgbmFtZXNwYWNlCi0gICAgc3Bhbi5pbm5lckhUTUwgPSBtc2cgKyAnPGJyIC8+JzsKLX0K LQotZnVuY3Rpb24gZXNjYXBlSFRNTCh0ZXh0KQotewotICAgIHJldHVybiB0ZXh0LnJlcGxhY2Uo LyYvZywgIiZhbXA7IikucmVwbGFjZSgvPC9nLCAiJmx0OyIpOwotfQotCi1mdW5jdGlvbiB0ZXN0 UGFzc2VkKG1zZykKLXsKLSAgICBkZWJ1ZygnPHNwYW4+PHNwYW4gY2xhc3M9InBhc3MiPlBBU1M8 L3NwYW4+ICcgKyBlc2NhcGVIVE1MKG1zZykgKyAnPC9zcGFuPicpOwotfQotCi1mdW5jdGlvbiB0 ZXN0RmFpbGVkKG1zZykKLXsKLSAgICBkZWJ1ZygnPHNwYW4+PHNwYW4gY2xhc3M9ImZhaWwiPkZB SUw8L3NwYW4+ICcgKyBlc2NhcGVIVE1MKG1zZykgKyAnPC9zcGFuPicpOwotfQotCi1mdW5jdGlv biBhcmVBcnJheXNFcXVhbChfYSwgX2IpCi17Ci0gICAgaWYgKF9hLmxlbmd0aCAhPT0gX2IubGVu Z3RoKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCBfYS5s ZW5ndGg7IGkrKykKLSAgICAgICAgaWYgKF9hW2ldICE9PSBfYltpXSkKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQotZnVuY3Rpb24gaXNNaW51c1plcm8o bikKLXsKLSAgICAvLyB0aGUgb25seSB3YXkgdG8gdGVsbCAwIGZyb20gLTAgaW4gSlMgaXMgdGhl IGZhY3QgdGhhdCAxLy0wIGlzCi0gICAgLy8gLUluZmluaXR5IGluc3RlYWQgb2YgSW5maW5pdHkK LSAgICByZXR1cm4gbiA9PT0gMCAmJiAxL24gPCAwOwotfQotCi1mdW5jdGlvbiBpc1Jlc3VsdENv cnJlY3QoX2FjdHVhbCwgX2V4cGVjdGVkKQotewotICAgIGlmIChfZXhwZWN0ZWQgPT09IDApCi0g ICAgICAgIHJldHVybiBfYWN0dWFsID09PSBfZXhwZWN0ZWQgJiYgKDEvX2FjdHVhbCkgPT09ICgx L19leHBlY3RlZCk7Ci0gICAgaWYgKF9hY3R1YWwgPT09IF9leHBlY3RlZCkKLSAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgaWYgKHR5cGVvZihfZXhwZWN0ZWQpID09ICJudW1iZXIiICYmIGlzTmFO KF9leHBlY3RlZCkpCi0gICAgICAgIHJldHVybiB0eXBlb2YoX2FjdHVhbCkgPT0gIm51bWJlciIg JiYgaXNOYU4oX2FjdHVhbCk7Ci0gICAgaWYgKE9iamVjdC5wcm90b3R5cGUudG9TdHJpbmcuY2Fs bChfZXhwZWN0ZWQpID09IE9iamVjdC5wcm90b3R5cGUudG9TdHJpbmcuY2FsbChbXSkpCi0gICAg ICAgIHJldHVybiBhcmVBcnJheXNFcXVhbChfYWN0dWFsLCBfZXhwZWN0ZWQpOwotICAgIHJldHVy biBmYWxzZTsKLX0KLQotZnVuY3Rpb24gc3RyaW5naWZ5KHYpCi17Ci0gICAgaWYgKHYgPT09IDAg JiYgMS92IDwgMCkKLSAgICAgICAgcmV0dXJuICItMCI7Ci0gICAgZWxzZSByZXR1cm4gIiIgKyB2 OwotfQotCi1mdW5jdGlvbiBzaG91bGRCZShfYSwgX2IpCi17Ci0gICAgaWYgKHR5cGVvZiBfYSAh PSAic3RyaW5nIiB8fCB0eXBlb2YgX2IgIT0gInN0cmluZyIpCi0gICAgICAgIGRlYnVnKCJXQVJO OiBzaG91bGRCZSgpIGV4cGVjdHMgc3RyaW5nIGFyZ3VtZW50cyIpOwotICAgIHZhciBleGNlcHRp b247Ci0gICAgdmFyIF9hdjsKLSAgICB0cnkgewotICAgICAgICBfYXYgPSBldmFsKF9hKTsKLSAg ICB9IGNhdGNoIChlKSB7Ci0gICAgICAgIGV4Y2VwdGlvbiA9IGU7Ci0gICAgfQotICAgIHZhciBf YnYgPSBldmFsKF9iKTsKLQotICAgIGlmIChleGNlcHRpb24pCi0gICAgICAgIHRlc3RGYWlsZWQo X2EgKyAiIHNob3VsZCBiZSAiICsgX2J2ICsgIi4gVGhyZXcgZXhjZXB0aW9uICIgKyBleGNlcHRp b24pOwotICAgIGVsc2UgaWYgKGlzUmVzdWx0Q29ycmVjdChfYXYsIF9idikpCi0gICAgICAgIHRl c3RQYXNzZWQoX2EgKyAiIGlzICIgKyBfYik7Ci0gICAgZWxzZSBpZiAodHlwZW9mKF9hdikgPT0g dHlwZW9mKF9idikpCi0gICAgICAgIHRlc3RGYWlsZWQoX2EgKyAiIHNob3VsZCBiZSAiICsgX2J2 ICsgIi4gV2FzICIgKyBzdHJpbmdpZnkoX2F2KSArICIuIik7Ci0gICAgZWxzZQotICAgICAgICB0 ZXN0RmFpbGVkKF9hICsgIiBzaG91bGQgYmUgIiArIF9idiArICIgKG9mIHR5cGUgIiArIHR5cGVv ZiBfYnYgKyAiKS4gV2FzICIgKyBfYXYgKyAiIChvZiB0eXBlICIgKyB0eXBlb2YgX2F2ICsgIiku Iik7Ci19Ci0KLWZ1bmN0aW9uIHNob3VsZEJlVHJ1ZShfYSkgeyBzaG91bGRCZShfYSwgInRydWUi KTsgfQotZnVuY3Rpb24gc2hvdWxkQmVGYWxzZShfYSkgeyBzaG91bGRCZShfYSwgImZhbHNlIik7 IH0KLWZ1bmN0aW9uIHNob3VsZEJlTmFOKF9hKSB7IHNob3VsZEJlKF9hLCAiTmFOIik7IH0KLWZ1 bmN0aW9uIHNob3VsZEJlTnVsbChfYSkgeyBzaG91bGRCZShfYSwgIm51bGwiKTsgfQotCi1mdW5j dGlvbiBzaG91bGRCZUVxdWFsVG9TdHJpbmcoYSwgYikKLXsKLSAgICB2YXIgdW5ldmFsZWRTdHJp bmcgPSAnIicgKyBiLnJlcGxhY2UoL1xcL2csICJcXFxcIikucmVwbGFjZSgvIi9nLCAiXCIiKS5y ZXBsYWNlKC9cbi9nLCAiXFxuIikucmVwbGFjZSgvXHIvZywgIlxcciIpICsgJyInOwotICAgIHNo b3VsZEJlKGEsIHVuZXZhbGVkU3RyaW5nKTsKLX0KLQotZnVuY3Rpb24gc2hvdWxkQmVVbmRlZmlu ZWQoX2EpCi17Ci0gICAgdmFyIGV4Y2VwdGlvbjsKLSAgICB2YXIgX2F2OwotICAgIHRyeSB7Ci0g ICAgICAgIF9hdiA9IGV2YWwoX2EpOwotICAgIH0gY2F0Y2ggKGUpIHsKLSAgICAgICAgZXhjZXB0 aW9uID0gZTsKLSAgICB9Ci0KLSAgICBpZiAoZXhjZXB0aW9uKQotICAgICAgICB0ZXN0RmFpbGVk KF9hICsgIiBzaG91bGQgYmUgdW5kZWZpbmVkLiBUaHJldyBleGNlcHRpb24gIiArIGV4Y2VwdGlv bik7Ci0gICAgZWxzZSBpZiAodHlwZW9mIF9hdiA9PSAidW5kZWZpbmVkIikKLSAgICAgICAgdGVz dFBhc3NlZChfYSArICIgaXMgdW5kZWZpbmVkLiIpOwotICAgIGVsc2UKLSAgICAgICAgdGVzdEZh aWxlZChfYSArICIgc2hvdWxkIGJlIHVuZGVmaW5lZC4gV2FzICIgKyBfYXYpOwotfQotCi1mdW5j dGlvbiBzaG91bGRUaHJvdyhfYSwgX2UpCi17Ci0gICAgdmFyIGV4Y2VwdGlvbjsKLSAgICB2YXIg X2F2OwotICAgIHRyeSB7Ci0gICAgICAgIF9hdiA9IGV2YWwoX2EpOwotICAgIH0gY2F0Y2ggKGUp IHsKLSAgICAgICAgZXhjZXB0aW9uID0gZTsKLSAgICB9Ci0KLSAgICB2YXIgX2V2OwotICAgIGlm IChfZSkKLSAgICAgICAgX2V2ID0gIGV2YWwoX2UpOwotCi0gICAgaWYgKGV4Y2VwdGlvbikgewot ICAgICAgICBpZiAodHlwZW9mIF9lID09ICJ1bmRlZmluZWQiIHx8IGV4Y2VwdGlvbiA9PSBfZXYp Ci0gICAgICAgICAgICB0ZXN0UGFzc2VkKF9hICsgIiB0aHJldyBleGNlcHRpb24gIiArIGV4Y2Vw dGlvbiArICIuIik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoX2EgKyAi IHNob3VsZCB0aHJvdyAiICsgKHR5cGVvZiBfZSA9PSAidW5kZWZpbmVkIiA/ICJhbiBleGNlcHRp b24iIDogX2V2KSArICIuIFRocmV3IGV4Y2VwdGlvbiAiICsgZXhjZXB0aW9uICsgIi4iKTsKLSAg ICB9IGVsc2UgaWYgKHR5cGVvZiBfYXYgPT0gInVuZGVmaW5lZCIpCi0gICAgICAgIHRlc3RGYWls ZWQoX2EgKyAiIHNob3VsZCB0aHJvdyAiICsgKHR5cGVvZiBfZSA9PSAidW5kZWZpbmVkIiA/ICJh biBleGNlcHRpb24iIDogX2V2KSArICIuIFdhcyB1bmRlZmluZWQuIik7Ci0gICAgZWxzZQotICAg ICAgICB0ZXN0RmFpbGVkKF9hICsgIiBzaG91bGQgdGhyb3cgIiArICh0eXBlb2YgX2UgPT0gInVu ZGVmaW5lZCIgPyAiYW4gZXhjZXB0aW9uIiA6IF9ldikgKyAiLiBXYXMgIiArIF9hdiArICIuIik7 Ci19Citkb2N1bWVudC53cml0ZSgiPHNjcmlwdCBzcmM9Jy9yZXNvdXJjZXMvanMtdGVzdC1wcmUu anMnPjwvc2NyaXB0PiIpOwogCiB2YXIgY29va2llcyA9IG5ldyBBcnJheSgpOwogCg==