137528 2014-10-08 10:47:11 -0700 [iOS] LayoutTestRelay should ensure its DRT/WKTR dies when receiving kill/term signals 2014-10-11 11:07:47 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) iPhone / iPad All RESOLVED FIXED P2 Normal --- 1 dfarler dfarler commit-queue dbates ddkilzer glenn ossy simon.fraser oldest_to_newest 1040344 0 dfarler 2014-10-08 10:47:11 -0700 If a test times out, webkitpy will kill the LayoutTestRelay. However, the signal isn't forwarded to the underlying DRT/WKTR. This used to not be a problem because when LayoutTestRelay gets launched with the same arguments, launching the same app identifier in the simulator would first quit the old instance. That's no longer the case and the same DRT/WKTR instance will be sitting there still timing out. So, we need to catch a signal and kill the simulator app before dying so that it can be properly relaunched when a timeout->kill happens. 1041078 1 239661 dfarler 2014-10-10 17:31:07 -0700 Created attachment 239661 Patch 1041080 2 239661 simon.fraser 2014-10-10 17:49:09 -0700 Comment on attachment 239661 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239661&action=review > Tools/LayoutTestRelay/LayoutTestRelay/main.m:103 > + NSLog(@"FINISHING"); I don't think you want this. > Tools/Scripts/webkitpy/common/system/executive.py:202 > + os.kill(pid, signal.SIGTERM) This needs a comment I think. 1041082 3 dfarler 2014-10-10 18:09:32 -0700 Committed r174628: <http://trac.webkit.org/changeset/174628> 1041111 4 ossy 2014-10-11 00:22:15 -0700 (In reply to comment #3) > Committed r174628: <http://trac.webkit.org/changeset/174628> It broke the related webkitpy unittest. Could you update its expected result? 1041132 5 simon.fraser 2014-10-11 08:48:58 -0700 This broke a python test. 1041149 6 simon.fraser 2014-10-11 11:07:47 -0700 I fixed this in r174634. 239661 2014-10-10 17:31:07 -0700 2014-10-10 17:49:08 -0700 Patch bug-137528-20141010173110.patch text/plain 4173 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NjI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2MxN2E5MjA5MTdmZTMyMDViMmE0NTMxMGY1ODFiOTIx OGNjMTI4OS4uZmVlOThhNGU1OTNhMWQwZjNlZWI2Yzg0NjllNjQyOWYwYmE3NThkYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3 IEBACiAyMDE0LTEwLTEwICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KIAorICAg ICAgICBbaU9TXSBMYXlvdXRUZXN0UmVsYXkgc2hvdWxkIGVuc3VyZSBpdHMgRFJUL1dLVFIgZGll cyB3aGVuIHJlY2VpdmluZyBraWxsL3Rlcm0gc2lnbmFscworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2F0Y2ggU0lHSU5UIGFuZCBTSUdURVJNIHNpZ25h bHMgaW4gdGhlIExheW91dFRlc3RSZWxheQorICAgICAgICBhbmQgU0lHS0lMTCB0aGUgcGFpcmVk IHNpbXVsYXRvciBhcHAgYmVmb3JlIGV4aXRpbmcgY2xlYW5seS4KKworICAgICAgICB3ZWJraXRw eSBvbmx5IHVzZXMgU0lHS0lMTCB0byBraWxsIHByb2Nlc3NlcyB3aGljaCB5b3UgY2Fubm90Cisg ICAgICAgIGNhdGNoLiBTZW5kIFNJR1RFUk0gdG8gdGhlIHByb2Nlc3MgYW5kIGdpdmUgaXQgY2hh bmNlIHRvIGRvCisgICAgICAgIGl0cyB0aGluZyBiZWZvcmUgc2VuZGluZyBTSUdLSUxMLiBTZW5k aW5nIGEgU0lHS0lMTCB0byBhbiBhbHJlYWR5CisgICAgICAgIGRlYWQgUElEIGlzIHNhZmUuCisK KyAgICAgICAgKiBMYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L0xUUmVsYXlDb250cm9s bGVyLmg6CisgICAgICAgICogTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS9MVFJlbGF5 Q29udHJvbGxlci5tOgorICAgICAgICAoLVtMVFJlbGF5Q29udHJvbGxlciBmaW5pc2hdKToKKyAg ICAgICAgKiBMYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L21haW4ubToKKyAgICAgICAg KHJlY2VpdmVkU2lnbmFsKToKKyAgICAgICAgKG1haW4pOgorCisyMDE0LTEwLTEwICBEYXZpZCBG YXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXSBMYXlvdXRUZXN0UmVs YXkgc2hvdWxkIGRldGVjdCBFT0YgYW5kIHByb3Blcmx5IHNpZ25hbCB1bmRlcmx5aW5nIERSVC9X S1RSCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc1 MjcKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS9M VFJlbGF5Q29udHJvbGxlci5oIGIvVG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxh eS9MVFJlbGF5Q29udHJvbGxlci5oCmluZGV4IGY5M2U5NDVlOGQ4NTI3NjEwZWRiMTA0OTc3NDA5 OTZlY2FjYmViNjIuLmNiODkwZWIwY2M3ZGFjYTFjYzJkMTNlNWZiMmEzMzI4MjBkNGFiMjYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkvTFRSZWxheUNv bnRyb2xsZXIuaAorKysgYi9Ub29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5L0xU UmVsYXlDb250cm9sbGVyLmgKQEAgLTM0LDYgKzM0LDcgQEAKIEBpbnRlcmZhY2UgTFRSZWxheUNv bnRyb2xsZXIgOiBOU09iamVjdCA8TFRSZWxheURlbGVnYXRlPgogLSAoaWQpaW5pdFdpdGhEZXZp Y2U6KFNpbURldmljZSAqKWRldmljZSBwcm9kdWN0RGlyOihOU1N0cmluZyAqKXByb2R1Y3REaXIg YXBwUGF0aDooTlNTdHJpbmcgKilhcHBQYXRoIGlkZW50aWZpZXJTdWZmaXg6KE5TU3RyaW5nICop c3VmZml4IGR1bXBUb29sQXJndW1lbnRzOihOU0FycmF5ICopYXJndW1lbnRzOwogLSAodm9pZClz dGFydDsKKy0gKHZvaWQpZmluaXNoOwogQGVuZAogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xz L0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkvbWFpbi5tIGIvVG9vbHMvTGF5b3V0VGVz dFJlbGF5L0xheW91dFRlc3RSZWxheS9tYWluLm0KaW5kZXggYTE0MmYwZDA2NzA4ZWVhM2VkN2Zm NDVjZDgxMTg2OTUwYmZmNjNkOC4uN2I4YjM2MTg2YzRjYjQ3OWQ2MWRjNjQ4NWIxYzZiNDZmMmI2 OTQ4NSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS9t YWluLm0KKysrIGIvVG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS9tYWluLm0K QEAgLTI4LDYgKzI4LDggQEAKICNpbXBvcnQgPENvcmVTaW11bGF0b3IvQ29yZVNpbXVsYXRvci5o PgogI2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CiAKK3N0YXRpYyBMVFJlbGF5Q29u dHJvbGxlciAqcmVsYXlDb250cm9sbGVyOworCiB2b2lkIHVzYWdlKCkKIHsKICAgICBOU1N0cmlu ZyAqaGVscFRleHQgPSBAIkxheW91dFRlc3RSZWxheTogcnVuIGEgZHVtcCB0b29sIGluIHRoZSBz aW11bGF0b3IuIE5vdCBmb3IgZGlyZWN0IGNvbnN1bXB0aW9uLlxuIgpAQCAtOTYsNiArOTgsMTcg QEAgdm9pZCB1c2FnZSgpCiAgICAgcmV0dXJuIGR1bXBUb29sQXJndW1lbnRzOwogfQogCit2b2lk IGZpbmlzaCgpCit7CisgICAgTlNMb2coQCJGSU5JU0hJTkciKTsKKyAgICBbcmVsYXlDb250cm9s bGVyIGZpbmlzaF07Cit9CisKK3ZvaWQgcmVjZWl2ZWRTaWduYWwoaW50IHNpZ25hbCkKK3sKKyAg ICBleGl0KEVYSVRfU1VDQ0VTUyk7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFy ICogYXJndltdKQogewogICAgIEBhdXRvcmVsZWFzZXBvb2wgewpAQCAtMTI3LDggKzE0MCwxMyBA QCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciAqIGFyZ3ZbXSkKIAogICAgICAgICBTaW1E ZXZpY2UgKmRldmljZSA9IGdldFRlc3RpbmdTaW1EZXZpY2UoZGV2aWNlVHlwZSwgcnVudGltZSk7 CiAKLSAgICAgICAgTFRSZWxheUNvbnRyb2xsZXIgKnJlbGF5Q29udHJvbGxlciA9IFtbTFRSZWxh eUNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoRGV2aWNlOmRldmljZSBwcm9kdWN0RGlyOnByb2R1 Y3REaXIgYXBwUGF0aDphcHBQYXRoIGlkZW50aWZpZXJTdWZmaXg6c3VmZml4IGR1bXBUb29sQXJn dW1lbnRzOmR1bXBUb29sQXJndW1lbnRzXTsKKyAgICAgICAgcmVsYXlDb250cm9sbGVyID0gW1tM VFJlbGF5Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhEZXZpY2U6ZGV2aWNlIHByb2R1Y3REaXI6 cHJvZHVjdERpciBhcHBQYXRoOmFwcFBhdGggaWRlbnRpZmllclN1ZmZpeDpzdWZmaXggZHVtcFRv b2xBcmd1bWVudHM6ZHVtcFRvb2xBcmd1bWVudHNdOwogICAgICAgICBbcmVsYXlDb250cm9sbGVy IHN0YXJ0XTsKKworICAgICAgICBhdGV4aXQoZmluaXNoKTsKKyAgICAgICAgc2lnbmFsKFNJR0lO VCwgcmVjZWl2ZWRTaWduYWwpOworICAgICAgICBzaWduYWwoU0lHVEVSTSwgcmVjZWl2ZWRTaWdu YWwpOworCiAgICAgICAgIFtbTlNSdW5Mb29wIG1haW5SdW5Mb29wXSBydW5dOwogICAgIH0KICAg ICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5 c3RlbS9leGVjdXRpdmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v ZXhlY3V0aXZlLnB5CmluZGV4IDY5MmIzNjQzZjc1NmU0NDBhMGNhNzA3OGE5MjA3ODhjMGNjYWIx YTQuLjM1M2E4YWM5MGE3NjFjYjQ4MzY1OWE4ZTkyNjk3Zjg5OTEzZTEzMDQgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQpAQCAtMTk5 LDYgKzE5OSw3IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICB3aGlsZSByZXRy aWVzX2xlZnQgPiAwOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHJldHJpZXNf bGVmdCAtPSAxCisgICAgICAgICAgICAgICAgb3Mua2lsbChwaWQsIHNpZ25hbC5TSUdURVJNKQog ICAgICAgICAgICAgICAgIG9zLmtpbGwocGlkLCBzaWduYWwuU0lHS0lMTCkKICAgICAgICAgICAg ICAgICBfID0gb3Mud2FpdHBpZChwaWQsIG9zLldOT0hBTkcpCiAgICAgICAgICAgICBleGNlcHQg T1NFcnJvciwgZToK