137527 2014-10-08 10:43:11 -0700 [iOS] LayoutTestRelay should detect EOF and properly signal underlying DRT/WKTR 2014-10-10 17:03:40 -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 simon.fraser oldest_to_newest 1040342 0 dfarler 2014-10-08 10:43:11 -0700 If the LayoutTestRelay receives an EOF from the test harness, it should do the following: - make sure that it gets properly forwarded to DRT/WKTR. The only question is - does DRT/WKTR as an iOS app "exit 0" when it receives the EOF and exits the "test server loop"? - exit 0 1041025 1 239650 dfarler 2014-10-10 14:41:38 -0700 Created attachment 239650 Patch 1041026 2 commit-queue 2014-10-10 14:43:34 -0700 Attachment 239650 did not pass style-queue: ERROR: Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m:72: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m:72: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1041030 3 dfarler 2014-10-10 14:47:27 -0700 (In reply to comment #2) > Attachment 239650 [details] did not pass style-queue: > > > ERROR: Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m:72: Place brace on its own line for function definitions. [whitespace/braces] [4] > ERROR: Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m:72: Extra space before ( in function call [whitespace/parens] [4] > Total errors found: 2 in 2 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Already filed a bug for this (Objective-C exceptions treated like functions). Thanks anyway, style bot. 1041038 4 239650 simon.fraser 2014-10-10 14:57:02 -0700 Comment on attachment 239650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239650&action=review > Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m:71 > + NSData *data = [NSData dataWithBytes:buffer length:len]; > + [[[self relay] outputStream] write:[data bytes] maxLength:[data length]]; Why make an NSData just to hand off the bytes directly? 1041041 5 dfarler 2014-10-10 15:06:00 -0700 (In reply to comment #4) > (From update of attachment 239650 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239650&action=review > > > Tools/LayoutTestRelay/LayoutTestRelay/LTRelayController.m:71 > > + NSData *data = [NSData dataWithBytes:buffer length:len]; > > + [[[self relay] outputStream] write:[data bytes] maxLength:[data length]]; > > Why make an NSData just to hand off the bytes directly? Oh. For some reason I just had it in my mind that I needed to do that from a different API a long time ago. I'll forward the bytes on directly. I'll have another patch in just a minute. 1041077 6 dfarler 2014-10-10 17:03:40 -0700 Committed r174626: <http://trac.webkit.org/changeset/174626> 239650 2014-10-10 14:41:38 -0700 2014-10-10 14:57:02 -0700 Patch bug-137527-20141010144141.patch text/plain 6172 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NjEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzE3NDI4OTYxNGM4ZjY1N2MyZGQwYzZhNzhiN2E0MDI1 ZDUwOWQ1My4uNjNmZGM3ZmFmMjU3MTBmM2RiYzFmNjFiOTVjOTJhNTY5MTZiMTU2NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE0LTEwLTEwICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKworICAg ICAgICBbaU9TXSBMYXlvdXRUZXN0UmVsYXkgc2hvdWxkIGRldGVjdCBFT0YgYW5kIHByb3Blcmx5 IHNpZ25hbCB1bmRlcmx5aW5nIERSVC9XS1RSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc1MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBOU0ZpbGVIYW5kbGUgZG9lc24ndCBub3RpZnkgb2YgRU9GIGlu IGl0cyByZWFkYWJpbGl0eSBoYW5kbGVyLgorICAgICAgICBVc2UgYSBkaXNwYXRjaF9zb3VyY2Vf dCBhbmQgYW4gZXZlbnQgaGFuZGxlciB0aGF0IGlzIGNhbGxlZCB3aGVuIHJlYWRpbmcgaXMgcG9z c2libGUuCisgICAgICAgIEluIHRoZSBoYW5kbGVyIGJsb2NrLCBkbyBhIHJ1bi1vZi10aGUtbWls bCByZWFkKDIpIGZyb20gc3RhbmRhcmQgaW5wdXQgYW5kCisgICAgICAgIGRldGVjdCBFT0YgaW4g dGhlIHVzdWFsIHdheSBieSBjaGVja2luZyB0aGF0IHplcm8gYnl0ZXMgd2VyZSByZWFkLgorCisg ICAgICAgIE9uY2UgYW4gRU9GIGlzIHJlY2VpdmVkLCB0aGUgRklGT3MgYXJlIGRpc2Nvbm5lY3Rl ZCwgdGhlIHNpbXVsYXRvciBhcHAKKyAgICAgICAgaXMga2lsbGVkLCBhbmQgdGhlIHJlbGF5IGV4 aXRzIHdpdGggc3RhdHVzIDAuCisKKyAgICAgICAgKiBMYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVz dFJlbGF5L0xUUmVsYXlDb250cm9sbGVyLm06CisgICAgICAgICgtW0xUUmVsYXlDb250cm9sbGVy IGluaXRXaXRoRGV2aWNlOnByb2R1Y3REaXI6YXBwUGF0aDppZGVudGlmaWVyU3VmZml4OmR1bXBU b29sQXJndW1lbnRzOl0pOgorICAgICAgICAoLVtMVFJlbGF5Q29udHJvbGxlciBkaWREaXNjb25u ZWN0XSk6CisgICAgICAgICgtW0xUUmVsYXlDb250cm9sbGVyIGRpZENvbm5lY3RdKToKKyAgICAg ICAgKC1bTFRSZWxheUNvbnRyb2xsZXIgbGF1bmNoQXBwXSk6CisgICAgICAgIFJlbmFtZSAiZGlz cGF0Y2hTb3VyY2UiIHRvICJzaW11bGF0b3JBcHBFeGl0RGlzcGF0Y2hTb3VyY2UiIHRvIHByZXZl bnQgYW55CisgICAgICAgIGNvbmZ1c2lvbiB3aXRoIHRoaXMgbmV3IGRpc3BhdGNoIHNvdXJjZSwg Y2FsbGVkICJzdGFuZGFyZElucHV0RGlzcGF0Y2hTb3VyY2UiLgorICAgICAgICAoLVtMVFJlbGF5 Q29udHJvbGxlciBmaW5pc2hdKTogQWRkZWQuCisgICAgICAgICgtW0xUUmVsYXlDb250cm9sbGVy IHJlYWRGaWxlSGFuZGxlOl0pOiBEZWxldGVkLgorCiAyMDE0LTEwLTEwICBBbGV4ZXkgUHJvc2t1 cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IENvbW1pdCBxdWV1 ZSBkb2Vzbid0IHByb2Nlc3Mgcm9sbG91dHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFRlc3RS ZWxheS9MYXlvdXRUZXN0UmVsYXkvTFRSZWxheUNvbnRyb2xsZXIubSBiL1Rvb2xzL0xheW91dFRl c3RSZWxheS9MYXlvdXRUZXN0UmVsYXkvTFRSZWxheUNvbnRyb2xsZXIubQppbmRleCAyYmEyMzFm MmZhYjVjZDdjMDU2NjA5ZThmZTg0OTgxM2Q5NWRkM2EzLi43NjZjMzg1OWMyNjkxZmIwMWUwMDVk NjUzMzUxYTY1YTJmYmU3YTY1IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRUZXN0UmVsYXkvTGF5 b3V0VGVzdFJlbGF5L0xUUmVsYXlDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTGF5b3V0VGVzdFJl bGF5L0xheW91dFRlc3RSZWxheS9MVFJlbGF5Q29udHJvbGxlci5tCkBAIC0zMCw3ICszMCw3IEBA CiAjaW1wb3J0IDxDb3JlU2ltdWxhdG9yL0NvcmVTaW11bGF0b3IuaD4KIAogQGludGVyZmFjZSBM VFJlbGF5Q29udHJvbGxlciAoKQotQHByb3BlcnR5IChyZWFkb25seSwgc3Ryb25nKSBOU0ZpbGVI YW5kbGUgKnN0YW5kYXJkSW5wdXQ7CitAcHJvcGVydHkgKHJlYWRvbmx5LCBzdHJvbmcpIGRpc3Bh dGNoX3NvdXJjZV90IHN0YW5kYXJkSW5wdXREaXNwYXRjaFNvdXJjZTsKIEBwcm9wZXJ0eSAocmVh ZG9ubHksIHN0cm9uZykgTlNGaWxlSGFuZGxlICpzdGFuZGFyZE91dHB1dDsKIEBwcm9wZXJ0eSAo cmVhZG9ubHksIHN0cm9uZykgTlNGaWxlSGFuZGxlICpzdGFuZGFyZEVycm9yOwogQHByb3BlcnR5 IChyZWFkb25seSwgc3Ryb25nKSBOU1N0cmluZyAqdW5pcXVlQXBwUGF0aDsKQEAgLTU4LDEwICs1 OCwyNyBAQCAtIChpZClpbml0V2l0aERldmljZTooU2ltRGV2aWNlICopZGV2aWNlIHByb2R1Y3RE aXI6KE5TU3RyaW5nICopcHJvZHVjdERpciBhcHBQYQogICAgICAgICBfb3JpZ2luYWxBcHBJZGVu dGlmaWVyID0gW05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aENvbnRlbnRzT2ZGaWxlOltfb3Jp Z2luYWxBcHBQYXRoIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkluZm8ucGxpc3Qi XV1bKE5TU3RyaW5nICopa0NGQnVuZGxlSWRlbnRpZmllcktleV07CiAgICAgICAgIF9pZGVudGlm aWVyU3VmZml4ID0gc3VmZml4OwogICAgICAgICBfZHVtcFRvb2xBcmd1bWVudHMgPSBhcmd1bWVu dHM7Ci0gICAgICAgIF9zdGFuZGFyZElucHV0ID0gW05TRmlsZUhhbmRsZSBmaWxlSGFuZGxlV2l0 aFN0YW5kYXJkSW5wdXRdOworICAgICAgICBfc3RhbmRhcmRJbnB1dERpc3BhdGNoU291cmNlID0g ZGlzcGF0Y2hfc291cmNlX2NyZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQRV9SRUFELCBTVERJTl9G SUxFTk8sIDAsIGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCkpOwogICAgICAgICBfc3RhbmRhcmRP dXRwdXQgPSBbTlNGaWxlSGFuZGxlIGZpbGVIYW5kbGVXaXRoU3RhbmRhcmRPdXRwdXRdOwogICAg ICAgICBfc3RhbmRhcmRFcnJvciA9IFtOU0ZpbGVIYW5kbGUgZmlsZUhhbmRsZVdpdGhTdGFuZGFy ZEVycm9yXTsKIAorICAgICAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIoX3N0 YW5kYXJkSW5wdXREaXNwYXRjaFNvdXJjZSwgXnsKKyAgICAgICAgICAgIGNoYXIgYnVmZmVyWzEw MjRdOworICAgICAgICAgICAgc3NpemVfdCBsZW4gPSByZWFkKFNURElOX0ZJTEVOTywgYnVmZmVy LCBzaXplb2YoYnVmZmVyKSk7CisgICAgICAgICAgICBpZiAobGVuID4gMCkgeworICAgICAgICAg ICAgICAgIEB0cnkgeworICAgICAgICAgICAgICAgICAgICBOU0RhdGEgKmRhdGEgPSBbTlNEYXRh IGRhdGFXaXRoQnl0ZXM6YnVmZmVyIGxlbmd0aDpsZW5dOworICAgICAgICAgICAgICAgICAgICBb W1tzZWxmIHJlbGF5XSBvdXRwdXRTdHJlYW1dIHdyaXRlOltkYXRhIGJ5dGVzXSBtYXhMZW5ndGg6 W2RhdGEgbGVuZ3RoXV07CisgICAgICAgICAgICAgICAgfSBAY2F0Y2ggKE5TRXhjZXB0aW9uICpl KSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEJyb2tlbiBwaXBlIC0gdGhlIGR1bXAgdG9vbCBj cmFzaGVkLiBUaW1lIHRvIGRpZS4KKyAgICAgICAgICAgICAgICAgICAgW3NlbGYgZGlkQ3Jhc2hX aXRoTWVzc2FnZTpuaWxdOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAgICAgLy8gRU9GIFJlY2VpdmVkIG9uIHRoZSByZWxheSdzIHN0YW5kYXJk IGlucHV0LgorICAgICAgICAgICAgICAgIFtzZWxmIGZpbmlzaF07CisgICAgICAgICAgICB9Cisg ICAgICAgIH0pOworCiAgICAgICAgIF9yZWxheSA9IFtbTFRQaXBlUmVsYXkgYWxsb2NdIGluaXRX aXRoUHJlZml4OltAIi90bXAiIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpbc2VsZiB1 bmlxdWVBcHBJZGVudGlmaWVyXV1dOwogICAgICAgICBbX3JlbGF5IHNldFJlbGF5RGVsZWdhdGU6 c2VsZl07CiAgICAgfQpAQCAtODcsMTggKzEwNCw2IEBAIC0gKE5TU3RyaW5nICopcHJvY2Vzc05h bWUKICAgICByZXR1cm4gW1tbc2VsZiBvcmlnaW5hbEFwcElkZW50aWZpZXJdIGNvbXBvbmVudHNT ZXBhcmF0ZWRCeVN0cmluZzpAIi4iXSBsYXN0T2JqZWN0XTsKIH0KIAotLSAodm9pZClyZWFkRmls ZUhhbmRsZTooTlNGaWxlSGFuZGxlICopZmlsZUhhbmRsZQotewotICAgIEB0cnkgewotICAgICAg ICBOU0RhdGEgKmRhdGEgPSBbZmlsZUhhbmRsZSBhdmFpbGFibGVEYXRhXTsKLSAgICAgICAgW1tb c2VsZiByZWxheV0gb3V0cHV0U3RyZWFtXSB3cml0ZTpbZGF0YSBieXRlc10gbWF4TGVuZ3RoOltk YXRhIGxlbmd0aF1dOwotICAgIH0gQGNhdGNoIChOU0V4Y2VwdGlvbiAqZSkgewotICAgICAgICAv LyBCcm9rZW4gcGlwZSAtIHRoZSBkdW1wIHRvb2wgY3Jhc2hlZC4gVGltZSB0byBkaWUuCi0gICAg ICAgIFtzZWxmIGRpZENyYXNoV2l0aE1lc3NhZ2U6bmlsXTsKLSAgICB9Ci19Ci0KLQogLSAodm9p ZClkaWRSZWNlaXZlU3Rkb3V0RGF0YTooTlNEYXRhICopZGF0YQogewogICAgIFtbc2VsZiBzdGFu ZGFyZE91dHB1dF0gd3JpdGVEYXRhOmRhdGFdOwpAQCAtMTExLDE1ICsxMTYsMTIgQEAgLSAodm9p ZClkaWRSZWNlaXZlU3RkZXJyRGF0YTooTlNEYXRhICopZGF0YQogCiAtICh2b2lkKWRpZERpc2Nv bm5lY3QKIHsKLSAgICBbW3NlbGYgc3RhbmRhcmRJbnB1dF0gc2V0UmVhZGFiaWxpdHlIYW5kbGVy Om5pbF07CisgICAgZGlzcGF0Y2hfc3VzcGVuZChbc2VsZiBzdGFuZGFyZElucHV0RGlzcGF0Y2hT b3VyY2VdKTsKIH0KIAogLSAodm9pZClkaWRDb25uZWN0CiB7Ci0gICAgW1tzZWxmIHN0YW5kYXJk SW5wdXRdIHNldFJlYWRhYmlsaXR5SGFuZGxlcjogXihOU0ZpbGVIYW5kbGUgKmZpbGVIYW5kbGUp Ci0gICAgewotICAgICAgICBbc2VsZiByZWFkRmlsZUhhbmRsZTpmaWxlSGFuZGxlXTsKLSAgICB9 XTsKKyAgICBkaXNwYXRjaF9yZXN1bWUoW3NlbGYgc3RhbmRhcmRJbnB1dERpc3BhdGNoU291cmNl XSk7CiB9CiAKIC0gKHZvaWQpZGlkQ3Jhc2hXaXRoTWVzc2FnZTooTlNTdHJpbmcgKiltZXNzYWdl CkBAIC0yMDQsMTMgKzIwNiwxMyBAQCAtICh2b2lkKWxhdW5jaEFwcAogICAgIFtzZWxmIHNldFBp ZDpwaWRdOwogCiAgICAgZGlzcGF0Y2hfcXVldWVfdCBxdWV1ZSA9IGRpc3BhdGNoX2dldF9tYWlu X3F1ZXVlKCk7Ci0gICAgZGlzcGF0Y2hfc291cmNlX3QgZGlzcGF0Y2hTb3VyY2UgPSBkaXNwYXRj aF9zb3VyY2VfY3JlYXRlKERJU1BBVENIX1NPVVJDRV9UWVBFX1BST0MsIFtzZWxmIHBpZF0sIERJ U1BBVENIX1BST0NfRVhJVCwgcXVldWUpOwotICAgIFtzZWxmIHNldEFwcERpc3BhdGNoU291cmNl OmRpc3BhdGNoU291cmNlXTsKLSAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIo ZGlzcGF0Y2hTb3VyY2UsIF57Ci0gICAgICAgIGRpc3BhdGNoX3NvdXJjZV9jYW5jZWwoZGlzcGF0 Y2hTb3VyY2UpOworICAgIGRpc3BhdGNoX3NvdXJjZV90IHNpbXVsYXRvckFwcEV4aXREaXNwYXRj aFNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVhdGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfUFJP QywgW3NlbGYgcGlkXSwgRElTUEFUQ0hfUFJPQ19FWElULCBxdWV1ZSk7CisgICAgW3NlbGYgc2V0 QXBwRGlzcGF0Y2hTb3VyY2U6c2ltdWxhdG9yQXBwRXhpdERpc3BhdGNoU291cmNlXTsKKyAgICBk aXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hhbmRsZXIoc2ltdWxhdG9yQXBwRXhpdERpc3BhdGNo U291cmNlLCBeeworICAgICAgICBkaXNwYXRjaF9zb3VyY2VfY2FuY2VsKHNpbXVsYXRvckFwcEV4 aXREaXNwYXRjaFNvdXJjZSk7CiAgICAgICAgIFtzZWxmIGRpZENyYXNoV2l0aE1lc3NhZ2U6bmls XTsKICAgICB9KTsKLSAgICBkaXNwYXRjaF9yZXN1bWUoZGlzcGF0Y2hTb3VyY2UpOworICAgIGRp c3BhdGNoX3Jlc3VtZShzaW11bGF0b3JBcHBFeGl0RGlzcGF0Y2hTb3VyY2UpOwogfQogCiAtICh2 b2lkKXN0YXJ0CkBAIC0yMjEsNCArMjIzLDExIEBAIC0gKHZvaWQpc3RhcnQKICAgICBbW3NlbGYg cmVsYXldIGNvbm5lY3RdOwogfQogCistICh2b2lkKWZpbmlzaAoreworICAgIFtbc2VsZiByZWxh eV0gZGlzY29ubmVjdF07CisgICAgW3NlbGYga2lsbEFwcF07CisgICAgZXhpdChFWElUX1NVQ0NF U1MpOworfQorCiBAZW5kCg==