170857 2017-04-14 14:03:30 -0700 webkitpy: Remove unneeded crash log retrieval, refactor Darwin crash retrieval 2017-05-09 16:19:12 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain buildbot commit-queue ddkilzer glenn lforschler webkit-bug-importer oldest_to_newest 1297504 0 jbedard 2017-04-14 14:03:30 -0700 Currently, the code which grabs crash logs assumes the iOS Simulator is being driven by another process. This is no longer true, and iOS Simulator and Mac can use the same technique for searching for crash logs. Devices will need a different technique. 1297509 1 webkit-bug-importer 2017-04-14 14:17:27 -0700 <rdar://problem/31635373> 1297510 2 307145 jbedard 2017-04-14 14:19:36 -0700 Created attachment 307145 Patch 1306618 3 307145 aakash_jain 2017-05-09 15:29:01 -0700 Comment on attachment 307145 Patch looks good to me. 1306620 4 307145 commit-queue 2017-05-09 15:31:07 -0700 Comment on attachment 307145 Patch Rejecting attachment 307145 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 307145, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: 1 FAILED at 50. 1 out of 1 hunk FAILED -- saving rejects to file Tools/Scripts/webkitpy/port/ios_device.py.rej patching file Tools/Scripts/webkitpy/port/ios_simulator.py patching file Tools/Scripts/webkitpy/port/ios_simulator_unittest.py patching file Tools/Scripts/webkitpy/port/mac.py patching file Tools/Scripts/webkitpy/port/mac_unittest.py Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Aakash Jain']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/3707973 1306631 5 309552 jbedard 2017-05-09 15:38:55 -0700 Created attachment 309552 Patch for landing 1306658 6 309552 commit-queue 2017-05-09 16:19:11 -0700 Comment on attachment 309552 Patch for landing Clearing flags on attachment: 309552 Committed r216556: <http://trac.webkit.org/changeset/216556> 1306659 7 commit-queue 2017-05-09 16:19:12 -0700 All reviewed patches have been landed. Closing bug. 307145 2017-04-14 14:19:36 -0700 2017-05-09 15:38:53 -0700 Patch bug-170857-20170414141936.patch text/plain 11363 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNTM3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDE3LTA0LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVtb3ZlIHVubmVlZGVkIGNyYXNoIGxvZyByZXRyaWV2 YWwsIHJlZmFjdG9yIERhcndpbiBjcmFzaCByZXRyaWV2YWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDg1NworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzE2MzUzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2luY2UgTGF5b3V0VGVzdFJlbGF5IGhhcyBiZWVuIHJlbW92ZWQsIGlPUyBTaW11bGF0 b3JzIGFuZCBNYWNzIGNhbiB1c2UgdGhlIHNhbWUKKyAgICAgICAgY29kZSB0byBzZWFyY2ggZm9y IGNyYXNoIGxvZ3MuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5 OgorICAgICAgICAoRGFyd2luUG9ydC5fZ2V0X2NyYXNoX2xvZyk6IE1vdmVkIGZyb20gTWFjUG9y dC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5Ogor ICAgICAgICAoRGFyd2luVGVzdC50ZXN0X2dldF9jcmFzaF9sb2cpOiBNb3ZlZCBmcm9tIE1hY1Rl c3QuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHk6CisgICAg ICAgIChJT1NEZXZpY2VQb3J0Ll9nZXRfY3Jhc2hfbG9nKTogSW1wbGVtZW50IHBhc3MtdGhyb3Vn aCBmb3IgaU9TIGRldmljZSwgc2luY2UgaU9TCisgICAgICAgIGRldmljZXMgbXVzdCBzZWFyY2gg Zm9yIGNyYXNoLWxvZ3MgcmVtb3RlbHkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L2lvc19zaW11bGF0b3IucHk6CisgICAgICAgIChJT1NTaW11bGF0b3JQb3J0Ll9nZXRfY3Jhc2hf bG9nKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVs YXRvcl91bml0dGVzdC5weToKKyAgICAgICAgKElPU1NpbXVsYXRvclRlc3QudGVzdF9nZXRfY3Jh c2hfbG9nKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5 OgorICAgICAgICAoTWFjUG9ydC5fZ2V0X2NyYXNoX2xvZyk6IE1vdmVkIHRvIERhcndpblBvcnQK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAg ICAoTWFjVGVzdC50ZXN0X2dldF9jcmFzaF9sb2cpOiBNb3ZlZCB0byBEYXJ3aW5UZXN0LgorCiAy MDE3LTA0LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAg ICB3ZWJraXRweTogSWdub3JlIHByZXZpb3VzbHkgbGF1bmNoZWQgcGlkIHdoZW4gc3lzdGVtIGlz IHVuZGVyIHN0cmVzcwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbi5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CShy ZXZpc2lvbiAyMTUzNzIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0yMiw2ICsyMiw3IEBACiAKIGltcG9ydCBsb2dnaW5nCiBpbXBv cnQgb3MKK2ltcG9ydCB0aW1lCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9y dCBtZW1vaXplZAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmNyYXNobG9ncyBpbXBvcnQg Q3Jhc2hMb2dzCkBAIC0xMDEsNyArMTAyLDI2IEBAIGNsYXNzIERhcndpblBvcnQoQXBwbGVQb3J0 KToKICAgICAgICAgcmV0dXJuIGNyYXNoX2xvZy5maW5kX2FsbF9sb2dzKGluY2x1ZGVfZXJyb3Jz PVRydWUsIG5ld2VyX3RoYW49bmV3ZXJfdGhhbikKIAogICAgIGRlZiBfZ2V0X2NyYXNoX2xvZyhz ZWxmLCBuYW1lLCBwaWQsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuLCB0aW1lX2ZuPU5vbmUs IHNsZWVwX2ZuPU5vbmUsIHdhaXRfZm9yX2xvZz1UcnVlKToKLSAgICAgICAgcmV0dXJuIHN1cGVy KERhcndpblBvcnQsIHNlbGYpLl9nZXRfY3Jhc2hfbG9nKG5hbWUsIHBpZCwgc3Rkb3V0LCBzdGRl cnIsIG5ld2VyX3RoYW4pCisgICAgICAgICMgTm90ZSB0aGF0IHdlIGRvIHNsb3ctc3BpbiBoZXJl IGFuZCB3YWl0LCBzaW5jZSBpdCBhcHBlYXJzIHRoZSB0aW1lCisgICAgICAgICMgUmVwb3J0Q3Jh c2ggdGFrZXMgdG8gYWN0dWFsbHkgd3JpdGUgYW5kIGZsdXNoIHRoZSBmaWxlIHZhcmllcyB3aGVu IHRoZXJlIGFyZQorICAgICAgICAjIGxvdHMgb2Ygc2ltdWx0YW5lb3VzIGNyYXNoZXMgZ29pbmcg b24uCisgICAgICAgIHRpbWVfZm4gPSB0aW1lX2ZuIG9yIHRpbWUudGltZQorICAgICAgICBzbGVl cF9mbiA9IHNsZWVwX2ZuIG9yIHRpbWUuc2xlZXAKKyAgICAgICAgY3Jhc2hfbG9nID0gJycKKyAg ICAgICAgY3Jhc2hfbG9ncyA9IENyYXNoTG9ncyhzZWxmLmhvc3QpCisgICAgICAgIG5vdyA9IHRp bWVfZm4oKQorICAgICAgICBkZWFkbGluZSA9IG5vdyArIDUgKiBpbnQoc2VsZi5nZXRfb3B0aW9u KCdjaGlsZF9wcm9jZXNzZXMnLCAxKSkKKyAgICAgICAgd2hpbGUgbm90IGNyYXNoX2xvZyBhbmQg bm93IDw9IGRlYWRsaW5lOgorICAgICAgICAgICAgY3Jhc2hfbG9nID0gY3Jhc2hfbG9ncy5maW5k X25ld2VzdF9sb2cobmFtZSwgcGlkLCBpbmNsdWRlX2Vycm9ycz1UcnVlLCBuZXdlcl90aGFuPW5l d2VyX3RoYW4pCisgICAgICAgICAgICBpZiBub3Qgd2FpdF9mb3JfbG9nOgorICAgICAgICAgICAg ICAgIGJyZWFrCisgICAgICAgICAgICBpZiBub3QgY3Jhc2hfbG9nIG9yIG5vdCBbbGluZSBmb3Ig bGluZSBpbiBjcmFzaF9sb2cuc3BsaXRsaW5lcygpIGlmIG5vdCBsaW5lLnN0YXJ0c3dpdGgoJ0VS Uk9SJyldOgorICAgICAgICAgICAgICAgIHNsZWVwX2ZuKDAuMSkKKyAgICAgICAgICAgICAgICBu b3cgPSB0aW1lX2ZuKCkKKworICAgICAgICBpZiBub3QgY3Jhc2hfbG9nOgorICAgICAgICAgICAg cmV0dXJuIChzdGRlcnIsIE5vbmUpCisgICAgICAgIHJldHVybiAoc3RkZXJyLCBjcmFzaF9sb2cp CiAKICAgICBkZWYgbG9va19mb3JfbmV3X2NyYXNoX2xvZ3Moc2VsZiwgY3Jhc2hlZF9wcm9jZXNz ZXMsIHN0YXJ0X3RpbWUpOgogICAgICAgICAiIiJTaW5jZSBjcmFzaCBsb2dzIGNhbiB0YWtlIGEg bG9uZyB0aW1lIHRvIGJlIHdyaXR0ZW4gb3V0IGlmIHRoZSBzeXN0ZW0gaXMKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW5fdGVzdGNhc2UucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90ZXN0Y2FzZS5weQkocmV2aXNpb24g MjE1MzcyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90ZXN0Y2FzZS5w eQkod29ya2luZyBjb3B5KQpAQCAtMjAsNiArMjAsOCBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogCitpbXBvcnQgdGltZQorCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1w b3J0IHBvcnRfdGVzdGNhc2UKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0 dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCiBmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1w b3J0IE1vY2tPcHRpb25zCkBAIC0xMjQsMyArMTI2LDExIEBAIGNsYXNzIERhcndpblRlc3QocG9y dF90ZXN0Y2FzZS5Qb3J0VGVzdEMKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAg ICAgICAgcG9ydC5ob3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2Zu PXRocm93aW5nX3J1bl9jb21tYW5kKQogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291 dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0Ml0pCisKKyAg ICBkZWYgdGVzdF9nZXRfY3Jhc2hfbG9nKHNlbGYpOgorICAgICAgICAjIERhcndpbiBjcmFzaCBs b2dzIGFyZSB0ZXN0ZWQgZWxzZXdoZXJlLCBzbyBoZXJlIHdlIGp1c3QgbWFrZSBzdXJlIHdlIGRv bid0IGNyYXNoLgorICAgICAgICBkZWYgZmFrZV90aW1lX2NiKCk6CisgICAgICAgICAgICB0aW1l cyA9IFswLCAyMCwgNDBdCisgICAgICAgICAgICByZXR1cm4gbGFtYmRhOiB0aW1lcy5wb3AoMCkK KyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT1zZWxmLnBvcnRfbmFtZSkK KyAgICAgICAgcG9ydC5fZ2V0X2NyYXNoX2xvZygnRHVtcFJlbmRlclRyZWUnLCAxMjM0LCBOb25l LCBOb25lLCB0aW1lLnRpbWUoKSwgd2FpdF9mb3JfbG9nPUZhbHNlKQpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkJKHJldmlzaW9uIDIxNTM3MikKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBA IC01MCwzICs1MCw2IEBAIGNsYXNzIElPU0RldmljZVBvcnQoSU9TUG9ydCk6CiAKICAgICBkZWYg b3BlcmF0aW5nX3N5c3RlbShzZWxmKToKICAgICAgICAgcmV0dXJuICdpb3MtZGV2aWNlJworCisg ICAgZGVmIF9nZXRfY3Jhc2hfbG9nKHNlbGYsIG5hbWUsIHBpZCwgc3Rkb3V0LCBzdGRlcnIsIG5l d2VyX3RoYW4sIHRpbWVfZm49Tm9uZSwgc2xlZXBfZm49Tm9uZSwgd2FpdF9mb3JfbG9nPVRydWUp OgorICAgICAgICByZXR1cm4gKHN0ZGVyciwgTm9uZSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lvbiAyMTUzNzIpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weQkod29ya2luZyBjb3B5KQpA QCAtMTM0LDQ0ICsxMzQsNiBAQCBjbGFzcyBJT1NTaW11bGF0b3JQb3J0KElPU1BvcnQpOgogCiAg ICAgICAgIHJldHVybiBtaW4obWF4aW11bV9zaW11bGF0b3JfY291bnRfb25fdGhpc19zeXN0ZW0s IGJlc3RfY2hpbGRfcHJvY2Vzc19jb3VudF9mb3JfY3B1KQogCi0gICAgZGVmIF9nZXRfY3Jhc2hf bG9nKHNlbGYsIG5hbWUsIHBpZCwgc3Rkb3V0LCBzdGRlcnIsIG5ld2VyX3RoYW4sIHRpbWVfZm49 dGltZS50aW1lLCBzbGVlcF9mbj10aW1lLnNsZWVwLCB3YWl0X2Zvcl9sb2c9VHJ1ZSk6Ci0gICAg ICAgIHRpbWVfZm4gPSB0aW1lX2ZuIG9yIHRpbWUudGltZQotICAgICAgICBzbGVlcF9mbiA9IHNs ZWVwX2ZuIG9yIHRpbWUuc2xlZXAKLQotICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgY29sbGVj dCB0aGUgYWN0dWFsIGNyYXNoIGxvZyBmb3IgRHVtcFJlbmRlclRyZWUuYXBwIGJlY2F1c2UgaXQg aW5jbHVkZXMgbW9yZQotICAgICAgICAjIGluZm9ybWF0aW9uIChlLmcuIGV4Y2VwdGlvbiBjb2Rl cykgdGhhbiBpcyBhdmFpbGFibGUgaW4gdGhlIHN0YWNrIHRyYWNlIHdyaXR0ZW4gdG8gc3RhbmRh cmQgZXJyb3IuCi0gICAgICAgIHN0ZGVycl9saW5lcyA9IFtdCi0gICAgICAgIGNyYXNoZWRfc3Vi cHJvY2Vzc19uYW1lX2FuZF9waWQgPSBOb25lICAjIGUuZy4gKCdEdW1wUmVuZGVyVHJlZS5hcHAn LCAxMjM0KQotICAgICAgICBmb3IgbGluZSBpbiAoc3RkZXJyIG9yICcnKS5zcGxpdGxpbmVzKCk6 Ci0gICAgICAgICAgICBpZiBub3QgY3Jhc2hlZF9zdWJwcm9jZXNzX25hbWVfYW5kX3BpZDoKLSAg ICAgICAgICAgICAgICBtYXRjaCA9IHNlbGYuU1VCUFJPQ0VTU19DUkFTSF9SRUdFWC5tYXRjaChs aW5lKQotICAgICAgICAgICAgICAgIGlmIG1hdGNoOgotICAgICAgICAgICAgICAgICAgICBjcmFz aGVkX3N1YnByb2Nlc3NfbmFtZV9hbmRfcGlkID0gKG1hdGNoLmdyb3VwKCdzdWJwcm9jZXNzX25h bWUnKSwgaW50KG1hdGNoLmdyb3VwKCdzdWJwcm9jZXNzX3BpZCcpKSkKLSAgICAgICAgICAgICAg ICAgICAgY29udGludWUKLSAgICAgICAgICAgIHN0ZGVycl9saW5lcy5hcHBlbmQobGluZSkKLQot ICAgICAgICBpZiBjcmFzaGVkX3N1YnByb2Nlc3NfbmFtZV9hbmRfcGlkOgotICAgICAgICAgICAg cmV0dXJuIHNlbGYuX2dldF9jcmFzaF9sb2coY3Jhc2hlZF9zdWJwcm9jZXNzX25hbWVfYW5kX3Bp ZFswXSwgY3Jhc2hlZF9zdWJwcm9jZXNzX25hbWVfYW5kX3BpZFsxXSwgc3Rkb3V0LAotICAgICAg ICAgICAgICAgICdcbicuam9pbihzdGRlcnJfbGluZXMpLCBuZXdlcl90aGFuLCB0aW1lX2ZuLCBz bGVlcF9mbiwgd2FpdF9mb3JfbG9nKQotCi0gICAgICAgICMgQXBwIGNyYXNoZWQKLSAgICAgICAg X2xvZy5kZWJ1ZygnbG9va2luZyBmb3IgY3Jhc2ggbG9nIGZvciAlczolcycgJSAobmFtZSwgc3Ry KHBpZCkpKQotICAgICAgICBjcmFzaF9sb2cgPSAnJwotICAgICAgICBjcmFzaF9sb2dzID0gQ3Jh c2hMb2dzKHNlbGYuaG9zdCkKLSAgICAgICAgbm93ID0gdGltZV9mbigpCi0gICAgICAgIGRlYWRs aW5lID0gbm93ICsgNSAqIGludChzZWxmLmdldF9vcHRpb24oJ2NoaWxkX3Byb2Nlc3NlcycsIDEp KQotICAgICAgICB3aGlsZSBub3QgY3Jhc2hfbG9nIGFuZCBub3cgPD0gZGVhZGxpbmU6Ci0gICAg ICAgICAgICBjcmFzaF9sb2cgPSBjcmFzaF9sb2dzLmZpbmRfbmV3ZXN0X2xvZyhuYW1lLCBwaWQs IGluY2x1ZGVfZXJyb3JzPVRydWUsIG5ld2VyX3RoYW49bmV3ZXJfdGhhbikKLSAgICAgICAgICAg IGlmIG5vdCB3YWl0X2Zvcl9sb2c6Ci0gICAgICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAg IGlmIG5vdCBjcmFzaF9sb2cgb3Igbm90IFtsaW5lIGZvciBsaW5lIGluIGNyYXNoX2xvZy5zcGxp dGxpbmVzKCkgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgnRVJST1InKV06Ci0gICAgICAgICAgICAg ICAgc2xlZXBfZm4oMC4xKQotICAgICAgICAgICAgICAgIG5vdyA9IHRpbWVfZm4oKQotCi0gICAg ICAgIGlmIG5vdCBjcmFzaF9sb2c6Ci0gICAgICAgICAgICByZXR1cm4gc3RkZXJyLCBOb25lCi0g ICAgICAgIHJldHVybiBzdGRlcnIsIGNyYXNoX2xvZwotCiAgICAgZGVmIF9idWlsZF9kcml2ZXJf ZmxhZ3Moc2VsZik6CiAgICAgICAgIGFyY2hzID0gWydBUkNIUz1pMzg2J10gaWYgc2VsZi5hcmNo aXRlY3R1cmUoKSA9PSAneDg2JyBlbHNlIFtdCiAgICAgICAgIHNkayA9IFsnLS1zZGsnLCAnaXBo b25lc2ltdWxhdG9yJ10KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2lt dWxhdG9yX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9pb3Nfc2ltdWxhdG9yX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMTUzNzIpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvcl91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtNTAsMTQgKzUwLDYgQEAgY2xhc3MgSU9TU2ltdWxhdG9yVGVzdChpb3NfdGVz dGNhc2UuSU9TVAogICAgIGRlZiB0ZXN0X29wZXJhdGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoJ2lvcy1zaW11bGF0b3InLCBzZWxmLm1ha2VfcG9ydCgpLm9wZXJh dGluZ19zeXN0ZW0oKSkKIAotICAgIGRlZiB0ZXN0X2dldF9jcmFzaF9sb2coc2VsZik6Ci0gICAg ICAgICMgTWFjIGNyYXNoIGxvZ3MgYXJlIHRlc3RlZCBlbHNld2hlcmUsIHNvIGhlcmUgd2UganVz dCBtYWtlIHN1cmUgd2UgZG9uJ3QgY3Jhc2guCi0gICAgICAgIGRlZiBmYWtlX3RpbWVfY2IoKToK LSAgICAgICAgICAgIHRpbWVzID0gWzAsIDIwLCA0MF0KLSAgICAgICAgICAgIHJldHVybiBsYW1i ZGE6IHRpbWVzLnBvcCgwKQotICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1l PXNlbGYucG9ydF9uYW1lKQotICAgICAgICBwb3J0Ll9nZXRfY3Jhc2hfbG9nKCdEdW1wUmVuZGVy VHJlZScsIDEyMzQsIE5vbmUsIE5vbmUsIHRpbWUudGltZSgpLCB3YWl0X2Zvcl9sb2c9RmFsc2Up Ci0KICAgICBkZWYgdGVzdF8zMmJpdChzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9w b3J0KG9wdGlvbnM9TW9ja09wdGlvbnMoYXJjaGl0ZWN0dXJlPSd4ODYnKSkKIApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CShyZXZpc2lvbiAyMTUzNzIpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNjIsMzEgKzE2Miw2 IEBAIGNsYXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgZGVmIF9jaGVja19wb3J0X2J1aWxk KHNlbGYpOgogICAgICAgICByZXR1cm4gbm90IHNlbGYuZ2V0X29wdGlvbignamF2YScpIG9yIHNl bGYuX2J1aWxkX2phdmFfdGVzdF9zdXBwb3J0KCkKIAotICAgIGRlZiBfZ2V0X2NyYXNoX2xvZyhz ZWxmLCBuYW1lLCBwaWQsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuLCB0aW1lX2ZuPU5vbmUs IHNsZWVwX2ZuPU5vbmUsIHdhaXRfZm9yX2xvZz1UcnVlKToKLSAgICAgICAgIyBOb3RlIHRoYXQg d2UgZG8gc2xvdy1zcGluIGhlcmUgYW5kIHdhaXQsIHNpbmNlIGl0IGFwcGVhcnMgdGhlIHRpbWUK LSAgICAgICAgIyBSZXBvcnRDcmFzaCB0YWtlcyB0byBhY3R1YWxseSB3cml0ZSBhbmQgZmx1c2gg dGhlIGZpbGUgdmFyaWVzIHdoZW4gdGhlcmUgYXJlCi0gICAgICAgICMgbG90cyBvZiBzaW11bHRh bmVvdXMgY3Jhc2hlcyBnb2luZyBvbi4KLSAgICAgICAgIyBGSVhNRTogU2hvdWxkIG1vc3Qgb2Yg dGhpcyBiZSBtb3ZlZCBpbnRvIENyYXNoTG9ncygpPwotICAgICAgICB0aW1lX2ZuID0gdGltZV9m biBvciB0aW1lLnRpbWUKLSAgICAgICAgc2xlZXBfZm4gPSBzbGVlcF9mbiBvciB0aW1lLnNsZWVw Ci0gICAgICAgIGNyYXNoX2xvZyA9ICcnCi0gICAgICAgIGNyYXNoX2xvZ3MgPSBDcmFzaExvZ3Mo c2VsZi5ob3N0KQotICAgICAgICBub3cgPSB0aW1lX2ZuKCkKLSAgICAgICAgIyBGSVhNRTogZGVs ZXRlIHRoaXMgYWZ0ZXIgd2UncmUgc3VyZSB0aGlzIGNvZGUgaXMgd29ya2luZyAuLi4KLSAgICAg ICAgX2xvZy5kZWJ1ZygnbG9va2luZyBmb3IgY3Jhc2ggbG9nIGZvciAlczolcycgJSAobmFtZSwg c3RyKHBpZCkpKQotICAgICAgICBkZWFkbGluZSA9IG5vdyArIDUgKiBpbnQoc2VsZi5nZXRfb3B0 aW9uKCdjaGlsZF9wcm9jZXNzZXMnLCAxKSkKLSAgICAgICAgd2hpbGUgbm90IGNyYXNoX2xvZyBh bmQgbm93IDw9IGRlYWRsaW5lOgotICAgICAgICAgICAgY3Jhc2hfbG9nID0gY3Jhc2hfbG9ncy5m aW5kX25ld2VzdF9sb2cobmFtZSwgcGlkLCBpbmNsdWRlX2Vycm9ycz1UcnVlLCBuZXdlcl90aGFu PW5ld2VyX3RoYW4pCi0gICAgICAgICAgICBpZiBub3Qgd2FpdF9mb3JfbG9nOgotICAgICAgICAg ICAgICAgIGJyZWFrCi0gICAgICAgICAgICBpZiBub3QgY3Jhc2hfbG9nIG9yIG5vdCBbbGluZSBm b3IgbGluZSBpbiBjcmFzaF9sb2cuc3BsaXRsaW5lcygpIGlmIG5vdCBsaW5lLnN0YXJ0c3dpdGgo J0VSUk9SJyldOgotICAgICAgICAgICAgICAgIHNsZWVwX2ZuKDAuMSkKLSAgICAgICAgICAgICAg ICBub3cgPSB0aW1lX2ZuKCkKLQotICAgICAgICBpZiBub3QgY3Jhc2hfbG9nOgotICAgICAgICAg ICAgcmV0dXJuIChzdGRlcnIsIE5vbmUpCi0gICAgICAgIHJldHVybiAoc3RkZXJyLCBjcmFzaF9s b2cpCi0KICAgICBkZWYgc3RhcnRfaGVscGVyKHNlbGYsIHBpeGVsX3Rlc3RzPUZhbHNlKToKICAg ICAgICAgaGVscGVyX3BhdGggPSBzZWxmLl9wYXRoX3RvX2hlbHBlcigpCiAgICAgICAgIGlmIG5v dCBoZWxwZXJfcGF0aDoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hY191 bml0dGVzdC5weQkocmV2aXNpb24gMjE1MzcyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L21hY191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTQxLDE0ICsxNDEsNiBAQCBj bGFzcyBNYWNUZXN0KGRhcndpbl90ZXN0Y2FzZS5EYXJ3aW5UZXN0CiAgICAgICAgIGNoaWxkX3By b2Nlc3NlcyA9IE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LmRlZmF1 bHRfY2hpbGRfcHJvY2Vzc2VzLCAoKSwgZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGNoaWxkX3Byb2Nlc3NlcywgMSkKIAotICAgIGRlZiB0ZXN0 X2dldF9jcmFzaF9sb2coc2VsZik6Ci0gICAgICAgICMgTWFjIGNyYXNoIGxvZ3MgYXJlIHRlc3Rl ZCBlbHNld2hlcmUsIHNvIGhlcmUgd2UganVzdCBtYWtlIHN1cmUgd2UgZG9uJ3QgY3Jhc2guCi0g ICAgICAgIGRlZiBmYWtlX3RpbWVfY2IoKToKLSAgICAgICAgICAgIHRpbWVzID0gWzAsIDIwLCA0 MF0KLSAgICAgICAgICAgIHJldHVybiBsYW1iZGE6IHRpbWVzLnBvcCgwKQotICAgICAgICBwb3J0 ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdtYWMtc25vd2xlb3BhcmQnKQotICAgICAgICBw b3J0Ll9nZXRfY3Jhc2hfbG9nKCdEdW1wUmVuZGVyVHJlZScsIDEyMzQsIE5vbmUsIE5vbmUsIHRp bWUudGltZSgpLCB3YWl0X2Zvcl9sb2c9RmFsc2UpCi0KICAgICBkZWYgdGVzdF8zMmJpdChzZWxm KToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KG9wdGlvbnM9TW9ja09wdGlvbnMoYXJj aGl0ZWN0dXJlPSd4ODYnKSkKIAo= 309552 2017-05-09 15:38:55 -0700 2017-05-09 16:19:11 -0700 Patch for landing bug-170857-20170509153854.patch text/plain 11471 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNjU0MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDE3LTA1LTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVtb3ZlIHVubmVlZGVkIGNyYXNoIGxvZyByZXRyaWV2 YWwsIHJlZmFjdG9yIERhcndpbiBjcmFzaCByZXRyaWV2YWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDg1NworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzE2MzUzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAg ICAgU2luY2UgTGF5b3V0VGVzdFJlbGF5IGhhcyBiZWVuIHJlbW92ZWQsIGlPUyBTaW11bGF0b3Jz IGFuZCBNYWNzIGNhbiB1c2UgdGhlIHNhbWUKKyAgICAgICAgY29kZSB0byBzZWFyY2ggZm9yIGNy YXNoIGxvZ3MuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5Ogor ICAgICAgICAoRGFyd2luUG9ydC5fZ2V0X2NyYXNoX2xvZyk6IE1vdmVkIGZyb20gTWFjUG9ydC4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5OgorICAg ICAgICAoRGFyd2luVGVzdC50ZXN0X2dldF9jcmFzaF9sb2cpOiBNb3ZlZCBmcm9tIE1hY1Rlc3Qu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHk6CisgICAgICAg IChJT1NEZXZpY2VQb3J0Ll9nZXRfY3Jhc2hfbG9nKTogSW1wbGVtZW50IHBhc3MtdGhyb3VnaCBm b3IgaU9TIGRldmljZSwgc2luY2UgaU9TCisgICAgICAgIGRldmljZXMgbXVzdCBzZWFyY2ggZm9y IGNyYXNoLWxvZ3MgcmVtb3RlbHkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lv c19zaW11bGF0b3IucHk6CisgICAgICAgIChJT1NTaW11bGF0b3JQb3J0Ll9nZXRfY3Jhc2hfbG9n KTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRv cl91bml0dGVzdC5weToKKyAgICAgICAgKElPU1NpbXVsYXRvclRlc3QudGVzdF9nZXRfY3Jhc2hf bG9nKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjLnB5Ogor ICAgICAgICAoTWFjUG9ydC5fZ2V0X2NyYXNoX2xvZyk6IE1vdmVkIHRvIERhcndpblBvcnQKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAgICAo TWFjVGVzdC50ZXN0X2dldF9jcmFzaF9sb2cpOiBNb3ZlZCB0byBEYXJ3aW5UZXN0LgorCiAyMDE3 LTA1LTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBi dWlsZCBJbWFnZURpZmYgd2l0aCBob3N0IFNESyBmcm9tIE1ha2UKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Rhcndpbi5weQkocmV2aXNpb24gMjE2NTM1KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weQkod29ya2luZyBjb3B5KQpAQCAtMjIsNiArMjIsNyBA QAogCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9zCitpbXBvcnQgdGltZQogCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5jcmFzaGxvZ3MgaW1wb3J0IENyYXNoTG9ncwpAQCAtMTAxLDcgKzEwMiwyNiBAQCBj bGFzcyBEYXJ3aW5Qb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgIHJldHVybiBjcmFzaF9sb2cuZmlu ZF9hbGxfbG9ncyhpbmNsdWRlX2Vycm9ycz1UcnVlLCBuZXdlcl90aGFuPW5ld2VyX3RoYW4pCiAK ICAgICBkZWYgX2dldF9jcmFzaF9sb2coc2VsZiwgbmFtZSwgcGlkLCBzdGRvdXQsIHN0ZGVyciwg bmV3ZXJfdGhhbiwgdGltZV9mbj1Ob25lLCBzbGVlcF9mbj1Ob25lLCB3YWl0X2Zvcl9sb2c9VHJ1 ZSk6Ci0gICAgICAgIHJldHVybiBzdXBlcihEYXJ3aW5Qb3J0LCBzZWxmKS5fZ2V0X2NyYXNoX2xv ZyhuYW1lLCBwaWQsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuKQorICAgICAgICAjIE5vdGUg dGhhdCB3ZSBkbyBzbG93LXNwaW4gaGVyZSBhbmQgd2FpdCwgc2luY2UgaXQgYXBwZWFycyB0aGUg dGltZQorICAgICAgICAjIFJlcG9ydENyYXNoIHRha2VzIHRvIGFjdHVhbGx5IHdyaXRlIGFuZCBm bHVzaCB0aGUgZmlsZSB2YXJpZXMgd2hlbiB0aGVyZSBhcmUKKyAgICAgICAgIyBsb3RzIG9mIHNp bXVsdGFuZW91cyBjcmFzaGVzIGdvaW5nIG9uLgorICAgICAgICB0aW1lX2ZuID0gdGltZV9mbiBv ciB0aW1lLnRpbWUKKyAgICAgICAgc2xlZXBfZm4gPSBzbGVlcF9mbiBvciB0aW1lLnNsZWVwCisg ICAgICAgIGNyYXNoX2xvZyA9ICcnCisgICAgICAgIGNyYXNoX2xvZ3MgPSBDcmFzaExvZ3Moc2Vs Zi5ob3N0KQorICAgICAgICBub3cgPSB0aW1lX2ZuKCkKKyAgICAgICAgZGVhZGxpbmUgPSBub3cg KyA1ICogaW50KHNlbGYuZ2V0X29wdGlvbignY2hpbGRfcHJvY2Vzc2VzJywgMSkpCisgICAgICAg IHdoaWxlIG5vdCBjcmFzaF9sb2cgYW5kIG5vdyA8PSBkZWFkbGluZToKKyAgICAgICAgICAgIGNy YXNoX2xvZyA9IGNyYXNoX2xvZ3MuZmluZF9uZXdlc3RfbG9nKG5hbWUsIHBpZCwgaW5jbHVkZV9l cnJvcnM9VHJ1ZSwgbmV3ZXJfdGhhbj1uZXdlcl90aGFuKQorICAgICAgICAgICAgaWYgbm90IHdh aXRfZm9yX2xvZzoKKyAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgaWYgbm90IGNy YXNoX2xvZyBvciBub3QgW2xpbmUgZm9yIGxpbmUgaW4gY3Jhc2hfbG9nLnNwbGl0bGluZXMoKSBp ZiBub3QgbGluZS5zdGFydHN3aXRoKCdFUlJPUicpXToKKyAgICAgICAgICAgICAgICBzbGVlcF9m bigwLjEpCisgICAgICAgICAgICAgICAgbm93ID0gdGltZV9mbigpCisKKyAgICAgICAgaWYgbm90 IGNyYXNoX2xvZzoKKyAgICAgICAgICAgIHJldHVybiAoc3RkZXJyLCBOb25lKQorICAgICAgICBy ZXR1cm4gKHN0ZGVyciwgY3Jhc2hfbG9nKQogCiAgICAgZGVmIGxvb2tfZm9yX25ld19jcmFzaF9s b2dzKHNlbGYsIGNyYXNoZWRfcHJvY2Vzc2VzLCBzdGFydF90aW1lKToKICAgICAgICAgIiIiU2lu Y2UgY3Jhc2ggbG9ncyBjYW4gdGFrZSBhIGxvbmcgdGltZSB0byBiZSB3cml0dGVuIG91dCBpZiB0 aGUgc3lzdGVtIGlzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rl c3RjYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3 aW5fdGVzdGNhc2UucHkJKHJldmlzaW9uIDIxNjUzNSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9kYXJ3aW5fdGVzdGNhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDYgKzIwLDgg QEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0IHRpbWUK KwogZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBwb3J0X3Rlc3RjYXNlCiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3 ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucwpAQCAtMTI0LDMgKzEyNiwx MSBAQCBjbGFzcyBEYXJ3aW5UZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDCiAgICAgICAgIHBv cnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgIHBvcnQuaG9zdC5leGVjdXRpdmUgPSBNb2Nr RXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj10aHJvd2luZ19ydW5fY29tbWFuZCkKICAgICAgICAg T3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3Ms IGFyZ3M9Wyd0ZXN0JywgNDJdKQorCisgICAgZGVmIHRlc3RfZ2V0X2NyYXNoX2xvZyhzZWxmKToK KyAgICAgICAgIyBEYXJ3aW4gY3Jhc2ggbG9ncyBhcmUgdGVzdGVkIGVsc2V3aGVyZSwgc28gaGVy ZSB3ZSBqdXN0IG1ha2Ugc3VyZSB3ZSBkb24ndCBjcmFzaC4KKyAgICAgICAgZGVmIGZha2VfdGlt ZV9jYigpOgorICAgICAgICAgICAgdGltZXMgPSBbMCwgMjAsIDQwXQorICAgICAgICAgICAgcmV0 dXJuIGxhbWJkYTogdGltZXMucG9wKDApCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChw b3J0X25hbWU9c2VsZi5wb3J0X25hbWUpCisgICAgICAgIHBvcnQuX2dldF9jcmFzaF9sb2coJ0R1 bXBSZW5kZXJUcmVlJywgMTIzNCwgTm9uZSwgTm9uZSwgdGltZS50aW1lKCksIHdhaXRfZm9yX2xv Zz1GYWxzZSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5 CShyZXZpc2lvbiAyMTY1MzUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2Rl dmljZS5weQkod29ya2luZyBjb3B5KQpAQCAtODcsNiArODcsOSBAQCBjbGFzcyBJT1NEZXZpY2VQ b3J0KElPU1BvcnQpOgogICAgIGRlZiBvcGVyYXRpbmdfc3lzdGVtKHNlbGYpOgogICAgICAgICBy ZXR1cm4gJ2lvcy1kZXZpY2UnCiAKKyAgICBkZWYgX2dldF9jcmFzaF9sb2coc2VsZiwgbmFtZSwg cGlkLCBzdGRvdXQsIHN0ZGVyciwgbmV3ZXJfdGhhbiwgdGltZV9mbj1Ob25lLCBzbGVlcF9mbj1O b25lLCB3YWl0X2Zvcl9sb2c9VHJ1ZSk6CisgICAgICAgIHJldHVybiAoc3RkZXJyLCBOb25lKQor CiAgICAgZGVmIF9jcmVhdGVfZGV2aWNlcyhzZWxmLCBkZXZpY2VfY2xhc3MpOgogICAgICAgICBp ZiBub3QgYXBwbGVfYWRkaXRpb25zKCk6CiAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3Io c2VsZi5OT19PTl9ERVZJQ0VfVEVTVElORykKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9pb3Nfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lvbiAyMTY1MzUpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtMTM0 LDQ0ICsxMzQsNiBAQCBjbGFzcyBJT1NTaW11bGF0b3JQb3J0KElPU1BvcnQpOgogCiAgICAgICAg IHJldHVybiBtaW4obWF4aW11bV9zaW11bGF0b3JfY291bnRfb25fdGhpc19zeXN0ZW0sIGJlc3Rf Y2hpbGRfcHJvY2Vzc19jb3VudF9mb3JfY3B1KQogCi0gICAgZGVmIF9nZXRfY3Jhc2hfbG9nKHNl bGYsIG5hbWUsIHBpZCwgc3Rkb3V0LCBzdGRlcnIsIG5ld2VyX3RoYW4sIHRpbWVfZm49dGltZS50 aW1lLCBzbGVlcF9mbj10aW1lLnNsZWVwLCB3YWl0X2Zvcl9sb2c9VHJ1ZSk6Ci0gICAgICAgIHRp bWVfZm4gPSB0aW1lX2ZuIG9yIHRpbWUudGltZQotICAgICAgICBzbGVlcF9mbiA9IHNsZWVwX2Zu IG9yIHRpbWUuc2xlZXAKLQotICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgY29sbGVjdCB0aGUg YWN0dWFsIGNyYXNoIGxvZyBmb3IgRHVtcFJlbmRlclRyZWUuYXBwIGJlY2F1c2UgaXQgaW5jbHVk ZXMgbW9yZQotICAgICAgICAjIGluZm9ybWF0aW9uIChlLmcuIGV4Y2VwdGlvbiBjb2RlcykgdGhh biBpcyBhdmFpbGFibGUgaW4gdGhlIHN0YWNrIHRyYWNlIHdyaXR0ZW4gdG8gc3RhbmRhcmQgZXJy b3IuCi0gICAgICAgIHN0ZGVycl9saW5lcyA9IFtdCi0gICAgICAgIGNyYXNoZWRfc3VicHJvY2Vz c19uYW1lX2FuZF9waWQgPSBOb25lICAjIGUuZy4gKCdEdW1wUmVuZGVyVHJlZS5hcHAnLCAxMjM0 KQotICAgICAgICBmb3IgbGluZSBpbiAoc3RkZXJyIG9yICcnKS5zcGxpdGxpbmVzKCk6Ci0gICAg ICAgICAgICBpZiBub3QgY3Jhc2hlZF9zdWJwcm9jZXNzX25hbWVfYW5kX3BpZDoKLSAgICAgICAg ICAgICAgICBtYXRjaCA9IHNlbGYuU1VCUFJPQ0VTU19DUkFTSF9SRUdFWC5tYXRjaChsaW5lKQot ICAgICAgICAgICAgICAgIGlmIG1hdGNoOgotICAgICAgICAgICAgICAgICAgICBjcmFzaGVkX3N1 YnByb2Nlc3NfbmFtZV9hbmRfcGlkID0gKG1hdGNoLmdyb3VwKCdzdWJwcm9jZXNzX25hbWUnKSwg aW50KG1hdGNoLmdyb3VwKCdzdWJwcm9jZXNzX3BpZCcpKSkKLSAgICAgICAgICAgICAgICAgICAg Y29udGludWUKLSAgICAgICAgICAgIHN0ZGVycl9saW5lcy5hcHBlbmQobGluZSkKLQotICAgICAg ICBpZiBjcmFzaGVkX3N1YnByb2Nlc3NfbmFtZV9hbmRfcGlkOgotICAgICAgICAgICAgcmV0dXJu IHNlbGYuX2dldF9jcmFzaF9sb2coY3Jhc2hlZF9zdWJwcm9jZXNzX25hbWVfYW5kX3BpZFswXSwg Y3Jhc2hlZF9zdWJwcm9jZXNzX25hbWVfYW5kX3BpZFsxXSwgc3Rkb3V0LAotICAgICAgICAgICAg ICAgICdcbicuam9pbihzdGRlcnJfbGluZXMpLCBuZXdlcl90aGFuLCB0aW1lX2ZuLCBzbGVlcF9m biwgd2FpdF9mb3JfbG9nKQotCi0gICAgICAgICMgQXBwIGNyYXNoZWQKLSAgICAgICAgX2xvZy5k ZWJ1ZygnbG9va2luZyBmb3IgY3Jhc2ggbG9nIGZvciAlczolcycgJSAobmFtZSwgc3RyKHBpZCkp KQotICAgICAgICBjcmFzaF9sb2cgPSAnJwotICAgICAgICBjcmFzaF9sb2dzID0gQ3Jhc2hMb2dz KHNlbGYuaG9zdCkKLSAgICAgICAgbm93ID0gdGltZV9mbigpCi0gICAgICAgIGRlYWRsaW5lID0g bm93ICsgNSAqIGludChzZWxmLmdldF9vcHRpb24oJ2NoaWxkX3Byb2Nlc3NlcycsIDEpKQotICAg ICAgICB3aGlsZSBub3QgY3Jhc2hfbG9nIGFuZCBub3cgPD0gZGVhZGxpbmU6Ci0gICAgICAgICAg ICBjcmFzaF9sb2cgPSBjcmFzaF9sb2dzLmZpbmRfbmV3ZXN0X2xvZyhuYW1lLCBwaWQsIGluY2x1 ZGVfZXJyb3JzPVRydWUsIG5ld2VyX3RoYW49bmV3ZXJfdGhhbikKLSAgICAgICAgICAgIGlmIG5v dCB3YWl0X2Zvcl9sb2c6Ci0gICAgICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAgIGlmIG5v dCBjcmFzaF9sb2cgb3Igbm90IFtsaW5lIGZvciBsaW5lIGluIGNyYXNoX2xvZy5zcGxpdGxpbmVz KCkgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgnRVJST1InKV06Ci0gICAgICAgICAgICAgICAgc2xl ZXBfZm4oMC4xKQotICAgICAgICAgICAgICAgIG5vdyA9IHRpbWVfZm4oKQotCi0gICAgICAgIGlm IG5vdCBjcmFzaF9sb2c6Ci0gICAgICAgICAgICByZXR1cm4gc3RkZXJyLCBOb25lCi0gICAgICAg IHJldHVybiBzdGRlcnIsIGNyYXNoX2xvZwotCiAgICAgZGVmIF9idWlsZF9kcml2ZXJfZmxhZ3Mo c2VsZik6CiAgICAgICAgIGFyY2hzID0gWydBUkNIUz1pMzg2J10gaWYgc2VsZi5hcmNoaXRlY3R1 cmUoKSA9PSAneDg2JyBlbHNlIFtdCiAgICAgICAgIHNkayA9IFsnLS1zZGsnLCAnaXBob25lc2lt dWxhdG9yJ10KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9y X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9p b3Nfc2ltdWxhdG9yX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMTY1MzUpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5 KQpAQCAtNTAsMTQgKzUwLDYgQEAgY2xhc3MgSU9TU2ltdWxhdG9yVGVzdChpb3NfdGVzdGNhc2Uu SU9TVAogICAgIGRlZiB0ZXN0X29wZXJhdGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoJ2lvcy1zaW11bGF0b3InLCBzZWxmLm1ha2VfcG9ydCgpLm9wZXJhdGluZ19z eXN0ZW0oKSkKIAotICAgIGRlZiB0ZXN0X2dldF9jcmFzaF9sb2coc2VsZik6Ci0gICAgICAgICMg TWFjIGNyYXNoIGxvZ3MgYXJlIHRlc3RlZCBlbHNld2hlcmUsIHNvIGhlcmUgd2UganVzdCBtYWtl IHN1cmUgd2UgZG9uJ3QgY3Jhc2guCi0gICAgICAgIGRlZiBmYWtlX3RpbWVfY2IoKToKLSAgICAg ICAgICAgIHRpbWVzID0gWzAsIDIwLCA0MF0KLSAgICAgICAgICAgIHJldHVybiBsYW1iZGE6IHRp bWVzLnBvcCgwKQotICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPXNlbGYu cG9ydF9uYW1lKQotICAgICAgICBwb3J0Ll9nZXRfY3Jhc2hfbG9nKCdEdW1wUmVuZGVyVHJlZScs IDEyMzQsIE5vbmUsIE5vbmUsIHRpbWUudGltZSgpLCB3YWl0X2Zvcl9sb2c9RmFsc2UpCi0KICAg ICBkZWYgdGVzdF8zMmJpdChzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KG9w dGlvbnM9TW9ja09wdGlvbnMoYXJjaGl0ZWN0dXJlPSd4ODYnKSkKIApJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L21hYy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvbWFjLnB5CShyZXZpc2lvbiAyMTY1MzUpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvbWFjLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNjIsMzEgKzE2Miw2IEBAIGNs YXNzIE1hY1BvcnQoRGFyd2luUG9ydCk6CiAgICAgZGVmIF9jaGVja19wb3J0X2J1aWxkKHNlbGYp OgogICAgICAgICByZXR1cm4gbm90IHNlbGYuZ2V0X29wdGlvbignamF2YScpIG9yIHNlbGYuX2J1 aWxkX2phdmFfdGVzdF9zdXBwb3J0KCkKIAotICAgIGRlZiBfZ2V0X2NyYXNoX2xvZyhzZWxmLCBu YW1lLCBwaWQsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuLCB0aW1lX2ZuPU5vbmUsIHNsZWVw X2ZuPU5vbmUsIHdhaXRfZm9yX2xvZz1UcnVlKToKLSAgICAgICAgIyBOb3RlIHRoYXQgd2UgZG8g c2xvdy1zcGluIGhlcmUgYW5kIHdhaXQsIHNpbmNlIGl0IGFwcGVhcnMgdGhlIHRpbWUKLSAgICAg ICAgIyBSZXBvcnRDcmFzaCB0YWtlcyB0byBhY3R1YWxseSB3cml0ZSBhbmQgZmx1c2ggdGhlIGZp bGUgdmFyaWVzIHdoZW4gdGhlcmUgYXJlCi0gICAgICAgICMgbG90cyBvZiBzaW11bHRhbmVvdXMg Y3Jhc2hlcyBnb2luZyBvbi4KLSAgICAgICAgIyBGSVhNRTogU2hvdWxkIG1vc3Qgb2YgdGhpcyBi ZSBtb3ZlZCBpbnRvIENyYXNoTG9ncygpPwotICAgICAgICB0aW1lX2ZuID0gdGltZV9mbiBvciB0 aW1lLnRpbWUKLSAgICAgICAgc2xlZXBfZm4gPSBzbGVlcF9mbiBvciB0aW1lLnNsZWVwCi0gICAg ICAgIGNyYXNoX2xvZyA9ICcnCi0gICAgICAgIGNyYXNoX2xvZ3MgPSBDcmFzaExvZ3Moc2VsZi5o b3N0KQotICAgICAgICBub3cgPSB0aW1lX2ZuKCkKLSAgICAgICAgIyBGSVhNRTogZGVsZXRlIHRo aXMgYWZ0ZXIgd2UncmUgc3VyZSB0aGlzIGNvZGUgaXMgd29ya2luZyAuLi4KLSAgICAgICAgX2xv Zy5kZWJ1ZygnbG9va2luZyBmb3IgY3Jhc2ggbG9nIGZvciAlczolcycgJSAobmFtZSwgc3RyKHBp ZCkpKQotICAgICAgICBkZWFkbGluZSA9IG5vdyArIDUgKiBpbnQoc2VsZi5nZXRfb3B0aW9uKCdj aGlsZF9wcm9jZXNzZXMnLCAxKSkKLSAgICAgICAgd2hpbGUgbm90IGNyYXNoX2xvZyBhbmQgbm93 IDw9IGRlYWRsaW5lOgotICAgICAgICAgICAgY3Jhc2hfbG9nID0gY3Jhc2hfbG9ncy5maW5kX25l d2VzdF9sb2cobmFtZSwgcGlkLCBpbmNsdWRlX2Vycm9ycz1UcnVlLCBuZXdlcl90aGFuPW5ld2Vy X3RoYW4pCi0gICAgICAgICAgICBpZiBub3Qgd2FpdF9mb3JfbG9nOgotICAgICAgICAgICAgICAg IGJyZWFrCi0gICAgICAgICAgICBpZiBub3QgY3Jhc2hfbG9nIG9yIG5vdCBbbGluZSBmb3IgbGlu ZSBpbiBjcmFzaF9sb2cuc3BsaXRsaW5lcygpIGlmIG5vdCBsaW5lLnN0YXJ0c3dpdGgoJ0VSUk9S JyldOgotICAgICAgICAgICAgICAgIHNsZWVwX2ZuKDAuMSkKLSAgICAgICAgICAgICAgICBub3cg PSB0aW1lX2ZuKCkKLQotICAgICAgICBpZiBub3QgY3Jhc2hfbG9nOgotICAgICAgICAgICAgcmV0 dXJuIChzdGRlcnIsIE5vbmUpCi0gICAgICAgIHJldHVybiAoc3RkZXJyLCBjcmFzaF9sb2cpCi0K ICAgICBkZWYgc3RhcnRfaGVscGVyKHNlbGYsIHBpeGVsX3Rlc3RzPUZhbHNlKToKICAgICAgICAg aGVscGVyX3BhdGggPSBzZWxmLl9wYXRoX3RvX2hlbHBlcigpCiAgICAgICAgIGlmIG5vdCBoZWxw ZXJfcGF0aDoKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hY191bml0dGVz dC5weQkocmV2aXNpb24gMjE2NTM1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21h Y191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTQxLDE0ICsxNDEsNiBAQCBjbGFzcyBN YWNUZXN0KGRhcndpbl90ZXN0Y2FzZS5EYXJ3aW5UZXN0CiAgICAgICAgIGNoaWxkX3Byb2Nlc3Nl cyA9IE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LmRlZmF1bHRfY2hp bGRfcHJvY2Vzc2VzLCAoKSwgZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNoaWxkX3Byb2Nlc3NlcywgMSkKIAotICAgIGRlZiB0ZXN0X2dldF9j cmFzaF9sb2coc2VsZik6Ci0gICAgICAgICMgTWFjIGNyYXNoIGxvZ3MgYXJlIHRlc3RlZCBlbHNl d2hlcmUsIHNvIGhlcmUgd2UganVzdCBtYWtlIHN1cmUgd2UgZG9uJ3QgY3Jhc2guCi0gICAgICAg IGRlZiBmYWtlX3RpbWVfY2IoKToKLSAgICAgICAgICAgIHRpbWVzID0gWzAsIDIwLCA0MF0KLSAg ICAgICAgICAgIHJldHVybiBsYW1iZGE6IHRpbWVzLnBvcCgwKQotICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQocG9ydF9uYW1lPSdtYWMtc25vd2xlb3BhcmQnKQotICAgICAgICBwb3J0Ll9n ZXRfY3Jhc2hfbG9nKCdEdW1wUmVuZGVyVHJlZScsIDEyMzQsIE5vbmUsIE5vbmUsIHRpbWUudGlt ZSgpLCB3YWl0X2Zvcl9sb2c9RmFsc2UpCi0KICAgICBkZWYgdGVzdF8zMmJpdChzZWxmKToKICAg ICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KG9wdGlvbnM9TW9ja09wdGlvbnMoYXJjaGl0ZWN0 dXJlPSd4ODYnKSkKIAo=