135441 2014-07-30 17:05:21 -0700 [iOS] run-webkit-tests: defaults for --runtime and --device-type flags 2014-08-05 18:38:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) iPhone / iPad All RESOLVED FIXED P2 Normal --- 1 dfarler dfarler ap commit-queue dbates ddkilzer glenn psolanki simon.fraser thorton oldest_to_newest 1025830 0 dfarler 2014-07-30 17:05:21 -0700 CoreSimulator identifiers are a mouthful - provide some defaults for most situations based on the latest runtime available in the current SDK and a default device based on architecture. 1027018 1 236067 dfarler 2014-08-05 18:05:30 -0700 Created attachment 236067 Patch 1027019 2 dfarler 2014-08-05 18:06:08 -0700 That brings it down to: Tools/Scripts/run-webkit-tests --ios-sim —debug or Tools/Scripts/run-webkit-tests --ios-sim —release 1027023 3 236067 thorton 2014-08-05 18:11:20 -0700 Comment on attachment 236067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236067&action=review > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:289 > + optparse.make_option('--device-type', help='iOS Simulator device type identifier (default: i386: iPhone 5, x86_64: iPhone 5s)'), maybe -> arrows instead of colons for the mapping? 1027033 4 dfarler 2014-08-05 18:37:56 -0700 Good call, that’s a lot of : 1027034 5 dfarler 2014-08-05 18:38:22 -0700 Committed r172117: <http://trac.webkit.org/changeset/172117> 236067 2014-08-05 18:05:30 -0700 2014-08-05 18:11:20 -0700 Patch bug-135441-20140805180518.patch text/plain 6869 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM0OWYxMDU3MmY3ZTBlNWVlYThiNDUwOWI4ZGNkMGRl YjVlOWNhYy4uOTFjNGE0MWVmZGU2MWVlNWJlMzZmYmZjMGExMzg2ZGUwODljNzJhYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE0LTA4LTA1ICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKworICAg ICAgICBbaU9TXSBydW4td2Via2l0LXRlc3RzOiBkZWZhdWx0cyBmb3IgLS1ydW50aW1lIGFuZCAt LWRldmljZS10eXBlIGZsYWdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzU0NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHk6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKF9zZXRfdXBfZGVyaXZlZF9v cHRpb25zKToKKyAgICAgICAgSWYgdXNpbmcgdGhlIGlvcy1zaW11bGF0b3IgcGxhdGZvcm0gYW5k IHJ1bnRpbWUgb3IgZGV2aWNlLXR5cGUKKyAgICAgICAgYXJlbid0IGRlZmluZWQsIGdldCB0aGUg bGF0ZXN0IHJ1bnRpbWUgZnJvbSB0aGUgYWN0aXZlIFhjb2RlLmFwcAorICAgICAgICBhbmQgcGlj ayBhIGRlZmF1bHQgZGV2aWNlIHR5cGUgYmFzZWQgb24gdGhlIGRlc2lyZWQgYXJjaGl0ZWN0dXJl OgorICAgICAgICBpUGhvbmUgNSBmb3IgaTM4NiBhbmQgaVBob25lIDVzIGZvciB4ODZfNjQuCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9fX2luaXRfXy5weTogQWRkZWQuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHk6IEFkZGVkLgorCiAyMDE0 LTA4LTA1ICBWaXZlayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFtndGtdIEluY2x1ZGUgbGx2bS1kZXYoZWwpIHBhY2thZ2UgdG8gc2F0aXNmeSBtZXNhIGJ1aWxk IGNvbmZpZ3VyYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDJhMzQ5YWI1YzIyOGM4ZmJhMzUwZWE3 MjlkNjU3MjNkNzdlMTk5ZDIuLjViNmUwNWFkMDFiNDBjNmJjOTQxMjI1NWRlMDRiOTc1N2U3ZDJm Y2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjg1LDggKzI4NSw4IEBAIGRlZiBwYXJzZV9hcmdzKGFy Z3MpOgogICAgIF0pKQogCiAgICAgb3B0aW9uX2dyb3VwX2RlZmluaXRpb25zLmFwcGVuZCgoImlP UyBTaW11bGF0b3IgT3B0aW9ucyIsIFsKLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0t cnVudGltZScsIGhlbHA9J2lPUyBTaW11bGF0b3IgcnVudGltZSBpZGVudGlmaWVyJyksCi0gICAg ICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCctLWRldmljZS10eXBlJywgaGVscD0naU9TIFNpbXVs YXRvciBkZXZpY2UgdHlwZSBpZGVudGlmaWVyJyksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCctLXJ1bnRpbWUnLCBoZWxwPSdpT1MgU2ltdWxhdG9yIHJ1bnRpbWUgaWRlbnRpZmllciAo ZGVmYXVsdDogbGF0ZXN0IHJ1bnRpbWUpJyksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9u KCctLWRldmljZS10eXBlJywgaGVscD0naU9TIFNpbXVsYXRvciBkZXZpY2UgdHlwZSBpZGVudGlm aWVyIChkZWZhdWx0OiBpMzg2OiBpUGhvbmUgNSwgeDg2XzY0OiBpUGhvbmUgNXMpJyksCiAgICAg XSkpCiAKICAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5kKCgiTWlzY2VsbGFuZW91 cyBPcHRpb25zIiwgWwpAQCAtMzkxLDYgKzM5MSwxNCBAQCBkZWYgX3NldF91cF9kZXJpdmVkX29w dGlvbnMocG9ydCwgb3B0aW9ucyk6CiAgICAgaWYgb3B0aW9ucy5wbGF0Zm9ybSA9PSAiZ3RrIiBv ciBvcHRpb25zLnBsYXRmb3JtID09ICJlZmwiOgogICAgICAgICBvcHRpb25zLndlYmtpdF90ZXN0 X3J1bm5lciA9IFRydWUKIAorICAgIGlmIG9wdGlvbnMucGxhdGZvcm0gPT0gJ2lvcy1zaW11bGF0 b3InOgorICAgICAgICBmcm9tIHdlYmtpdHB5IGltcG9ydCB4Y29kZQorICAgICAgICBpZiBvcHRp b25zLnJ1bnRpbWUgaXMgTm9uZToKKyAgICAgICAgICAgIG9wdGlvbnMucnVudGltZSA9IHhjb2Rl LnNpbXVsYXRvci5nZXRfbGF0ZXN0X3J1bnRpbWUoKVsnaWRlbnRpZmllciddCisgICAgICAgIGlm IG9wdGlvbnMuZGV2aWNlX3R5cGUgaXMgTm9uZToKKyAgICAgICAgICAgIGRldmljZV90eXBlcyA9 IHhjb2RlLnNpbXVsYXRvci5nZXRfZGV2aWNlX3R5cGVzKCkKKyAgICAgICAgICAgIG9wdGlvbnMu ZGV2aWNlX3R5cGUgPSBkZXZpY2VfdHlwZXNbJ2lQaG9uZSA1J10gaWYgb3B0aW9ucy5hcmNoaXRl Y3R1cmUgPT0gJ3g4NicgZWxzZSBkZXZpY2VfdHlwZXNbJ2lQaG9uZSA1cyddCisKIAogZGVmIHJ1 bihwb3J0LCBvcHRpb25zLCBhcmdzLCBsb2dnaW5nX3N0cmVhbSk6CiAgICAgbG9nZ2VyID0gbG9n Z2luZy5nZXRMb2dnZXIoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29k ZS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvX19pbml0X18ucHkK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uMzJlZGM0NDY4NTQzMTBhZjAzM2Y4YTY1YzViYWE0MTNhYjMyMjM0NAotLS0g L2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvX19pbml0X18ucHkK QEAgLTAsMCArMSBAQAoraW1wb3J0IHNpbXVsYXRvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hj b2RlL3NpbXVsYXRvci5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42M2RjM2IzOWRmMWIyOWNiM2FhYjI5NzU5ZTU0 MGM3ZWExZmZiYWRkCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS94 Y29kZS9zaW11bGF0b3IucHkKQEAgLTAsMCArMSwxMDUgQEAKK2ltcG9ydCBzdWJwcm9jZXNzCitp bXBvcnQgcmUKKworIiIiCitNaW5pbWFsbHkgd3JhcHMgQ29yZVNpbXVsYXRvciBmdW5jdGlvbmFs aXR5IHRocm91Z2ggc2ltY3RsLgorCitJZiBwb3NzaWJsZSwgdXNlIHJlYWwgQ29yZVNpbXVsYXRv ci5mcmFtZXdvcmsgZnVuY3Rpb25hbGl0eSBieSBsaW5raW5nIHRvIHRoZSBmcmFtZXdvcmsgaXRz ZWxmLgorRG8gbm90IHVzZSBQeU9iakMgdG8gZGxvcGVuIHRoZSBmcmFtZXdvcmsuCisiIiIKKwor CitkZWYgZ2V0X3J1bnRpbWVzKG9ubHlfYXZhaWxhYmxlPVRydWUpOgorICAgICIiIgorICAgIEdp dmUgYSBkaWN0aW9uYXJ5IG1hcHBpbmcKKyAgICA6cmV0dXJuOiBBIGRpY3Rpb25hcnkgbWFwcGlu ZyBpT1MgdmVyc2lvbiBzdHJpbmcgdG8gcnVudGltZSBpZGVudGlmaWVyLgorICAgIDpydHlwZTog ZGljdAorICAgICIiIgorICAgIHJ1bnRpbWVzID0ge30KKyAgICBydW50aW1lX3JlID0gcmUuY29t cGlsZShiJ2lPUyAoP1A8dmVyc2lvbj5bMC05XStcLlswLTldKSBcKFswLTldK1wuWzAtOV0rIC0g KD9QPHVwZGF0ZT5bXildKylcKSBcKCg/UDxpZGVudGlmaWVyPlteKV0rKVwpKCBcKCg/UDx1bmF2 YWlsYWJsZT5bXildKylcKSk/JykKKyAgICBzdGRvdXQgPSBzdWJwcm9jZXNzLmNoZWNrX291dHB1 dChbJ3hjcnVuJywgJy1zZGsnLCAnaXBob25lc2ltdWxhdG9yJywgJ3NpbWN0bCcsICdsaXN0Jywg J3J1bnRpbWVzJ10pCisgICAgbGluZXMgPSBpdGVyKHN0ZG91dC5zcGxpdGxpbmVzKCkpCisgICAg aGVhZGVyID0gbmV4dChsaW5lcykKKyAgICBpZiBoZWFkZXIgIT0gJz09IFJ1bnRpbWVzID09JzoK KyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIGZvciBsaW5lIGluIGxpbmVzOgorICAgICAgICBy dW50aW1lX21hdGNoID0gcnVudGltZV9yZS5tYXRjaChsaW5lKQorICAgICAgICBpZiBub3QgcnVu dGltZV9tYXRjaDoKKyAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgIHJ1bnRpbWUgPSBydW50 aW1lX21hdGNoLmdyb3VwZGljdCgpCisgICAgICAgIHZlcnNpb24gPSB0dXBsZShbaW50KGNvbXBv bmVudCkgZm9yIGNvbXBvbmVudCBpbiBydW50aW1lX21hdGNoLmdyb3VwKCd2ZXJzaW9uJykuc3Bs aXQoJy4nKV0pCisgICAgICAgIHJ1bnRpbWUgPSB7CisgICAgICAgICAgICAnaWRlbnRpZmllcic6 IHJ1bnRpbWVbJ2lkZW50aWZpZXInXSwKKyAgICAgICAgICAgICdhdmFpbGFibGUnOiBydW50aW1l Wyd1bmF2YWlsYWJsZSddIGlzIE5vbmUsCisgICAgICAgICAgICAndmVyc2lvbic6IHZlcnNpb24s CisgICAgICAgIH0KKyAgICAgICAgaWYgb25seV9hdmFpbGFibGUgYW5kIG5vdCBydW50aW1lWydh dmFpbGFibGUnXToKKyAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgcnVudGltZXNbdmVy c2lvbl0gPSBydW50aW1lCisKKyAgICByZXR1cm4gcnVudGltZXMKKworCitkZWYgZ2V0X2Rldmlj ZXMoKToKKyAgICAiIiIKKyAgICA6cmV0dXJuOiBBIGRpY3Rpb25hcnkgbWFwcGluZyBpT1MgdmVy c2lvbiB0byBkZXZpY2UgaGFyZHdhcmUgbW9kZWwsIHNpbXVsYXRvciBVRElELCBhbmQgc3RhdGUu CisgICAgOnJ0eXBlOiBkaWN0CisgICAgIiIiCisgICAgZGV2aWNlcyA9IHt9CisgICAgdmVyc2lv bl9yZSA9IHJlLmNvbXBpbGUoJy0tIGlPUyAoP1A8dmVyc2lvbj5bMC05XStcLlswLTldKykgLS0n KQorICAgIGRldmljZXNfcmUgPSByZS5jb21waWxlKCdccyooP1A8bmFtZT5bXihdKyApXCgoP1A8 dWRpZD5bXildKylcKSBcKCg/UDxzdGF0ZT5bXildKylcKScpCisgICAgc3Rkb3V0ID0gc3VicHJv Y2Vzcy5jaGVja19vdXRwdXQoWyd4Y3J1bicsICctc2RrJywgJ2lwaG9uZXNpbXVsYXRvcicsICdz aW1jdGwnLCAnbGlzdCcsICdkZXZpY2VzJ10pCisgICAgbGluZXMgPSBpdGVyKHN0ZG91dC5zcGxp dGxpbmVzKCkpCisgICAgaGVhZGVyID0gbmV4dChsaW5lcykKKyAgICB2ZXJzaW9uID0gTm9uZQor ICAgIGlmIGhlYWRlciAhPSAnPT0gRGV2aWNlcyA9PSc6CisgICAgICAgIHJldHVybiBOb25lCisK KyAgICBmb3IgbGluZSBpbiBsaW5lczoKKyAgICAgICAgdmVyc2lvbl9tYXRjaCA9IHZlcnNpb25f cmUubWF0Y2gobGluZSkKKyAgICAgICAgaWYgdmVyc2lvbl9tYXRjaDoKKyAgICAgICAgICAgIHZl cnNpb24gPSB0dXBsZShbaW50KGNvbXBvbmVudCkgZm9yIGNvbXBvbmVudCBpbiB2ZXJzaW9uX21h dGNoLmdyb3VwKCd2ZXJzaW9uJykuc3BsaXQoJy4nKV0pCisgICAgICAgICAgICBjb250aW51ZQor ICAgICAgICBkZXZpY2VfbWF0Y2ggPSBkZXZpY2VzX3JlLm1hdGNoKGxpbmUpCisgICAgICAgIGlm IG5vdCBkZXZpY2VfbWF0Y2g6CisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoKQorICAg ICAgICBkZXZpY2UgPSBkZXZpY2VfbWF0Y2guZ3JvdXBkaWN0KCkKKyAgICAgICAgZGV2aWNlWydu YW1lJ10gPSBkZXZpY2VbJ25hbWUnXS5yc3RyaXAoKQorCisgICAgICAgIGRldmljZXNbdmVyc2lv bl1bZGV2aWNlWyd1ZGlkJ11dID0gZGV2aWNlCisKKyAgICByZXR1cm4gZGV2aWNlcworCisKK2Rl ZiBnZXRfZGV2aWNlX3R5cGVzKCk6CisgICAgIiIiCisgICAgOnJldHVybjogQSBkaWN0aW9uYXJ5 IG1hcHBpbmcgb2YgZGV2aWNlIG5hbWUgLT4gaWRlbnRpZmllcgorICAgIDpydHlwZTogZGljdAor ICAgICIiIgorICAgIGRldmljZV90eXBlcyA9IHt9CisgICAgZGV2aWNlX3R5cGVfcmUgPSByZS5j b21waWxlKCcoP1A8bmFtZT5bXihdKylcKCg/UDxpZGVudGlmaWVyPlteKV0rKVwpJykKKyAgICBz dGRvdXQgPSBzdWJwcm9jZXNzLmNoZWNrX291dHB1dChbJ3hjcnVuJywgJy1zZGsnLCAnaXBob25l c2ltdWxhdG9yJywgJ3NpbWN0bCcsICdsaXN0JywgJ2RldmljZXR5cGVzJ10pCisgICAgbGluZXMg PSBpdGVyKHN0ZG91dC5zcGxpdGxpbmVzKCkpCisgICAgaGVhZGVyID0gbmV4dChsaW5lcykKKyAg ICBpZiBoZWFkZXIgIT0gJz09IERldmljZSBUeXBlcyA9PSc6CisgICAgICAgIHJldHVybiBOb25l CisKKyAgICBmb3IgbGluZSBpbiBsaW5lczoKKyAgICAgICAgZGV2aWNlX3R5cGVfbWF0Y2ggPSBk ZXZpY2VfdHlwZV9yZS5tYXRjaChsaW5lKQorICAgICAgICBpZiBub3QgZGV2aWNlX3R5cGVfbWF0 Y2g6CisgICAgICAgICAgICBjb250aW51ZQorICAgICAgICBkZXZpY2VfdHlwZSA9IGRldmljZV90 eXBlX21hdGNoLmdyb3VwZGljdCgpCisgICAgICAgIGRldmljZV90eXBlWyduYW1lJ10gPSBkZXZp Y2VfdHlwZVsnbmFtZSddLnJzdHJpcCgpCisgICAgICAgIGRldmljZV90eXBlc1tkZXZpY2VfdHlw ZVsnbmFtZSddXSA9IGRldmljZV90eXBlWydpZGVudGlmaWVyJ10KKworICAgIHJldHVybiBkZXZp Y2VfdHlwZXMKKworCitkZWYgZ2V0X2xhdGVzdF9ydW50aW1lKCk6CisgICAgcnVudGltZXMgPSBn ZXRfcnVudGltZXMoKQorICAgIGlmIG5vdCBydW50aW1lczoKKyAgICAgICAgcmV0dXJuIE5vbmUK KyAgICBsYXRlc3RfdmVyc2lvbiA9IHNvcnRlZChydW50aW1lcy5rZXlzKCkpWzBdCisgICAgcmV0 dXJuIHJ1bnRpbWVzW2xhdGVzdF92ZXJzaW9uXQo=