140751 2015-01-21 17:12:48 -0800 [iOS] run-webkit-tests --ios-sim dies with an error; fails to parse Apple Internal runtime in simctl output 2015-01-22 10:51:53 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) iPhone / iPad iOS 8.1 RESOLVED FIXED P2 Normal --- 1 dbates dbates commit-queue ddkilzer glenn jake.nielsen.webkit oldest_to_newest 1063237 0 dbates 2015-01-21 17:12:48 -0800 Following the fix for <rdar://problem/19444383>, run-webkit-tests --ios-sim dies with an error because it doesn't know how to parse the simctl output with respect to an Apple Internal runtime. 1063238 1 245102 dbates 2015-01-21 17:23:21 -0800 Created attachment 245102 Patch I am not happy with this patch. The Simulator class and is fragile since it depends on parsing the output of the simctl tool, which may change. We should find a better way to query the state of simulator devices, runtimes, and their capabilities. One idea is to use a similiar approach as we do in webkitdirs.pm to support the scripts run-webkit-app and run-safari and read the device.plist files directly in ~/Library/Developer/CoreSimulator/Devices instead of querying simctl for the information in these files. It is a larger refactoring to implement such a change so I suggest we defer it to another patch. 1063391 2 245102 ddkilzer 2015-01-22 10:48:16 -0800 Comment on attachment 245102 Patch r=me 1063392 3 245102 dbates 2015-01-22 10:51:50 -0800 Comment on attachment 245102 Patch Clearing flags on attachment: 245102 Committed r178925: <http://trac.webkit.org/changeset/178925> 1063393 4 dbates 2015-01-22 10:51:53 -0800 All reviewed patches have been landed. Closing bug. 245102 2015-01-21 17:23:21 -0800 2015-01-22 10:51:50 -0800 Patch bug-140751-20150121172329.patch text/plain 7370 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4ODU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGRjOTA4NDIyNDU1NjRmY2JlYmQ4MmE2MWRhZjU3MWM0 NjZiNjhhZi4uYTZiMGVmZWQ0MjMwYTlkNjM5MDYzYWVmZmRiZGE3OWRjNGUyZjM5YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE1LTAxLTIxICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBbaU9TXSBydW4td2Via2l0LXRlc3RzIC0taW9zLXNpbSBkaWVzIHdpdGggYW4gZXJyb3I7 IGZhaWxzIHRvIHBhcnNlIEFwcGxlIEludGVybmFsCisgICAgICAgIHJ1bnRpbWUgaW4gc2ltY3Rs IG91dHB1dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQwNzUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Rm9sbG93aW5nIHRoZSBmaXggZm9yIDxyZGFyOi8vcHJvYmxlbS8xOTQ0NDM4Mz4sIHJ1bi13ZWJr aXQtdGVzdHMgLS1pb3Mtc2ltIGRpZXMKKyAgICAgICAgd2l0aCBhbiBlcnJvciBiZWNhdXNlIGl0 IGRvZXMgbm90IGtub3cgaG93IHRvIHBhcnNlIHRoZSBvdXRwdXQgb2YgdGhlIHNpbWN0bCB0b29s CisgICAgICAgIHRvIGlkZW50aWZ5IGFuIEFwcGxlIEludGVybmFsIHJ1bnRpbWUuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weToKKyAgICAgICAgKFJ1bnRp bWUuX19pbml0X18pOiBBZGQgcGFyYW1ldGVyIGlzX2ludGVybmFsX3J1bnRpbWUgKGRlZmF1bHRz IHRvIEZhbHNlKS4KKyAgICAgICAgKFJ1bnRpbWUuX19lcV9fKTogVGFrZSBpc19pbnRlcm5hbF9y dW50aW1lIHdoZW4gY29tcGFyaW5nIHR3byBSdW50aW1lIG9iamVjdHMgZm9yIGVxdWFsaXR5Lgor ICAgICAgICAoUnVudGltZS5fX3JlcHJfXyk6IFVwZGF0ZSBwcmludGFibGUgcmVwcmVzZW50YXRp b24gb2YgUnVudGltZSBvYmplY3QgdG8gaW5kaWNhdGUgd2hldGhlcgorICAgICAgICB0aGUgcnVu dGltZSBpcyBhbiBpbnRlcm5hbCBydW50aW1lLgorICAgICAgICAoU2ltdWxhdG9yKTogVXBkYXRl IHJlZ3VsYXIgZXhwcmVzc2lvbnMgcnVudGltZV9yZSBhbmQgdmVyc2lvbl9yZSB0byBtYXRjaCBh biBpbnRlcm5hbCBydW50aW1lLgorICAgICAgICAoU2ltdWxhdG9yLl9wYXJzZV9ydW50aW1lcyk6 IFBhc3MgaXNfaW50ZXJuYWxfcnVudGltZSB0byB0aGUgUnVudGltZSBjb25zdHJ1Y3RvciB3aXRo IHRoZQorICAgICAgICBhcHByb3ByaWF0ZSB2YWx1ZS4KKyAgICAgICAgKFNpbXVsYXRvci5fcGFy c2VfZGV2aWNlcyk6IFBhc3MgYXJndW1lbnQgaXNfaW50ZXJuYWxfcnVudGltZSB0byBTaW11bGF0 b3IucnVudGltZSgpIHNvIHRoYXQKKyAgICAgICAgaXQgdXBkYXRlcyB0aGUgYXBwcm9wcmlhdGUg UnVudGltZSBvYmplY3QuCisgICAgICAgIChTaW11bGF0b3IucnVudGltZSk6IEFkZGVkIG9wdGlv bmFsIHBhcmFtZXRlciwgaXNfaW50ZXJuYWxfcnVudGltZS4gTW9kaWZpZWQgdG8gc3VwcG9ydAor ICAgICAgICBsb29raW5nIHVwIGEgUnVudGltZSBvYmplY3QgZm9yIGFuIGludGVybmFsIHJ1bnRp bWUuCisKIDIwMTUtMDEtMDggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIExheW91dFRlc3RSZWxheSBkb2VzIG5vdCBpbnN0YWxsIER1bXBSZW5kZXJUcmVlLmFw cC9XZWJLaXRUZXN0UnVubmVyQXBwLmFwcApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS94Y29kZS9zaW11bGF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3Np bXVsYXRvci5weQppbmRleCBkNzU3NzkwNmVhMTY2MjkwYWE3ODlmYmY1NzUxYWRlYTI5NGRhYjY0 Li45NGY5OWQzMjIzZGY2ZGNiNjYxNzYyMTUyNGRmZTViNWQ5YWI3ZWFiIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQpAQCAtODMsMjEgKzgzLDI0IEBAIGNsYXNz IFJ1bnRpbWUob2JqZWN0KToKICAgICBSZXByZXNlbnRzIGEgQ29yZVNpbXVsYXRvciBydW50aW1l IGFzc29jaWF0ZWQgd2l0aCBhbiBpT1MgU0RLLgogICAgICIiIgogCi0gICAgZGVmIF9faW5pdF9f KHNlbGYsIHZlcnNpb24sIGlkZW50aWZpZXIsIGF2YWlsYWJsZSwgZGV2aWNlcz1Ob25lKToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgdmVyc2lvbiwgaWRlbnRpZmllciwgYXZhaWxhYmxlLCBkZXZp Y2VzPU5vbmUsIGlzX2ludGVybmFsX3J1bnRpbWU9RmFsc2UpOgogICAgICAgICAiIiIKICAgICAg ICAgOnBhcmFtIHZlcnNpb246IFRoZSBpT1MgU0RLIHZlcnNpb24KICAgICAgICAgOnR5cGUgdmVy c2lvbjogdHVwbGUKLSAgICAgICAgOnBhcmFtIGlkZW50aWZpZXI6IFRoZSBDb3JlU2ltdWFsdG9y IHJ1bnRpbWUgaWRlbnRpZmllcgorICAgICAgICA6cGFyYW0gaWRlbnRpZmllcjogVGhlIENvcmVT aW11bGF0b3IgcnVudGltZSBpZGVudGlmaWVyCiAgICAgICAgIDp0eXBlIGlkZW50aWZpZXI6IHN0 cgogICAgICAgICA6cGFyYW0gYXZhaWxhYmlsaXR5OiBXaGV0aGVyIHRoZSBydW50aW1lIGlzIGF2 YWlsYWJsZSBmb3IgdXNlLgogICAgICAgICA6dHlwZSBhdmFpbGFiaWxpdHk6IGJvb2wKICAgICAg ICAgOnBhcmFtIGRldmljZXM6IEEgbGlzdCBvZiBkZXZpY2VzIHVuZGVyIHRoaXMgcnVudGltZQog ICAgICAgICA6dHlwZSBkZXZpY2VzOiBsaXN0IG9yIE5vbmUKKyAgICAgICAgOnBhcmFtIGlzX2lu dGVybmFsX3J1bnRpbWU6IFdoZXRoZXIgdGhlIHJ1bnRpbWUgaXMgYW4gQXBwbGUgaW50ZXJuYWwg cnVudGltZQorICAgICAgICA6dHlwZSBpc19pbnRlcm5hbF9ydW50aW1lOiBib29sCiAgICAgICAg ICIiIgogICAgICAgICBzZWxmLnZlcnNpb24gPSB2ZXJzaW9uCiAgICAgICAgIHNlbGYuaWRlbnRp ZmllciA9IGlkZW50aWZpZXIKICAgICAgICAgc2VsZi5hdmFpbGFibGUgPSBhdmFpbGFibGUKICAg ICAgICAgc2VsZi5kZXZpY2VzID0gZGV2aWNlcyBvciBbXQorICAgICAgICBzZWxmLmlzX2ludGVy bmFsX3J1bnRpbWUgPSBpc19pbnRlcm5hbF9ydW50aW1lCiAKICAgICBAY2xhc3NtZXRob2QKICAg ICBkZWYgZnJvbV9pZGVudGlmaWVyKGNscywgaWRlbnRpZmllcik6CkBAIC0xMTYsMTQgKzExOSwx NyBAQCBjbGFzcyBSdW50aW1lKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBydW50aW1lCiAKICAg ICBkZWYgX19lcV9fKHNlbGYsIG90aGVyKToKLSAgICAgICAgcmV0dXJuIChzZWxmLnZlcnNpb24g PT0gb3RoZXIudmVyc2lvbikgYW5kIChzZWxmLmlkZW50aWZpZXIgPT0gb3RoZXIuaWRlbnRpZmll cikKKyAgICAgICAgcmV0dXJuIChzZWxmLnZlcnNpb24gPT0gb3RoZXIudmVyc2lvbikgYW5kIChz ZWxmLmlkZW50aWZpZXIgPT0gb3RoZXIuaWRlbnRpZmllcikgYW5kIChzZWxmLmlzX2ludGVybmFs X3J1bnRpbWUgPT0gb3RoZXIuaXNfaW50ZXJuYWxfcnVudGltZSkKIAogICAgIGRlZiBfX25lX18o c2VsZiwgb3RoZXIpOgogICAgICAgICByZXR1cm4gbm90IHNlbGYuX19lcV9fKG90aGVyKQogCiAg ICAgZGVmIF9fcmVwcl9fKHNlbGYpOgorICAgICAgICB2ZXJzaW9uX3N1ZmZpeCA9ICIiCisgICAg ICAgIGlmIHNlbGYuaXNfaW50ZXJuYWxfcnVudGltZToKKyAgICAgICAgICAgIHZlcnNpb25fc3Vm Zml4ID0gIiBJbnRlcm5hbCIKICAgICAgICAgcmV0dXJuICc8UnVudGltZSB7dmVyc2lvbn06IHtp ZGVudGlmaWVyfS4gQXZhaWxhYmxlOiB7YXZhaWxhYmxlfSwge251bV9kZXZpY2VzfSBkZXZpY2Vz PicuZm9ybWF0KAotICAgICAgICAgICAgdmVyc2lvbj0nLicuam9pbihtYXAoc3RyLCBzZWxmLnZl cnNpb24pKSwKKyAgICAgICAgICAgIHZlcnNpb249Jy4nLmpvaW4obWFwKHN0ciwgc2VsZi52ZXJz aW9uKSkgKyB2ZXJzaW9uX3N1ZmZpeCwKICAgICAgICAgICAgIGlkZW50aWZpZXI9c2VsZi5pZGVu dGlmaWVyLAogICAgICAgICAgICAgYXZhaWxhYmxlPXNlbGYuYXZhaWxhYmxlLAogICAgICAgICAg ICAgbnVtX2RldmljZXM9bGVuKHNlbGYuZGV2aWNlcykpCkBAIC0yMDIsMTQgKzIwOCwxOCBAQCBj bGFzcyBEZXZpY2Uob2JqZWN0KToKICAgICAgICAgICAgIHJ1bnRpbWU9c2VsZi5ydW50aW1lLmlk ZW50aWZpZXIpCiAKIAorIyBGSVhNRTogVGhpcyBjbGFzcyBpcyBmcmFnaWxlIGJlY2F1c2UgaXQg cGFyc2VzIHRoZSBvdXRwdXQgb2YgdGhlIHNpbWN0bCBjb21tYW5kIGxpbmUgdXRpbGl0eSwgd2hp Y2ggbWF5IGNoYW5nZS4KKyMgICAgICAgIFdlIHNob3VsZCBmaW5kIGEgYmV0dGVyIHdheSB0byBx dWVyeSBmb3Igc2ltdWxhdG9yIGRldmljZSBzdGF0ZSBhbmQgY2FwYWJpbGl0aWVzLiBNYXliZSB0 YWtlIGEgc2ltaWxpYXIKKyMgICAgICAgIGFwcHJvYWNoIGFzIGluIHdlYmtpdGRpcnMucG0gYW5k IHV0aWxpemUgdGhlIHBhcnNlZCBvdXRwdXQgZnJvbSB0aGUgZGV2aWNlLnBsaXN0IGZpbGVzIGlu IHRoZSBzdWItCisjICAgICAgICBkaXJlY3RvcmllcyBvZiB+L0xpYnJhcnkvRGV2ZWxvcGVyL0Nv cmVTaW11bGF0b3IvRGV2aWNlcz8KIGNsYXNzIFNpbXVsYXRvcihvYmplY3QpOgogICAgICIiIgog ICAgIFJlcHJlc2VudHMgdGhlIGlPUyBTaW11bGF0b3IgaW5mcmFzdHJ1Y3R1cmUgdW5kZXIgdGhl IGN1cnJlbnRseSBzZWxlY3QgWGNvZGUuYXBwIGJ1bmRsZS4KICAgICAiIiIKICAgICBkZXZpY2Vf dHlwZV9yZSA9IHJlLmNvbXBpbGUoJyg/UDxuYW1lPlteKF0rKVwoKD9QPGlkZW50aWZpZXI+W14p XSspXCknKQogICAgIHJ1bnRpbWVfcmUgPSByZS5jb21waWxlKAotICAgICAgICAnaU9TICg/UDx2 ZXJzaW9uPlswLTldK1wuWzAtOV0pIFwoWzAtOV0rXC5bMC05XSsgLSAoP1A8YnVpbGRfdmVyc2lv bj5bXildKylcKSBcKCg/UDxpZGVudGlmaWVyPlteKV0rKVwpKCBcKCg/UDxhdmFpbGFiaWxpdHk+ W14pXSspXCkpPycpCi0gICAgdmVyc2lvbl9yZSA9IHJlLmNvbXBpbGUoJy0tIGlPUyAoP1A8dmVy c2lvbj5bMC05XStcLlswLTldKykgLS0nKQorICAgICAgICAnaU9TICg/UDx2ZXJzaW9uPlswLTld K1wuWzAtOV0pKD9QPGludGVybmFsPiBJbnRlcm5hbCk/IFwoWzAtOV0rXC5bMC05XSsgLSAoP1A8 YnVpbGRfdmVyc2lvbj5bXildKylcKSBcKCg/UDxpZGVudGlmaWVyPlteKV0rKVwpKCBcKCg/UDxh dmFpbGFiaWxpdHk+W14pXSspXCkpPycpCisgICAgdmVyc2lvbl9yZSA9IHJlLmNvbXBpbGUoJy0t IGlPUyAoP1A8dmVyc2lvbj5bMC05XStcLlswLTldKykoP1A8aW50ZXJuYWw+IEludGVybmFsKT8g LS0nKQogICAgIGRldmljZXNfcmUgPSByZS5jb21waWxlKAogICAgICAgICAnXHMqKD9QPG5hbWU+ W14oXSsgKVwoKD9QPHVkaWQ+W14pXSspXCkgXCgoP1A8c3RhdGU+W14pXSspXCkoIFwoKD9QPGF2 YWlsYWJpbGl0eT5bXildKylcKSk/JykKIApAQCAtMjcwLDcgKzI4MCw4IEBAIGNsYXNzIFNpbXVs YXRvcihvYmplY3QpOgogICAgICAgICAgICAgdmVyc2lvbiA9IHR1cGxlKG1hcChpbnQsIHJ1bnRp bWVfbWF0Y2guZ3JvdXAoJ3ZlcnNpb24nKS5zcGxpdCgnLicpKSkKICAgICAgICAgICAgIHJ1bnRp bWUgPSBSdW50aW1lKHZlcnNpb249dmVyc2lvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlkZW50aWZpZXI9cnVudGltZV9tYXRjaC5ncm91cCgnaWRlbnRpZmllcicpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlPXJ1bnRpbWVfbWF0Y2guZ3JvdXAoJ2F2 YWlsYWJpbGl0eScpIGlzIE5vbmUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdmFp bGFibGU9cnVudGltZV9tYXRjaC5ncm91cCgnYXZhaWxhYmlsaXR5JykgaXMgTm9uZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlzX2ludGVybmFsX3J1bnRpbWU9Ym9vbChydW50aW1l X21hdGNoLmdyb3VwKCdpbnRlcm5hbCcpKSkKICAgICAgICAgICAgIHNlbGYucnVudGltZXMuYXBw ZW5kKHJ1bnRpbWUpCiAgICAgICAgIHNlbGYuX3BhcnNlX2RldmljZXMobGluZXMpCiAKQEAgLTI4 Niw3ICsyOTcsNyBAQCBjbGFzcyBTaW11bGF0b3Iob2JqZWN0KToKICAgICAgICAgICAgIHZlcnNp b25fbWF0Y2ggPSBzZWxmLnZlcnNpb25fcmUubWF0Y2gobGluZSkKICAgICAgICAgICAgIGlmIHZl cnNpb25fbWF0Y2g6CiAgICAgICAgICAgICAgICAgdmVyc2lvbiA9IHR1cGxlKG1hcChpbnQsIHZl cnNpb25fbWF0Y2guZ3JvdXAoJ3ZlcnNpb24nKS5zcGxpdCgnLicpKSkKLSAgICAgICAgICAgICAg ICBjdXJyZW50X3J1bnRpbWUgPSBzZWxmLnJ1bnRpbWUodmVyc2lvbj12ZXJzaW9uKQorICAgICAg ICAgICAgICAgIGN1cnJlbnRfcnVudGltZSA9IHNlbGYucnVudGltZSh2ZXJzaW9uPXZlcnNpb24s IGlzX2ludGVybmFsX3J1bnRpbWU9Ym9vbCh2ZXJzaW9uX21hdGNoLmdyb3VwKCdpbnRlcm5hbCcp KSkKICAgICAgICAgICAgICAgICBhc3NlcnQgY3VycmVudF9ydW50aW1lCiAgICAgICAgICAgICAg ICAgY29udGludWUKICAgICAgICAgICAgIGRldmljZV9tYXRjaCA9IHNlbGYuZGV2aWNlc19yZS5t YXRjaChsaW5lKQpAQCAtMzE2LDcgKzMyNyw3IEBAIGNsYXNzIFNpbXVsYXRvcihvYmplY3QpOgog ICAgICAgICAgICAgcmV0dXJuIGRldmljZV90eXBlCiAgICAgICAgIHJldHVybiBOb25lCiAKLSAg ICBkZWYgcnVudGltZShzZWxmLCB2ZXJzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSk6CisgICAg ZGVmIHJ1bnRpbWUoc2VsZiwgdmVyc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIGlzX2ludGVy bmFsX3J1bnRpbWU9Tm9uZSk6CiAgICAgICAgICIiIgogICAgICAgICA6cGFyYW0gdmVyc2lvbjog VGhlIGlPUyB2ZXJzaW9uIG9mIHRoZSBkZXNpcmVkIHJ1bnRpbWUuCiAgICAgICAgIDp0eXBlIHZl cnNpb246IHR1cGxlCkBAIC0zMzEsNiArMzQyLDggQEAgY2xhc3MgU2ltdWxhdG9yKG9iamVjdCk6 CiAgICAgICAgIGZvciBydW50aW1lIGluIHNlbGYucnVudGltZXM6CiAgICAgICAgICAgICBpZiB2 ZXJzaW9uIGFuZCBydW50aW1lLnZlcnNpb24gIT0gdmVyc2lvbjoKICAgICAgICAgICAgICAgICBj b250aW51ZQorICAgICAgICAgICAgaWYgaXNfaW50ZXJuYWxfcnVudGltZSBhbmQgcnVudGltZS5p c19pbnRlcm5hbF9ydW50aW1lICE9IGlzX2ludGVybmFsX3J1bnRpbWU6CisgICAgICAgICAgICAg ICAgY29udGludWUKICAgICAgICAgICAgIGlmIGlkZW50aWZpZXIgYW5kIHJ1bnRpbWUuaWRlbnRp ZmllciAhPSBpZGVudGlmaWVyOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAg ICByZXR1cm4gcnVudGltZQo=