151076 2015-11-09 21:16:39 -0800 run-api-tests fails to run with public iOS SDK 2015-11-12 11:19:42 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build iPhone / iPad iOS 9.0 RESOLVED FIXED P2 Normal --- 151207 1 dbates dbates ap dburkart dean_johnson jmarcell lforschler oldest_to_newest 1140678 0 265141 dbates 2015-11-09 21:16:39 -0800 Created attachment 265141 run-api-tests stdio When I looked at the Apple iOS 9 Simulator Release WK2 (Tests) bot tonight, I noticed that the step run-api-test is green, but has the following error in its stdio output: [[ perl ./Tools/Scripts/run-api-tests --no-build --release --verbose --ios-simulator [....] xcrun: error: unable to find utility "sim", not a developer tool or in PATH Failed to build list of tests!-- ]] <https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20WK2%20%28Tests%29/builds/1013/steps/run-api-tests/logs/stdio> The same error can also be seen on the Apple iOS 9 Simulator Release WK1 (Tests) bot: <https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20WK1%20%28Tests%29/builds/1054/steps/run-api-tests/logs/stdio>. 1141486 1 265396 dbates 2015-11-12 08:34:54 -0800 Created attachment 265396 Patch 1141523 2 265396 ap 2015-11-12 10:17:04 -0800 Comment on attachment 265396 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265396&action=review > Tools/ChangeLog:8 > + Use the command line tool simctl as the sim tool was remove from the public iOS 9 SDK. Typo: should be "was removed" > Tools/Scripts/run-api-tests:358 > + if (willUseIOSSimulatorSDKWhenBuilding()) { It is a little strange that we consult a "when building" function when running the tests. > Tools/Scripts/webkitdirs.pm:2219 > +sub shutdownSimulatorDevice($) As a verb, this should be shutDownSimulatorDevice. Also, probably shutDownIOSSimulatorDevice, as webkitdirs is cross-platform. 1141531 3 dbates 2015-11-12 10:33:21 -0800 (In reply to comment #2) > Comment on attachment 265396 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=265396&action=review > > > Tools/ChangeLog:8 > > + Use the command line tool simctl as the sim tool was remove from the public iOS 9 SDK. > > Typo: should be "was removed" > Will fix before landing. > > Tools/Scripts/run-api-tests:358 > > + if (willUseIOSSimulatorSDKWhenBuilding()) { > > It is a little strange that we consult a "when building" function when > running the tests. > We should come up with better names for functions willUseIOS{Device, Simulator}SDKWhenBuilding as they are not specific to scripts that build a product. Maybe willUseIOS{Device, Simulator}SDK? > > Tools/Scripts/webkitdirs.pm:2219 > > +sub shutdownSimulatorDevice($) > > As a verb, this should be shutDownSimulatorDevice. Also, probably > shutDownIOSSimulatorDevice, as webkitdirs is cross-platform. Will rename functions {restart, shutdown}SimulatorDevice to {restart, shutDown}IOSSimulatorDevice, respectively, before landing. 1141534 4 ap 2015-11-12 10:38:02 -0800 > Maybe willUseIOS{Device, Simulator}SDK? This one looks better to me indeed. 1141555 5 dbates 2015-11-12 11:16:40 -0800 (In reply to comment #4) > > Maybe willUseIOS{Device, Simulator}SDK? > > This one looks better to me indeed. Filed bug #151207 to rename the functions webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding(). 1141558 6 dbates 2015-11-12 11:19:42 -0800 Committed r192370: <http://trac.webkit.org/changeset/192370> 265141 2015-11-09 21:16:39 -0800 2015-11-09 21:16:39 -0800 run-api-tests stdio run-api-tests_110915.html text/html 1605 dbates PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgVHJhbnNpdGlvbmFs Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS10cmFuc2l0 aW9uYWwuZHRkIj4KICA8aHRtbD4KICA8aGVhZD48dGl0bGU+TG9nIEZpbGUgY29udGVudHM8L3Rp dGxlPgogIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4v ZGVmYXVsdC5jc3MiIHR5cGU9InRleHQvY3NzIiAvPgogIDwvaGVhZD4KICA8Ym9keSBjbGFzcz0n bG9nJz4KICAgIDxhIGhyZWY9InN0ZGlvL3RleHQiPih2aWV3IGFzIHRleHQpPC9hPjxici8+CiAg ICA8cHJlPjxzcGFuIGNsYXNzPSJoZWFkZXIiPnBlcmwgLi9Ub29scy9TY3JpcHRzL3J1bi1hcGkt dGVzdHMgLS1uby1idWlsZCAtLXJlbGVhc2UgLS12ZXJib3NlIC0taW9zLXNpbXVsYXRvcgogaW4g ZGlyIC9Wb2x1bWVzL0RhdGEvc2xhdmUvaW9zLXNpbXVsYXRvci05LXJlbGVhc2UtdGVzdHMtd2sy L2J1aWxkICh0aW1lb3V0IDEyMDAgc2VjcykKIHdhdGNoaW5nIGxvZ2ZpbGVzIHt9CiBhcmd2OiBb JiMzOTtwZXJsJiMzOTssICYjMzk7Li9Ub29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMmIzM5Oywg JiMzOTstLW5vLWJ1aWxkJiMzOTssICYjMzk7LS1yZWxlYXNlJiMzOTssICYjMzk7LS12ZXJib3Nl JiMzOTssICYjMzk7LS1pb3Mtc2ltdWxhdG9yJiMzOTtdCiBlbnZpcm9ubWVudDoKICBBcHBsZV9Q dWJTdWJfU29ja2V0X1JlbmRlcj0vcHJpdmF0ZS90bXAvY29tLmFwcGxlLmxhdW5jaGQuUW8ya3Q3 bVhxWC9SZW5kZXIKICBIT01FPS9Vc2Vycy9idWlsZGJvdAogIExPR05BTUU9YnVpbGRib3QKICBP TERQV0Q9L1VzZXJzL2J1aWxkYm90CiAgUEFUSD0vdXNyL2xvY2FsL2JpbjovdXNyL2JpbjovYmlu Oi91c3Ivc2Jpbjovc2JpbgogIFBXRD0vVm9sdW1lcy9EYXRhL3NsYXZlL2lvcy1zaW11bGF0b3It OS1yZWxlYXNlLXRlc3RzLXdrMi9idWlsZAogIFNIRUxMPS9iaW4vYmFzaAogIFNITFZMPTEKICBT U0hfQVVUSF9TT0NLPS9wcml2YXRlL3RtcC9jb20uYXBwbGUubGF1bmNoZC5DTTJDa1VkZW1ZL0xp c3RlbmVycwogIFRNUERJUj0vdmFyL2ZvbGRlcnMvazEvMXR0ZDhwZzE2MWI4Ym5ic3RrX3RqbXo0 MDAwMGduL1QvCiAgVVNFUj1idWlsZGJvdAogIFZFUlNJT05FUl9QWVRIT05fUFJFRkVSXzMyX0JJ VD1ubwogIFZFUlNJT05FUl9QWVRIT05fVkVSU0lPTj0yLjcKICBYUENfRkxBR1M9MHgwCiAgWFBD X1NFUlZJQ0VfTkFNRT0wCiAgXz0vdXNyL2Jpbi90d2lzdGQKICBfX0NGX1VTRVJfVEVYVF9FTkNP RElORz0weDFGNToweDA6MHgwCiB1c2luZyBQVFk6IEZhbHNlCjwvc3Bhbj48c3BhbiBjbGFzcz0i c3RkZXJyIj54Y3J1bjogZXJyb3I6IHVuYWJsZSB0byBmaW5kIHV0aWxpdHkgJiMzNDtzaW0mIzM0 Oywgbm90IGEgZGV2ZWxvcGVyIHRvb2wgb3IgaW4gUEFUSApGYWlsZWQgdG8gYnVpbGQgbGlzdCBv ZiB0ZXN0cyEtLQo8L3NwYW4+PHNwYW4gY2xhc3M9ImhlYWRlciI+cHJvZ3JhbSBmaW5pc2hlZCB3 aXRoIGV4aXQgY29kZSAwCmVsYXBzZWRUaW1lPTIuMDg0NzA4Cjwvc3Bhbj48L3ByZT4KPC9ib2R5 Pgo8L2h0bWw+ 265396 2015-11-12 08:34:54 -0800 2015-11-12 10:17:04 -0800 Patch bug-151076-20151112083448.patch text/plain 7209 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMzYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDcxZDBmOWI5MDdjMWQ3NmYxOTA4YzFkYWZjZWE2NGJh NzI1YWU3Mi4uM2I2YjVkYWViMWMyNDUyYTU3NGE2OTYzNTNmMTU2ZGExN2M4NzY2ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMy IEBACiAyMDE1LTExLTEyICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAg ICAgICBydW4tYXBpLXRlc3RzIGZhaWxzIHRvIHJ1biB3aXRoIHB1YmxpYyBpT1MgU0RLCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEwNzYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIGNvbW1h bmQgbGluZSB0b29sIHNpbWN0bCBhcyB0aGUgc2ltIHRvb2wgd2FzIHJlbW92ZSBmcm9tIHRoZSBw dWJsaWMgaU9TIDkgU0RLLgorCisgICAgICAgIEEgc2lkZSBiZW5lZml0IG9mIHRoaXMgY2hhbmdl IGl0IGlzIHN1ZmZpY2llbnQgdG8gcnVuIHRoZSB0ZXN0cyB3aXRob3V0IGxhdW5jaGluZyBTaW11 bGF0b3IuYXBwCisgICAgICAgIHRvIGJvb3QgdGhlIHNpbXVsYXRvciBkZXZpY2UgYmVmb3JlaGFu ZCBiZWNhdXNlIHNpbWN0bCB3aWxsIGJvb3QgdGhlIGRldmljZSBmb3IgdXMuCisKKyAgICAgICAg QWRkaXRpb25hbGx5LCB1c2UgUGVybCBwcmFnbWEgc2lndHJhcCB0byBpbnN0YWxsIHNpZ25hbCBo YW5kbGVycyB0byBjYXRjaCBTSUd7SFVQLCBJTlQsIFBJUEUsIFRFUk19CisgICAgICAgIHNpZ25h bHMgYW5kIHVsdGltYXRlbHkgcnVuIG91ciBFTkQgYmxvY2sgc28gdGhhdCB3ZSBzaHV0ZG93biB0 aGUgc2ltdWxhdG9yIGRldmljZSAoaWYgYXBwbGljYWJsZSkuCisgICAgICAgIFRoaXMgbWFrZXMg Q29udHJvbC1DIHRlcm1pbmF0ZSB0aGUgYXBwIGdyYWNlZnVsbHkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3J1bi1hcGktdGVzdHM6CisgICAgICAgIChydW5UZXN0KToKKyAgICAgICAgKGxpc3RBbGxU ZXN0cyk6CisgICAgICAgIChwcmVwYXJlRW52aXJvbm1lbnRGb3JSdW5uaW5nVGVzdFRvb2wpOiBX aGVuIHJ1bm5pbmcgZm9yIGlPUyBTaW11bGF0b3IgdXNlIHNldHVwSU9TV2ViS2l0RW52aXJvbm1l bnQoKQorICAgICAgICB0byBzZXR1cCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGVzIGZvciBpT1Mg aW5zdGVhZCBvZiB1c2luZyBzZXR1cE1hY1dlYktpdEVudmlyb25tZW50KCkuIFdlIGFsc28KKyAg ICAgICAgcHJlZml4IHRoZSBuYW1lIG9mIHRoZXNlIGVudmlyb25tZW50IHZhcmlhYmxlcyB3aXRo ICJTSU1DVExfQ0hJTERfIiBzbyB0aGF0IHNpbWN0bCBzZXRzIHRoZXNlIGVudmlyb25tZW50Cisg ICAgICAgIHZhcmlhYmxlcyBpbiB0aGUgc2ltdWxhdG9yIGVudmlyb25tZW50LgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKHNodXRkb3duU2ltdWxhdG9yRGV2aWNl KTogQWRkZWQuCisgICAgICAgIChyZXN0YXJ0U2ltdWxhdG9yRGV2aWNlKTogQWRkZWQuCisKKzIw MTUtMTEtMTIgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIFN1 cHBvcnQgYnVpbGRpbmcgY29uZmlndXJhdGlvbiBQcm9kdWN0aW9uIG9mIER1bXBSZW5kZXJUcmVl IGFuZCBXZWJLaXRUZXN0UnVubmVyIGZvciBpT1MKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTE5MQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3J1bi1hcGktdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMKaW5kZXggNGVhOGY3 MzczOTQ1ZWVlMzc5NjhmMjhkYjQ5MThjYTBlMGRjOGU5Yy4uYWJiYjk0MDFiNDM0ZTA0ODllOWFj YzY3NjI1N2JiMDNiMzg3MjMyOSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRl c3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cwpAQCAtMSw2ICsxLDYgQEAKICMh L3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAxMC0yMDEyLCAyMDE0IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDEwLTIwMTIsIDIw MTQtMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog IyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKQEAgLTMxLDYgKzMxLDcgQEAgdXNlIEZpbmRCaW47CiB1c2UgR2V0b3B0OjpM b25nIHF3KDpjb25maWcgcGFzc190aHJvdWdoKTsKIHVzZSBJUEM6Ok9wZW4zOwogdXNlIGxpYiAk RmluZEJpbjo6QmluOwordXNlIHNpZ3RyYXAgcXcoZGllIG5vcm1hbC1zaWduYWxzKTsKIHVzZSB3 ZWJraXRkaXJzOwogdXNlIFZDU1V0aWxzOwogCkBAIC0xMDgsOCArMTA5LDExIEBAIHNldENvbmZp Z3VyYXRpb25Qcm9kdWN0RGlyKEN3ZDo6YWJzX3BhdGgoJHJvb3QpKSBpZiAoZGVmaW5lZCgkcm9v dCkpOwogYnVpbGRUZXN0VG9vbCgpIGlmICRidWlsZCAmJiAhZGVmaW5lZCgkcm9vdCk7CiBzZXRQ YXRoRm9yUnVubmluZ1dlYktpdEFwcChcJUVOVik7CiAKLSMgRklYTUU6IFdlIGxhdW5jaCAoYW5k IHF1aXQpIGlPUyBTaW11bGF0b3IgYXMgYSB3b3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2JsZW0v MjIzODg4MTI+LgotcmVsYXVuY2hJT1NTaW11bGF0b3IoZmluZE9yQ3JlYXRlU2ltdWxhdG9yRm9y SU9TRGV2aWNlKFNJTVVMQVRPUl9ERVZJQ0VfU1VGRklYX0ZPUl9XRUJLSVRfREVWRUxPUE1FTlQp KSBpZiB3aWxsVXNlSU9TU2ltdWxhdG9yU0RLV2hlbkJ1aWxkaW5nKCk7CitteSAkc2ltdWxhdG9y RGV2aWNlOworaWYgKHdpbGxVc2VJT1NTaW11bGF0b3JTREtXaGVuQnVpbGRpbmcoKSkgeworICAg ICRzaW11bGF0b3JEZXZpY2UgPSBmaW5kT3JDcmVhdGVTaW11bGF0b3JGb3JJT1NEZXZpY2UoU0lN VUxBVE9SX0RFVklDRV9TVUZGSVhfRk9SX1dFQktJVF9ERVZFTE9QTUVOVCk7CisgICAgcmVzdGFy dFNpbXVsYXRvckRldmljZSgkc2ltdWxhdG9yRGV2aWNlKTsKK30KIG15IEB0ZXN0c1RvUnVuID0g bGlzdEFsbFRlc3RzKCk7CiAKIEB0ZXN0c1RvUnVuID0gZ3JlcCB7IG15ICR0ZXN0ID0gJF87IGdy ZXAgeyAkdGVzdCA9fiBtL15cUSRfXEUvIH0gQEFSR1Y7IH0gQHRlc3RzVG9SdW4gaWYgQEFSR1Y7 CkBAIC0xMTksOCArMTIzLDcgQEAgaWYgKCRkdW1wVGVzdHMpIHsKICAgICBleGl0IDA7CiB9CiAK LSMgRklYTUU6IFdlIGxhdW5jaCAoYW5kIHF1aXQpIGlPUyBTaW11bGF0b3IgYXMgYSB3b3JrYXJv dW5kIGZvciA8cmRhcjovL3Byb2JsZW0vMjIzODg4MTI+LgotRU5EIHsgcXVpdElPU1NpbXVsYXRv cigpIGlmIHdpbGxVc2VJT1NTaW11bGF0b3JTREtXaGVuQnVpbGRpbmcoKTsgfQorRU5EIHsgc2h1 dGRvd25TaW11bGF0b3JEZXZpY2UoJHNpbXVsYXRvckRldmljZSkgaWYgJHNpbXVsYXRvckRldmlj ZTsgfQogCiBleGl0IHJ1blRlc3RzQnlTdWl0ZShAdGVzdHNUb1J1bik7CiAKQEAgLTE5Nyw4ICsy MDAsOCBAQCBzdWIgcnVuVGVzdCgkJCkKICAgICBmb3JlYWNoKHRlc3RUb29sUGF0aHMoKSkgewog ICAgICAgICBteSAkcGlkOwogICAgICAgICBteSBAY29tbW9uQXJndW1lbnRzID0gKCRfLCAkZ3Rl c3RBcmcsIEBBUkdWKTsKLSAgICAgICAgaWYgKGlzSU9TV2ViS2l0KCkpIHsKLSAgICAgICAgICAg ICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAkY2hpbGRFcnIsIHF3KHhjcnVuIC1z ZGsgaXBob25lc2ltdWxhdG9yIHNpbSAtLWVudmlyb25tZW50PW1lcmdlKSwgQGNvbW1vbkFyZ3Vt ZW50cykgb3IgZGllICJGYWlsZWQgdG8gcnVuIHRlc3Q6ICR0ZXN0LiI7CisgICAgICAgIGlmICh3 aWxsVXNlSU9TU2ltdWxhdG9yU0RLV2hlbkJ1aWxkaW5nKCkpIHsKKyAgICAgICAgICAgICRwaWQg PSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAkY2hpbGRFcnIsIHF3KHhjcnVuIC0tc2RrIGlw aG9uZXNpbXVsYXRvciBzaW1jdGwgc3Bhd24pLCAkc2ltdWxhdG9yRGV2aWNlLT57VURJRH0sIEBj b21tb25Bcmd1bWVudHMpIG9yIGRpZSAiRmFpbGVkIHRvIHJ1biB0ZXN0OiAkdGVzdC4iOwogICAg ICAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0KCkgJiYgYXJjaGl0ZWN0dXJlKCkpIHsKICAg ICAgICAgICAgICRwaWQgPSBvcGVuMygkY2hpbGRJbiwgJGNoaWxkT3V0LCAkY2hpbGRFcnIsICJh cmNoIiwgIi0iIC4gYXJjaGl0ZWN0dXJlKCksIGFyY2hDb21tYW5kTGluZUFyZ3VtZW50c0ZvclJl c3RyaWN0ZWRFbnZpcm9ubWVudFZhcmlhYmxlcygpLCBAY29tbW9uQXJndW1lbnRzKSBvciBkaWUg IkZhaWxlZCB0byBydW4gdGVzdDogJHRlc3QuIjsKICAgICAgICAgfSBlbHNlIHsKQEAgLTI3MCw3 ICsyNzMsNyBAQCBzdWIgbGlzdEFsbFRlc3RzKCkKICAgICAgICAgbXkgJHBpZDsKICAgICAgICAg bXkgQGNvbW1vbkFyZ3VtZW50cyA9ICgkXywgIi0tZ3Rlc3RfbGlzdF90ZXN0cyIpOwogICAgICAg ICBpZiAoaXNJT1NXZWJLaXQoKSkgewotICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRjaGlsZElu LCAkY2hpbGRPdXQsICRjaGlsZEVyciwgcXcoeGNydW4gLXNkayBpcGhvbmVzaW11bGF0b3Igc2lt IC0tZW52aXJvbm1lbnQ9bWVyZ2UpLCBAY29tbW9uQXJndW1lbnRzKSBvciBkaWUgIkZhaWxlZCB0 byBidWlsZCBsaXN0IG9mIHRlc3RzISI7CisgICAgICAgICAgICAkcGlkID0gb3BlbjMoJGNoaWxk SW4sICRjaGlsZE91dCwgJGNoaWxkRXJyLCBxdyh4Y3J1biAtLXNkayBpcGhvbmVzaW11bGF0b3Ig c2ltY3RsIHNwYXduKSwgJHNpbXVsYXRvckRldmljZS0+e1VESUR9LCBAY29tbW9uQXJndW1lbnRz KSBvciBkaWUgIkZhaWxlZCB0byBidWlsZCBsaXN0IG9mIHRlc3RzISI7CiAgICAgICAgIH0gZWxz aWYgKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiBhcmNoaXRlY3R1cmUoKSkgewogICAgICAgICAgICAg JHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hpbGRPdXQsICRjaGlsZEVyciwgImFyY2giLCAiLSIg LiBhcmNoaXRlY3R1cmUoKSwgYXJjaENvbW1hbmRMaW5lQXJndW1lbnRzRm9yUmVzdHJpY3RlZEVu dmlyb25tZW50VmFyaWFibGVzKCksIEBjb21tb25Bcmd1bWVudHMpIG9yIGRpZSAiRmFpbGVkIHRv IGJ1aWxkIGxpc3Qgb2YgdGVzdHMhIjsKICAgICAgICAgfSBlbHNlIHsKQEAgLTM1Miw2ICszNTUs MTkgQEAgc3ViIHByZXBhcmVFbnZpcm9ubWVudEZvclJ1bm5pbmdUZXN0VG9vbCgpCiB7CiAgICAg cmV0dXJuIHVubGVzcyBpc0FwcGxlTWFjV2ViS2l0KCk7CiAKKyAgICBpZiAod2lsbFVzZUlPU1Np bXVsYXRvclNES1doZW5CdWlsZGluZygpKSB7CisgICAgICAgIG15ICVzaW11bGF0b3JFTlY7Cisg ICAgICAgIHsKKyAgICAgICAgICAgIGxvY2FsICVFTlY7CisgICAgICAgICAgICBzZXR1cElPU1dl YktpdEVudmlyb25tZW50KHByb2R1Y3REaXIoKSk7CisgICAgICAgICAgICAlc2ltdWxhdG9yRU5W ID0gJUVOVjsKKyAgICAgICAgfQorICAgICAgICAjIFByZWZpeCB0aGUgZW52aXJvbm1lbnQgdmFy aWFibGVzIHdpdGggU0lNQ1RMX0NISUxEXyBwZXIgYHhjcnVuIHNpbWN0bCBoZWxwIGxhdW5jaGAu CisgICAgICAgIGZvcmVhY2ggbXkgJGtleSAoa2V5cyAlc2ltdWxhdG9yRU5WKSB7CisgICAgICAg ICAgICAkRU5WeyJTSU1DVExfQ0hJTERfJGtleSJ9ID0gJHNpbXVsYXRvckVOVnska2V5fTsKKyAg ICAgICAgfQorICAgICAgICByZXR1cm47CisgICAgfQogICAgIHNldHVwTWFjV2ViS2l0RW52aXJv bm1lbnQocHJvZHVjdERpcigpKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGI2MWRlOGNjNzVh ZTE0ZWI5MTljMzFiZTgxYmQyNDIxM2YxOTVmYjUuLjZlOTg2MGM0YzExMGZhNzUxNmI3ZWIxODY3 ZGRjYjcyMzMwM2JlNDggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTc0LDYgKzc0LDcgQEAgQkVHSU4g ewogICAgICAgICZwcm9kdWN0RGlyCiAgICAgICAgJnF1aXRJT1NTaW11bGF0b3IKICAgICAgICAm cmVsYXVuY2hJT1NTaW11bGF0b3IKKyAgICAgICAmcmVzdGFydFNpbXVsYXRvckRldmljZQogICAg ICAgICZydW5JT1NXZWJLaXRBcHAKICAgICAgICAmcnVuTWFjV2ViS2l0QXBwCiAgICAgICAgJnNh ZmFyaVBhdGgKQEAgLTgyLDYgKzgzLDcgQEAgQkVHSU4gewogICAgICAgICZzZXR1cE1hY1dlYktp dEVudmlyb25tZW50CiAgICAgICAgJnNoYXJlZENvbW1hbmRMaW5lT3B0aW9ucwogICAgICAgICZz aGFyZWRDb21tYW5kTGluZU9wdGlvbnNVc2FnZQorICAgICAgICZzaHV0ZG93blNpbXVsYXRvckRl dmljZQogICAgICAgIFNJTVVMQVRPUl9ERVZJQ0VfU1VGRklYX0ZPUl9XRUJLSVRfREVWRUxPUE1F TlQKICAgICAgICBVU0VfT1BFTl9DT01NQU5ECiAgICApOwpAQCAtMjIxNCw2ICsyMjE2LDIwIEBA IHN1YiB3YWl0VW50aWxJT1NTaW11bGF0b3JEZXZpY2VJc0luU3RhdGUoJCQpCiAgICAgfQogfQog CitzdWIgc2h1dGRvd25TaW11bGF0b3JEZXZpY2UoJCkKK3sKKyAgICBteSAoJHNpbXVsYXRvckRl dmljZSkgPSBAXzsKKyAgICBzeXN0ZW0oInhjcnVuIC0tc2RrIGlwaG9uZXNpbXVsYXRvciBzaW1j dGwgc2h1dGRvd24gJHNpbXVsYXRvckRldmljZS0+e1VESUR9ID4gL2Rldi9udWxsIDI+JjEiKTsK K30KKworc3ViIHJlc3RhcnRTaW11bGF0b3JEZXZpY2UoJCkKK3sKKyAgICBteSAoJHNpbXVsYXRv ckRldmljZSkgPSBAXzsKKyAgICBzaHV0ZG93blNpbXVsYXRvckRldmljZSgkc2ltdWxhdG9yRGV2 aWNlKTsKKworICAgIGV4aXRTdGF0dXMoc3lzdGVtKCJ4Y3J1biIsICItLXNkayIsICJpcGhvbmVz aW11bGF0b3IiLCAic2ltY3RsIiwgImJvb3QiLCAkc2ltdWxhdG9yRGV2aWNlLT57VURJRH0pKSA9 PSAwIG9yIGRpZSAiRmFpbGVkIHRvIGJvb3Qgc2ltdWxhdG9yIGRldmljZSAkc2ltdWxhdG9yRGV2 aWNlLT57VURJRH0iOworfQorCiBzdWIgcmVsYXVuY2hJT1NTaW11bGF0b3IoJCkKIHsKICAgICBt eSAoJHNpbXVsYXRlZERldmljZSkgPSBAXzsK