141711 2015-02-17 09:50:38 -0800 run_webkit_tests.py should not know about iOS Simulator details 2015-02-17 14:13:23 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) iPhone / iPad iOS 8.1 RESOLVED FIXED P2 Normal --- 141715 141718 1 dbates dbates ap commit-queue ddkilzer glenn jake.nielsen.webkit oldest_to_newest 1069867 0 dbates 2015-02-17 09:50:38 -0800 run_webkit_tests.py should only parse the iOS Simulator command line options --runtime and --device-type. The IOSSimulatorPort object should be responsible for validating these parsed values and instantiating internal data structures to represent them. 1069869 1 246750 dbates 2015-02-17 09:56:37 -0800 Created attachment 246750 Patch 1069935 2 246750 dbates 2015-02-17 14:13:19 -0800 Comment on attachment 246750 Patch Clearing flags on attachment: 246750 Committed r180238: <http://trac.webkit.org/changeset/180238> 1069936 3 dbates 2015-02-17 14:13:23 -0800 All reviewed patches have been landed. Closing bug. 246750 2015-02-17 09:56:37 -0800 2015-02-17 14:13:19 -0800 Patch bug-141711-20150217095631.patch text/plain 9764 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMTQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2QzMmY5N2QyYWY0NTBmOThmYWUzZTlmZmEwZDkxYTEw MzdhZDY2Ni4uNzI0NjQ5OWRiMjg3Y2Q3MGNkMWVhYzgzNWRiN2EwYTI0NTFjYWE2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0 IEBACisyMDE1LTAyLTE3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBydW5fd2Via2l0X3Rlc3RzLnB5IHNob3VsZCBub3Qga25vdyBhYm91dCBpT1MgU2ltdWxh dG9yIGRldGFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0MTcxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJ1bl93ZWJraXRfdGVzdHMucHkgc2hvdWxkIG9ubHkgcGFyc2UgdGhlIGlPUy1zcGVjaWZp YyBjb21tYW5kCisgICAgICAgIGxpbmUgb3B0aW9ucyAtLXJ1bnRpbWUgYW5kIC0tZGV2aWNlLXR5 cGUuIExldCB0aGUgcG9ydC1zcGVjaWZpYworICAgICAgICBsb2dpYyBpbiBpb3MucHkgdmFsaWRh dGUgdGhlIHBhcnNlZCBvcHRpb25zIGFuZCBpbnN0YW50aWF0ZQorICAgICAgICBpbnRlcm5hbCBk YXRhIHN0cnVjdHVyZXMuCisKKyAgICAgICAgQ3VycmVudGx5IHJ1bl93ZWJraXRfdGVzdHMucHkg cGFyc2VzIHRoZSBpT1Mtc3BlY2lmaWMgY29tbWFuZAorICAgICAgICBsaW5lIG9wdGlvbnMgLS1y dW50aW1lIGFuZCAtLWRldmljZS10eXBlLCB2YWxpZGF0ZXMgdGhlbSwgYW5kCisgICAgICAgIGlu c3RhbnRpYXRlcyBpbnRlcm5hbCBkYXRhIHN0cnVjdHVyZXMgZnJvbSB0aGUgcGFyc2VkIHN0cmlu Z3MuCisgICAgICAgIEluc3RlYWQgdGhlIHZhbGlkYXRpb24gbG9naWMgYW5kIGluc3RhbnRpYXRp b24gb2YgaW50ZXJuYWwKKyAgICAgICAgZGF0YSBzdHJ1Y3R1cmVzIHNob3VsZCBiZSBoYW5kbGVk IGJ5IHRoZSBpT1MgcG9ydCBvYmplY3QuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAoX3NldF91cF9kZXJpdmVk X29wdGlvbnMpOiBSZW1vdmUgbG9naWMgdG8gdmFsaWRhdGUgLS1ydW50aW1lIGFuZCAtLWRldmlj ZS10eXBlCisgICAgICAgIGFuZCBpbnN0YW50aWF0ZSBpbnRlcm5hbCBkYXRhIHN0cnVjdHVyZXMg Zm9yIHRoZW0uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weToKKyAg ICAgICAgKElPU1NpbXVsYXRvckRyaXZlci5jbWRfbGluZSk6IE1vZGlmaWVkIHRvIHJlZmVyZW5j ZSBJT1NTaW11bGF0b3JQb3J0LnNpbXVsYXRvcl9ydW50aW1lCisgICAgICAgIGFuZCBJT1NTaW11 bGF0b3JQb3J0LnNpbXVsYXRvcl9kZXZpY2VfdHlwZSBmb3IgdGhlIGlPUyBTaW11bGF0b3IgcnVu dGltZSBhbmQgZGV2aWNlIHR5cGUsCisgICAgICAgIHJlc3BlY3RpdmVseS4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5OiBTb3J0IHRoZSBsaXN0IG9mIGltcG9ydHMuCisg ICAgICAgIChJT1NTaW11bGF0b3JQb3J0LnNpbXVsYXRvcl9ydW50aW1lKTogQWRkZWQuIEluc3Rh bnRpYXRlcyBhIFJ1bnRpbWUKKyAgICAgICAgb2JqZWN0IGZyb20gLS1ydW50aW1lLCBpZiBzcGVj aWZpZWQuIE90aGVyd2lzZSwgaW5zdGFudGlhdGVzIGEgUnVudGltZQorICAgICAgICBvYmplY3Qg Zm9yIHRoZSBsYXRlc3QgaW5zdGFsbGVkIGlwaG9uZXNpbXVsYXRvciBTREsgdmVyc2lvbi4KKyAg ICAgICAgKElPU1NpbXVsYXRvclBvcnQuc2ltdWxhdG9yX2RldmljZV90eXBlKTogQWRkZWQuIElu c3RhbnRpYXRlcyBhIERldmljZVR5cGUKKyAgICAgICAgb2JqZWN0IGZyb20gLS1kZXZpY2UtdHlw ZSwgaWYgc3BlY2lmaWVkLiBPdGhlcndpc2UsIGluc3RhbnRpYXRlcworICAgICAgICBhIERldmlj ZVR5cGUgb2JqZWN0IGZvciBhIGlQaG9uZSA1IG9yIGlQaG9uZSA1cyB3aGVuIG9uIGEgMzItYml0 IGFuZCA2NC1iaXQKKyAgICAgICAgbWFjaGluZSwgcmVzcGVjdGl2ZWx5LgorICAgICAgICAoSU9T U2ltdWxhdG9yUG9ydC5jaGVja19zeXNfZGVwcyk6IEFkZGVkLiBWYWxpZGF0ZSBpZiB0aGUgY2hv c2VuIGlPUyBzaW11bGF0b3IKKyAgICAgICAgcnVudGltZSBpcyBhdmFpbGFibGUgdG8gdXNlLgor ICAgICAgICAoSU9TU2ltdWxhdG9yUG9ydC50ZXN0aW5nX2RldmljZSk6IE1vZGlmaWVkIHRvIG1h a2UgdXNlIG9mIHByb3BlcnRpZXMgc2ltdWxhdG9yX2RldmljZV90eXBlCisgICAgICAgIGFuZCBz aW11bGF0b3JfcnVudGltZSBmb3IgdGhlIGlPUyBTaW11bGF0b3IgZGV2aWNlIHR5cGUgYW5kIHJ1 bnRpbWUsIHJlc3BlY3RpdmVseS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3Np bXVsYXRvci5weToKKyAgICAgICAgKFJ1bnRpbWUuZnJvbV92ZXJzaW9uX3N0cmluZyk6IEFkZGVk LiBUdXJucyBhcm91bmQgYW5kIGNhbGxzIFJ1bnRpbWUuZnJvbV9pZGVudGlmaWVyKCkKKyAgICAg ICAgd2l0aCBhIHJ1bnRpbWUgaWRlbnRpZmllciBmb3IgdGhlIHNwZWNpZmllZCBpT1MgdmVyc2lv bi4KKwogMjAxNS0wMi0xNiAgQW5kcnplaiBCYWRvd3NraSAgPGEuYmFkb3dza2lAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQWRkIG15c2VsZiBhcyBhIGNvbW1pdHRlci4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CmluZGV4IDVmNmJiYzg5N2JkZDA0MTBlMzIzN2M4YzI0MWM1NWZmMTljZjRmYzUu LjA5ODFmMGJjMzRkZjM2YTE5MTUwOTJkNTBjYjA3ZGNjM2Q1ZTQ3ODAgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQpAQCAtMzkyLDIxICszOTIsNiBAQCBkZWYgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwg b3B0aW9ucyk6CiAgICAgaWYgb3B0aW9ucy5wbGF0Zm9ybSA9PSAiZ3RrIiBvciBvcHRpb25zLnBs YXRmb3JtID09ICJlZmwiOgogICAgICAgICBvcHRpb25zLndlYmtpdF90ZXN0X3J1bm5lciA9IFRy dWUKIAotICAgIGlmIG9wdGlvbnMucGxhdGZvcm0gPT0gJ2lvcy1zaW11bGF0b3InOgotICAgICAg ICBmcm9tIHdlYmtpdHB5IGltcG9ydCB4Y29kZQotICAgICAgICBpZiBvcHRpb25zLnJ1bnRpbWUg aXMgTm9uZToKLSAgICAgICAgICAgIG9wdGlvbnMucnVudGltZSA9IHhjb2RlLnNpbXVsYXRvci5T aW11bGF0b3IoKS5sYXRlc3RfYXZhaWxhYmxlX3J1bnRpbWUKLSAgICAgICAgZWxzZToKLSAgICAg ICAgICAgIG9wdGlvbnMucnVudGltZSA9IHhjb2RlLnNpbXVsYXRvci5SdW50aW1lLmZyb21faWRl bnRpZmllcihvcHRpb25zLnJ1bnRpbWUpCi0gICAgICAgICAgICBpZiBub3Qgb3B0aW9ucy5ydW50 aW1lLmF2YWlsYWJsZToKLSAgICAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ1RoZSBpT1Mg U2ltdWxhdG9yIHJ1bnRpbWUgd2l0aCBpZGVudGlmaWVyICJ7aWRlbnRpZmllcn0iIGNhbm5vdCBi ZSB1c2VkIGJlY2F1c2UgaXQgaXMgdW5hdmFpbGFibGUuJy5mb3JtYXQoaWRlbnRpZmllcj1vcHRp b25zLnJ1bnRpbWUuaWRlbnRpZmllcikpCi0gICAgICAgIGlmIG9wdGlvbnMuZGV2aWNlX3R5cGUg aXMgTm9uZToKLSAgICAgICAgICAgIGlwaG9uZTUgPSB4Y29kZS5zaW11bGF0b3IuRGV2aWNlVHlw ZS5mcm9tX25hbWUoJ2lQaG9uZSA1JykKLSAgICAgICAgICAgIGlwaG9uZTVzID0geGNvZGUuc2lt dWxhdG9yLkRldmljZVR5cGUuZnJvbV9uYW1lKCdpUGhvbmUgNXMnKQotICAgICAgICAgICAgb3B0 aW9ucy5kZXZpY2VfdHlwZSA9IGlwaG9uZTUgaWYgb3B0aW9ucy5hcmNoaXRlY3R1cmUgPT0gJ3g4 NicgZWxzZSBpcGhvbmU1cwotICAgICAgICBlbHNlOgotICAgICAgICAgICAgb3B0aW9ucy5kZXZp Y2VfdHlwZSA9IHhjb2RlLnNpbXVsYXRvci5EZXZpY2VUeXBlLmZyb21faWRlbnRpZmllcihvcHRp b25zLmRldmljZV90eXBlKQotCiAKIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgbG9nZ2lu Z19zdHJlYW0pOgogICAgIGxvZ2dlciA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvZHJpdmVyLnB5CmluZGV4IDI4MmVhNWVlNzRmYjk3MTdkYjZjOGI2YmNkNDBj NTIzYTM3NzZkYmIuLmVlODZhODdiOTM4NzQ0YmU3NDc1YzZjYjg0MjIzYjI2Y2UxMjJhZjEgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQpAQCAtNTU2LDExICs1NTYsOSBAQCBj bGFzcyBJT1NTaW11bGF0b3JEcml2ZXIoRHJpdmVyKToKICAgICAgICAgZHVtcF90b29sID0gY21k WzBdCiAgICAgICAgIGR1bXBfdG9vbF9hcmdzID0gY21kWzE6XQogICAgICAgICBwcm9kdWN0X2Rp ciA9IHNlbGYuX3BvcnQuX2J1aWxkX3BhdGgoKQotICAgICAgICBydW50aW1lID0gc2VsZi5fcG9y dC5nZXRfb3B0aW9uKCdydW50aW1lJykKLSAgICAgICAgZGV2aWNlX3R5cGUgPSBzZWxmLl9wb3J0 LmdldF9vcHRpb24oJ2RldmljZV90eXBlJykKICAgICAgICAgcmVsYXlfYXJncyA9IFsKLSAgICAg ICAgICAgICctcnVudGltZScsIHJ1bnRpbWUuaWRlbnRpZmllciwKLSAgICAgICAgICAgICctZGV2 aWNlVHlwZScsIGRldmljZV90eXBlLmlkZW50aWZpZXIsCisgICAgICAgICAgICAnLXJ1bnRpbWUn LCBzZWxmLl9wb3J0LnNpbXVsYXRvcl9ydW50aW1lLmlkZW50aWZpZXIsCisgICAgICAgICAgICAn LWRldmljZVR5cGUnLCBzZWxmLl9wb3J0LnNpbXVsYXRvcl9kZXZpY2VfdHlwZS5pZGVudGlmaWVy LAogICAgICAgICAgICAgJy1zdWZmaXgnLCBzdHIoc2VsZi5fd29ya2VyX251bWJlciksCiAgICAg ICAgICAgICAnLXByb2R1Y3REaXInLCBwcm9kdWN0X2RpciwKICAgICAgICAgICAgICctYXBwJywg ZHVtcF90b29sLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkKaW5kZXggMjU5MjhlYjc3ZjBh ZDdmOGE5NmQ1Y2NlZmNmOTc2MDBjMzU1ZjRkYy4uYmMyNzdjM2I0OGE1ZjkwYTkyNWEyNzIyYjEw Mzg2ZDRiZDM3ZWExYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lv cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CkBAIC0yMCwyMyAr MjAsMjQgQEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0 IGl0ZXJ0b29scwogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwotaW1wb3J0IHNodXRpbAotaW1w b3J0IHRpbWUKIGltcG9ydCByZQotaW1wb3J0IGl0ZXJ0b29scworaW1wb3J0IHNodXRpbAogaW1w b3J0IHN1YnByb2Nlc3MKK2ltcG9ydCB0aW1lCiAKLWZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3Rz Lm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9uCitmcm9t IHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKIGZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5jcmFzaGxvZ3MgaW1wb3J0IENyYXNoTG9ncwogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKLWZyb20gd2Via2l0cHku cG9ydC5hcHBsZSBpbXBvcnQgQXBwbGVQb3J0Citmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5t b2RlbHMudGVzdF9jb25maWd1cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJhdGlvbgorZnJvbSB3 ZWJraXRweS5wb3J0IGltcG9ydCBjb25maWcgYXMgcG9ydF9jb25maWcKIGZyb20gd2Via2l0cHku cG9ydCBpbXBvcnQgZHJpdmVyLCBpbWFnZV9kaWZmCitmcm9tIHdlYmtpdHB5LnBvcnQuYXBwbGUg aW1wb3J0IEFwcGxlUG9ydAogZnJvbSB3ZWJraXRweS5wb3J0LmJhc2UgaW1wb3J0IFBvcnQKIGZy b20gd2Via2l0cHkucG9ydC5sZWFrZGV0ZWN0b3IgaW1wb3J0IExlYWtEZXRlY3RvcgotZnJvbSB3 ZWJraXRweS5wb3J0IGltcG9ydCBjb25maWcgYXMgcG9ydF9jb25maWcKLWZyb20gd2Via2l0cHku eGNvZGUuc2ltdWxhdG9yIGltcG9ydCBTaW11bGF0b3IKK2Zyb20gd2Via2l0cHkueGNvZGUuc2lt dWxhdG9yIGltcG9ydCBTaW11bGF0b3IsIFJ1bnRpbWUsIERldmljZVR5cGUKIAogCiBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCkBAIC0xMDIsNiArMTAzLDI5IEBAIGNsYXNzIElP U1NpbXVsYXRvclBvcnQoUG9ydCk6CiAgICAgICAgIHJldHVybiAnRHVtcFJlbmRlclRyZWUuYXBw JwogCiAgICAgQHByb3BlcnR5CisgICAgQG1lbW9pemVkCisgICAgZGVmIHNpbXVsYXRvcl9ydW50 aW1lKHNlbGYpOgorICAgICAgICBydW50aW1lX2lkZW50aWZpZXIgPSBzZWxmLmdldF9vcHRpb24o J3J1bnRpbWUnKQorICAgICAgICBpZiBydW50aW1lX2lkZW50aWZpZXI6CisgICAgICAgICAgICBy dW50aW1lID0gUnVudGltZS5mcm9tX2lkZW50aWZpZXIocnVudGltZV9pZGVudGlmaWVyKQorICAg ICAgICBlbHNlOgorICAgICAgICAgICAgcnVudGltZSA9IFJ1bnRpbWUuZnJvbV92ZXJzaW9uX3N0 cmluZyhzZWxmLmhvc3QucGxhdGZvcm0ueGNvZGVfc2RrX3ZlcnNpb24oJ2lwaG9uZXNpbXVsYXRv cicpKQorICAgICAgICByZXR1cm4gcnVudGltZQorCisgICAgQHByb3BlcnR5CisgICAgQG1lbW9p emVkCisgICAgZGVmIHNpbXVsYXRvcl9kZXZpY2VfdHlwZShzZWxmKToKKyAgICAgICAgZGV2aWNl X3R5cGVfaWRlbnRpZmllciA9IHNlbGYuZ2V0X29wdGlvbignZGV2aWNlX3R5cGUnKQorICAgICAg ICBpZiBkZXZpY2VfdHlwZV9pZGVudGlmaWVyOgorICAgICAgICAgICAgZGV2aWNlX3R5cGUgPSBE ZXZpY2VUeXBlLmZyb21faWRlbnRpZmllcihkZXZpY2VfdHlwZV9pZGVudGlmaWVyKQorICAgICAg ICBlbHNlOgorICAgICAgICAgICAgaWYgc2VsZi5hcmNoaXRlY3R1cmUoKSA9PSAneDg2XzY0JzoK KyAgICAgICAgICAgICAgICBkZXZpY2VfdHlwZSA9IERldmljZVR5cGUuZnJvbV9uYW1lKCdpUGhv bmUgNXMnKQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBkZXZpY2VfdHlwZSA9 IERldmljZVR5cGUuZnJvbV9uYW1lKCdpUGhvbmUgNScpCisgICAgICAgIHJldHVybiBkZXZpY2Vf dHlwZQorCisgICAgQHByb3BlcnR5CiAgICAgZGVmIHJlbGF5X3BhdGgoc2VsZik6CiAgICAgICAg IG1hY19jb25maWcgPSBwb3J0X2NvbmZpZy5Db25maWcoc2VsZi5fZXhlY3V0aXZlLCBzZWxmLl9m aWxlc3lzdGVtLCAnbWFjJykKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbiht YWNfY29uZmlnLmJ1aWxkX2RpcmVjdG9yeShzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24n KSksIHNlbGYucmVsYXlfbmFtZSkKQEAgLTIxMSw2ICsyMzUsMTIgQEAgY2xhc3MgSU9TU2ltdWxh dG9yUG9ydChQb3J0KToKICAgICBkZWYgb3BlcmF0aW5nX3N5c3RlbShzZWxmKToKICAgICAgICAg cmV0dXJuICdpb3Mtc2ltdWxhdG9yJwogCisgICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYsIG5l ZWRzX2h0dHApOgorICAgICAgICBpZiBub3Qgc2VsZi5zaW11bGF0b3JfcnVudGltZS5hdmFpbGFi bGU6CisgICAgICAgICAgICBfbG9nLmVycm9yKCdUaGUgaU9TIFNpbXVsYXRvciBydW50aW1lIHdp dGggaWRlbnRpZmllciAiezB9IiBjYW5ub3QgYmUgdXNlZCBiZWNhdXNlIGl0IGlzIHVuYXZhaWxh YmxlLicuZm9ybWF0KHNlbGYuc2ltdWxhdG9yX3J1bnRpbWUuaWRlbnRpZmllcikpCisgICAgICAg ICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgcmV0dXJuIHN1cGVyKElPU1NpbXVsYXRvclBvcnQs IHNlbGYpLmNoZWNrX3N5c19kZXBzKG5lZWRzX2h0dHApCisKICAgICBkZWYgY2hlY2tfZm9yX2xl YWtzKHNlbGYsIHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpOgogICAgICAgICBpZiBub3Qgc2Vs Zi5nZXRfb3B0aW9uKCdsZWFrcycpOgogICAgICAgICAgICAgcmV0dXJuCkBAIC0yODYsMTAgKzMx Niw3IEBAIGNsYXNzIElPU1NpbXVsYXRvclBvcnQoUG9ydCk6CiAgICAgZGVmIHRlc3RpbmdfZGV2 aWNlKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl90ZXN0aW5nX2RldmljZSBpcyBub3QgTm9uZToK ICAgICAgICAgICAgIHJldHVybiBzZWxmLl90ZXN0aW5nX2RldmljZQotCi0gICAgICAgIGRldmlj ZV90eXBlID0gc2VsZi5nZXRfb3B0aW9uKCdkZXZpY2VfdHlwZScpCi0gICAgICAgIHJ1bnRpbWUg PSBzZWxmLmdldF9vcHRpb24oJ3J1bnRpbWUnKQotICAgICAgICBzZWxmLl90ZXN0aW5nX2Rldmlj ZSA9IFNpbXVsYXRvcigpLmxvb2t1cF9vcl9jcmVhdGVfZGV2aWNlKGRldmljZV90eXBlLm5hbWUg KyAnIFdlYktpdCBUZXN0ZXInLCBkZXZpY2VfdHlwZSwgcnVudGltZSkKKyAgICAgICAgc2VsZi5f dGVzdGluZ19kZXZpY2UgPSBTaW11bGF0b3IoKS5sb29rdXBfb3JfY3JlYXRlX2RldmljZShzZWxm LnNpbXVsYXRvcl9kZXZpY2VfdHlwZS5uYW1lICsgJyBXZWJLaXQgVGVzdGVyJywgc2VsZi5zaW11 bGF0b3JfZGV2aWNlX3R5cGUsIHNlbGYuc2ltdWxhdG9yX3J1bnRpbWUpCiAgICAgICAgIHJldHVy biBzZWxmLnRlc3RpbmdfZGV2aWNlCiAKICAgICBkZWYgbG9va19mb3JfbmV3X2NyYXNoX2xvZ3Mo c2VsZiwgY3Jhc2hlZF9wcm9jZXNzZXMsIHN0YXJ0X3RpbWUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3hjb2RlL3NpbXVsYXRvci5weQppbmRleCBkNGM5YTA3OTBiYzNiZDMxNjUzYjA1ZjIwOWU5 OGExNjBkZDAwYzllLi43OTdkNGJhMjc5MWIyYzAwZjkxZTEyYzY1ZGQ3MzlmMTY5NmVlMTBiIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQpAQCAtMTI3LDYgKzEy NywxMCBAQCBjbGFzcyBSdW50aW1lKG9iamVjdCk6CiAgICAgICAgIHNlbGYuaXNfaW50ZXJuYWxf cnVudGltZSA9IGlzX2ludGVybmFsX3J1bnRpbWUKIAogICAgIEBjbGFzc21ldGhvZAorICAgIGRl ZiBmcm9tX3ZlcnNpb25fc3RyaW5nKGNscywgdmVyc2lvbik6CisgICAgICAgIHJldHVybiBjbHMu ZnJvbV9pZGVudGlmaWVyKCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy0n ICsgdmVyc2lvbi5yZXBsYWNlKCcuJywgJy0nKSkKKworICAgIEBjbGFzc21ldGhvZAogICAgIGRl ZiBmcm9tX2lkZW50aWZpZXIoY2xzLCBpZGVudGlmaWVyKToKICAgICAgICAgIiIiCiAgICAgICAg IDpwYXJhbSBpZGVudGlmaWVyOiBUaGUgaWRlbnRpZmllciBmb3IgdGhlIGRlc2lyZWQgQ29yZVNp bXVsYXRvciBydW50aW1lLgo=