227600 2021-07-01 16:20:57 -0700 [run-webkit-tests] Set software_variant from runtime 2021-07-01 21:05:50 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard ews-watchlist glenn slewis webkit-bug-importer oldest_to_newest 1774286 0 jbedard 2021-07-01 16:20:57 -0700 We currently try to infer the software_variant from the runtime. This is not really correct, the software_variant should be derived from the runtime. This is particularly relevant for iPhone and iPad where two device_families share a software_variant. 1774287 1 jbedard 2021-07-01 16:23:32 -0700 <rdar://problem/80052263> 1774289 2 432743 jbedard 2021-07-01 16:27:22 -0700 Created attachment 432743 Patch 1774354 3 ews-feeder 2021-07-01 21:05:49 -0700 Committed r279496 (239348@main): <https://commits.webkit.org/239348@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432743. 432743 2021-07-01 16:27:22 -0700 2021-07-01 21:05:49 -0700 Patch bug-227600-20210701162721.patch text/plain 6410 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3OTQ4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTA3LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gU2V0IHNvZnR3YXJlX3ZhcmlhbnQgZnJv bSBydW50aW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjc2MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgwMDUyMjYzPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94 Y29kZS9kZXZpY2VfdHlwZS5weToKKyAgICAgICAgKERldmljZVR5cGUuX2RlZmluZV9zb2Z0d2Fy ZV92YXJpYW50X2Zyb21faGFyZHdhcmVfZmFtaWx5KToKKyAgICAgICAgKERldmljZVR5cGUuY2hl Y2tfY29uc2lzdGVuY3kpOgorICAgICAgICAoRGV2aWNlVHlwZS5fX2NvbnRhaW5zX18pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHk6Cisg ICAgICAgIChEZXZpY2VUeXBlVGVzdC50ZXN0X2Zyb21fc3RyaW5nKToKKyAgICAgICAgKERldmlj ZVR5cGVUZXN0LnRlc3RfY29udGFpbmVkX2luKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHk6CisgICAgICAgIChTaW11bGF0ZWREZXZpY2VNYW5h Z2VyLl9jcmVhdGVfZGV2aWNlX3dpdGhfcnVudGltZSk6CisKIDIwMjEtMDctMDEgIEpvbmF0aGFu IEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFtjbGVhbi13ZWJraXRdIEV4 Y2x1ZGUgYXV0b2luc3RhbGxlZCBkaXJlY3RvcnkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkveGNvZGUvZGV2aWNlX3R5cGUucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS94Y29kZS9kZXZpY2VfdHlwZS5weQkocmV2aXNpb24gMjc5NDg1KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlwZS5weQkod29ya2luZyBjb3B5KQpAQCAtNjQs MjggKzY0LDI3IEBAIGNsYXNzIERldmljZVR5cGUob2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5z b2Z0d2FyZV92YXJpYW50OgogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgc2VsZi5zb2Z0 d2FyZV92YXJpYW50ID0gJ2lPUycKKyAgICAgICAgc2VsZi5zb2Z0d2FyZV92YXJpYW50ID0gTm9u ZQogICAgICAgICBpZiBzZWxmLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpLnNwbGl0KCcgJylbLTFd LnN0YXJ0c3dpdGgoJ3dhdGNoJyk6CiAgICAgICAgICAgICBzZWxmLmhhcmR3YXJlX2ZhbWlseSA9 ICdBcHBsZSBXYXRjaCcKICAgICAgICAgICAgIHNlbGYuc29mdHdhcmVfdmFyaWFudCA9ICd3YXRj aE9TJwogICAgICAgICBlbGlmIHNlbGYuaGFyZHdhcmVfZmFtaWx5Lmxvd2VyKCkuc3BsaXQoJyAn KVstMV0uc3RhcnRzd2l0aCgndHYnKToKICAgICAgICAgICAgIHNlbGYuaGFyZHdhcmVfZmFtaWx5 ID0gJ0FwcGxlIFRWJwogICAgICAgICAgICAgc2VsZi5zb2Z0d2FyZV92YXJpYW50ID0gJ3R2T1Mn CisgICAgICAgIGVsaWYgc2VsZi5oYXJkd2FyZV9mYW1pbHkubG93ZXIoKS5zdGFydHN3aXRoKCdp cGFkJykgb3Igc2VsZi5oYXJkd2FyZV9mYW1pbHkubG93ZXIoKS5zdGFydHN3aXRoKCdpcGhvbmUn KToKKyAgICAgICAgICAgIHNlbGYuc29mdHdhcmVfdmFyaWFudCA9ICdpT1MnCiAKICAgICBkZWYg Y2hlY2tfY29uc2lzdGVuY3koc2VsZik6CiAgICAgICAgIGlmIHNlbGYuaGFyZHdhcmVfZmFtaWx5 IGlzIG5vdCBOb25lOgotICAgICAgICAgICAgYXNzZXJ0IHNlbGYuc29mdHdhcmVfdmFyaWFudCBp cyBub3QgTm9uZQogICAgICAgICAgICAgaWYgc2VsZi5oYXJkd2FyZV9mYW1pbHkgPT0gJ0FwcGxl IFdhdGNoJzoKICAgICAgICAgICAgICAgICBhc3NlcnQgc2VsZi5zb2Z0d2FyZV92YXJpYW50ID09 ICd3YXRjaE9TJwogICAgICAgICAgICAgZWxpZiBzZWxmLmhhcmR3YXJlX2ZhbWlseSA9PSAnQXBw bGUgVFYnOgogICAgICAgICAgICAgICAgIGFzc2VydCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQgPT0g J3R2T1MnCi0gICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgZWxpZiBzZWxmLmhhcmR3YXJl X2ZhbWlseSBpbiAoJ2lQaG9uZScsICdpUGFkJyk6CiAgICAgICAgICAgICAgICAgYXNzZXJ0IHNl bGYuc29mdHdhcmVfdmFyaWFudCA9PSAnaU9TJwogCiAgICAgICAgIGlmIHNlbGYuaGFyZHdhcmVf dHlwZSBpcyBub3QgTm9uZToKICAgICAgICAgICAgIGFzc2VydCBzZWxmLmhhcmR3YXJlX2ZhbWls eSBpcyBub3QgTm9uZQotICAgICAgICBpZiBzZWxmLnNvZnR3YXJlX3ZlcnNpb246Ci0gICAgICAg ICAgICBhc3NlcnQgc2VsZi5zb2Z0d2FyZV92YXJpYW50IGlzIG5vdCBOb25lCiAKICAgICBkZWYg X19pbml0X18oc2VsZiwgaGFyZHdhcmVfZmFtaWx5PU5vbmUsIGhhcmR3YXJlX3R5cGU9Tm9uZSwg c29mdHdhcmVfdmVyc2lvbj1Ob25lLCBzb2Z0d2FyZV92YXJpYW50PU5vbmUpOgogICAgICAgICAi IiIKQEAgLTE0NiwxMSArMTQ1LDExIEBAIGNsYXNzIERldmljZVR5cGUob2JqZWN0KToKIAogICAg IGRlZiBfX2NvbnRhaW5zX18oc2VsZiwgb3RoZXIpOgogICAgICAgICBhc3NlcnQgaXNpbnN0YW5j ZShvdGhlciwgRGV2aWNlVHlwZSkKLSAgICAgICAgaWYgc2VsZi5oYXJkd2FyZV9mYW1pbHkgaXMg bm90IE5vbmUgYW5kIChub3Qgb3RoZXIuaGFyZHdhcmVfZmFtaWx5IG9yIHNlbGYuaGFyZHdhcmVf ZmFtaWx5Lmxvd2VyKCkgIT0gb3RoZXIuaGFyZHdhcmVfZmFtaWx5Lmxvd2VyKCkpOgorICAgICAg ICBpZiBzZWxmLmhhcmR3YXJlX2ZhbWlseSBpcyBub3QgTm9uZSBhbmQgb3RoZXIuaGFyZHdhcmVf ZmFtaWx5IGlzIG5vdCBOb25lIGFuZCBzZWxmLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpICE9IG90 aGVyLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0g ICAgICAgIGlmIHNlbGYuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUgaXMgbm90IE5vbmUgYW5k IChub3Qgb3RoZXIuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUgb3Igc2VsZi5zdGFuZGFyZGl6 ZWRfaGFyZHdhcmVfdHlwZS5sb3dlcigpICE9IG90aGVyLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90 eXBlLmxvd2VyKCkpOgorICAgICAgICBpZiBzZWxmLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBl IGlzIG5vdCBOb25lIGFuZCBvdGhlci5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBpcyBub3Qg Tm9uZSBhbmQgc2VsZi5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZS5sb3dlcigpICE9IG90aGVy LnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlLmxvd2VyKCk6CiAgICAgICAgICAgICByZXR1cm4g RmFsc2UKLSAgICAgICAgaWYgc2VsZi5zb2Z0d2FyZV92YXJpYW50IGlzIG5vdCBOb25lIGFuZCAo bm90IG90aGVyLnNvZnR3YXJlX3ZhcmlhbnQgb3Igc2VsZi5zb2Z0d2FyZV92YXJpYW50Lmxvd2Vy KCkgIT0gb3RoZXIuc29mdHdhcmVfdmFyaWFudC5sb3dlcigpKToKKyAgICAgICAgaWYgc2VsZi5z b2Z0d2FyZV92YXJpYW50IGlzIG5vdCBOb25lIGFuZCBvdGhlci5zb2Z0d2FyZV92YXJpYW50IGlz IG5vdCBOb25lIGFuZCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQubG93ZXIoKSAhPSBvdGhlci5zb2Z0 d2FyZV92YXJpYW50Lmxvd2VyKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAg aWYgc2VsZi5zb2Z0d2FyZV92ZXJzaW9uIGlzIG5vdCBOb25lIGFuZCBvdGhlci5zb2Z0d2FyZV92 ZXJzaW9uIGlzIG5vdCBOb25lIGFuZCBub3Qgb3RoZXIuc29mdHdhcmVfdmVyc2lvbiBpbiBzZWxm LnNvZnR3YXJlX3ZlcnNpb246CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlwZV91bml0dGVzdC5w eQkocmV2aXNpb24gMjc5NDg1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZp Y2VfdHlwZV91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTA0LDcgKzEwNCw2IEBAIGNs YXNzIERldmljZVR5cGVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCgnaVBhZCBBaXIgMiBydW5uaW5nIGlPUycsIHN0cihEZXZpY2VUeXBlLmZyb21fc3Ry aW5nKCdpUGFkIEFpciAyJykpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBXYXRj aCBTZXJpZXMgMiAtIDQybW0gcnVubmluZyB3YXRjaE9TJywgc3RyKERldmljZVR5cGUuZnJvbV9z dHJpbmcoJ0FwcGxlIFdhdGNoIFNlcmllcyAyIC0gNDJtbScpKSkKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCgnQXBwbGUgVFYgNEsgcnVubmluZyB0dk9TJywgc3RyKERldmljZVR5cGUuZnJvbV9z dHJpbmcoJ0FwcGxlIFRWIDRLJykpKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdEZXZpY2Ug cnVubmluZyBpT1MnLCBzdHIoRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnJykpKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBXYXRjaCBydW5uaW5nIHdhdGNoT1MnLCBzdHIoRGV2aWNl VHlwZS5mcm9tX3N0cmluZygnQXBwbGUgV2F0Y2gnKSkpCiAKICAgICBkZWYgdGVzdF9jb21wYXJp c29uKHNlbGYpOgpAQCAtMTQxLDcgKzE0MCw3IEBAIGNsYXNzIERldmljZVR5cGVUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2NvbnRhaW5lZF9pbihzZWxmKToKICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQaG9uZSA2cycpIGlu IERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQaG9uZScpKQotICAgICAgICBzZWxmLmFzc2VydEZh bHNlKERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQaG9uZScpIGluIERldmljZVR5cGUuZnJvbV9z dHJpbmcoJ2lQaG9uZSA2cycpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKERldmljZVR5cGUu ZnJvbV9zdHJpbmcoJ2lQYWQnKSBpbiBEZXZpY2VUeXBlLmZyb21fc3RyaW5nKCdpUGhvbmUgNnMn KSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQaG9u ZScsIFZlcnNpb24oMTEsIDEpKSBpbiBEZXZpY2VUeXBlLmZyb21fc3RyaW5nKCdpUGhvbmUnLCBW ZXJzaW9uKDExKSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoRGV2aWNlVHlwZS5mcm9tX3N0 cmluZygnaVBob25lJywgVmVyc2lvbigxMSkpIGluIERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQ aG9uZScsIFZlcnNpb24oMTEsIDEpKSkKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94 Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQkocmV2aXNpb24gMjc5NDg1KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5CSh3b3JraW5nIGNv cHkpCkBAIC0xMTIsNyArMTEyLDcgQEAgY2xhc3MgU2ltdWxhdGVkRGV2aWNlTWFuYWdlcihvYmpl Y3QpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBkZXZpY2VfdHlwZV9zdHJpbmcgPSBTaW11 bGF0ZWREZXZpY2VNYW5hZ2VyLl9kZXZpY2VfaWRlbnRpZmllcl90b19uYW1lW3JlYWRQbGlzdCho b3N0LmZpbGVzeXN0ZW0ub3Blbl9iaW5hcnlfZmlsZV9mb3JfcmVhZGluZyhkZXZpY2VfcGxpc3Qp KVsnZGV2aWNlVHlwZSddXQogICAgICAgICAgICAgZGV2aWNlX3R5cGUgPSBEZXZpY2VUeXBlLmZy b21fc3RyaW5nKGRldmljZV90eXBlX3N0cmluZywgcnVudGltZS52ZXJzaW9uKQotICAgICAgICAg ICAgYXNzZXJ0IGRldmljZV90eXBlLnNvZnR3YXJlX3ZhcmlhbnQgPT0gcnVudGltZS5vc192YXJp YW50CisgICAgICAgICAgICBkZXZpY2VfdHlwZS5zb2Z0d2FyZV92YXJpYW50ID0gcnVudGltZS5v c192YXJpYW50CiAgICAgICAgIGV4Y2VwdCAoVmFsdWVFcnJvciwgQXNzZXJ0aW9uRXJyb3IpOgog ICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAo=