171679 2017-05-04 11:39:12 -0700 buildbot: Cleanup simulators after running tests 2017-05-08 13:07:34 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap commit-queue dbates lforschler webkit-bug-importer oldest_to_newest 1304725 0 jbedard 2017-05-04 11:39:12 -0700 In some cases, our simulator tear-down code fails to run. Buildbot should explicitly search for simulators created by our WebKit scripts and clean them up after running layout tests on iOS simulators. 1304726 1 webkit-bug-importer 2017-05-04 11:39:52 -0700 <rdar://problem/31994361> 1304728 2 309071 jbedard 2017-05-04 11:44:15 -0700 Created attachment 309071 Patch 1304848 3 309071 aakash_jain 2017-05-04 14:47:05 -0700 Comment on attachment 309071 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309071&action=review > Tools/BuildSlaveSupport/cleanup-simulators:34 > + Nit: don't we need two empty lines here? how does style check pass this. > Tools/BuildSlaveSupport/cleanup-simulators:42 > + subprocess.call(['killall', '-9', '-m', 'Simulator']) I feel that since this script shares code with webkitpy and currently webkitpy has all the simulator code, it might be better to have this script in webkitpy and try to re-use the existing code. > Tools/BuildSlaveSupport/cleanup-simulators:50 > + simctllist = run_command(['xcrun', 'simctl', 'list']).splitlines() Nit: can consider renaming simctllist to simctl_list to make it more readable. > Tools/BuildSlaveSupport/cleanup-simulators:69 > + if device_state(udid) != 1: might be better to use something like Simulator.DeviceState.SHUTDOWN to clearly indicate what does 1 indicate. 1304874 4 309110 jbedard 2017-05-04 15:55:15 -0700 Created attachment 309110 Patch 1304876 5 jbedard 2017-05-04 15:56:34 -0700 Sending the 'shutdown' command to a booted simulator will actually shut all booted simulators down. This seems like the simplest approach. 1304880 6 aakash_jain 2017-05-04 15:59:26 -0700 looks good to me, assuming it pass your local testing and EWS. 1304928 7 309110 dbates 2017-05-04 18:11:30 -0700 Comment on attachment 309110 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309110&action=review > Tools/BuildSlaveSupport/kill-old-processes:116 > + os.system("xcrun simctl shutdown booted") Does this shutdown all booted simulators? 1304929 8 dbates 2017-05-04 18:12:17 -0700 (In reply to Daniel Bates from comment #7) > Comment on attachment 309110 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=309110&action=review > > > Tools/BuildSlaveSupport/kill-old-processes:116 > > + os.system("xcrun simctl shutdown booted") > > Does this shutdown all booted simulators? Never mind you answered this in comment #5. 1305016 9 309110 ap 2017-05-04 22:45:09 -0700 Comment on attachment 309110 Patch What will happen if iOS SDK isn't installed? I think that there won't be a simctl to run. 1305106 10 jbedard 2017-05-05 08:05:00 -0700 (In reply to Alexey Proskuryakov from comment #9) > Comment on attachment 309110 [details] > Patch > > What will happen if iOS SDK isn't installed? I think that there won't be a > simctl to run. Actually, simctl is still there, just without any iOS SDKs or simulators. I tested this on some of our Mac bots. This command will succeed, but do nothing on them. 1305115 11 309110 commit-queue 2017-05-05 08:33:21 -0700 Comment on attachment 309110 Patch Clearing flags on attachment: 309110 Committed r216244: <http://trac.webkit.org/changeset/216244> 1305116 12 commit-queue 2017-05-05 08:33:22 -0700 All reviewed patches have been landed. Closing bug. 1305939 13 jbedard 2017-05-08 10:44:51 -0700 We need to re-open this bug since builedbot runs kill-old-processes as sudo. Simctl separates simulators for each user, so the original patch did not work as intended. 1305942 14 309379 jbedard 2017-05-08 10:51:12 -0700 Created attachment 309379 Patch 1305992 15 309379 aakash_jain 2017-05-08 12:24:53 -0700 Comment on attachment 309379 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309379&action=review looks fine to me. > Tools/ChangeLog:8 > + Simctl is partitioned for each user. Since kill-old-processes Nit: "Simctl" -> "simctl", since its a command name. > Tools/BuildSlaveSupport/kill-old-processes:116 > + if os.geteuid() != 0 or not user: better to reverse the if else to make it more readable. 1305994 16 309394 jbedard 2017-05-08 12:26:43 -0700 Created attachment 309394 Patch for landing 1306011 17 309394 commit-queue 2017-05-08 13:07:31 -0700 Comment on attachment 309394 Patch for landing Clearing flags on attachment: 309394 Committed r216447: <http://trac.webkit.org/changeset/216447> 1306012 18 commit-queue 2017-05-08 13:07:34 -0700 All reviewed patches have been landed. Closing bug. 309071 2017-05-04 11:44:15 -0700 2017-05-04 15:55:14 -0700 Patch bug-171679-20170504114415.patch text/plain 6181 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNjE5NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE3LTA1LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBidWlsZGJvdDogQ2xlYW51cCBzaW11bGF0b3JzIGFmdGVyIHJ1bm5pbmcg dGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl IHNodXRkb3duIHRoZSBzaW11bGF0b3IgcHJvY2VzcyBiZXR3ZWVuIHRlc3RzLCBidXQgaW4gc29t ZSBjYXNlcywgdGhpcyBpcyBub3QKKyAgICAgICAgc3VmZmljaWVudC4gIEV4cGxpY2l0bHkgc2h1 dGRvd24gYW5kIGRlbGV0ZSBldmVyeSBzaW11bGF0b3IgY3JlYXRlZCBieSBXZWJLaXQuCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIu Y2ZnOgorICAgICAgICAoQ2xlYW5VcFNpbXVsYXRvcnMpOgorICAgICAgICAoVGVzdEZhY3Rvcnku X19pbml0X18pOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2NsZWFudXAtc2ltdWxhdG9y czogQWRkZWQuCisgICAgICAgIChydW5fY29tbWFuZCk6IFJ1biBhIGNvbW1hbmQgYW5kIHJldHVy biB0aGUgcmVzdWx0LgorICAgICAgICAoa2lsbF9zaW11bGF0b3JzKTogS2lsbCBhbGwgc2ltdWxh dG9yIHByb2Nlc3Nlcy4KKyAgICAgICAgKHNpbV9wYXRoKTogUmV0dXJuIHRoZSBwYXRoIHRvIHRo ZSBkaXJlY3RvcnkgY29udGFpbmluZyBkZXZpY2UgZmlsZXMuCisgICAgICAgIChzaW11bGF0b3Jf bGlzdCk6IFJldHVybiBhIGxpc3Qgb2Ygc2ltdWxhdG9yIHVkaWRzIHdoaWNoIHdlcmUgY3JlYXRl ZCBieSBXZWJLaXQuCisgICAgICAgIChkZXZpY2Vfc3RhdGUpOiBSZXR1cm4gdGhlIGludGVnZXIg c3RhdGUgb2YgdGhlIGRldmljZSB3aXRoIHRoZSBwcm92aWRlZCB1ZGlkLgorICAgICAgICAocmVt b3ZlX3NpbXVsYXRvcnMpOiBTaHV0ZG93biBhbmQgZGVsZXRlIGEgc2ltdWxhdG9yIHdpdGggdGhl IHNwZWNpZmllZCB1ZGlkLgorCiAyMDE3LTA1LTA0ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxz b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNZWRpYVN0cmVhbV0gQWxsb3cgaG9zdCBhcHBsaWNh dGlvbiB0byBlbmFibGUvZGlzYWJsZSBtZWRpYSBjYXB0dXJlCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9jbGVhbnVwLXNpbXVsYXRvcnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvY2xlYW51cC1zaW11bGF0b3JzCShub25leGlzdGVudCkKKysrIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2NsZWFudXAtc2ltdWxhdG9ycwkod29ya2luZyBjb3B5KQpAQCAtMCww ICsxLDgwIEBACisjIS91c3IvYmluL2VudiBweXRob24KKworIyBDb3B5cmlnaHQgKEMpIDIwMTcg QXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworIyBhcmUgbWV0OgorIworIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5E IEFOWQorIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFRIRSBJTVBMSUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWQorIyBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUworIyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CisjIExPU1Mg T0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORAorIyBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyMg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KKworIyBTaHV0ZG93biBhbmQgcmVtb3ZlIGFsbCBzaW11bGF0b3JzCisKK2ltcG9y dCBvcworaW1wb3J0IHBsaXN0bGliCitpbXBvcnQgcmUKK2ltcG9ydCBzaHV0aWwKK2ltcG9ydCBz dWJwcm9jZXNzCitpbXBvcnQgdGltZQorCitkZWYgcnVuX2NvbW1hbmQoY29tbWFuZCk6CisgICAg cGlwZSA9IHN1YnByb2Nlc3MuUG9wZW4oY29tbWFuZCwgc3RkaW49c3VicHJvY2Vzcy5QSVBFLCBz dGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAgIG91dHB1 dCwgZXJyID0gcGlwZS5jb21tdW5pY2F0ZShiJycpCisgICAgcmV0dXJuIG91dHB1dAorCisKK2Rl ZiBraWxsX3NpbXVsYXRvcnMoKToKKyAgICBzdWJwcm9jZXNzLmNhbGwoWydraWxsYWxsJywgJy05 JywgJy1tJywgJ1NpbXVsYXRvciddKQorCisKK2RlZiBzaW1fcGF0aCh1ZGlkKToKKyAgICByZXR1 cm4gb3MucGF0aC5yZWFscGF0aChvcy5wYXRoLmV4cGFuZHVzZXIob3MucGF0aC5qb2luKCd+L0xp YnJhcnkvRGV2ZWxvcGVyL0NvcmVTaW11bGF0b3IvRGV2aWNlcycsIHVkaWQpKSkKKworCitkZWYg c2ltdWxhdG9yX2xpc3QoKToKKyAgICBzaW1jdGxsaXN0ID0gcnVuX2NvbW1hbmQoWyd4Y3J1bics ICdzaW1jdGwnLCAnbGlzdCddKS5zcGxpdGxpbmVzKCkKKyAgICByZWdleCA9IHJlLmNvbXBpbGUo J1xzKig/UDxuYW1lPi4rKSBcKCg/UDx1ZGlkPltBLVowLTlcLV0rKVwpIFwoKD9QPHN0YXRlPlte KV0rKVwpKCBcKCg/UDxhdmFpbGFiaWxpdHk+W14pXSspXCkpPycpCisgICAgcmVzdWx0ID0gW10K KyAgICBmb3IgbGluZSBpbiBzaW1jdGxsaXN0OgorICAgICAgICBtYXRjaCA9IHJlZ2V4Lm1hdGNo KGxpbmUpCisgICAgICAgIGlmIG1hdGNoIGFuZCAnV2ViS2l0JyBpbiBtYXRjaC5ncm91cCgnbmFt ZScpOgorICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChtYXRjaC5ncm91cCgndWRpZCcpKQorICAg IHJldHVybiByZXN1bHQKKworCitkZWYgZGV2aWNlX3N0YXRlKHVkaWQpOgorICAgIGRldmljZV9w bGlzdCA9IG9zLnBhdGguam9pbihzaW1fcGF0aCh1ZGlkKSwgJ2RldmljZS5wbGlzdCcpCisgICAg aWYgbm90IG9zLnBhdGguaXNmaWxlKGRldmljZV9wbGlzdCk6CisgICAgICAgIHJldHVybiAtMQor ICAgIHJldHVybiBwbGlzdGxpYi5yZWFkUGxpc3QoZGV2aWNlX3BsaXN0KVsnc3RhdGUnXQorCisK K2RlZiByZW1vdmVfc2ltdWxhdG9ycyh1ZGlkcyk6CisgICAgZm9yIHVkaWQgaW4gdWRpZHM6Cisg ICAgICAgIGlmIGRldmljZV9zdGF0ZSh1ZGlkKSAhPSAxOgorICAgICAgICAgICAgc3VicHJvY2Vz cy5jYWxsKFsneGNydW4nLCAnc2ltY3RsJywgJ3NodXRkb3duJywgdWRpZF0pCisgICAgICAgIHdo aWxlIGRldmljZV9zdGF0ZSh1ZGlkKSAhPSAxOgorICAgICAgICAgICAgdGltZS5zbGVlcCg1KQor ICAgICAgICAgICAgcHJpbnQgJ1dhaXRpbmcgb24ge30gdG8gc2h1dGRvd24nLmZvcm1hdCh1ZGlk KQorICAgICAgICBsb2dzX3BhdGggPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5leHBhbmR1c2VyKCJ+ IiksICJMaWJyYXJ5L0xvZ3MvQ29yZVNpbXVsYXRvci8iLCB1ZGlkKQorICAgICAgICBzaHV0aWwu cm10cmVlKGxvZ3NfcGF0aCwgaWdub3JlX2Vycm9ycz1UcnVlKQorICAgICAgICBzdWJwcm9jZXNz LmNoZWNrX2NhbGwoWyd4Y3J1bicsICdzaW1jdGwnLCAnZGVsZXRlJywgdWRpZF0pCisKK2lmIF9f bmFtZV9fID09ICdfX21haW5fXyc6CisgICAga2lsbF9zaW11bGF0b3JzKCkKKyAgICByZW1vdmVf c2ltdWxhdG9ycyhzaW11bGF0b3JfbGlzdCgpKQoKUHJvcGVydHkgY2hhbmdlcyBvbjogVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvY2xlYW51cC1zaW11bGF0b3JzCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2 bjpleGVjdXRhYmxlCiMjIC0wLDAgKzEgIyMKKyoKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9w ZXJ0eQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvbWFzdGVyLmNmZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCShyZXZpc2lvbiAyMTYxNTkpCisrKyBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTIsNiArMTUyLDEyIEBAIGNsYXNzIEtpbGxPbGRQcm9jZXNzZXMo c2hlbGwuQ29tcGlsZSk6CiAgICAgZGVzY3JpcHRpb25Eb25lID0gWyJraWxsZWQgb2xkIHByb2Nl c3NlcyJdCiAgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQva2lsbC1vbGQtcHJvY2Vzc2VzIl0KIAorY2xhc3MgQ2xlYW5VcFNpbXVsYXRvcnMoc2hlbGwu Q29tcGlsZSk6CisgICAgbmFtZSA9ICJjbGVhbi11cCBzaW11bGF0b3JzIgorICAgIGRlc2NyaXB0 aW9uID0gWyJjbGVhbmluZyB1cCBzaW11bGF0b3JzIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBb ImNsZWFuZWQgdXAgc2ltdWxhdG9ycyJdCisgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvY2xlYW51cC1zaW11bGF0b3JzIl0KKwogY2xhc3MgQ2xlYW5C dWlsZElmU2NoZWR1bGVkKHNoZWxsLkNvbXBpbGUpOgogICAgIG5hbWUgPSAiZGVsZXRlIFdlYktp dEJ1aWxkIGRpcmVjdG9yeSIKICAgICBkZXNjcmlwdGlvbiA9IFsiZGVsZXRpbmcgV2ViS2l0QnVp bGQgZGlyZWN0b3J5Il0KQEAgLTg1Nyw2ICs4NjMsOCBAQCBjbGFzcyBUZXN0RmFjdG9yeShGYWN0 b3J5KToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlVGVzdFJlc3VsdHMoKSkKICAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChVcGxvYWRUZXN0UmVzdWx0cygpKQogICAgICAgICAgICAg c2VsZi5hZGRTdGVwKEV4dHJhY3RUZXN0UmVzdWx0cygpKQorICAgICAgICBpZiAic2ltdWxhdG9y IiBpbiBwbGF0Zm9ybToKKyAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDbGVhblVwU2ltdWxhdG9y cygpKQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiZ3RrIjoKICAgICAgICAgICAgIHNlbGYuYWRk U3RlcChSdW5HdGtBUElUZXN0cygpKQogCg== 309110 2017-05-04 15:55:15 -0700 2017-05-08 10:51:11 -0700 Patch bug-171679-20170504155514.patch text/plain 1618 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNjIxMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTA1LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBidWlsZGJvdDogQ2xlYW51cCBzaW11bGF0b3JzIGFmdGVyIHJ1bm5pbmcg dGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTY3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzE5OTQzNjE+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugc2h1dGRvd24gdGhlIHNpbXVsYXRv ciBwcm9jZXNzIGJldHdlZW4gdGVzdHMsIGJ1dCBpbiBzb21lIGNhc2VzLCB0aGlzIGlzIG5vdAor ICAgICAgICBzdWZmaWNpZW50LiBFeHBsaWNpdGx5IHNodXRkb3duIGV2ZXJ5IGJvb3RlZCBzaW11 bGF0b3IuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXM6 CisgICAgICAgIChtYWluKTogU2h1dGRvd24gYWxsIGJvb3RlZCBzaW11bGF0b3JzLgorCiAyMDE3 LTA1LTA0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAg IFtXSzJdIEFkZCBzdXBwb3J0IGZvciBrZWVwaW5nIHRoZSBzZWxlY3Rpb24gaW4gYSBmb2N1c2Vk IGVkaXRhYmxlIGVsZW1lbnQgd2hlbiBkcmFnZ2luZyBiZWdpbnMKSW5kZXg6IFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2tpbGwtb2xkLXByb2Nlc3Nlcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMJKHJldmlzaW9uIDIxNjIwNikKKysrIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2tpbGwtb2xkLXByb2Nlc3Nlcwkod29ya2luZyBjb3B5KQpA QCAtMTEyLDYgKzExMiw4IEBAIGRlZiBtYWluKCk6CiAgICAgaWYgc3lzLnBsYXRmb3JtID09ICdk YXJ3aW4nOgogICAgICAgICBmb3IgdGFzayBpbiB0YXNrc1RvS2lsbCArIHRhc2tzVG9LaWxsTWFj OgogICAgICAgICAgICAgb3Muc3lzdGVtKCJraWxsYWxsIC05IC12IC1tICIgKyB0YXNrKQorICAg ICAgICAjIFNodXRkb3duIGFueSBzaW11bGF0b3JzCisgICAgICAgIG9zLnN5c3RlbSgieGNydW4g c2ltY3RsIHNodXRkb3duIGJvb3RlZCIpCiAgICAgICAgICMgS2lsbCBhbGwgaW5zdGFuY2VzIG9m IHB5dGhvbiBleGVjdXRpbmcgcnVuLXdlYmtpdC10ZXN0cwogICAgICAgICBvcy5zeXN0ZW0oInBz IGF1eCB8IGdyZXAgLUUgJy4rL1B5dGhvbiAuKyhydW5fd2Via2l0X3Rlc3RzfHJ1bi13ZWJraXQt dGVzdHN8bW9kX3B5d2Vic29ja2V0KScgfCBncmVwIC12IGdyZXAgfCBhd2sgJ3twcmludCAkMn0n IHwgeGFyZ3Mga2lsbCIpCiAgICAgZWxpZiBzeXMucGxhdGZvcm0gPT0gJ2N5Z3dpbicgb3Igc3lz LnBsYXRmb3JtID09ICd3aW4zMic6Cg== 309379 2017-05-08 10:51:12 -0700 2017-05-08 12:26:42 -0700 Patch bug-171679-20170508105111.patch text/plain 2960 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNjQzNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE3LTA1LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBidWlsZGJvdDogQ2xlYW51cCBzaW11bGF0b3JzIGFmdGVyIHJ1bm5pbmcg dGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNp bWN0bCBpcyBwYXJ0aXRpb25lZCBmb3IgZWFjaCB1c2VyLiBTaW5jZSBraWxsLW9sZC1wcm9jZXNz ZXMKKyAgICAgICAgaXMgcnVuIGFzIHJvb3QsIHdlIG5lZWQgdG8gc3BlY2lmeSB0aGUgYnVpbGRi b3QgdXNlciB3aGVuIHRlYXJpbmcKKyAgICAgICAgZG93biBzaW11bGF0b3JzIGJldHdlZW4gc3Rl cHMuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9tYXN0ZXIuY2ZnOgorICAgICAgICAoS2lsbE9sZFByb2Nlc3Nlcyk6IFBhc3MgYnVpbGRib3Qg dXNlciB0byBraWxsLW9sZC1wcm9jZXNzZXMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQv a2lsbC1vbGQtcHJvY2Vzc2VzOgorICAgICAgICAobWFpbik6IFNwZWNpZnkgdGhlIHVzZXIgZm9y IHNpbWN0bCBpZiBvbmUgaGFzIGJlZW4gcHJvdmlkZWQuCisKIDIwMTctMDUtMDggIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQu IEZpeCBHVEsrIHRlc3QgL3dlYmtpdDIvV2ViS2l0Q29uc29sZU1lc3NhZ2UvbmV0d29yay1lcnJv ciBhZnRlciByMjE1NTU2LgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQva2lsbC1vbGQt cHJvY2Vzc2VzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2tpbGwtb2xk LXByb2Nlc3NlcwkocmV2aXNpb24gMjE2NDIwKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv a2lsbC1vbGQtcHJvY2Vzc2VzCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw3IEBACiBpbXBv cnQgb3MsIHN5cwogCiAKLWRlZiBtYWluKCk6CitkZWYgbWFpbih1c2VyPU5vbmUpOgogICAgIHRh c2tzVG9LaWxsV2luID0gWwogICAgICAgICAiY2wuZXhlIiwKICAgICAgICAgImRldmVudi5jb20i LApAQCAtMTEzLDcgKzExMywxMCBAQCBkZWYgbWFpbigpOgogICAgICAgICBmb3IgdGFzayBpbiB0 YXNrc1RvS2lsbCArIHRhc2tzVG9LaWxsTWFjOgogICAgICAgICAgICAgb3Muc3lzdGVtKCJraWxs YWxsIC05IC12IC1tICIgKyB0YXNrKQogICAgICAgICAjIFNodXRkb3duIGFueSBzaW11bGF0b3Jz Ci0gICAgICAgIG9zLnN5c3RlbSgieGNydW4gc2ltY3RsIHNodXRkb3duIGJvb3RlZCIpCisgICAg ICAgIGlmIG9zLmdldGV1aWQoKSAhPSAwIG9yIG5vdCB1c2VyOgorICAgICAgICAgICAgb3Muc3lz dGVtKCJ4Y3J1biBzaW1jdGwgc2h1dGRvd24gYm9vdGVkIikKKyAgICAgICAgZWxzZToKKyAgICAg ICAgICAgIG9zLnN5c3RlbSgic3VkbyAtdSB7fSB4Y3J1biBzaW1jdGwgc2h1dGRvd24gYm9vdGVk Ii5mb3JtYXQodXNlcikpCiAgICAgICAgICMgS2lsbCBhbGwgaW5zdGFuY2VzIG9mIHB5dGhvbiBl eGVjdXRpbmcgcnVuLXdlYmtpdC10ZXN0cwogICAgICAgICBvcy5zeXN0ZW0oInBzIGF1eCB8IGdy ZXAgLUUgJy4rL1B5dGhvbiAuKyhydW5fd2Via2l0X3Rlc3RzfHJ1bi13ZWJraXQtdGVzdHN8bW9k X3B5d2Vic29ja2V0KScgfCBncmVwIC12IGdyZXAgfCBhd2sgJ3twcmludCAkMn0nIHwgeGFyZ3Mg a2lsbCIpCiAgICAgZWxpZiBzeXMucGxhdGZvcm0gPT0gJ2N5Z3dpbicgb3Igc3lzLnBsYXRmb3Jt ID09ICd3aW4zMic6CkBAIC0xMjksNCArMTMyLDUgQEAgZGVmIG1haW4oKToKIAogCiBpZiBfX25h bWVfXyA9PSAnX19tYWluX18nOgotICAgIHN5cy5leGl0KG1haW4oKSkKKyAgICB1c2VyID0gc3lz LmFyZ3ZbMV0gaWYgbGVuKHN5cy5hcmd2KSA+IDEgZWxzZSBOb25lCisgICAgc3lzLmV4aXQobWFp bih1c2VyKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL21hc3Rlci5jZmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwkocmV2aXNpb24gMjE2NDIwKQorKysg VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNm Zwkod29ya2luZyBjb3B5KQpAQCAtMTUwLDcgKzE1MCw3IEBAIGNsYXNzIEtpbGxPbGRQcm9jZXNz ZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgbmFtZSA9ICJraWxsIG9sZCBwcm9jZXNzZXMiCiAgICAg ZGVzY3JpcHRpb24gPSBbImtpbGxpbmcgb2xkIHByb2Nlc3NlcyJdCiAgICAgZGVzY3JpcHRpb25E b25lID0gWyJraWxsZWQgb2xkIHByb2Nlc3NlcyJdCi0gICAgY29tbWFuZCA9IFsicHl0aG9uIiwg Ii4vVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQva2lsbC1vbGQtcHJvY2Vzc2VzIl0KKyAgICBjb21t YW5kID0gWyJweXRob24iLCAiLi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9j ZXNzZXMiLCAiYnVpbGRib3QiXQogCiBjbGFzcyBDbGVhbkJ1aWxkSWZTY2hlZHVsZWQoc2hlbGwu Q29tcGlsZSk6CiAgICAgbmFtZSA9ICJkZWxldGUgV2ViS2l0QnVpbGQgZGlyZWN0b3J5Igo= 309394 2017-05-08 12:26:43 -0700 2017-05-08 13:07:31 -0700 Patch for landing bug-171679-20170508122643.patch text/plain 2954 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNjQzNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE3LTA1LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBidWlsZGJvdDogQ2xlYW51cCBzaW11bGF0b3JzIGFmdGVyIHJ1bm5pbmcg dGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IEFha2FzaCBKYWluLgorCisgICAgICAgIHNpbWN0 bCBpcyBwYXJ0aXRpb25lZCBmb3IgZWFjaCB1c2VyLiBTaW5jZSBraWxsLW9sZC1wcm9jZXNzZXMK KyAgICAgICAgaXMgcnVuIGFzIHJvb3QsIHdlIG5lZWQgdG8gc3BlY2lmeSB0aGUgYnVpbGRib3Qg dXNlciB3aGVuIHRlYXJpbmcKKyAgICAgICAgZG93biBzaW11bGF0b3JzIGJldHdlZW4gc3RlcHMu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9t YXN0ZXIuY2ZnOgorICAgICAgICAoS2lsbE9sZFByb2Nlc3Nlcyk6IFBhc3MgYnVpbGRib3QgdXNl ciB0byBraWxsLW9sZC1wcm9jZXNzZXMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQva2ls bC1vbGQtcHJvY2Vzc2VzOgorICAgICAgICAobWFpbik6IFNwZWNpZnkgdGhlIHVzZXIgZm9yIHNp bWN0bCBpZiBvbmUgaGFzIGJlZW4gcHJvdmlkZWQuCisKIDIwMTctMDUtMDggIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZp eCBHVEsrIHRlc3QgL3dlYmtpdDIvV2ViS2l0Q29uc29sZU1lc3NhZ2UvbmV0d29yay1lcnJvciBh ZnRlciByMjE1NTU2LgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQva2lsbC1vbGQtcHJv Y2Vzc2VzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2tpbGwtb2xkLXBy b2Nlc3NlcwkocmV2aXNpb24gMjE2NDIwKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQva2ls bC1vbGQtcHJvY2Vzc2VzCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw3IEBACiBpbXBvcnQg b3MsIHN5cwogCiAKLWRlZiBtYWluKCk6CitkZWYgbWFpbih1c2VyPU5vbmUpOgogICAgIHRhc2tz VG9LaWxsV2luID0gWwogICAgICAgICAiY2wuZXhlIiwKICAgICAgICAgImRldmVudi5jb20iLApA QCAtMTEzLDcgKzExMywxMCBAQCBkZWYgbWFpbigpOgogICAgICAgICBmb3IgdGFzayBpbiB0YXNr c1RvS2lsbCArIHRhc2tzVG9LaWxsTWFjOgogICAgICAgICAgICAgb3Muc3lzdGVtKCJraWxsYWxs IC05IC12IC1tICIgKyB0YXNrKQogICAgICAgICAjIFNodXRkb3duIGFueSBzaW11bGF0b3JzCi0g ICAgICAgIG9zLnN5c3RlbSgieGNydW4gc2ltY3RsIHNodXRkb3duIGJvb3RlZCIpCisgICAgICAg IGlmIG9zLmdldGV1aWQoKSA9PSAwIGFuZCB1c2VyOgorICAgICAgICAgICAgb3Muc3lzdGVtKCJz dWRvIC11IHt9IHhjcnVuIHNpbWN0bCBzaHV0ZG93biBib290ZWQiLmZvcm1hdCh1c2VyKSkKKyAg ICAgICAgZWxzZToKKyAgICAgICAgICAgIG9zLnN5c3RlbSgieGNydW4gc2ltY3RsIHNodXRkb3du IGJvb3RlZCIpCiAgICAgICAgICMgS2lsbCBhbGwgaW5zdGFuY2VzIG9mIHB5dGhvbiBleGVjdXRp bmcgcnVuLXdlYmtpdC10ZXN0cwogICAgICAgICBvcy5zeXN0ZW0oInBzIGF1eCB8IGdyZXAgLUUg Jy4rL1B5dGhvbiAuKyhydW5fd2Via2l0X3Rlc3RzfHJ1bi13ZWJraXQtdGVzdHN8bW9kX3B5d2Vi c29ja2V0KScgfCBncmVwIC12IGdyZXAgfCBhd2sgJ3twcmludCAkMn0nIHwgeGFyZ3Mga2lsbCIp CiAgICAgZWxpZiBzeXMucGxhdGZvcm0gPT0gJ2N5Z3dpbicgb3Igc3lzLnBsYXRmb3JtID09ICd3 aW4zMic6CkBAIC0xMjksNCArMTMyLDUgQEAgZGVmIG1haW4oKToKIAogCiBpZiBfX25hbWVfXyA9 PSAnX19tYWluX18nOgotICAgIHN5cy5leGl0KG1haW4oKSkKKyAgICB1c2VyID0gc3lzLmFyZ3Zb MV0gaWYgbGVuKHN5cy5hcmd2KSA+IDEgZWxzZSBOb25lCisgICAgc3lzLmV4aXQobWFpbih1c2Vy KSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L21hc3Rlci5jZmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwkocmV2aXNpb24gMjE2NDIwKQorKysgVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwkod29y a2luZyBjb3B5KQpAQCAtMTUwLDcgKzE1MCw3IEBAIGNsYXNzIEtpbGxPbGRQcm9jZXNzZXMoc2hl bGwuQ29tcGlsZSk6CiAgICAgbmFtZSA9ICJraWxsIG9sZCBwcm9jZXNzZXMiCiAgICAgZGVzY3Jp cHRpb24gPSBbImtpbGxpbmcgb2xkIHByb2Nlc3NlcyJdCiAgICAgZGVzY3JpcHRpb25Eb25lID0g WyJraWxsZWQgb2xkIHByb2Nlc3NlcyJdCi0gICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQva2lsbC1vbGQtcHJvY2Vzc2VzIl0KKyAgICBjb21tYW5kID0g WyJweXRob24iLCAiLi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMi LCAiYnVpbGRib3QiXQogCiBjbGFzcyBDbGVhbkJ1aWxkSWZTY2hlZHVsZWQoc2hlbGwuQ29tcGls ZSk6CiAgICAgbmFtZSA9ICJkZWxldGUgV2ViS2l0QnVpbGQgZGlyZWN0b3J5Igo=