193787 2019-01-24 15:14:33 -0800 [webkitdirs] iosSimulatorApplicationsPath may not have iOS.simruntime in its path 2019-01-24 16:36:28 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard dbates ews-watchlist lforschler webkit-bug-importer oldest_to_newest 1497982 0 jbedard 2019-01-24 15:14:33 -0800 Make iosSimulatorApplicationsPath more flexible to accommodate different runtime directories. 1497983 1 jbedard 2019-01-24 15:14:45 -0800 <rdar://problem/47497634> 1497987 2 360042 jbedard 2019-01-24 15:22:03 -0800 Created attachment 360042 Patch 1498009 3 360042 ap 2019-01-24 16:01:29 -0800 Comment on attachment 360042 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360042&action=review > Tools/ChangeLog:3 > + [webkitdirs] iosSimulatorApplicationsPath may not have iOS.simruntime in it's path s/it's/its/ > Tools/Scripts/webkitdirs.pm:2509 > + my @runtimes = grep {!/^\./} readdir(RUNTIMES); Maybe check for ".simruntime" in the name? > Tools/Scripts/webkitdirs.pm:2511 > + return File::Spec->catdir($runtimePath, @runtimes ? $runtimes[0] : "iOS.simruntime", "Contents", "Resources", "RuntimeRoot", "Applications"); I suggest adding a FIXME here. Building the path manually is fragile, and randomly picking a single runtime path is just weird. We need to find a way to determine which runtime corresponds to a simulator that we're about to use. 1498025 4 jbedard 2019-01-24 16:35:21 -0800 Committed r240455: <https://trac.webkit.org/changeset/240455> 1498027 5 webkit-bug-importer 2019-01-24 16:36:28 -0800 <rdar://problem/47533806> 360042 2019-01-24 15:22:03 -0800 2019-01-24 16:01:29 -0800 Patch bug-193787-20190124152203.patch text/plain 1705 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0MDQ1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE5LTAxLTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0ZGlyc10gaW9zU2ltdWxhdG9yQXBwbGljYXRpb25zUGF0aCBt YXkgbm90IGhhdmUgaU9TLnNpbXJ1bnRpbWUgaW4gaXQncyBwYXRoCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM3ODcKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQ3NDk3NjM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoaW9zU2ltdWxhdG9y QXBwbGljYXRpb25zUGF0aCk6IFBpY2sgZnJvbSBhdmFpbGFibGUgcnVudGltZSBkaXJlY3Rvcmll cy4KKwogMjAxOS0wMS0yNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCBtaWxlc3RvbmUgc2hvdWxkIGFsd2F5 cyBmaXJlIGF0IHNvbWUgcG9pbnQuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAyNDA0 NDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTI1 MDQsOCArMjUwNCwxMSBAQCBzdWIgc2V0dXBJT1NXZWJLaXRFbnZpcm9ubWVudCgkKQogCiBzdWIg aW9zU2ltdWxhdG9yQXBwbGljYXRpb25zUGF0aCgpCiB7Ci0gICAgbXkgJGlwaG9uZU9TUGxhdGZv cm1QYXRoID0gc2RrUGxhdGZvcm1EaXJlY3RvcnkoImlwaG9uZW9zIik7Ci0gICAgcmV0dXJuIEZp bGU6OlNwZWMtPmNhdGRpcigkaXBob25lT1NQbGF0Zm9ybVBhdGgsICJEZXZlbG9wZXIiLCAiTGli cmFyeSIsICJDb3JlU2ltdWxhdG9yIiwgIlByb2ZpbGVzIiwgIlJ1bnRpbWVzIiwgImlPUy5zaW1y dW50aW1lIiwgIkNvbnRlbnRzIiwgIlJlc291cmNlcyIsICJSdW50aW1lUm9vdCIsICJBcHBsaWNh dGlvbnMiKTsKKyAgICBteSAkcnVudGltZVBhdGggPSBGaWxlOjpTcGVjLT5jYXRkaXIoc2RrUGxh dGZvcm1EaXJlY3RvcnkoImlwaG9uZW9zIiksICJEZXZlbG9wZXIiLCAiTGlicmFyeSIsICJDb3Jl U2ltdWxhdG9yIiwgIlByb2ZpbGVzIiwgIlJ1bnRpbWVzIik7CisgICAgb3BlbmRpcihSVU5USU1F UywgJHJ1bnRpbWVQYXRoKTsKKyAgICBteSBAcnVudGltZXMgPSBncmVwIHshL15cLi99IHJlYWRk aXIoUlVOVElNRVMpOworICAgIGNsb3NlKFJVTlRJTUVTKTsKKyAgICByZXR1cm4gRmlsZTo6U3Bl Yy0+Y2F0ZGlyKCRydW50aW1lUGF0aCwgQHJ1bnRpbWVzID8gJHJ1bnRpbWVzWzBdIDogImlPUy5z aW1ydW50aW1lIiwgIkNvbnRlbnRzIiwgIlJlc291cmNlcyIsICJSdW50aW1lUm9vdCIsICJBcHBs aWNhdGlvbnMiKTsKIH0KIAogc3ViIGluc3RhbGxlZE1vYmlsZVNhZmFyaUJ1bmRsZSgpCg==