195472 2019-03-08 10:56:07 -0800 Running a single test will always use the default device 2019-04-26 11:25:35 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino jbedard ap commit-queue ews-watchlist glenn lforschler webkit-bug-importer oldest_to_newest 1514080 0 dino 2019-03-08 10:56:07 -0800 e.g. Put a test in fast/events/ios/ipad/foo.html In platform/ios/TestExpectations fast/events/ios/ipad [ Skip ] In platform/ipad/TestExpectations fast/events/ios/ipad [ Pass ] > run-webkit-tests --ios-simulator fast/events/ios/ipad launches an iPhone SE, not an iPad 1514125 1 jbedard 2019-03-08 12:10:32 -0800 Edited the bug title since talking with Dean (and Shawn a few days ago). Running a single test should override skipped expectations (this has been the case for a long time), but with the addition of device specific expectations and the fact that the ios-simulator port supports 3 devices, we expect fast/events/ios/ipad to be run on iPad when using the ios-simulator port, not iPhone SE. 1514166 2 webkit-bug-importer 2019-03-08 14:03:40 -0800 <rdar://problem/48724825> 1530703 3 368322 jbedard 2019-04-26 09:39:54 -0700 Created attachment 368322 Patch 1530706 4 368322 lforschler 2019-04-26 09:43:42 -0700 Comment on attachment 368322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368322&action=review > Tools/ChangeLog:6 > + the title of this doesn't seem to match the description of what the change is about... I see nothing about devices in the code below... 1530726 5 368322 jbedard 2019-04-26 10:08:50 -0700 Comment on attachment 368322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368322&action=review >> Tools/ChangeLog:6 >> + > > the title of this doesn't seem to match the description of what the change is about... I see nothing about devices in the code below... It does, although webkitpy has abstracted enough code that it is not at all obvious why. There are two changes that are device specific. The first is removing this code: ... elif self._options.skipped != 'always': tests_to_skip -= set(paths) ... Each device has it's own layout test finder (because each device is a separate configuration). Before this change, we would run tests which should be skipped on the current configuration but were explicitly requested by the user. Instead of doing this in the LayoutTestFinder (which, it must be added, only has this behavior when actually running layout tests, not when, for example, rebaselining tests), I moved it to the manager, which is the second part of this change: ... tests_to_run_by_device[device_type_list[0]].append(arg) ... This part of the change DOES contain a device type (or rather, a list of device types) but this is actually the new implementation of the above removed code. Instead of adding explicitly requests tests to all configurations, the code will now only add a test which was SKIPPED in ALL configurations to default configuration if that test was specified by the user. It's a bit confusing, but the usability conclusion is that if I did: run-webkit-tests --ios-simulator platform/ipad/fast/viewport/width-is-device-width.html The test would be run on iPad, but if I did: run-webkit-tests --iphone-simulator platform/ipad/fast/viewport/width-is-device-width.html The test would be run on iPhone. 1530763 6 368322 commit-queue 2019-04-26 11:25:34 -0700 Comment on attachment 368322 Patch Clearing flags on attachment: 368322 Committed r244701: <https://trac.webkit.org/changeset/244701> 1530764 7 commit-queue 2019-04-26 11:25:35 -0700 All reviewed patches have been landed. Closing bug. 368322 2019-04-26 09:39:54 -0700 2019-04-26 11:25:34 -0700 Patch bug-195472-20190426093954.patch text/plain 5451 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDY5MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE5LTA0LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUnVubmluZyBhIHNpbmdsZSB0ZXN0IHdpbGwgYWx3YXlz IHVzZSB0aGUgZGVmYXVsdCBkZXZpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NTQ3MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg3MjQ4MjU+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgbWFr ZXMgbW9yZSBzZW5zZSB0byBoYXZlIHRoZSBNYW5hZ2VyIGNsYXNzIGhhbmRsZSB0aGUgY2FzZSB3 aGVyZSBhIHVzZXIgc3BlY2lmaWNhbGx5IHJlcXVlc3RzIGEgdGVzdCB3aGljaCBpcworICAgICAg ICBza2lwcGVkIG9uIHRoZSBjdXJyZW50IGNvbmZpZ3VyYXRpb24uIFRoaXMgY2hhbmdlcyB0aGUg YmVoYXZpb3Igd2hlbiBydW5uaW5nIHBhcnQgb2YgYSB0ZXN0IHNoYXJkLCBub3cgdGVzdHMgZXhw bGljaXRseQorICAgICAgICByZXF1ZXN0ZWQgd2lsbCBiZSBydW4gcmVnYXJkbGVzcyBvZiB3aGF0 IHNoYXJkIHRoZXkgYXJlIGluLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfZmluZGVyLnB5OgorICAgICAgICAoTGF5b3V0 VGVzdEZpbmRlci5za2lwX3Rlc3RzKTogQ2FsbGVyIHNob3VsZCBtYW5hZ2UgcnVubmluZyBza2lw cGVkIHRlc3RzIHdoaWNoIHdlcmUgZXhwbGljaXRseSByZXF1ZXN0ZWQuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAg ICAgKE1hbmFnZXIucnVuKTogSWYgYSB0ZXN0IGlzIG1hcmtlZCBhcyBza2lwcGVkIGZvciB0aGUg Y29uZmlndXJhdGlvbiwgYnV0IHdhcyBzcGVjaWZpY2FsbHkgcmVxdWVzdGVkLCBydW4gaXQgYW55 d2F5cworICAgICAgICBvbiB0aGUgZGVmYXVsdCBkZXZpY2UgdHlwZS4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVz dC5weToKKyAgICAgICAgKFJ1blRlc3QudGVzdF9ydW5fY2h1bmspOiBFeHBsaWNpdGx5IHJlcXVl c3RpbmcgYSB0ZXN0IHdpbGwgb3ZlcnJpZGUgc2hhcmluZyBiZWhhdmlvci4KKyAgICAgICAgKFJ1 blRlc3QudGVzdF9ydW5fcGFydCk6IERpdHRvLgorCiAyMDE5LTA0LTI2ICBZb3NoaWFraSBKaXRz dWthd2EgIDx5b3NoaWFraS5qaXRzdWthd2FAc29ueS5jb20+CiAKICAgICAgICAgY2hlY2std2Vi a2l0LXN0eWxlIGNvbXBsYWlucyB0aGUgZmlyc3QgYmxvY2sgaW4gd2hpbGUgbG9vcC4KSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50 ZWdyYXRpb250ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CShyZXZpc2lvbiAy NDQ2NjgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzg1LDcgKzM4NSw3 IEBAIGNsYXNzIFJ1blRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVQKIAogICAgICAgICAj IFRlc3QgdGhhdCB3ZSB3cmFwIGFyb3VuZCBpZiB0aGUgbnVtYmVyIG9mIHRlc3RzIGlzIG5vdCBl dmVubHkgZGl2aXNpYmxlIGJ5IHRoZSBjaHVuayBzaXplCiAgICAgICAgIHRlc3RzX3RvX3J1biA9 IFsncGFzc2VzL2Vycm9yLmh0bWwnLCAncGFzc2VzL2ltYWdlLmh0bWwnLCAncGFzc2VzL3BsYXRm b3JtX2ltYWdlLmh0bWwnLCAncGFzc2VzL3RleHQuaHRtbCddCi0gICAgICAgIGNodW5rX3Rlc3Rz X3J1biA9IGdldF90ZXN0c19ydW4oWyctLXJ1bi1jaHVuaycsICcxOjMnXSArIHRlc3RzX3RvX3J1 bikKKyAgICAgICAgY2h1bmtfdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1bihbJy0tcnVuLWNodW5r JywgJzE6MycsICctLXNraXBwZWQnLCAnYWx3YXlzJ10gKyB0ZXN0c190b19ydW4pCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoWydwYXNzZXMvdGV4dC5odG1sJywgJ3Bhc3Nlcy9lcnJvci5odG1s JywgJ3Bhc3Nlcy9pbWFnZS5odG1sJ10sIGNodW5rX3Rlc3RzX3J1bikKIAogICAgIGRlZiB0ZXN0 X3J1bl9mb3JjZShzZWxmKToKQEAgLTM5NywxMyArMzk3LDEzIEBAIGNsYXNzIFJ1blRlc3QodW5p dHRlc3QuVGVzdENhc2UsIFN0cmVhbVQKICAgICBkZWYgdGVzdF9ydW5fcGFydChzZWxmKToKICAg ICAgICAgIyBUZXN0IHRoYXQgd2UgYWN0dWFsbHkgc2VsZWN0IHRoZSByaWdodCBwYXJ0CiAgICAg ICAgIHRlc3RzX3RvX3J1biA9IFsncGFzc2VzL2Vycm9yLmh0bWwnLCAncGFzc2VzL2ltYWdlLmh0 bWwnLCAncGFzc2VzL3BsYXRmb3JtX2ltYWdlLmh0bWwnLCAncGFzc2VzL3RleHQuaHRtbCddCi0g ICAgICAgIHRlc3RzX3J1biA9IGdldF90ZXN0c19ydW4oWyctLXJ1bi1wYXJ0JywgJzE6MiddICsg dGVzdHNfdG9fcnVuKQorICAgICAgICB0ZXN0c19ydW4gPSBnZXRfdGVzdHNfcnVuKFsnLS1ydW4t cGFydCcsICcxOjInLCAnLS1za2lwcGVkJywgJ2Fsd2F5cyddICsgdGVzdHNfdG9fcnVuKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKFsncGFzc2VzL2Vycm9yLmh0bWwnLCAncGFzc2VzL2ltYWdl Lmh0bWwnXSwgdGVzdHNfcnVuKQogCiAgICAgICAgICMgVGVzdCB0aGF0IHdlIHdyYXAgYXJvdW5k IGlmIHRoZSBudW1iZXIgb2YgdGVzdHMgaXMgbm90IGV2ZW5seSBkaXZpc2libGUgYnkgdGhlIGNo dW5rIHNpemUKICAgICAgICAgIyAoaGVyZSB3ZSBlbmQgdXAgd2l0aCAzIHBhcnRzLCBlYWNoIHdp dGggMiB0ZXN0cywgYW5kIHdlIG9ubHkgaGF2ZSA0IHRlc3RzIHRvdGFsLCBzbyB0aGUKICAgICAg ICAgIyBsYXN0IHBhcnQgcmVwZWF0cyB0aGUgZmlyc3QgdHdvIHRlc3RzKS4KLSAgICAgICAgY2h1 bmtfdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1bihbJy0tcnVuLXBhcnQnLCAnMzozJ10gKyB0ZXN0 c190b19ydW4pCisgICAgICAgIGNodW5rX3Rlc3RzX3J1biA9IGdldF90ZXN0c19ydW4oWyctLXJ1 bi1wYXJ0JywgJzM6MycsICctLXNraXBwZWQnLCAnYWx3YXlzJ10gKyB0ZXN0c190b19ydW4pCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWydwYXNzZXMvZXJyb3IuaHRtbCcsICdwYXNzZXMvaW1h Z2UuaHRtbCddLCBjaHVua190ZXN0c19ydW4pCiAKICAgICBkZWYgdGVzdF9ydW5fc2luZ2x5KHNl bGYpOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbGF5b3V0X3Rlc3RfZmluZGVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X2ZpbmRlci5weQkocmV2 aXNpb24gMjQ0NjY4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbGF5b3V0X3Rlc3RfZmluZGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzAsOSAr MTMwLDYgQEAgY2xhc3MgTGF5b3V0VGVzdEZpbmRlcihvYmplY3QpOgogICAgICAgICAgICAgdGVz dHNfdG9fc2tpcCA9IGFsbF90ZXN0cyAtIHRlc3RzX3RvX3NraXAKICAgICAgICAgZWxpZiBzZWxm Ll9vcHRpb25zLnNraXBwZWQgPT0gJ2lnbm9yZSc6CiAgICAgICAgICAgICB0ZXN0c190b19za2lw ID0gc2V0KCkKLSAgICAgICAgZWxpZiBzZWxmLl9vcHRpb25zLnNraXBwZWQgIT0gJ2Fsd2F5cyc6 Ci0gICAgICAgICAgICAjIG1ha2Ugc3VyZSB3ZSdyZSBleHBsaWNpdGx5IHJ1bm5pbmcgYW55IHRl c3RzIHBhc3NlZCBvbiB0aGUgY29tbWFuZCBsaW5lOyBlcXVpdmFsZW50IHRvICdkZWZhdWx0Jy4K LSAgICAgICAgICAgIHRlc3RzX3RvX3NraXAgLT0gc2V0KHBhdGhzKQogCiAgICAgICAgICMgdW5s ZXNzIG9mIGNvdXJzZSB3ZSBkb24ndCB3YW50IHRvIHJ1biB0aGUgSFRUUCB0ZXN0cyA6KQogICAg ICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5odHRwOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 CShyZXZpc2lvbiAyNDQ2NjgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsNiArMjA1LDEz IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgIHRlc3RzX3RvX3J1bl9ieV9k ZXZpY2VbZGV2aWNlX3R5cGVdID0gW3Rlc3QgZm9yIHRlc3QgaW4gdGVzdHNfdG9fcnVuIGlmIHRl c3Qgbm90IGluIGFnZ3JlZ2F0ZV90ZXN0c10KICAgICAgICAgICAgIGFnZ3JlZ2F0ZV90ZXN0cy51 cGRhdGUodGVzdHNfdG9fcnVuKQogCisgICAgICAgICMgSWYgYSB0ZXN0IGlzIG1hcmtlZCBza2lw cGVkLCBidXQgd2FzIGV4cGxpY2l0bHkgcmVxdWVzdGVkLCBydW4gaXQgYW55d2F5cworICAgICAg ICBpZiBzZWxmLl9vcHRpb25zLnNraXBwZWQgIT0gJ2Fsd2F5cyc6CisgICAgICAgICAgICBmb3Ig YXJnIGluIGFyZ3M6CisgICAgICAgICAgICAgICAgaWYgYXJnIGluIHRvdGFsX3Rlc3RzIGFuZCBh cmcgbm90IGluIGFnZ3JlZ2F0ZV90ZXN0czoKKyAgICAgICAgICAgICAgICAgICAgdGVzdHNfdG9f cnVuX2J5X2RldmljZVtkZXZpY2VfdHlwZV9saXN0WzBdXS5hcHBlbmQoYXJnKQorICAgICAgICAg ICAgICAgICAgICBhZ2dyZWdhdGVfdGVzdHMuYWRkKGFyZykKKwogICAgICAgICB0ZXN0c190b19z a2lwID0gdG90YWxfdGVzdHMgLSBhZ2dyZWdhdGVfdGVzdHMKICAgICAgICAgc2VsZi5fcHJpbnRl ci5wcmludF9mb3VuZChsZW4oYWdncmVnYXRlX3Rlc3RfbmFtZXMpLCBsZW4oYWdncmVnYXRlX3Rl c3RzKSwgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25z KQogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkK