84823 2012-04-24 20:23:07 -0700 [chromium] Make DRT work without the --test-shell flag in new-run-webkit-tests 2012-05-04 11:54:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke eric ojan rniwa tkent tony oldest_to_newest 609420 0 dpranke 2012-04-24 20:23:07 -0700 [chromium] Make DRT work without the --test-shell flag 609424 1 138726 dpranke 2012-04-24 20:24:38 -0700 Created attachment 138726 work-in-progress roll-up patch 609432 2 138726 eric 2012-04-24 20:33:43 -0700 Comment on attachment 138726 work-in-progress roll-up patch View in context: https://bugs.webkit.org/attachment.cgi?id=138726&action=review > Tools/Scripts/webkitpy/layout_tests/port/chromium.py:402 > + self._test_shell = '--test-shell' in port.get_option('additional_drt_flag') I'm not sure I understand this part. 609822 3 dpranke 2012-04-25 09:12:12 -0700 (In reply to comment #2) > (From update of attachment 138726 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138726&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/chromium.py:402 > > + self._test_shell = '--test-shell' in port.get_option('additional_drt_flag') > > I'm not sure I understand this part. This is how we toggle between --test-shell mode and not in the chromium.py code, rather than adding yet another obscure command line flag to NRWT itself. Eventually this code will go away and we won't support --test-shell mode at all, but this is here now for testing. It's not suitable to land as-is, though, since I'm fairly certain it would break chromium win completely, and may not work on linux either (will know more today). 610067 4 dpranke 2012-04-25 14:56:21 -0700 It looks like this more-or-less works on mac and linux, so I'm going to start carving this up into reviewable patches. Win is probably going to take some more work, so I'm planning to make this on by default on Mac and Linux and off by default on Win. 616483 5 dpranke 2012-05-04 11:54:16 -0700 This is now on everywhere. Closing. 138726 2012-04-24 20:24:38 -0700 2012-04-25 14:56:34 -0700 work-in-progress roll-up patch bug-84823-20120424202437.patch text/plain 27418 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0OTc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzk5MzVjNTUxYzg4NThhODhjOWM4N2I5ZjE3Yjc3MTk5 ZmM3ZmRhNy4uMzcwMWE1ZGVkNzU3NDU4MWQyZTQ0ZmZlY2IwY2UwNTQzN2M0MzFkZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY1 IEBACisyMDEyLTA0LTI0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFtjaHJvbWl1bV0gTWFrZSBEUlQgd29yayB3aXRob3V0IHRoZSAtLXRlc3Qtc2hlbGwg ZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ4 MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXb3Jr IGluIHByb2dyZXNzLCBvbmx5IHRlc3RlZCBvbiBNYWMgU0wgc28gZmFyLiBTZWVtcyB0bworICAg ICAgICB3b3JrIGV4Y2VwdCBmb3Igb25lIG9kZGx5IGZhaWxpbmcgU1ZHIHRlc3QgdGhhdCBJIGhh dmUgbm8KKyAgICAgICAgZXhwbGFuYXRpb24gZm9yLiBUaGUgcHl0aG9uIHVuaXQgdGVzdHMgbmVl ZCB0byBiZSB1cGRhdGVkLAorICAgICAgICBhbmQgb2YgY291cnNlIEkgbmVlZCB0byB0ZXN0IHRo aXMgb24gTGludXggYW5kIFdpbi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1Rlc3RFdmVudFByaW50ZXIuY3BwOgorICAgICAgICAoRFJUUHJpbnRlcik6CisgICAgICAgIChU ZXN0U2hlbGxQcmludGVyKToKKyAgICAgICAgKERSVFByaW50ZXI6OmhhbmRsZVRleHRGb290ZXIp OgorICAgICAgICAoRFJUUHJpbnRlcjo6aGFuZGxlQXVkaW9Gb290ZXIpOgorICAgICAgICAoRFJU UHJpbnRlcjo6aGFuZGxlVGVzdEZvb3Rlcik6CisgICAgICAgIChUZXN0U2hlbGxQcmludGVyOjpo YW5kbGVBdWRpb0Zvb3Rlcik6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVz dEV2ZW50UHJpbnRlci5oOgorICAgICAgICAoVGVzdEV2ZW50UHJpbnRlcik6CisgICAgICAgICog RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKFRlc3RTaGVs bDo6VGVzdFNoZWxsKToKKyAgICAgICAgKFRlc3RTaGVsbDo6ZHVtcCk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5OgorICAgICAg ICAoV29ya2VyLnJ1bik6CisgICAgICAgIChXb3JrZXIuY2xlYW51cCk6CisgICAgICAgIChXb3Jr ZXIua2lsbF9kcml2ZXIpOgorICAgICAgICAoV29ya2VyLmNsZWFuX3VwX2FmdGVyX3Rlc3QpOgor ICAgICAgICAoV29ya2VyLl9ydW5fdGVzdF9pbl90aGlzX3RocmVhZCk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5z YW1wbGVfcHJvY2Vzcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bS5weToKKyAgICAgICAgKENocm9taXVtRHJpdmVyKToKKyAgICAgICAgKENo cm9taXVtRHJpdmVyLl9faW5pdF9fKToKKyAgICAgICAgKENocm9taXVtRHJpdmVyLl93cmFwcGVy X29wdGlvbnMpOgorICAgICAgICAoQ2hyb21pdW1Ecml2ZXIuY21kX2xpbmUpOgorICAgICAgICAo Q2hyb21pdW1Ecml2ZXIuX3N0YXJ0KToKKyAgICAgICAgKENocm9taXVtRHJpdmVyLmhhc19jcmFz aGVkKToKKyAgICAgICAgKENocm9taXVtRHJpdmVyLnJ1bl90ZXN0KToKKyAgICAgICAgKENocm9t aXVtRHJpdmVyLnN0b3ApOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHk6CisgICAgICAgIChDaHJvbWl1bURyaXZlclRlc3Qu c2V0VXApOgorICAgICAgICAoQ2hyb21pdW1Ecml2ZXJUZXN0LnRlc3RfdHdvX2RyaXZlcnMuTW9j a0RyaXZlci5fX2luaXRfXyk6CisgICAgICAgIChDaHJvbWl1bURyaXZlclRlc3QudGVzdF90d29f ZHJpdmVycyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9t YWMucHk6CisgICAgICAgIChNYWNQb3J0LnNhbXBsZV9wcm9jZXNzKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAg IChQb3J0VGVzdENhc2UubWFrZV9wb3J0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2VydmVyUHJvY2Vz cy5fX2luaXRfXyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLndyaXRlKToKKyAgICAgICAgKFNl cnZlclByb2Nlc3MuX2xvZyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9oYW5kbGVfdGltZW91 dCk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl93YWl0X2Zvcl9kYXRhX2FuZF91cGRhdGVfYnVm ZmVycyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLnN0b3ApOgorICAgICAgICAoU2VydmVyUHJv Y2Vzcyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLmtpbGwpOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAoV2ViS2l0RHJp dmVyLl9zdGFydCk6CisgICAgICAgIChXZWJLaXREcml2ZXIucnVuX3Rlc3QpOgorCiAyMDEyLTA0 LTIzICBFcmlxIEF1Z3VzdGluZSAgPGVhdWd1c3RpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXR1cm4gdmFsdWUgZnJvbSBleGVjdXRlZCBzY3JpcHQgaW4gQ2hyb21pdW0uCmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0RXZlbnRQcmludGVyLmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwCmluZGV4IDgy NDZjMDliZTY0N2EzYmQ5MmY3ZDk2ODdlMGZhMDI2YWE4MWU2YjUuLjczMGQ3NmIyN2U0MzQ5NjY3 OWZkZGM1MWVlNjE1ZDczY2UxYjdmYmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIGhhbmRsZVRleHRIZWFkZXIoKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZVRleHRG b290ZXIoKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZUF1ZGlvSGVhZGVyKCkgY29uc3Q7CisgICAg dm9pZCBoYW5kbGVBdWRpb0Zvb3RlcigpIGNvbnN0OwogICAgIHZvaWQgaGFuZGxlSW1hZ2UoY29u c3QgY2hhciogYWN0dWFsSGFzaCwgY29uc3QgY2hhciogZXhwZWN0ZWRIYXNoLCBjb25zdCB1bnNp Z25lZCBjaGFyKiBpbWFnZURhdGEsIHNpemVfdCBpbWFnZVNpemUsIGNvbnN0IGNoYXIqIGZpbGVO YW1lKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZUltYWdlRm9vdGVyKCkgY29uc3Q7CiAgICAgdm9p ZCBoYW5kbGVUZXN0Rm9vdGVyKGJvb2wgZHVtcGVkQW55dGhpbmcpIGNvbnN0OwpAQCAtNTYsNiAr NTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBoYW5kbGVUZXh0SGVhZGVyKCkgY29uc3Q7CiAgICAg dm9pZCBoYW5kbGVUZXh0Rm9vdGVyKCkgY29uc3Q7CiAgICAgdm9pZCBoYW5kbGVBdWRpb0hlYWRl cigpIGNvbnN0OworICAgIHZvaWQgaGFuZGxlQXVkaW9Gb290ZXIoKSBjb25zdDsKICAgICB2b2lk IGhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gsIGNvbnN0IGNoYXIqIGV4cGVjdGVk SGFzaCwgY29uc3QgdW5zaWduZWQgY2hhciogaW1hZ2VEYXRhLCBzaXplX3QgaW1hZ2VTaXplLCBj b25zdCBjaGFyKiBmaWxlTmFtZSkgY29uc3Q7CiAgICAgdm9pZCBoYW5kbGVJbWFnZUZvb3Rlcigp IGNvbnN0OwogICAgIHZvaWQgaGFuZGxlVGVzdEZvb3Rlcihib29sIGR1bXBlZEFueXRoaW5nKSBj b25zdDsKQEAgLTk1LDYgKzk3LDcgQEAgdm9pZCBEUlRQcmludGVyOjpoYW5kbGVUZXh0SGVhZGVy KCkgY29uc3QKIHZvaWQgRFJUUHJpbnRlcjo6aGFuZGxlVGV4dEZvb3RlcigpIGNvbnN0CiB7CiAg ICAgcHJpbnRmKCIjRU9GXG4iKTsKKyAgICBmcHJpbnRmKHN0ZGVyciwgIiNFT0ZcbiIpOwogfQog CiB2b2lkIERSVFByaW50ZXI6OmhhbmRsZUF1ZGlvSGVhZGVyKCkgY29uc3QKQEAgLTEwMiw2ICsx MDUsMTIgQEAgdm9pZCBEUlRQcmludGVyOjpoYW5kbGVBdWRpb0hlYWRlcigpIGNvbnN0CiAgICAg cHJpbnRmKCJDb250ZW50LVR5cGU6IGF1ZGlvL3dhdlxuIik7CiB9CiAKK3ZvaWQgRFJUUHJpbnRl cjo6aGFuZGxlQXVkaW9Gb290ZXIoKSBjb25zdAoreworICAgIHByaW50ZigiI0VPRlxuIik7Cisg ICAgZnByaW50ZihzdGRlcnIsICIjRU9GXG4iKTsKK30KKwogdm9pZCBEUlRQcmludGVyOjpoYW5k bGVJbWFnZShjb25zdCBjaGFyKiBhY3R1YWxIYXNoLCBjb25zdCBjaGFyKiBleHBlY3RlZEhhc2gs IGNvbnN0IHVuc2lnbmVkIGNoYXIqIGltYWdlRGF0YSwgc2l6ZV90IGltYWdlU2l6ZSwgY29uc3Qg Y2hhciopIGNvbnN0CiB7CiAgICAgQVNTRVJUKGFjdHVhbEhhc2gpOwpAQCAtMTE5LDEzICsxMjgs OSBAQCB2b2lkIERSVFByaW50ZXI6OmhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gs IGNvbnN0IGNoYXIqIGV4cGVjdGVkSGFzaCwgYwogICAgIH0KIH0KIAotdm9pZCBEUlRQcmludGVy OjpoYW5kbGVJbWFnZUZvb3RlcigpIGNvbnN0Ci17Ci0gICAgcHJpbnRmKCIjRU9GXG4iKTsKLX0K LQogdm9pZCBEUlRQcmludGVyOjpoYW5kbGVUZXN0Rm9vdGVyKGJvb2wpIGNvbnN0CiB7CisgICAg cHJpbnRmKCIjRU9GXG4iKTsKIH0KIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtMTUzLDYgKzE1OCwxMSBAQCB2 b2lkIFRlc3RTaGVsbFByaW50ZXI6OmhhbmRsZUF1ZGlvSGVhZGVyKCkgY29uc3QKICAgICBwcmlu dGYoIkNvbnRlbnQtVHlwZTogYXVkaW8vd2F2XG4iKTsKIH0KIAordm9pZCBUZXN0U2hlbGxQcmlu dGVyOjpoYW5kbGVBdWRpb0Zvb3RlcigpIGNvbnN0Cit7CisgICAgcHJpbnRmKCJcbiIpOworfQor CiB2b2lkIFRlc3RTaGVsbFByaW50ZXI6OmhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhh c2gsIGNvbnN0IGNoYXIqLCBjb25zdCB1bnNpZ25lZCBjaGFyKiBpbWFnZURhdGEsIHNpemVfdCBp bWFnZVNpemUsIGNvbnN0IGNoYXIqIGZpbGVOYW1lKSBjb25zdAogewogICAgIEFTU0VSVChhY3R1 YWxIYXNoKTsKQEAgLTE3MywxMCArMTgzLDYgQEAgdm9pZCBUZXN0U2hlbGxQcmludGVyOjpoYW5k bGVJbWFnZShjb25zdCBjaGFyKiBhY3R1YWxIYXNoLCBjb25zdCBjaGFyKiwgY29uc3QgdW4KICAg ICBwcmludGYoIiNNRDU6JXNcbiIsIGFjdHVhbEhhc2gpOwogfQogCi12b2lkIFRlc3RTaGVsbFBy aW50ZXI6OmhhbmRsZUltYWdlRm9vdGVyKCkgY29uc3QKLXsKLX0KLQogdm9pZCBUZXN0U2hlbGxQ cmludGVyOjpoYW5kbGVUZXN0Rm9vdGVyKGJvb2wgZHVtcGVkQW55dGhpbmcpIGNvbnN0CiB7CiAg ICAgaWYgKGR1bXBlZEFueXRoaW5nKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdEV2ZW50UHJpbnRlci5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdEV2ZW50UHJpbnRlci5oCmluZGV4IGY2OTUyM2MzNGZhNmMxZTNjNjU1NDU3NDcxNDk2 Nzk5ZjAzZjNiNzcuLjM3NDgyN2UxODljYTlhYjE1ODlkNmJhMzZmNzlmYzQ4OTUyNjM4NDIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIu aAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0RXZlbnRQcmludGVyLmgK QEAgLTQ0LDggKzQ0LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVUZXh0SGVh ZGVyKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVUZXh0Rm9vdGVyKCkgY29u c3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVBdWRpb0hlYWRlcigpIGNvbnN0ID0gMDsK KyAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQXVkaW9Gb290ZXIoKSBjb25zdCA9IDA7CiAgICAgdmly dHVhbCB2b2lkIGhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gsIGNvbnN0IGNoYXIq IGV4cGVjdGVkSGFzaCwgY29uc3QgdW5zaWduZWQgY2hhciogaW1hZ2VEYXRhLCBzaXplX3QgaW1h Z2VTaXplLCBjb25zdCBjaGFyKiBmaWxlTmFtZSkgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgdm9p ZCBoYW5kbGVJbWFnZUZvb3RlcigpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxl VGVzdEZvb3Rlcihib29sIGR1bXBlZEFueXRoaW5nKSBjb25zdCA9IDA7CiB9OwogCmRpZmYgLS1n aXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRleCA1NmZiYTEyZmZhODZj YTMxY2I3ZTc3MWE1NzYwYWJmNjY5OGM1MjE2Li5iYTNjZTBlMDM3ZTE4NDJmZWNkNWI1MGIwOTkw Y2Q0YmQ3YzYxY2E2IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9U ZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVs bC5jcHAKQEAgLTEyNiw3ICsxMjYsNyBAQCBUZXN0U2hlbGw6OlRlc3RTaGVsbCgpCiAgICAgV2Vi UnVudGltZUZlYXR1cmVzOjplbmFibGVNZWRpYVNvdXJjZSh0cnVlKTsKICAgICBXZWJSdW50aW1l RmVhdHVyZXM6OmVuYWJsZUVuY3J5cHRlZE1lZGlhKHRydWUpOwogICAgIFdlYlJ1bnRpbWVGZWF0 dXJlczo6ZW5hYmxlTWVkaWFTdHJlYW0odHJ1ZSk7Ci0gICAgV2ViUnVudGltZUZlYXR1cmVzOjpl bmFibGVXZWJBdWRpbyh0cnVlKTsgCisgICAgV2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVXZWJB dWRpbyh0cnVlKTsKICAgICBXZWJSdW50aW1lRmVhdHVyZXM6OmVuYWJsZVZpZGVvVHJhY2sodHJ1 ZSk7CiAgICAgV2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVHYW1lcGFkKHRydWUpOwogICAgIFdl YlJ1bnRpbWVGZWF0dXJlczo6ZW5hYmxlU2hhZG93RE9NKHRydWUpOwpAQCAtNTU1LDggKzU1NSw3 IEBAIHZvaWQgVGVzdFNoZWxsOjpkdW1wKCkKIAogICAgICAgICBpZiAoZndyaXRlKHdlYkFycmF5 QnVmZmVyVmlldy5iYXNlQWRkcmVzcygpLCAxLCB3ZWJBcnJheUJ1ZmZlclZpZXcuYnl0ZUxlbmd0 aCgpLCBzdGRvdXQpICE9IHdlYkFycmF5QnVmZmVyVmlldy5ieXRlTGVuZ3RoKCkpCiAgICAgICAg ICAgICBGQVRBTCgiU2hvcnQgd3JpdGUgdG8gc3Rkb3V0LCBkaXNrIGZ1bGw/XG4iKTsKLSAgICAg ICAgcHJpbnRmKCJcbiIpOwotCisgICAgICAgIG1fcHJpbnRlci0+aGFuZGxlQXVkaW9Gb290ZXIo KTsKICAgICAgICAgbV9wcmludGVyLT5oYW5kbGVUZXN0Rm9vdGVyKHRydWUpOwogCiAgICAgICAg IGZmbHVzaChzdGRvdXQpOwpAQCAtNjQxLDcgKzY0MCw2IEBAIHZvaWQgVGVzdFNoZWxsOjpkdW1w KCkKIAogICAgICAgICBkdW1wSW1hZ2UobV93ZWJWaWV3SG9zdC0+Y2FudmFzKCkpOwogICAgIH0K LSAgICBtX3ByaW50ZXItPmhhbmRsZUltYWdlRm9vdGVyKCk7CiAgICAgbV9wcmludGVyLT5oYW5k bGVUZXN0Rm9vdGVyKGR1bXBlZEFueXRoaW5nKTsKICAgICBmZmx1c2goc3Rkb3V0KTsKICAgICBm Zmx1c2goc3RkZXJyKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQppbmRleCBhMWUzYmVlNzBlYjI5MmYyN2Q1 MGMzMWY4MjYxNWM4YzdjZGI3OTBjLi44NTY5YWUxN2YxZTViNjVhZTMxYTlhOWExMWEyZWFjMzVl ODk1YzRhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy93b3JrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5CkBAIC0xMzEsNyArMTMxLDcgQEAgY2xhc3MgV29y a2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgICAgICBf bG9nLmRlYnVnKCIlcyBzdGFydGluZyIgJSBzZWxmLl9uYW1lKQogICAgICAgICAgICAgc3VwZXIo V29ya2VyLCBzZWxmKS5ydW4oKQogICAgICAgICBmaW5hbGx5OgotICAgICAgICAgICAgc2VsZi5r aWxsX2RyaXZlcigpCisgICAgICAgICAgICBzZWxmLmtpbGxfZHJpdmVyKCdhdCBlbmQnKQogICAg ICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdkb25lJykKICAg ICAgICAgICAgIF9sb2cuZGVidWcoIiVzIGV4aXRpbmciICUgc2VsZi5fbmFtZSkKICAgICAgICAg ICAgIHNlbGYuY2xlYW51cCgpCkBAIC0xNzcsNyArMTc3LDcgQEAgY2xhc3MgV29ya2VyKG1hbmFn ZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAKICAgICBkZWYgY2xlYW51cChzZWxm KToKICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgY2xlYW5pbmcgdXAiICUgc2VsZi5fbmFtZSkKLSAg ICAgICAgc2VsZi5raWxsX2RyaXZlcigpCisgICAgICAgIHNlbGYua2lsbF9kcml2ZXIoJ2NsZWFu dXAnKQogICAgICAgICBpZiBzZWxmLl90ZXN0c19ydW5fZmlsZToKICAgICAgICAgICAgIHNlbGYu X3Rlc3RzX3J1bl9maWxlLmNsb3NlKCkKICAgICAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxl ID0gTm9uZQpAQCAtMjAxLDkgKzIwMSw5IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9i cm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICB0aHJlYWRfdGltZW91dF9zZWMgPSBkcml2 ZXJfdGltZW91dF9zZWMgKyB0aHJlYWRfcGFkZGluZ19zZWMKICAgICAgICAgcmV0dXJuIHRocmVh ZF90aW1lb3V0X3NlYwogCi0gICAgZGVmIGtpbGxfZHJpdmVyKHNlbGYpOgorICAgIGRlZiBraWxs X2RyaXZlcihzZWxmLCByZWFzb24pOgogICAgICAgICBpZiBzZWxmLl9kcml2ZXI6Ci0gICAgICAg ICAgICBfbG9nLmRlYnVnKCIlcyBraWxsaW5nIGRyaXZlciIgJSBzZWxmLl9uYW1lKQorICAgICAg ICAgICAgX2xvZy5kZWJ1ZygiJXMga2lsbGluZyBkcml2ZXI6ICVzIiAlIChzZWxmLl9uYW1lLCBy ZWFzb24pKQogICAgICAgICAgICAgc2VsZi5fZHJpdmVyLnN0b3AoKQogICAgICAgICAgICAgc2Vs Zi5fZHJpdmVyID0gTm9uZQogCkBAIC0yMjAsNyArMjIwLDcgQEAgY2xhc3MgV29ya2VyKG1hbmFn ZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgIGlmIHJlc3VsdC5mYWls dXJlczoKICAgICAgICAgICAgICMgQ2hlY2sgYW5kIGtpbGwgRHVtcFJlbmRlclRyZWUgaWYgd2Ug bmVlZCB0by4KICAgICAgICAgICAgIGlmIGFueShbZi5kcml2ZXJfbmVlZHNfcmVzdGFydCgpIGZv ciBmIGluIHJlc3VsdC5mYWlsdXJlc10pOgotICAgICAgICAgICAgICAgIHNlbGYua2lsbF9kcml2 ZXIoKQorICAgICAgICAgICAgICAgIHNlbGYua2lsbF9kcml2ZXIoJ3Jlc3RhcnQgYWZ0ZXIgJXMg ZmFpbGVkJyAlIHRlc3RfbmFtZSkKICAgICAgICAgICAgICAgICAjIFJlc2V0IHRoZSBiYXRjaCBj b3VudCBzaW5jZSB0aGUgc2hlbGwganVzdCBib3VuY2VkLgogICAgICAgICAgICAgICAgIHNlbGYu X2JhdGNoX2NvdW50ID0gMAogCkBAIC0yMzQsNyArMjM0LDcgQEAgY2xhc3MgV29ya2VyKG1hbmFn ZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgICAgICBfbG9nLmRlYnVn KCIlcyAlcyBwYXNzZWQiICUgKHNlbGYuX25hbWUsIHRlc3RfbmFtZSkpCiAKICAgICAgICAgaWYg c2VsZi5fYmF0Y2hfc2l6ZSA+IDAgYW5kIHNlbGYuX2JhdGNoX2NvdW50ID49IHNlbGYuX2JhdGNo X3NpemU6Ci0gICAgICAgICAgICBzZWxmLmtpbGxfZHJpdmVyKCkKKyAgICAgICAgICAgIHNlbGYu a2lsbF9kcml2ZXIoJ3Jlc3RhcnQgYWZ0ZXIgYmF0Y2gnKQogICAgICAgICAgICAgc2VsZi5fYmF0 Y2hfY291bnQgPSAwCiAKICAgICBkZWYgX3J1bl90ZXN0X2luX2Fub3RoZXJfdGhyZWFkKHNlbGYs IHRlc3RfaW5wdXQsIHRocmVhZF90aW1lb3V0X3NlYyk6CkBAIC0yOTIsNyArMjkyLDcgQEAgY2xh c3MgV29ya2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAg IFJldHVybnM6IGEgVGVzdFJlc3VsdCBvYmplY3QuCiAgICAgICAgICIiIgogICAgICAgICBpZiBz ZWxmLl9kcml2ZXIgYW5kIHNlbGYuX2RyaXZlci5oYXNfY3Jhc2hlZCgpOgotICAgICAgICAgICAg c2VsZi5raWxsX2RyaXZlcigpCisgICAgICAgICAgICBzZWxmLmtpbGxfZHJpdmVyKCdhZnRlciBj cmFzaCcpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9kcml2ZXI6CiAgICAgICAgICAgICBzZWxmLl9k cml2ZXIgPSBzZWxmLl9wb3J0LmNyZWF0ZV9kcml2ZXIoc2VsZi5fd29ya2VyX251bWJlcikKICAg ICAgICAgcmV0dXJuIHNlbGYucnVuX3NpbmdsZV90ZXN0KHNlbGYuX2RyaXZlciwgdGVzdF9pbnB1 dCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5w eQppbmRleCA2YzQ1ZDlkZGNhZGZiYzIzNWEzZWNhNzU0ZmQ3NDM4ZjgxMWM1MjRhLi5lYTkyMjVi NzI3MGJlOTA3OGM2YzVlYjliNDNlOTliYTI5ODk1ODVhIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xMDgxLDYgKzEwODEsOSBA QCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICAgICAnXG4nLmpvaW4oKCdTVERPVVQ6ICcg KyBsKSBmb3IgbCBpbiBzdGRvdXRfbGluZXMpLAogICAgICAgICAgICAgJ1xuJy5qb2luKCgnU1RE RVJSOiAnICsgbCkgZm9yIGwgaW4gc3RkZXJyX2xpbmVzKSkKIAorICAgIGRlZiBzYW1wbGVfcHJv Y2VzcyhzZWxmLCBuYW1lLCBwaWQpOgorICAgICAgICBwYXNzCisKICAgICBkZWYgdmlydHVhbF90 ZXN0X3N1aXRlcyhzZWxmKToKICAgICAgICAgcmV0dXJuIFtdCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IDA4Zjky NmI3YjkzOTM0MmUwM2ZiZjg0YzY2YzA4ZTE1ODMyMzhhMzYuLmY2YWQ0YjY1YmRjNGU1MDBmY2Jj ZTkwZjVjNmZiNTI4YmU0YjFlY2QgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQpAQCAtNDYsNyArNDYsOCBAQCBmcm9tIHdl YmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycy5tYW5hZ2VyIGltcG9ydCBNYW5hZ2VyCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfZXhwZWN0YXRpb25z CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25maWd1cmF0aW9uIGlt cG9ydCBUZXN0Q29uZmlndXJhdGlvbgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5i YXNlIGltcG9ydCBQb3J0LCBWaXJ0dWFsVGVzdFN1aXRlCi1mcm9tIHdlYmtpdHB5LmxheW91dF90 ZXN0cy5wb3J0LmRyaXZlciBpbXBvcnQgRHJpdmVyLCBEcml2ZXJPdXRwdXQKK2Zyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLnBvcnQuZHJpdmVyIGltcG9ydCBEcml2ZXJPdXRwdXQKK2Zyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQud2Via2l0IGltcG9ydCBXZWJLaXREcml2ZXIKIGZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGJ1aWxkZXJzCiBmcm9tIHdlYmtpdHB5 LmxheW91dF90ZXN0cy5zZXJ2ZXJzIGltcG9ydCBodHRwX3NlcnZlcgogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMuc2VydmVycyBpbXBvcnQgd2Vic29ja2V0X3NlcnZlcgpAQCAtMzkzLDIwICsz OTQsMjQgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KFBvcnQpOgogICAgICAgICByZXR1cm4gc2VsZi5f YnVpbGRfcGF0aChzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgYmluYXJ5X25hbWUp CiAKIAotIyBGSVhNRTogVGhpcyBzaG91bGQgaW5oZXJpdCBmcm9tIFdlYktpdERyaXZlciBub3cg dGhhdCBDaHJvbWl1bSBoYXMgYSBEdW1wUmVuZGVyVHJlZSBwcm9jZXNzIGxpa2UgdGhlIHJlc3Qg b2YgV2ViS2l0LgotY2xhc3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKK2NsYXNzIENocm9taXVt RHJpdmVyKFdlYktpdERyaXZlcik6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIHdvcmtl cl9udW1iZXIsIHBpeGVsX3Rlc3RzLCBub190aW1lb3V0PUZhbHNlKToKLSAgICAgICAgRHJpdmVy Ll9faW5pdF9fKHNlbGYsIHBvcnQsIHdvcmtlcl9udW1iZXIsIHBpeGVsX3Rlc3RzLCBub190aW1l b3V0KQorICAgICAgICBXZWJLaXREcml2ZXIuX19pbml0X18oc2VsZiwgcG9ydCwgd29ya2VyX251 bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQpCiAgICAgICAgIHNlbGYuX3Byb2MgPSBOb25l CiAgICAgICAgIHNlbGYuX2ltYWdlX3BhdGggPSBOb25lCisgICAgICAgIHNlbGYuX3Rlc3Rfc2hl bGwgPSAnLS10ZXN0LXNoZWxsJyBpbiBwb3J0LmdldF9vcHRpb24oJ2FkZGl0aW9uYWxfZHJ0X2Zs YWcnKQogCiAgICAgZGVmIF93cmFwcGVyX29wdGlvbnMoc2VsZiwgcGl4ZWxfdGVzdHMpOgogICAg ICAgICBjbWQgPSBbXQogICAgICAgICBpZiBwaXhlbF90ZXN0czoKLSAgICAgICAgICAgIGlmIG5v dCBzZWxmLl9pbWFnZV9wYXRoOgotICAgICAgICAgICAgICAgIHNlbGYuX2ltYWdlX3BhdGggPSBz ZWxmLl9wb3J0Ll9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgp LCAncG5nX3Jlc3VsdCVzLnBuZycgJSBzZWxmLl93b3JrZXJfbnVtYmVyKQotICAgICAgICAgICAg IyBTZWUgbm90ZSBhYm92ZSBpbiBkaWZmX2ltYWdlKCkgZm9yIHdoeSB3ZSBuZWVkIF9jb252ZXJ0 X3BhdGgoKS4KLSAgICAgICAgICAgIGNtZC5hcHBlbmQoIi0tcGl4ZWwtdGVzdHM9IiArIHNlbGYu X3BvcnQuX2NvbnZlcnRfcGF0aChzZWxmLl9pbWFnZV9wYXRoKSkKKyAgICAgICAgICAgIGlmIHNl bGYuX3Rlc3Rfc2hlbGw6CisgICAgICAgICAgICAgICAgaWYgbm90IHNlbGYuX2ltYWdlX3BhdGg6 CisgICAgICAgICAgICAgICAgICAgIHNlbGYuX2ltYWdlX3BhdGggPSBzZWxmLl9wb3J0Ll9maWxl c3lzdGVtLmpvaW4oc2VsZi5fcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpLCAncG5nX3Jlc3VsdCVz LnBuZycgJSBzZWxmLl93b3JrZXJfbnVtYmVyKQorICAgICAgICAgICAgICAgICAjIFNlZSBub3Rl IGFib3ZlIGluIGRpZmZfaW1hZ2UoKSBmb3Igd2h5IHdlIG5lZWQgX2NvbnZlcnRfcGF0aCgpLgor ICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoIi0tcGl4ZWwtdGVzdHM9IiArIHNlbGYuX3BvcnQu X2NvbnZlcnRfcGF0aChzZWxmLl9pbWFnZV9wYXRoKSkKKyAgICAgICAgICAgIGVsc2U6CisgICAg ICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1waXhlbC10ZXN0cycpCisKICAgICAgICAgIyBGSVhN RTogVGhpcyBpcyBub3QgTm9uZSBzaG91bGRuJ3QgYmUgbmVjZXNzYXJ5LCB1bmxlc3MgLS1qcy1m bGFncz0iJyciIGNoYW5nZXMgYmVoYXZpb3Igc29tZWhvdz8KICAgICAgICAgaWYgc2VsZi5fcG9y dC5nZXRfb3B0aW9uKCdqc19mbGFncycpIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgY21kLmFw cGVuZCgnLS1qcy1mbGFncz0iJyArIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignanNfZmxhZ3MnKSAr ICciJykKQEAgLTQ0MCwxNSArNDQ1LDE4IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKERyaXZlcik6 CiAgICAgZGVmIGNtZF9saW5lKHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKICAg ICAgICAgY21kID0gc2VsZi5fY29tbWFuZF93cmFwcGVyKHNlbGYuX3BvcnQuZ2V0X29wdGlvbign d3JhcHBlcicpKQogICAgICAgICBjbWQuYXBwZW5kKHNlbGYuX3BvcnQuX3BhdGhfdG9fZHJpdmVy KCkpCi0gICAgICAgICMgRklYTUU6IFdoeSBkb2VzIC0tdGVzdC1zaGVsbCBleGlzdD8gIFRlc3RT aGVsbCBpcyBkZWFkLCBzaG91bGRuJ3QgdGhpcyBiZSByZW1vdmVkPwotICAgICAgICAjIEl0IHNl ZW1zIGl0J3Mgc3RpbGwgaW4gdXNlIGluIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1 bXBSZW5kZXJUcmVlLmNwcCBhcyBvZiA4LzEwLzExLgotICAgICAgICBjbWQuYXBwZW5kKCctLXRl c3Qtc2hlbGwnKQogICAgICAgICBjbWQuZXh0ZW5kKHNlbGYuX3dyYXBwZXJfb3B0aW9ucyhwaXhl bF90ZXN0cykpCiAgICAgICAgIGNtZC5leHRlbmQocGVyX3Rlc3RfYXJncykKIAorICAgICAgICBp ZiBub3Qgc2VsZi5fdGVzdF9zaGVsbDoKKyAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0nKQorCiAg ICAgICAgIHJldHVybiBjbWQKIAogICAgIGRlZiBfc3RhcnQoc2VsZiwgcGl4ZWxfdGVzdHMsIHBl cl90ZXN0X2FyZ3MpOgorICAgICAgICBpZiBub3Qgc2VsZi5fdGVzdF9zaGVsbDoKKyAgICAgICAg ICAgIHJldHVybiBzdXBlcihDaHJvbWl1bURyaXZlciwgc2VsZikuX3N0YXJ0KHBpeGVsX3Rlc3Rz LCBwZXJfdGVzdF9hcmdzKQorCiAgICAgICAgIGFzc2VydCBub3Qgc2VsZi5fcHJvYwogICAgICAg ICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgU2VydmVyUHJvY2VzcyBsaWtlIFdlYktpdERyaXZl ciBkb2VzLgogICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgYmUgcmVhZGluZyBzdGRlcnIgYW5k IHN0ZG91dCBzZXBhcmF0ZWx5IGxpa2UgaG93IFdlYktpdERyaXZlciBkb2VzLgpAQCAtNDU2LDYg KzQ2NCw5IEBAIGNsYXNzIENocm9taXVtRHJpdmVyKERyaXZlcik6CiAgICAgICAgIHNlbGYuX3By b2MgPSBzdWJwcm9jZXNzLlBvcGVuKHNlbGYuY21kX2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0 X2FyZ3MpLCBzdGRpbj1zdWJwcm9jZXNzLlBJUEUsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0 ZGVycj1zdWJwcm9jZXNzLlNURE9VVCwgY2xvc2VfZmRzPWNsb3NlX2ZkcykKIAogICAgIGRlZiBo YXNfY3Jhc2hlZChzZWxmKToKKyAgICAgICAgaWYgbm90IHNlbGYuX3Rlc3Rfc2hlbGw6CisgICAg ICAgICAgICByZXR1cm4gc3VwZXIoQ2hyb21pdW1Ecml2ZXIsIHNlbGYpLmhhc19jcmFzaGVkKCkK KwogICAgICAgICBpZiBzZWxmLl9wcm9jIGlzIE5vbmU6CiAgICAgICAgICAgICByZXR1cm4gRmFs c2UKICAgICAgICAgcmV0dXJuIHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25lCkBAIC01MTMs NiArNTI0LDkgQEAgY2xhc3MgQ2hyb21pdW1Ecml2ZXIoRHJpdmVyKToKICAgICAgICAgICAgIHNl bGYuX3BvcnQuX2ZpbGVzeXN0ZW0ucmVtb3ZlKHNlbGYuX2ltYWdlX3BhdGgpCiAKICAgICBkZWYg cnVuX3Rlc3Qoc2VsZiwgZHJpdmVyX2lucHV0KToKKyAgICAgICAgaWYgbm90IHNlbGYuX3Rlc3Rf c2hlbGw6CisgICAgICAgICAgICByZXR1cm4gc3VwZXIoQ2hyb21pdW1Ecml2ZXIsIHNlbGYpLnJ1 bl90ZXN0KGRyaXZlcl9pbnB1dCkKKwogICAgICAgICBpZiBub3Qgc2VsZi5fcHJvYzoKICAgICAg ICAgICAgIHNlbGYuX3N0YXJ0KGRyaXZlcl9pbnB1dC5zaG91bGRfcnVuX3BpeGVsX3Rlc3QsIGRy aXZlcl9pbnB1dC5hcmdzKQogCkBAIC02MTQsOSArNjI4LDExIEBAIGNsYXNzIENocm9taXVtRHJp dmVyKERyaXZlcik6CiAgICAgICAgICAgICBzZWxmLl9zdGFydChwaXhlbF90ZXN0cywgcGVyX3Rl c3RfYXJncykKIAogICAgIGRlZiBzdG9wKHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi5fdGVz dF9zaGVsbDoKKyAgICAgICAgICAgIHJldHVybiBzdXBlcihDaHJvbWl1bURyaXZlciwgc2VsZiku c3RvcCgpCisKICAgICAgICAgaWYgbm90IHNlbGYuX3Byb2M6CiAgICAgICAgICAgICByZXR1cm4K LSAgICAgICAgIyBGSVhNRTogSWYgd2UgdXNlZCBTZXJ2ZXJQcm9jZXNzIGFsbCB0aGlzIHdvdWxk IGhhcHBlbiBmb3IgZnJlZSB3aXRoIFNlcnZlclByb2Nlcy5zdG9wKCkKICAgICAgICAgc2VsZi5f cHJvYy5zdGRpbi5jbG9zZSgpCiAgICAgICAgIHNlbGYuX3Byb2Muc3Rkb3V0LmNsb3NlKCkKICAg ICAgICAgaWYgc2VsZi5fcHJvYy5zdGRlcnI6CkBAIC02MzUsMTAgKzY1MSwxMSBAQCBjbGFzcyBD aHJvbWl1bURyaXZlcihEcml2ZXIpOgogICAgICAgICAjIGZvcmNlLWtpbGwgdGhlIHByb2Nlc3Mg aWYgbmVjZXNzYXJ5LgogICAgICAgICB0aW1lb3V0ID0gdGltZS50aW1lKCkgKyBraWxsX3RpbWVv dXRfc2Vjb25kcwogICAgICAgICB3aGlsZSBzZWxmLl9wcm9jLnBvbGwoKSBpcyBOb25lIGFuZCB0 aW1lLnRpbWUoKSA8IHRpbWVvdXQ6Ci0gICAgICAgICAgICB0aW1lLnNsZWVwKDAuMSkKKyAgICAg ICAgICAgIHRpbWUuc2xlZXAoMC4wMSkKICAgICAgICAgaWYgc2VsZi5fcHJvYy5wb2xsKCkgaXMg Tm9uZToKICAgICAgICAgICAgIF9sb2cud2FybmluZygnc3RvcHBpbmcgdGVzdCBkcml2ZXIgdGlt ZWQgb3V0LCBraWxsaW5nIGl0JykKICAgICAgICAgICAgIHNlbGYuX3BvcnQuX2V4ZWN1dGl2ZS5r aWxsX3Byb2Nlc3Moc2VsZi5fcHJvYy5waWQpCisgICAgICAgICAgICBfbG9nLndhcm5pbmcoJ2tp bGxlZCcpCiAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgc29tZXRpbWUgTm9uZS4gV2hhdCBpcyB3 cm9uZz8gYXNzZXJ0IHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25lCiAgICAgICAgIGlmIHNl bGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgc2VsZi5fcHJvYy53YWl0 KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CmluZGV4IDBjZjA0YWMzYjg2ODFlM2NiNTI2M2Iy YjM0MGM3Yjc0YzlhZGU3YzAuLmEzNjk1NDE5ZTZlOWUxMDdlZmRhODM5MmRmYjhkNjIzNWE0NTdi MDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weQpAQCAtMzUsNiArMzUsNyBAQCBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGxvZ3Rlc3RpbmcKIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZSwgTW9ja0V4ZWN1 dGl2ZTIKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0 IE1vY2tGaWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdF9t b2NrIGltcG9ydCBNb2NrU3lzdGVtSG9zdAorZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9y dC5jb25maWdfbW9jayBpbXBvcnQgTW9ja0NvbmZpZwogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5 Lm1vY2sgaW1wb3J0IE1vY2sKIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9j a09wdGlvbnMKIApAQCAtNTEsOSArNTIsMTIgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMu cG9ydC5kcml2ZXIgaW1wb3J0IERyaXZlcklucHV0CiAKIGNsYXNzIENocm9taXVtRHJpdmVyVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNlbGYpOgotICAgICAgICBtb2Nr X3BvcnQgPSBNb2NrKCkgICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBhIHRpZ2h0ZXIgbW9jay4K LSAgICAgICAgbW9ja19wb3J0LmRlZmF1bHRfdGVzdF90aW1lb3V0X21zID0gbGFtYmRhOiAxMDAw Ci0gICAgICAgIHNlbGYuZHJpdmVyID0gY2hyb21pdW0uQ2hyb21pdW1Ecml2ZXIobW9ja19wb3J0 LCB3b3JrZXJfbnVtYmVyPTAsIHBpeGVsX3Rlc3RzPVRydWUpCisgICAgICAgIGhvc3QgPSBNb2Nr U3lzdGVtSG9zdCgpCisgICAgICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9ucyhjb25maWd1cmF0aW9u PSdSZWxlYXNlJywgYWRkaXRpb25hbF9kcnRfZmxhZz1bJy0tdGVzdC1zaGVsbCddKQorICAgICAg ICBjb25maWcgPSBNb2NrQ29uZmlnKGZpbGVzeXN0ZW09aG9zdC5maWxlc3lzdGVtLCBkZWZhdWx0 X2NvbmZpZ3VyYXRpb249J1JlbGVhc2UnKQorICAgICAgICBzZWxmLnBvcnQgPSBjaHJvbWl1bV9t YWMuQ2hyb21pdW1NYWNQb3J0KGhvc3QsICdjaHJvbWl1bS1tYWMtc25vd2xlb3BhcmQnLCBvcHRp b25zPW9wdGlvbnMsIGNvbmZpZz1jb25maWcpCisgICAgICAgIHNlbGYucG9ydC5kZWZhdWx0X3Rl c3RfdGltZW91dF9tcyA9IGxhbWJkYTogMTAwMAorICAgICAgICBzZWxmLmRyaXZlciA9IGNocm9t aXVtLkNocm9taXVtRHJpdmVyKHNlbGYucG9ydCwgd29ya2VyX251bWJlcj0wLCBwaXhlbF90ZXN0 cz1UcnVlKQogCiAgICAgZGVmIHRlc3RfdGVzdF9zaGVsbF9jb21tYW5kKHNlbGYpOgogICAgICAg ICBleHBlY3RlZF9jb21tYW5kID0gInRlc3QuaHRtbCAyIGNoZWNrc3VtXG4iCkBAIC0xMzksMjEg KzE0MywxOCBAQCBjbGFzcyBDaHJvbWl1bURyaXZlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLnBpZCwgMSkKIAogICAgIGRlZiB0ZXN0X3R3 b19kcml2ZXJzKHNlbGYpOgotICAgICAgICBtb2NrX3BvcnQgPSBNb2NrKCkKIAogICAgICAgICBj bGFzcyBNb2NrRHJpdmVyKGNocm9taXVtLkNocm9taXVtRHJpdmVyKToKLSAgICAgICAgICAgIGRl ZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bURyaXZl ci5fX2luaXRfXyhzZWxmLCBtb2NrX3BvcnQsIHdvcmtlcl9udW1iZXI9MCwgcGl4ZWxfdGVzdHM9 RmFsc2UpCisgICAgICAgICAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCk6CisgICAgICAgICAg ICAgICAgY2hyb21pdW0uQ2hyb21pdW1Ecml2ZXIuX19pbml0X18oc2VsZiwgcG9ydCwgd29ya2Vy X251bWJlcj0wLCBwaXhlbF90ZXN0cz1GYWxzZSkKIAogICAgICAgICAgICAgZGVmIGNtZF9saW5l KHNlbGYsIHBpeGVsX3Rlc3QsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICAgICAgICAgIHJldHVy biAncHl0aG9uJwogCiAgICAgICAgICMgZ2V0X29wdGlvbiBpcyB1c2VkIHRvIGdldCB0aGUgdGlt ZW91dCAobXMpIGZvciBhIHByb2Nlc3MgYmVmb3JlIHdlIGtpbGwgaXQuCi0gICAgICAgIG1vY2tf cG9ydC5nZXRfb3B0aW9uID0gbGFtYmRhIG5hbWU6IDYwICogMTAwMAotICAgICAgICBtb2NrX3Bv cnQuZGVmYXVsdF90ZXN0X3RpbWVvdXRfbXMgPSBsYW1iZGE6IDEwMDAKLSAgICAgICAgZHJpdmVy MSA9IE1vY2tEcml2ZXIoKQorICAgICAgICBkcml2ZXIxID0gTW9ja0RyaXZlcihzZWxmLnBvcnQp CiAgICAgICAgIGRyaXZlcjEuX3N0YXJ0KEZhbHNlLCBbXSkKLSAgICAgICAgZHJpdmVyMiA9IE1v Y2tEcml2ZXIoKQorICAgICAgICBkcml2ZXIyID0gTW9ja0RyaXZlcihzZWxmLnBvcnQpCiAgICAg ICAgIGRyaXZlcjIuX3N0YXJ0KEZhbHNlLCBbXSkKICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIGZv ciBkcml2ZXIxIHRvIHRpbWVvdXQgd2hlbiBzdG9wcGluZyBpZiBpdCdzIHNoYXJpbmcgc3RkaW4g d2l0aCBkcml2ZXIyLgogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKaW5kZXggYTYxMTQ1 OGVkYjcxNzI3NDdkYzYzNWIwMDFlMmJmNGY4Y2ExNjU3Zi4uYzdhNjU3NWEwOWIwZTNkOGZjZmZj NjNhYWY5OTFiZmNmNWRlODY5ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9tYWMucHkKQEAgLTE5OCw2ICsxOTgsMjAgQEAgY2xhc3MgTWFjUG9ydChB cHBsZVBvcnQpOgogICAgICAgICAgICAgX2xvZy53YXJuaW5nKGNyYXNoX2xvZykKICAgICAgICAg cmV0dXJuIGNyYXNoX2xvZwogCisgICAgZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBp ZCk6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIGhhbmdfcmVwb3J0ID0gb3MucGF0aC5qb2lu KHNlbGYuX3BvcnQucmVzdWx0c19kaXJlY3RvcnkoKSwgIiVzLSVzLnNhbXBsZS50eHQiICUgKG5h bWUsIHBpZCkpCisgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWworICAg ICAgICAgICAgICAgICIvdXNyL2Jpbi9zYW1wbGUiLAorICAgICAgICAgICAgICAgIHBpZCwKKyAg ICAgICAgICAgICAgICAxMCwKKyAgICAgICAgICAgICAgICAxMCwKKyAgICAgICAgICAgICAgICAi LWZpbGUiLAorICAgICAgICAgICAgICAgIGhhbmdfcmVwb3J0LAorICAgICAgICAgICAgXSkKKyAg ICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgorICAgICAgICAgICAgc2VsZi5fbG9nKCdVbmFi bGUgdG8gc2FtcGxlIHByb2Nlc3MuJykKKwogICAgIGRlZiBfcGF0aF90b19oZWxwZXIoc2VsZik6 CiAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRlc3RIZWxwZXInCiAgICAgICAgIHJldHVy biBzZWxmLl9idWlsZF9wYXRoKGJpbmFyeV9uYW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CmluZGV4IDRi ZGMzZWQxMzg3MDZiNDkzZTExNDg3ZTM4Yjg4ZDdlYjExOTcxNmQuLjUyODMzNjY4NzYyZDMxMzM5 MjkwZDg2MDllNGU0ZmJiMjBiMWY2ZGYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKQEAgLTU2LDcgKzU2 LDcgQEAgY2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiBt YWtlX3BvcnQoc2VsZiwgaG9zdD1Ob25lLCBwb3J0X25hbWU9Tm9uZSwgb3B0aW9ucz1Ob25lLCBv c19uYW1lPU5vbmUsIG9zX3ZlcnNpb249Tm9uZSwgY29uZmlnPU5vbmUsICoqa3dhcmdzKToKICAg ICAgICAgaG9zdCA9IGhvc3Qgb3IgTW9ja1N5c3RlbUhvc3Qob3NfbmFtZT0ob3NfbmFtZSBvciBz ZWxmLm9zX25hbWUpLCBvc192ZXJzaW9uPShvc192ZXJzaW9uIG9yIHNlbGYub3NfdmVyc2lvbikp Ci0gICAgICAgIG9wdGlvbnMgPSBvcHRpb25zIG9yIE1vY2tPcHRpb25zKGNvbmZpZ3VyYXRpb249 J1JlbGVhc2UnKQorICAgICAgICBvcHRpb25zID0gb3B0aW9ucyBvciBNb2NrT3B0aW9ucyhjb25m aWd1cmF0aW9uPSdSZWxlYXNlJywgYWRkaXRpb25hbF9kcnRfZmxhZz1bXSkKICAgICAgICAgY29u ZmlnID0gY29uZmlnIG9yIE1vY2tDb25maWcoZmlsZXN5c3RlbT1ob3N0LmZpbGVzeXN0ZW0sIGRl ZmF1bHRfY29uZmlndXJhdGlvbj0nUmVsZWFzZScpCiAgICAgICAgIHBvcnRfbmFtZSA9IHBvcnRf bmFtZSBvciBzZWxmLnBvcnRfbmFtZQogICAgICAgICBwb3J0X25hbWUgPSBzZWxmLnBvcnRfbWFr ZXIuZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVy X3Byb2Nlc3MucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Nl cnZlcl9wcm9jZXNzLnB5CmluZGV4IDI0NWI3N2E2YWM5YjdmYWZiZGM0MTNkZWZhM2ZiOWIxZTA4 NTRhMzMuLjIyNTBkYTAyZjBlNmY4N2VkMjBlOWE2ZTNkYmI2MTllNWM5OWI5NmYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nl c3MucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2 ZXJfcHJvY2Vzcy5weQpAQCAtNTIsMTEgKzUyLDE1IEBAIGNsYXNzIFNlcnZlclByb2Nlc3M6CiAg ICAgaW5kZWZpbml0ZWx5LiBUaGUgY2xhc3MgYWxzbyBoYW5kbGVzIHRyYW5zcGFyZW50bHkgcmVz dGFydGluZyBwcm9jZXNzZXMKICAgICBhcyBuZWNlc3NhcnkgdG8ga2VlcCBpc3N1aW5nIGNvbW1h bmRzLiIiIgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfb2JqLCBuYW1lLCBjbWQsIGVu dj1Ob25lLCBleGVjdXRpdmU9RXhlY3V0aXZlKCkpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBw b3J0X29iaiwgbmFtZSwgY21kLCBlbnY9Tm9uZSwgZXhlY3V0aXZlPUV4ZWN1dGl2ZSgpLCBzYW1w bGVfcHJvY2Vzcz1Ob25lKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnRfb2JqCiAgICAgICAg IHNlbGYuX25hbWUgPSBuYW1lICAjIFNob3VsZCBiZSB0aGUgY29tbWFuZCBuYW1lIChlLmcuIER1 bXBSZW5kZXJUcmVlLCBJbWFnZURpZmYpCiAgICAgICAgIHNlbGYuX2NtZCA9IGNtZAogICAgICAg ICBzZWxmLl9lbnYgPSBlbnYKKyAgICAgICAgaWYgc2FtcGxlX3Byb2Nlc3M6CisgICAgICAgICAg ICBzZWxmLl9zYW1wbGVfcHJvY2VzcyA9IHNhbXBsZV9wcm9jZXNzCisgICAgICAgIGVsc2U6Cisg ICAgICAgICAgICBzZWxmLl9zYW1wbGVfcHJvY2VzcyA9IGxhbWJkYSBuYW1lLCBwaWQ6IE5vbmUK ICAgICAgICAgc2VsZi5fcmVzZXQoKQogICAgICAgICBzZWxmLl9leGVjdXRpdmUgPSBleGVjdXRp dmUKIApAQCAtMTIxLDYgKzEyNSw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3M6CiAgICAgICAgIHRy eToKICAgICAgICAgICAgIHNlbGYuX3Byb2Muc3RkaW4ud3JpdGUoYnl0ZXMpCiAgICAgICAgIGV4 Y2VwdCBJT0Vycm9yLCBlOgorICAgICAgICAgICAgX2xvZy53YXJuaW5nKCIlcyAtIElPRXJyb3Ig LSBzdG9wIiAlIHNlbGYuX25hbWUpCiAgICAgICAgICAgICBzZWxmLnN0b3AoKQogICAgICAgICAg ICAgIyBzdG9wKCkgY2FsbHMgX3Jlc2V0KCksIHNvIHdlIGhhdmUgdG8gc2V0IGNyYXNoZWQgdG8g VHJ1ZSBhZnRlciBjYWxsaW5nIHN0b3AoKS4KICAgICAgICAgICAgIHNlbGYuX2NyYXNoZWQgPSBU cnVlCkBAIC0xNzksMjUgKzE4NCwxMSBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzOgogICAgICAgICBf bG9nLmluZm8oJycpCiAgICAgICAgIF9sb2cuaW5mbyhtZXNzYWdlKQogCi0gICAgZGVmIF9zYW1w bGUoc2VsZik6Ci0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybSAhPSAiZGFyd2luIjoKLSAgICAgICAg ICAgIHJldHVybgotICAgICAgICB0cnk6Ci0gICAgICAgICAgICBoYW5nX3JlcG9ydCA9IG9zLnBh dGguam9pbihzZWxmLl9wb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCksICIlcy0lcy5zYW1wbGUudHh0 IiAlIChzZWxmLl9uYW1lLCBzZWxmLl9wcm9jLnBpZCkpCi0gICAgICAgICAgICBzZWxmLl9leGVj dXRpdmUucnVuX2NvbW1hbmQoWwotICAgICAgICAgICAgICAgICIvdXNyL2Jpbi9zYW1wbGUiLAot ICAgICAgICAgICAgICAgIHNlbGYuX3Byb2MucGlkLAotICAgICAgICAgICAgICAgIDEwLAotICAg ICAgICAgICAgICAgIDEwLAotICAgICAgICAgICAgICAgICItZmlsZSIsCi0gICAgICAgICAgICAg ICAgaGFuZ19yZXBvcnQsCi0gICAgICAgICAgICBdKQotICAgICAgICBleGNlcHQgU2NyaXB0RXJy b3IsIGU6Ci0gICAgICAgICAgICBzZWxmLl9sb2coJ1VuYWJsZSB0byBzYW1wbGUgcHJvY2Vzcy4n KQogCiAgICAgZGVmIF9oYW5kbGVfdGltZW91dChzZWxmKToKICAgICAgICAgc2VsZi50aW1lZF9v dXQgPSBUcnVlCi0gICAgICAgIHNlbGYuX3NhbXBsZSgpCisgICAgICAgIGlmIHNlbGYuX3Byb2M6 CisgICAgICAgICAgICBzZWxmLl9zYW1wbGVfcHJvY2VzcyhzZWxmLl9uYW1lLCBzZWxmLl9wcm9j LnBpZCkKIAogICAgIGRlZiBfc3BsaXRfc3RyaW5nX2FmdGVyX2luZGV4KHNlbGYsIHN0cmluZywg aW5kZXgpOgogICAgICAgICByZXR1cm4gc3RyaW5nWzppbmRleF0sIHN0cmluZ1tpbmRleDpdCkBA IC0yMTQsNyArMjA1LDggQEAgY2xhc3MgU2VydmVyUHJvY2VzczoKICAgICAgICAgb3V0X2ZkID0g c2VsZi5fcHJvYy5zdGRvdXQuZmlsZW5vKCkKICAgICAgICAgZXJyX2ZkID0gc2VsZi5fcHJvYy5z dGRlcnIuZmlsZW5vKCkKICAgICAgICAgc2VsZWN0X2ZkcyA9IChvdXRfZmQsIGVycl9mZCkKLSAg ICAgICAgcmVhZF9mZHMsIF8sIF8gPSBzZWxlY3Quc2VsZWN0KHNlbGVjdF9mZHMsIFtdLCBzZWxl Y3RfZmRzLCBkZWFkbGluZSAtIHRpbWUudGltZSgpKQorICAgICAgICBub3cgPSB0aW1lLnRpbWUo KQorICAgICAgICByZWFkX2ZkcywgXywgXyA9IHNlbGVjdC5zZWxlY3Qoc2VsZWN0X2ZkcywgW10s IHNlbGVjdF9mZHMsIGRlYWRsaW5lIC0gbm93KQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBp ZiBvdXRfZmQgaW4gcmVhZF9mZHM6CiAgICAgICAgICAgICAgICAgc2VsZi5fb3V0cHV0ICs9IHNl bGYuX3Byb2Muc3Rkb3V0LnJlYWQoKQpAQCAtMjc5LDQgKzI3MSwxNCBAQCBjbGFzcyBTZXJ2ZXJQ cm9jZXNzOgogICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygnc3RvcHBpbmcgJXMgdGltZWQg b3V0LCBraWxsaW5nIGl0JyAlIHNlbGYuX25hbWUpCiAgICAgICAgICAgICAgICAgc2VsZi5fZXhl Y3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9wcm9jLnBpZCkKICAgICAgICAgICAgICAgICBfbG9n Lndhcm5pbmcoJ2tpbGxlZCcpCisKKyAgICAgICAgaWYgc2VsZi5fcHJvYy5wb2xsKCkgaXMgbm90 IE5vbmU6CisgICAgICAgICAgICBzZWxmLl9wcm9jLndhaXQoKQogICAgICAgICBzZWxmLl9yZXNl dCgpCisKKyAgICBkZWYga2lsbChzZWxmKToKKyAgICAgICAgaWYgc2VsZi5fcHJvYzoKKyAgICAg ICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5raWxsX3Byb2Nlc3Moc2VsZi5fcHJvYy5waWQpCisgICAg ICAgICAgICBpZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgICAg ICBzZWxmLl9wcm9jLndhaXQoKQorICAgICAgICAgICAgc2VsZi5fcmVzZXQoKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRleCBh OTFhZjlhZDYwNTU0OGI2NzNjYjg5MGQ1Mjk4MTMyOGY3MmVjZjA4Li44OWRiMjQwMDAyYzFlYzA0 ZDAyN2I2ZTc2NDdhNzFmZWVhNDg3MDkzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtNDgxLDcgKzQ4MSw3IEBAIGNsYXNz IFdlYktpdERyaXZlcihEcml2ZXIpOgogICAgICAgICBlbnZpcm9ubWVudFsnTE9DQUxfUkVTT1VS Q0VfUk9PVCddID0gc2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKICAgICAgICAgc2VsZi5f Y3Jhc2hlZF9wcm9jZXNzX25hbWUgPSBOb25lCiAgICAgICAgIHNlbGYuX2NyYXNoZWRfcGlkID0g Tm9uZQotICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2VzcyA9IHNlcnZlcl9wcm9jZXNzLlNlcnZl clByb2Nlc3Moc2VsZi5fcG9ydCwgc2VydmVyX25hbWUsIHNlbGYuY21kX2xpbmUocGl4ZWxfdGVz dHMsIHBlcl90ZXN0X2FyZ3MpLCBlbnZpcm9ubWVudCkKKyAgICAgICAgc2VsZi5fc2VydmVyX3By b2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKHNlbGYuX3BvcnQsIHNlcnZlcl9u YW1lICsgJy8nICsgc3RyKHNlbGYuX3dvcmtlcl9udW1iZXIpLCBzZWxmLmNtZF9saW5lKHBpeGVs X3Rlc3RzLCBwZXJfdGVzdF9hcmdzKSwgZW52aXJvbm1lbnQsIHNlbGYuX3BvcnQuX2V4ZWN1dGl2 ZSwgc2VsZi5fcG9ydC5zYW1wbGVfcHJvY2VzcykKIAogICAgIGRlZiBoYXNfY3Jhc2hlZChzZWxm KToKICAgICAgICAgaWYgc2VsZi5fc2VydmVyX3Byb2Nlc3MgaXMgTm9uZToKQEAgLTU0Myw3ICs1 NDMsNyBAQCBjbGFzcyBXZWJLaXREcml2ZXIoRHJpdmVyKToKICAgICBkZWYgcnVuX3Rlc3Qoc2Vs ZiwgZHJpdmVyX2lucHV0KToKICAgICAgICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCiAgICAg ICAgIGlmIG5vdCBzZWxmLl9zZXJ2ZXJfcHJvY2VzczoKLSAgICAgICAgICAgIHNlbGYuX3N0YXJ0 KGRyaXZlcl9pbnB1dC5zaG91bGRfcnVuX3BpeGVsX3Rlc3QsIFtdKQorICAgICAgICAgICAgc2Vs Zi5fc3RhcnQoZHJpdmVyX2lucHV0LnNob3VsZF9ydW5fcGl4ZWxfdGVzdCwgZHJpdmVyX2lucHV0 LmFyZ3MpCiAgICAgICAgIHNlbGYuZXJyb3JfZnJvbV90ZXN0ID0gc3RyKCkKICAgICAgICAgc2Vs Zi5lcnJfc2Vlbl9lb2YgPSBGYWxzZQogCkBAIC01NjUsOSArNTY1LDEyIEBAIGNsYXNzIFdlYktp dERyaXZlcihEcml2ZXIpOgogICAgICAgICAgICAgY3Jhc2hfbG9nID0gc2VsZi5fcG9ydC5fZ2V0 X2NyYXNoX2xvZyhzZWxmLl9jcmFzaGVkX3Byb2Nlc3NfbmFtZSwgc2VsZi5fY3Jhc2hlZF9waWQs IHRleHQsIHNlbGYuZXJyb3JfZnJvbV90ZXN0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBuZXdlcl90aGFuPXN0YXJ0X3RpbWUpCiAKKyAgICAgICAg dGltZW91dCA9IHNlbGYuX3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dAorICAgICAgICBpZiB0aW1l b3V0OgorICAgICAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3Mua2lsbCgpCiAgICAgICAgIHJl dHVybiBEcml2ZXJPdXRwdXQodGV4dCwgaW1hZ2UsIGFjdHVhbF9pbWFnZV9oYXNoLCBhdWRpbywK ICAgICAgICAgICAgIGNyYXNoPXNlbGYuaGFzX2NyYXNoZWQoKSwgdGVzdF90aW1lPXRpbWUudGlt ZSgpIC0gc3RhcnRfdGltZSwKLSAgICAgICAgICAgIHRpbWVvdXQ9c2VsZi5fc2VydmVyX3Byb2Nl c3MudGltZWRfb3V0LCBlcnJvcj1zZWxmLmVycm9yX2Zyb21fdGVzdCwKKyAgICAgICAgICAgIHRp bWVvdXQ9dGltZW91dCwgZXJyb3I9c2VsZi5lcnJvcl9mcm9tX3Rlc3QsCiAgICAgICAgICAgICBj cmFzaGVkX3Byb2Nlc3NfbmFtZT1zZWxmLl9jcmFzaGVkX3Byb2Nlc3NfbmFtZSwKICAgICAgICAg ICAgIGNyYXNoZWRfcGlkPXNlbGYuX2NyYXNoZWRfcGlkLCBjcmFzaF9sb2c9Y3Jhc2hfbG9nKQog Cg==