48941 2010-11-03 12:39:48 -0700 [Qt] TestController::runUntil doesn't honor the timeout parameter 2010-11-12 03:31:14 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED PlatformOnly, Qt, QtTriaged P2 Normal --- 1 aroben webkit-unassigned benjamin commit-queue kling vestbo oldest_to_newest 304204 0 aroben 2010-11-03 12:39:48 -0700 In order to fix bug 43047 I'm adding a timeout parameter to TestController::runUntil. The parameter specifies how long we are willing to run the run loop before giving up. TestControllerQt should honor this parameter. 308046 1 73634 benjamin 2010-11-11 12:09:11 -0800 Created attachment 73634 Patch 308477 2 73634 commit-queue 2010-11-12 03:31:09 -0800 Comment on attachment 73634 Patch Clearing flags on attachment: 73634 Committed r71902: <http://trac.webkit.org/changeset/71902> 308478 3 commit-queue 2010-11-12 03:31:14 -0800 All reviewed patches have been landed. Closing bug. 73634 2010-11-11 12:09:11 -0800 2010-11-12 03:31:09 -0800 Patch 48941.diff text/plain 3150 benjamin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmYzY2N2VmLi5kYmY4OGQ5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMTEt MTEgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFRlc3RDb250 cm9sbGVyOjpydW5VbnRpbCBkb2Vzbid0IGhvbm9yIHRoZSB0aW1lb3V0IHBhcmFtZXRlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg5NDEKKworICAg ICAgICBJbXBsZW1lbnQgdGhlIG1pc3NpbmcgdGltZW91dCBvZiBXZWJLaXRUZXN0UnVubmVyIGZv ciBRdC4KKworICAgICAgICBBIFFFbGFwc2VkVGltZXIgaGFzIGJlZW4gYWRkZWQgdG8gUnVuVW50 aWxDb25kaXRpb25Mb29wIGluIG9yZGVyCisgICAgICAgIHRvIG1lYXN1cmUgaG93IGxvbmcgdGhl IGxvb3AgaGFzIGJlZW4gcnVubmluZy4gV2hlbiB0aGUgdGltZXIKKyAgICAgICAgaXMgYmlnZ2Vy IG9yIGVxdWFsIHRoYW4gdGhlIHRpbWVvdXQsIHRoZSBsb29wIGVuZHMgZXZlbiBpZiB0aGUKKyAg ICAgICAgY29uZGl0aW9uIGlzIG5vdCBtZXQuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVy L3F0L1Rlc3RDb250cm9sbGVyUXQuY3BwOgorICAgICAgICAoV1RSOjpSdW5VbnRpbENvbmRpdGlv bkxvb3A6OnN0YXJ0KToKKyAgICAgICAgKFdUUjo6UnVuVW50aWxDb25kaXRpb25Mb29wOjpydW4p OgorICAgICAgICAoV1RSOjpSdW5VbnRpbENvbmRpdGlvbkxvb3A6OnRpbWVyRXZlbnQpOgorICAg ICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1SdW5VbnRpbCk6CisKIDIwMTAtMTEt MTAgIENocmlzIEd1aWxsb3J5ICA8Y2hyaXMuZ3VpbGxvcnlAZ29vZ2xlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvcXQvVGVzdENvbnRyb2xsZXJRdC5jcHAgYi9XZWJLaXRUb29scy9XZWJL aXRUZXN0UnVubmVyL3F0L1Rlc3RDb250cm9sbGVyUXQuY3BwCmluZGV4IGQ0ZGUxYmEuLmQzZmM1 YmYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvVGVzdENvbnRy b2xsZXJRdC5jcHAKKysrIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9UZXN0Q29u dHJvbGxlclF0LmNwcApAQCAtMzAsNiArMzAsMTEgQEAKIAogI2luY2x1ZGUgPGNzdGRsaWI+CiAj aW5jbHVkZSA8UUNvcmVBcHBsaWNhdGlvbj4KKyNpZiAoUVRfVkVSU0lPTiA+PSAweDA0MDcwMCkK KyMgICAgaW5jbHVkZSA8UUVsYXBzZWRUaW1lcj4KKyNlbHNlCisjICAgIGluY2x1ZGUgPFFUaW1l PgorI2VuZGlmCiAjaW5jbHVkZSA8UUV2ZW50TG9vcD4KICNpbmNsdWRlIDxRRmlsZUluZm8+CiAj aW5jbHVkZSA8UUxpYnJhcnk+CkBAIC00OCwxOCArNTMsMjAgQEAgY2xhc3MgUnVuVW50aWxDb25k aXRpb25Mb29wIDogcHVibGljIFFPYmplY3QgewogICAgIFFfT0JKRUNUCiAKIHB1YmxpYzoKLSAg ICBzdGF0aWMgdm9pZCBzdGFydChib29sJiBkb25lKQorICAgIHN0YXRpYyB2b2lkIHN0YXJ0KGJv b2wmIGRvbmUsIGludCB0aW1lb3V0KQogICAgIHsKICAgICAgICAgc3RhdGljIFJ1blVudGlsQ29u ZGl0aW9uTG9vcCogaW5zdGFuY2UgPSBuZXcgUnVuVW50aWxDb25kaXRpb25Mb29wOwotICAgICAg ICBpbnN0YW5jZS0+cnVuKGRvbmUpOworICAgICAgICBpbnN0YW5jZS0+cnVuKGRvbmUsIHRpbWVv dXQpOwogICAgIH0KIAogcHJpdmF0ZToKICAgICBSdW5VbnRpbENvbmRpdGlvbkxvb3AoKSB7fQog Ci0gICAgdm9pZCBydW4oYm9vbCYgZG9uZSkKKyAgICB2b2lkIHJ1bihib29sJiBkb25lLCBpbnQg dGltZW91dCkKICAgICB7CiAgICAgICAgIG1fY29uZGl0aW9uID0gJmRvbmU7CisgICAgICAgIG1f dGltZW91dCA9IHRpbWVvdXQ7CisgICAgICAgIG1fZWxhcHNlZFRpbWUuc3RhcnQoKTsKICAgICAg ICAgbV90aW1lcklEID0gc3RhcnRUaW1lcihrVGltZXJJbnRlcnZhbE1TKTsKICAgICAgICAgQVNT RVJUKG1fdGltZXJJRCk7CiAgICAgICAgIG1fZXZlbnRMb29wLmV4ZWMoUUV2ZW50TG9vcDo6RXhj bHVkZVVzZXJJbnB1dEV2ZW50cyk7CkBAIC02Nyw3ICs3NCw3IEBAIHByaXZhdGU6CiAKICAgICB2 aXJ0dWFsIHZvaWQgdGltZXJFdmVudChRVGltZXJFdmVudCopCiAgICAgewotICAgICAgICBpZiAo ISptX2NvbmRpdGlvbikKKyAgICAgICAgaWYgKCEqbV9jb25kaXRpb24gJiYgbV9lbGFwc2VkVGlt ZS5lbGFwc2VkKCkgPCBtX3RpbWVvdXQpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAg a2lsbFRpbWVyKG1fdGltZXJJRCk7CkBAIC03NywxNyArODQsMjEgQEAgcHJpdmF0ZToKICAgICBR RXZlbnRMb29wIG1fZXZlbnRMb29wOwogICAgIGJvb2wqIG1fY29uZGl0aW9uOwogICAgIGludCBt X3RpbWVySUQ7CisgICAgaW50IG1fdGltZW91dDsKKyNpZiAoUVRfVkVSU0lPTiA+PSAweDA0MDcw MCkKKyAgICBRRWxhcHNlZFRpbWVyIG1fZWxhcHNlZFRpbWU7CisjZWxzZQorICAgIFFUaW1lIG1f ZWxhcHNlZFRpbWU7CisjZW5kaWYKIH07CiAKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3Jt SW5pdGlhbGl6ZSgpCiB7CiB9CiAKLXZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtUnVuVW50 aWwoYm9vbCYgZG9uZSwgZG91YmxlKQordm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1SdW5V bnRpbChib29sJiBkb25lLCBkb3VibGUgdGltZW91dCkKIHsKLSAgICAvLyBGSVhNRTogSG9ub3Ig dGhlIHRpbWVvdXQgcGFyYW1ldGVyIDxodHRwOi8vd2Via2l0Lm9yZy9iLzQ4OTQxPi4KLSAgICBS dW5VbnRpbENvbmRpdGlvbkxvb3A6OnN0YXJ0KGRvbmUpOwotICAgIEFTU0VSVChkb25lKTsKKyAg ICBSdW5VbnRpbENvbmRpdGlvbkxvb3A6OnN0YXJ0KGRvbmUsIHN0YXRpY19jYXN0PGludD4odGlt ZW91dCAqIDEwMDApKTsKIH0KIAogc3RhdGljIGJvb2wgaXNFeGlzdGluZ0xpYnJhcnkoY29uc3Qg UVN0cmluZyYgcGF0aCkK