162733 2016-09-29 10:12:36 -0700 Make WKTR short timeout dynamic 2016-09-29 11:47:25 -0700 1 1 1 Unclassified WebKit Tools / Tests Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue dbates ddkilzer lforschler ryanhaddad oldest_to_newest 1234839 0 ap 2016-09-29 10:12:36 -0700 WebKitTestRunner has a hardcoded value for how long to wait for IPC responses, which is 5 seconds, or 10 seconds under ASan. But some of the operations can be fairly time consuming - e.g. launching Networking process on demand. These may take longer under load, especially with GuardMalloc. I think that half of the normal test timeout would work here. It will be a little weird because those are per-test ("slow" tests get more), and IPC timeouts don't need to be, but that seems harmless. See also: rdar://problem/28116746 1234843 1 290213 ap 2016-09-29 10:21:16 -0700 Created attachment 290213 proposed patch 1234887 2 290213 commit-queue 2016-09-29 11:47:21 -0700 Comment on attachment 290213 proposed patch Clearing flags on attachment: 290213 Committed r206596: <http://trac.webkit.org/changeset/206596> 1234888 3 commit-queue 2016-09-29 11:47:25 -0700 All reviewed patches have been landed. Closing bug. 290213 2016-09-29 10:21:16 -0700 2016-09-29 11:47:21 -0700 proposed patch ShortTimeout.txt text/plain 5986 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwNjU4NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE2LTA5LTI5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIE1ha2UgV0tUUiBzaG9ydCB0aW1lb3V0IGR5bmFtaWMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjczMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgaGFz IGEgaGFyZGNvZGVkIHZhbHVlIGZvciBob3cgbG9uZyB0byB3YWl0IGZvciBJUEMgcmVzcG9uc2Vz LAorICAgICAgICB3aGljaCBpcyA1IHNlY29uZHMsIG9yIDEwIHNlY29uZHMgdW5kZXIgQVNhbi4g QnV0IHNvbWUgb2YgdGhlIG9wZXJhdGlvbnMgY2FuIGJlCisgICAgICAgIGZhaXJseSB0aW1lIGNv bnN1bWluZyAtIGUuZy4gbGF1bmNoaW5nIE5ldHdvcmtpbmcgcHJvY2VzcyBvbiBkZW1hbmQuCisg ICAgICAgIFRoZXNlIG1heSB0YWtlIGxvbmdlciB1bmRlciBsb2FkLCBlc3BlY2lhbGx5IHdpdGgg R3VhcmRNYWxsb2MuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnJlc2V0U3RhdGVUb0NvbnNpc3Rl bnRWYWx1ZXMpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cmVhdHRhY2hQYWdlVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmg6 CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAg IChXVFI6OlRlc3RJbnZvY2F0aW9uOjpzaG9ydFRpbWVvdXQpOgorICAgICAgICAoV1RSOjpUZXN0 SW52b2NhdGlvbjo6aW52b2tlKToKKyAgICAgICAgKFdUUjo6VGVzdEludm9jYXRpb246OmR1bXBS ZXN1bHRzKToKKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uaDoK KyAgICAgICAgKFdUUjo6VGVzdEludm9jYXRpb246OmN1c3RvbVRpbWVvdXQpOiBEZWxldGVkLCB0 aGlzIGZ1bmN0aW9uIHdhcyB1bnVzZWQuCisKIDIwMTYtMDktMjkgIEd5dXlvdW5nIEtpbSAgPGd5 dXlvdW5nLmtpbUBuYXZlcmNvcnAuY29tPgogCiAgICAgICAgIFtFRkxdIEFkZCBzZWFyY2ggYnV0 dG9uIHRvIHVybCBiYXIgaW4gTWluaUJyb3dzZXIKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyMDY0NDgpCisrKyBUb29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODksMTEgKzg5 LDcgQEAgY29uc3QgdW5zaWduZWQgVGVzdENvbnRyb2xsZXI6OnZpZXdIZWlnaAogY29uc3QgdW5z aWduZWQgVGVzdENvbnRyb2xsZXI6OnczY1NWR1ZpZXdXaWR0aCA9IDQ4MDsKIGNvbnN0IHVuc2ln bmVkIFRlc3RDb250cm9sbGVyOjp3M2NTVkdWaWV3SGVpZ2h0ID0gMzYwOwogCi0jaWYgQVNBTl9F TkFCTEVECi1jb25zdCBkb3VibGUgVGVzdENvbnRyb2xsZXI6OnNob3J0VGltZW91dCA9IDEwLjA7 Ci0jZWxzZQotY29uc3QgZG91YmxlIFRlc3RDb250cm9sbGVyOjpzaG9ydFRpbWVvdXQgPSA1LjA7 Ci0jZW5kaWYKK2NvbnN0IGRvdWJsZSBUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFNob3J0VGltZW91 dCA9IDUuMDsKIAogY29uc3QgZG91YmxlIFRlc3RDb250cm9sbGVyOjpub1RpbWVvdXQgPSAtMTsK IApAQCAtNzk3LDcgKzc5Myw3IEBAIGJvb2wgVGVzdENvbnRyb2xsZXI6OnJlc2V0U3RhdGVUb0Nv bnNpc3QKICAgICBzZXRJZ25vcmVzVmlld3BvcnRTY2FsZUxpbWl0cyhvcHRpb25zLmlnbm9yZXNW aWV3cG9ydFNjYWxlTGltaXRzKTsKIAogICAgIFdLUGFnZUxvYWRVUkwobV9tYWluV2ViVmlldy0+ cGFnZSgpLCBibGFua1VSTCgpKTsKLSAgICBydW5VbnRpbChtX2RvbmVSZXNldHRpbmcsIHNob3J0 VGltZW91dCk7CisgICAgcnVuVW50aWwobV9kb25lUmVzZXR0aW5nLCBtX2N1cnJlbnRJbnZvY2F0 aW9uLT5zaG9ydFRpbWVvdXQoKSk7CiAgICAgcmV0dXJuIG1fZG9uZVJlc2V0dGluZzsKIH0KIApA QCAtODExLDcgKzgwNyw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnJlYXR0YWNoUGFnZVRvV2Vi UHIKICAgICAvLyBMb2FkaW5nIGEgd2ViIHBhZ2UgaXMgdGhlIG9ubHkgd2F5IHRvIHJlYXR0YWNo IGFuIGV4aXN0aW5nIHBhZ2UgdG8gYSBwcm9jZXNzLgogICAgIG1fZG9uZVJlc2V0dGluZyA9IGZh bHNlOwogICAgIFdLUGFnZUxvYWRVUkwobV9tYWluV2ViVmlldy0+cGFnZSgpLCBibGFua1VSTCgp KTsKLSAgICBydW5VbnRpbChtX2RvbmVSZXNldHRpbmcsIHNob3J0VGltZW91dCk7CisgICAgcnVu VW50aWwobV9kb25lUmVzZXR0aW5nLCBtX2N1cnJlbnRJbnZvY2F0aW9uLT5zaG9ydFRpbWVvdXQo KSk7CiB9CiAKIGNvbnN0IGNoYXIqIFRlc3RDb250cm9sbGVyOjp3ZWJQcm9jZXNzTmFtZSgpCklu ZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCShyZXZpc2lvbiAyMDY0 NDgpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTU3LDcgKzU3LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25l ZCB3M2NTVkdWaWV3V2lkdGg7CiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIHczY1NWR1ZpZXdI ZWlnaHQ7CiAKLSAgICBzdGF0aWMgY29uc3QgZG91YmxlIHNob3J0VGltZW91dDsKKyAgICBzdGF0 aWMgY29uc3QgZG91YmxlIGRlZmF1bHRTaG9ydFRpbWVvdXQ7CiAgICAgc3RhdGljIGNvbnN0IGRv dWJsZSBub1RpbWVvdXQ7CiAKICAgICBUZXN0Q29udHJvbGxlcihpbnQgYXJnYywgY29uc3QgY2hh ciogYXJndltdKTsKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24u Y3BwCShyZXZpc2lvbiAyMDY0NDgpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZv Y2F0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTgsNiArOTgsMjAgQEAgdm9pZCBUZXN0SW52 b2NhdGlvbjo6c2V0SXNQaXhlbFRlc3QoY29ucwogICAgIG1fZXhwZWN0ZWRQaXhlbEhhc2ggPSBl eHBlY3RlZFBpeGVsSGFzaDsKIH0KIAorZG91YmxlIFRlc3RJbnZvY2F0aW9uOjpzaG9ydFRpbWVv dXQoKSBjb25zdAoreworICAgIGlmICghbV90aW1lb3V0KSB7CisgICAgICAgIC8vIFJ1bm5pbmcg V0tUUiBkaXJlY3RseSwgd2l0aG91dCB3ZWJraXRweS4KKyAgICAgICAgcmV0dXJuIFRlc3RDb250 cm9sbGVyOjpkZWZhdWx0U2hvcnRUaW1lb3V0OworICAgIH0KKworICAgIC8vIFRoaXMgaXMgbm90 IGV4YWN0bHkgY29ycmVjdCBmb3IgdGhlIHdheSBzaG9ydCB0aW1lb3V0IGlzIHVzZWQgLSBpdCBz aG91bGQgbm90IGRlcGVuZCBvbiB3aGV0aGVyIGEgdGVzdCBpcyAic2xvdyIsCisgICAgLy8gYnV0 IGl0IGN1cnJlbnRseSBkb2VzLiBUaGVyZSBpcyBubyB3YXkgdG8ga25vdyB3aGF0IGEgbm9ybWFs IHRlc3QncyB0aW1lb3V0IGlzLCBhcyB3ZWJraXRweSBvbmx5IHBhc3NlcyB0aW1lb3V0cworICAg IC8vIGZvciBlYWNoIHRlc3QgaW5kaXZpZHVhbGx5LgorICAgIC8vIEJ1dCB0aGVyZSBzaG91bGRu J3QgYmUgYW55IG9ic2VydmFibGUgbmVnYXRpdmUgY29uc2VxdWVuY2VzIGZyb20gdGhpcy4KKyAg ICByZXR1cm4gbV90aW1lb3V0IC8gMTAwMC4gLyAyOworfQorCiBib29sIFRlc3RJbnZvY2F0aW9u OjpzaG91bGRMb2dGcmFtZUxvYWREZWxlZ2F0ZXMoKSBjb25zdAogewogICAgIHJldHVybiB1cmxD b250YWlucygibG9hZGluZy8iKTsKQEAgLTE0OSw3ICsxNjMsNyBAQCB2b2lkIFRlc3RJbnZvY2F0 aW9uOjppbnZva2UoKQogCiAgICAgYm9vbCBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzID0gZmFsc2U7 CiAKLSAgICBUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkucnVuVW50aWwobV9nb3RJbml0aWFs UmVzcG9uc2UsIFRlc3RDb250cm9sbGVyOjpzaG9ydFRpbWVvdXQpOworICAgIFRlc3RDb250cm9s bGVyOjpzaW5nbGV0b24oKS5ydW5VbnRpbChtX2dvdEluaXRpYWxSZXNwb25zZSwgc2hvcnRUaW1l b3V0KCkpOwogICAgIGlmICghbV9nb3RJbml0aWFsUmVzcG9uc2UpIHsKICAgICAgICAgbV9lcnJv ck1lc3NhZ2UgPSAiVGltZWQgb3V0IHdhaXRpbmcgZm9yIGluaXRpYWwgcmVzcG9uc2UgZnJvbSB3 ZWIgcHJvY2Vzc1xuIjsKICAgICAgICAgbV93ZWJQcm9jZXNzSXNVbnJlc3BvbnNpdmUgPSB0cnVl OwpAQCAtMjUzLDcgKzI2Nyw3IEBAIHZvaWQgVGVzdEludm9jYXRpb246OmR1bXBSZXN1bHRzKCkK ICAgICAgICAgZWxzZSBpZiAobV9waXhlbFJlc3VsdElzUGVuZGluZykgewogICAgICAgICAgICAg bV9nb3RSZXBhaW50ID0gZmFsc2U7CiAgICAgICAgICAgICBXS1BhZ2VGb3JjZVJlcGFpbnQoVGVz dENvbnRyb2xsZXI6OnNpbmdsZXRvbigpLm1haW5XZWJWaWV3KCktPnBhZ2UoKSwgdGhpcywgVGVz dEludm9jYXRpb246OmZvcmNlUmVwYWludERvbmVDYWxsYmFjayk7Ci0gICAgICAgICAgICBUZXN0 Q29udHJvbGxlcjo6c2luZ2xldG9uKCkucnVuVW50aWwobV9nb3RSZXBhaW50LCBUZXN0Q29udHJv bGxlcjo6c2hvcnRUaW1lb3V0KTsKKyAgICAgICAgICAgIFRlc3RDb250cm9sbGVyOjpzaW5nbGV0 b24oKS5ydW5VbnRpbChtX2dvdFJlcGFpbnQsIHNob3J0VGltZW91dCgpKTsKICAgICAgICAgICAg IGlmICghbV9nb3RSZXBhaW50KSB7CiAgICAgICAgICAgICAgICAgbV9lcnJvck1lc3NhZ2UgPSAi VGltZWQgb3V0IHdhaXRpbmcgZm9yIHByZS1waXhlbCBkdW1wIHJlcGFpbnRcbiI7CiAgICAgICAg ICAgICAgICAgbV93ZWJQcm9jZXNzSXNVbnJlc3BvbnNpdmUgPSB0cnVlOwpJbmRleDogVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uaAkocmV2aXNpb24gMjA2NDQ4KQorKysgVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC00 OSw4ICs0OSwxMSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldElzUGl4ZWxUZXN0KGNvbnN0IHN0 ZDo6c3RyaW5nJiBleHBlY3RlZFBpeGVsSGFzaCk7CiAKKyAgICAvLyBNaWxsaXNlY29uZHMKICAg ICB2b2lkIHNldEN1c3RvbVRpbWVvdXQoaW50IGR1cmF0aW9uKSB7IG1fdGltZW91dCA9IGR1cmF0 aW9uOyB9Ci0gICAgaW50IGN1c3RvbVRpbWVvdXQoKSBjb25zdCB7IHJldHVybiBtX3RpbWVvdXQ7 IH0KKworICAgIC8vIFNlY29uZHMKKyAgICBkb3VibGUgc2hvcnRUaW1lb3V0KCkgY29uc3Q7CiAK ICAgICB2b2lkIGludm9rZSgpOwogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0 ZWRCdW5kbGUoV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSk7 Cg==