52086 2011-01-07 15:05:28 -0800 Make WebKitTestRunner rest between loads more robust to avoid test crashes 2011-01-07 16:22:00 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 331040 0 mjs 2011-01-07 15:05:28 -0800 Make WebKitTestRunner rest between loads more robust to avoid test crashes 331042 1 78278 mjs 2011-01-07 15:07:02 -0800 Created attachment 78278 Patch 331078 2 78278 sam 2011-01-07 15:50:33 -0800 Comment on attachment 78278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78278&action=review If you remove the debug code, this looks fine. r=me > Tools/WebKitTestRunner/TestController.cpp:40 > -static const double defaultShortTimeout = 5; > +static const double defaultShortTimeout = 30; You should revert this. > Tools/WebKitTestRunner/TestController.cpp:364 > + platformRunUntil(done, timeoutDuration == (TimeoutDuration)(-15) ? 3600 : timeoutDuration == ShortTimeout ? m_shortTimeout : m_longTimeout); This too. > Tools/WebKitTestRunner/TestInvocation.cpp:135 > + TestController::shared().runUntil(m_gotFinalMessage, (TestController::TimeoutDuration)(-13)); Here too. 331086 3 mjs 2011-01-07 16:22:00 -0800 Committed r75291: <http://trac.webkit.org/changeset/75291> 78278 2011-01-07 15:07:02 -0800 2011-01-07 15:50:33 -0800 Patch bug-52086-20110107150659.patch text/plain 4264 mjs SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1Mjc5KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDEtMDcgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFdl YktpdFRlc3RSdW5uZXIgcmVzdCBiZXR3ZWVuIGxvYWRzIG1vcmUgcm9idXN0IHRvIGF2b2lkIHRl c3QgY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTIwODYKKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5q ZWN0ZWRCdW5kbGUuY3BwOgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1bmRsZTo6ZGlkUmVjZWl2 ZU1lc3NhZ2UpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5 b3V0VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpMYXlvdXRUZXN0Q29udHJvbGxl cjo6bm90aWZ5RG9uZSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxl ci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpyZXNldFN0YXRlVG9Db25zaXN0 ZW50VmFsdWVzKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnJ1bik6CisgICAgICAg IChXVFI6OlRlc3RDb250cm9sbGVyOjpydW5VbnRpbCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1 bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgIChXVFI6OlRlc3RJbnZvY2F0aW9uOjpp bnZva2UpOgorCiAyMDExLTAxLTA3ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2ZXJ0ICJJbXBsZW1lbnQgbW96aWxsYSdzIGFuaW1hdGlvblRpbWUg cHJvcGVydHkiCkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cAkocmV2aXNpb24gNzUxNDYpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9s bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQAogbmFtZXNwYWNlIFdUUiB7 CiAKIHN0YXRpYyBjb25zdCBkb3VibGUgZGVmYXVsdExvbmdUaW1lb3V0ID0gMzA7Ci1zdGF0aWMg Y29uc3QgZG91YmxlIGRlZmF1bHRTaG9ydFRpbWVvdXQgPSA1Oworc3RhdGljIGNvbnN0IGRvdWJs ZSBkZWZhdWx0U2hvcnRUaW1lb3V0ID0gMzA7CiAKIHN0YXRpYyBXS1VSTFJlZiBibGFua1VSTCgp CiB7CkBAIC0yODAsNiArMjgwLDkgQEAgYm9vbCBUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRv Q29uc2lzdAogewogICAgIG1fc3RhdGUgPSBSZXNldHRpbmc7CiAKKyAgICBXS1JldGFpblB0cjxX S1N0cmluZ1JlZj4gbWVzc2FnZU5hbWUoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENT dHJpbmcoIlJlc2V0IikpOworICAgIFdLQ29udGV4dFBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRs ZShUZXN0Q29udHJvbGxlcjo6c2hhcmVkKCkuY29udGV4dCgpLCBtZXNzYWdlTmFtZS5nZXQoKSwg MCk7CisKICAgICAvLyBGSVhNRTogVGhpcyBmdW5jdGlvbiBzaG91bGQgYWxzbyBlbnN1cmUgdGhh dCB0aGVyZSBpcyBvbmx5IG9uZSBwYWdlIG9wZW4uCiAKICAgICAvLyBSZXNldCBwcmVmZXJlbmNl cwpAQCAtMzUzLDExICszNTYsMTIgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cnVuKCkKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KKwogfQogCiB2b2lkIFRlc3RDb250 cm9sbGVyOjpydW5VbnRpbChib29sJiBkb25lLCBUaW1lb3V0RHVyYXRpb24gdGltZW91dER1cmF0 aW9uKQogewotICAgIHBsYXRmb3JtUnVuVW50aWwoZG9uZSwgdGltZW91dER1cmF0aW9uID09IFNo b3J0VGltZW91dCA/IG1fc2hvcnRUaW1lb3V0IDogbV9sb25nVGltZW91dCk7CisgICAgcGxhdGZv cm1SdW5VbnRpbChkb25lLCB0aW1lb3V0RHVyYXRpb24gPT0gKFRpbWVvdXREdXJhdGlvbikoLTE1 KSA/IDM2MDAgOiB0aW1lb3V0RHVyYXRpb24gPT0gU2hvcnRUaW1lb3V0ID8gbV9zaG9ydFRpbWVv dXQgOiBtX2xvbmdUaW1lb3V0KTsKIH0KIAogLy8gV0tDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGll bnQKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCShyZXZp c2lvbiA3NTE0NikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMzIsNyArMTMyLDcgQEAgdm9pZCBUZXN0SW52b2NhdGlvbjo6 aW52b2tlKCkKIAogICAgIFdLUGFnZUxvYWRVUkwoVGVzdENvbnRyb2xsZXI6OnNoYXJlZCgpLm1h aW5XZWJWaWV3KCktPnBhZ2UoKSwgbV91cmwuZ2V0KCkpOwogCi0gICAgVGVzdENvbnRyb2xsZXI6 OnNoYXJlZCgpLnJ1blVudGlsKG1fZ290RmluYWxNZXNzYWdlLCBUZXN0Q29udHJvbGxlcjo6TG9u Z1RpbWVvdXQpOworICAgIFRlc3RDb250cm9sbGVyOjpzaGFyZWQoKS5ydW5VbnRpbChtX2dvdEZp bmFsTWVzc2FnZSwgKFRlc3RDb250cm9sbGVyOjpUaW1lb3V0RHVyYXRpb24pKC0xMykpOwogICAg IGlmICghbV9nb3RGaW5hbE1lc3NhZ2UpIHsKICAgICAgICAgZHVtcCgiVGltZWQgb3V0IHdhaXRp bmcgZm9yIGZpbmFsIG1lc3NhZ2UgZnJvbSB3ZWIgcHJvY2Vzc1xuIik7CiAgICAgICAgIHJldHVy bjsKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRC dW5kbGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCShyZXZpc2lvbiA3NTE0NikKKysrIFRvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMjgsNiArMTI4LDkgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6ZGlkUmVjZWl2ZU1l c3NhZ2UoVwogCiAgICAgICAgIGJlZ2luVGVzdGluZygpOwogICAgICAgICByZXR1cm47CisgICAg fSBlbHNlIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKG1lc3NhZ2VOYW1lLCAiUmVz ZXQiKSkgeworICAgICAgICBtX3N0YXRlID0gSWRsZTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0K IAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBlcnJvck1lc3NhZ2VOYW1lKEFkb3B0V0ss IFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJFcnJvciIpKTsKSW5kZXg6IFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0 VGVzdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA3NTE0NikKKysrIFRvb2xzL1dlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMjksNiArMTI5LDkgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6d2FpdFRv RHVtcFdhdAogCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpub3RpZnlEb25lKCkKIHsKKyAg ICBpZiAoIUluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rlc3RSdW5uaW5nKCkpCisgICAgICAg IHJldHVybjsKKwogICAgIGlmIChtX3dhaXRUb0R1bXAgJiYgIUluamVjdGVkQnVuZGxlOjpzaGFy ZWQoKS5wYWdlKCktPmlzTG9hZGluZygpKQogICAgICAgICBJbmplY3RlZEJ1bmRsZTo6c2hhcmVk KCkucGFnZSgpLT5kdW1wKCk7CiAgICAgbV93YWl0VG9EdW1wID0gZmFsc2U7Cg==