90503 2012-07-03 15:44:39 -0700 nrwt: clean up exception handling and make sure we log some more failures 2012-07-03 17:15:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ojan webkit.review.bot oldest_to_newest 662528 0 dpranke 2012-07-03 15:44:39 -0700 nrwt: clean up exception handling and make sure we log some more failures 662530 1 150683 dpranke 2012-07-03 15:46:42 -0700 Created attachment 150683 Patch 662531 2 webkit.review.bot 2012-07-03 15:48:56 -0700 Attachment 150683 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py:415: deprecated form of raising exception [pep8/W602] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 662549 3 150683 ojan 2012-07-03 16:14:42 -0700 Comment on attachment 150683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150683&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/worker.py:120 > + # happenss (and log the appropriate messages). happens > Tools/Scripts/webkitpy/layout_tests/controllers/worker.py:198 > + driver = self._driver > + self._driver = None > + if driver: > _log.debug("%s killing driver" % self._name) > - self._driver.stop() > - self._driver = None > + driver.stop() We don't need to worry about thread-safety, right? In that case, couldn't you just move the self._drive = None line to being right after the if statement? Then you wouldn't need the local variable. Not a big deal, just a little easier to read. 662594 4 dpranke 2012-07-03 17:15:26 -0700 Committed r121816: <http://trac.webkit.org/changeset/121816> 150683 2012-07-03 15:46:42 -0700 2012-07-03 16:14:42 -0700 Patch bug-90503-20120703154640.patch text/plain 11199 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjk0YTYyNjFhYzI0MThiZWE0NWJjMzc2NzBkYTg3ZmY1 OTUxNGI3NC4uNGNjNGU5MjhlOGQ5NDAxZmNlYWMwMGI2OTlhNDI2MjQ1Y2JhZjg3MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDEyLTA3LTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIGV4Y2VwdGlvbiBoYW5kbGluZyBhbmQgbWFrZSBzdXJlIHdl IGxvZyBzb21lIG1vcmUgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkwNTAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlcmUgd2VyZSBzZXZlcmFsIHBsYWNlcyB3aGVyZSBleGNlcHRpb25z IHdlcmVuJ3QgZ2V0dGluZworICAgICAgICBsb2dnZWQsIG1vc3Qgbm90YWJseSBpZiB5b3UgcGFz c2VkIGEgYmFkIHZhbHVlIHRvIC0tcGxhdGZvcm0uCisgICAgICAgIFRoaXMgY2hhbmdlIHRlc3Rz IHRoYXQgYW5kIGNsZWFucyB0aGluZ3MgdXAgYSBiaXQ7IG1vcmUgY2xlYW51cAorICAgICAgICB3 aWxsIGJlIHBvc3NpYmxlIHdoZW4gd2UgcmV3b3JrIHRoZSBtYW5hZ2VyX3dvcmtlcl9icm9rZXIg Y29kZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weToKKyAgICAgICAgKF9Ccm9rZXJDb25uZWN0aW9u LnJhaXNlX2V4Y2VwdGlvbik6CisgICAgICAgIChfSW5saW5lV29ya2VyQ29ubmVjdGlvbi5yYWlz ZV9leGNlcHRpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL3dvcmtlci5weToKKyAgICAgICAgKFdvcmtlci5ydW4pOgorICAgICAgICAoV29y a2VyLmtpbGxfZHJpdmVyKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2ZhY3RvcnkucHk6CisgICAgICAgIChQb3J0RmFjdG9yeS5nZXQpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAg ICAgIChydW4pOgorICAgICAgICAobWFpbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHk6CisgICAgICAg IChNYWluVGVzdC50ZXN0X3Vuc3VwcG9ydGVkX3BsYXRmcm9tKToKKworMjAxMi0wNy0wMyAgRGly ayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICBucnd0OiBmaXggbW9j ayBwb3J0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MDUwMAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkKaW5k ZXggOTI4MWY3ZGJjZGI1MDVlZWZkYTY1MjJhNjUwMGJiMTk0ZjE3ZTZhOS4uZTM1N2NkZjUxMzUx MTkzMGRjMjg2MzQ4YjhkMjU0ZWVlMDBiOTc2YyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXJfd29ya2VyX2Jyb2tlci5weQpAQCAtMjUyLDkgKzI1MiwxMCBAQCBjbGFzcyBfQnJva2Vy Q29ubmVjdGlvbihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1l c3NhZ2VfbmFtZSwgKm1lc3NhZ2VfYXJncykKIAogICAgIGRlZiByYWlzZV9leGNlcHRpb24oc2Vs ZiwgZXhjX2luZm8pOgotICAgICAgICAjIFNpbmNlIHRyYWNlYmFja3MgYXJlbid0IHBpY2tsYWJs ZSwgc2VuZCB0aGUgZXh0cmFjdGVkIHN0YWNrIGluc3RlYWQuCisgICAgICAgICMgU2luY2UgdHJh Y2ViYWNrcyBhcmVuJ3QgcGlja2xhYmxlLCBzZW5kIHRoZSBleHRyYWN0ZWQgc3RhY2sgaW5zdGVh ZCwKKyAgICAgICAgIyBidXQgYXQgbGVhc3QgbG9nIHRoZSBmdWxsIHRyYWNlYmFjay4KICAgICAg ICAgZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjayA9 IHN5cy5leGNfaW5mbygpCi0gICAgICAgIHN0YWNrX3V0aWxzLmxvZ190cmFjZWJhY2soX2xvZy5k ZWJ1ZywgZXhjZXB0aW9uX3RyYWNlYmFjaykKKyAgICAgICAgc3RhY2tfdXRpbHMubG9nX3RyYWNl YmFjayhfbG9nLmVycm9yLCBleGNlcHRpb25fdHJhY2ViYWNrKQogICAgICAgICBzdGFjayA9IHRy YWNlYmFjay5leHRyYWN0X3RiKGV4Y2VwdGlvbl90cmFjZWJhY2spCiAgICAgICAgIHNlbGYuX2Jy b2tlci5wb3N0X21lc3NhZ2Uoc2VsZi5fY2xpZW50LCBzZWxmLl9wb3N0X3RvcGljLCAnZXhjZXB0 aW9uJywgZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgc3RhY2spCiAKQEAgLTQwNyw4 ICs0MDgsMTEgQEAgY2xhc3MgX0lubGluZVdvcmtlckNvbm5lY3Rpb24oX1dvcmtlckNvbm5lY3Rp b24pOgogICAgIGRlZiByYWlzZV9leGNlcHRpb24oc2VsZiwgZXhjX2luZm8pOgogICAgICAgICAj IFNpbmNlIHRoZSB3b3JrZXIgaXMgaW4gdGhlIHNhbWUgcHJvY2VzcyBhcyB0aGUgbWFuYWdlciwg d2UgY2FuCiAgICAgICAgICMgcmFpc2UgdGhlIGV4Y2VwdGlvbiBkaXJlY3RseSwgcmF0aGVyIHRo YW4gaGF2aW5nIHRvIHNlbmQgaXQgdGhyb3VnaAotICAgICAgICAjIHRoZSBxdWV1ZS4gVGhpcyBh bGxvd3MgdXMgdG8gcHJlc2VydmUgdGhlIHRyYWNlYmFjay4KLSAgICAgICAgcmFpc2UgZXhjX2lu Zm9bMF0sIGV4Y19pbmZvWzFdLCBleGNfaW5mb1syXQorICAgICAgICAjIHRoZSBxdWV1ZS4gVGhp cyBhbGxvd3MgdXMgdG8gcHJlc2VydmUgdGhlIHRyYWNlYmFjaywgYnV0IHdlIGxvZworICAgICAg ICAjIGl0IGFueXdheSBmb3IgY29uc2lzdGVuY3kgd2l0aCB0aGUgbXVsdGlwcm9jZXNzIGNhc2Uu CisgICAgICAgIGV4Y2VwdGlvbl90eXBlLCBleGNlcHRpb25fdmFsdWUsIGV4Y2VwdGlvbl90cmFj ZWJhY2sgPSBzeXMuZXhjX2luZm8oKQorICAgICAgICBzdGFja191dGlscy5sb2dfdHJhY2ViYWNr KF9sb2cuZXJyb3IsIGV4Y2VwdGlvbl90cmFjZWJhY2spCisgICAgICAgIHJhaXNlIGV4Y2VwdGlv bl90eXBlLCBleGNlcHRpb25fdmFsdWUsIGV4Y2VwdGlvbl90cmFjZWJhY2sKIAogCiBjbGFzcyBf UHJvY2VzcyhtdWx0aXByb2Nlc3NpbmcuUHJvY2Vzcyk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkKaW5kZXgg YTg2MTFhODcyZTUyNzA1MzA3NDEzNDA5ZWU5OWUwZWNiZTg3ZjVjMC4uN2MxN2ZmOGI0ODBhYzU1 ZTM2ZTUyNTdmNzBkODBkYWRiMDQ5YzYzNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQpAQCAtMTA3LDEw ICsxMDcsMTggQEAgY2xhc3MgV29ya2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdv cmtlcik6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCIlcyBzdGFydGluZyIgJSBzZWxmLl9uYW1l KQogICAgICAgICAgICAgc3VwZXIoV29ya2VyLCBzZWxmKS5ydW4oKQogICAgICAgICBmaW5hbGx5 OgotICAgICAgICAgICAgc2VsZi5raWxsX2RyaXZlcigpCi0gICAgICAgICAgICBfbG9nLmRlYnVn KCIlcyBleGl0aW5nIiAlIHNlbGYuX25hbWUpCi0gICAgICAgICAgICBzZWxmLmNsZWFudXAoKQot ICAgICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdkb25lJywg c2VsZi5fbG9nX21lc3NhZ2VzKQorICAgICAgICAgICAgIyBGSVhNRTogd2hlbiB3ZSBtb3ZlIHRo ZSBydW4gbG9vcCBpbnRvIG1hbmFnZXJfd29ya2VyX2Jyb2tlcgorICAgICAgICAgICAgIyBpdCBz aG91bGQgZGVhbCB3aXRoIHRoaXMgY2xlYW51cCBtb3JlIGVhc2lseS4KKyAgICAgICAgICAgIHRy eToKKyAgICAgICAgICAgICAgICBzZWxmLmNsZWFudXAoKQorICAgICAgICAgICAgZXhjZXB0Ogor ICAgICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnJhaXNlX2V4Y2VwdGlvbihz eXMuZXhjX2luZm8oKSkKKyAgICAgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICAgICAgX2xv Zy5kZWJ1ZygiJXMgZXhpdGluZyIgJSBzZWxmLl9uYW1lKQorICAgICAgICAgICAgICAgICMgQnkg cG9zdGluZyB0aGlzIGluIHRoZSAnZmluYWxseScgY2xhdXNlIHdlIG1ha2Ugb3VyIGJlc3QKKyAg ICAgICAgICAgICAgICAjIGVmZm9ydCB0byB0ZWxsIHRoZSBtYW5hZ2VyIHdlIGV4aXRlZCBjbGVh bmx5IG5vIG1hdHRlciB3aGF0CisgICAgICAgICAgICAgICAgIyBoYXBwZW5zcyAoYW5kIGxvZyB0 aGUgYXBwcm9wcmlhdGUgbWVzc2FnZXMpLgorICAgICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9j b25uZWN0aW9uLnBvc3RfbWVzc2FnZSgnZG9uZScsIHNlbGYuX2xvZ19tZXNzYWdlcykKIAogICAg IGRlZiBoYW5kbGVfdGVzdF9saXN0KHNlbGYsIHNyYywgbGlzdF9uYW1lLCB0ZXN0X2xpc3QpOgog ICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1lKCkKQEAgLTE4MSwxMCArMTg5LDEzIEBAIGNs YXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAg ICByZXR1cm4gdGhyZWFkX3RpbWVvdXRfc2VjCiAKICAgICBkZWYga2lsbF9kcml2ZXIoc2VsZik6 Ci0gICAgICAgIGlmIHNlbGYuX2RyaXZlcjoKKyAgICAgICAgIyBCZSBjYXJlZnVsIGFib3V0IGhv dyBhbmQgd2hlbiB3ZSBraWxsIHRoZSBkcml2ZXI7IGlmIGRyaXZlci5zdG9wKCkKKyAgICAgICAg IyByYWlzZXMgYW4gZXhjZXB0aW9uLCB0aGlzIHJvdXRpbmUgbWF5IGdldCByZS1lbnRlcmVkIHZp YSBfX2RlbF9fLgorICAgICAgICBkcml2ZXIgPSBzZWxmLl9kcml2ZXIKKyAgICAgICAgc2VsZi5f ZHJpdmVyID0gTm9uZQorICAgICAgICBpZiBkcml2ZXI6CiAgICAgICAgICAgICBfbG9nLmRlYnVn KCIlcyBraWxsaW5nIGRyaXZlciIgJSBzZWxmLl9uYW1lKQotICAgICAgICAgICAgc2VsZi5fZHJp dmVyLnN0b3AoKQotICAgICAgICAgICAgc2VsZi5fZHJpdmVyID0gTm9uZQorICAgICAgICAgICAg ZHJpdmVyLnN0b3AoKQogCiAgICAgZGVmIHJ1bl90ZXN0X3dpdGhfdGltZW91dChzZWxmLCB0ZXN0 X2lucHV0LCB0aW1lb3V0KToKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ydW5fc2luZ2x5Ogpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0 b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5 LnB5CmluZGV4IDVkYTViYzU1NjUwZWVhMzY2ZWQ2YTBmMDRlNzBiZWI2NzgyMjEwM2QuLjliNWNm MjdiMDgxMjY1YTcwMTk2YzEwZTQ1OTg3ZGVkOTg5OGI4ZWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkKQEAgLTExMiw3ICsx MTIsNyBAQCBjbGFzcyBQb3J0RmFjdG9yeShvYmplY3QpOgogICAgICAgICAgICAgaWYgcG9ydF9u YW1lLnN0YXJ0c3dpdGgoY2xzLnBvcnRfbmFtZSk6CiAgICAgICAgICAgICAgICAgcG9ydF9uYW1l ID0gY2xzLmRldGVybWluZV9mdWxsX3BvcnRfbmFtZShzZWxmLl9ob3N0LCBvcHRpb25zLCBwb3J0 X25hbWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNscyhzZWxmLl9ob3N0LCBwb3J0X25hbWUs IG9wdGlvbnM9b3B0aW9ucywgKiprd2FyZ3MpCi0gICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVk RXJyb3IoJ3Vuc3VwcG9ydGVkIHBvcnQ6ICVzJyAlIHBvcnRfbmFtZSkKKyAgICAgICAgcmFpc2Ug Tm90SW1wbGVtZW50ZWRFcnJvcigndW5zdXBwb3J0ZWQgcGxhdGZvcm06ICIlcyInICUgcG9ydF9u YW1lKQogCiAgICAgZGVmIGFsbF9wb3J0X25hbWVzKHNlbGYpOgogICAgICAgICAiIiJSZXR1cm4g YSBsaXN0IG9mIGFsbCB2YWxpZCwgZnVsbHktc3BlY2lmaWVkLCAicmVhbCIgcG9ydCBuYW1lcy4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CmluZGV4IGMxMDQzZThkZGMzMDlhNzY2ZWMzMjI1ZjYyZGM0NTFiMjUwMTg2 OGUuLmUzYTEzYzIwZmUwOGI3NDJkYmE1NjkzYjI4NGMzN2ZkNjNjNTFkZWYgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 cy5weQpAQCAtMzcsNyArMzcsOCBAQCBpbXBvcnQgc2lnbmFsCiBpbXBvcnQgc3lzCiAKIGZyb20g d2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKLWZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLmNvbnRyb2xsZXJzLm1hbmFnZXIgaW1wb3J0IE1hbmFnZXIKK2Zyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbSBpbXBvcnQgc3RhY2tfdXRpbHMKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3Rz LmNvbnRyb2xsZXJzLm1hbmFnZXIgaW1wb3J0IE1hbmFnZXIsIFdvcmtlckV4Y2VwdGlvbiwgVGVz dFJ1bkludGVycnVwdGVkRXhjZXB0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2Rl bHMgaW1wb3J0IHRlc3RfZXhwZWN0YXRpb25zCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5w b3J0IGltcG9ydCBwb3J0X29wdGlvbnMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnZpZXdz IGltcG9ydCBwcmludGluZwpAQCAtNDYsNiArNDcsMTQgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRf dGVzdHMudmlld3MgaW1wb3J0IHByaW50aW5nCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19u YW1lX18pCiAKIAorIyBUaGlzIG1pcnJvcnMgd2hhdCB0aGUgc2hlbGwgbm9ybWFsbHkgZG9lcy4K K0lOVEVSUlVQVEVEX0VYSVRfU1RBVFVTID0gc2lnbmFsLlNJR0lOVCArIDEyOAorCisjIFRoaXMg aXMgYSByYW5kb21seSBjaG9zZW4gZXhpdCBjb2RlIHRoYXQgY2FuIGJlIHRlc3RlZCBhZ2FpbnN0 IHRvCisjIGluZGljYXRlIHRoYXQgYW4gdW5leHBlY3RlZCBleGNlcHRpb24gb2NjdXJyZWQuCitF WENFUFRJT05BTF9FWElUX1NUQVRVUyA9IDI1NAorCisKIGRlZiBsaW50KHBvcnQsIG9wdGlvbnMp OgogICAgIGhvc3QgPSBwb3J0Lmhvc3QKICAgICBpZiBvcHRpb25zLnBsYXRmb3JtOgpAQCAtMTE5 LDYgKzEyOCwxMSBAQCBkZWYgcnVuKHBvcnQsIG9wdGlvbnMsIGFyZ3MsIHJlZ3VsYXJfb3V0cHV0 PXN5cy5zdGRlcnIsIGJ1aWxkYm90X291dHB1dD1zeXMuc3RkbwogCiAgICAgICAgIHVuZXhwZWN0 ZWRfcmVzdWx0X2NvdW50ID0gbWFuYWdlci5ydW4oKQogICAgICAgICBfbG9nLmRlYnVnKCJUZXN0 aW5nIGNvbXBsZXRlZCwgRXhpdCBzdGF0dXM6ICVkIiAlIHVuZXhwZWN0ZWRfcmVzdWx0X2NvdW50 KQorICAgIGV4Y2VwdCBFeGNlcHRpb246CisgICAgICAgIGV4Y2VwdGlvbl90eXBlLCBleGNlcHRp b25fdmFsdWUsIGV4Y2VwdGlvbl90cmFjZWJhY2sgPSBzeXMuZXhjX2luZm8oKQorICAgICAgICBp ZiBleGNlcHRpb25fdHlwZSBub3QgaW4gKEtleWJvYXJkSW50ZXJydXB0LCBUZXN0UnVuSW50ZXJy dXB0ZWRFeGNlcHRpb24sIFdvcmtlckV4Y2VwdGlvbik6CisgICAgICAgICAgICBzdGFja191dGls cy5sb2dfdHJhY2ViYWNrKF9sb2cuZXJyb3IsIGV4Y2VwdGlvbl90cmFjZWJhY2spCisgICAgICAg IHJhaXNlCiAgICAgZmluYWxseToKICAgICAgICAgcHJpbnRlci5jbGVhbnVwKCkKIApAQCAtNDMz LDggKzQ0Nyw4IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgcmV0dXJuIG9wdGlv bl9wYXJzZXIucGFyc2VfYXJncyhhcmdzKQogCiAKLWRlZiBtYWluKCk6Ci0gICAgb3B0aW9ucywg YXJncyA9IHBhcnNlX2FyZ3MoKQorZGVmIG1haW4oYXJndj1Ob25lKToKKyAgICBvcHRpb25zLCBh cmdzID0gcGFyc2VfYXJncyhhcmd2KQogICAgIGlmIG9wdGlvbnMucGxhdGZvcm0gYW5kICd0ZXN0 JyBpbiBvcHRpb25zLnBsYXRmb3JtOgogICAgICAgICAjIEl0J3MgYSBiaXQgbGFtZSB0byBpbXBv cnQgbW9ja3MgaW50byByZWFsIGNvZGUsIGJ1dCB0aGlzIGFsbG93cyB0aGUgdXNlcgogICAgICAg ICAjIHRvIHJ1biB0ZXN0cyBhZ2FpbnN0IHRoZSB0ZXN0IHBsYXRmb3JtIGludGVyYWN0aXZlbHks IHdoaWNoIGlzIHVzZWZ1bCBmb3IKQEAgLTQ0Myw3ICs0NTcsMTQgQEAgZGVmIG1haW4oKToKICAg ICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICBlbHNlOgogICAgICAgICBob3N0ID0gSG9zdCgp Ci0gICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldChvcHRpb25zLnBsYXRmb3JtLCBvcHRp b25zKQorCisgICAgdHJ5OgorICAgICAgICBwb3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KG9w dGlvbnMucGxhdGZvcm0sIG9wdGlvbnMpCisgICAgZXhjZXB0IE5vdEltcGxlbWVudGVkRXJyb3Is IGU6CisgICAgICAgICMgRklYTUU6IGlzIHRoaXMgdGhlIGJlc3Qgd2F5IHRvIGhhbmRsZSB1bnN1 cHBvcnRlZCBwb3J0IG5hbWVzPworICAgICAgICBwcmludCA+PiBzeXMuc3RkZXJyLCBzdHIoZSkK KyAgICAgICAgcmV0dXJuIEVYQ0VQVElPTkFMX0VYSVRfU1RBVFVTCisKICAgICBsb2dnaW5nLmdl dExvZ2dlcigpLnNldExldmVsKGxvZ2dpbmcuREVCVUcgaWYgb3B0aW9ucy52ZXJib3NlIGVsc2Ug bG9nZ2luZy5JTkZPKQogICAgIHJldHVybiBydW4ocG9ydCwgb3B0aW9ucywgYXJncykKIApAQCAt NDUxLDEyICs0NzIsNyBAQCBkZWYgbWFpbigpOgogaWYgJ19fbWFpbl9fJyA9PSBfX25hbWVfXzoK ICAgICB0cnk6CiAgICAgICAgIHN5cy5leGl0KG1haW4oKSkKLSAgICBleGNlcHQgS2V5Ym9hcmRJ bnRlcnJ1cHQ6Ci0gICAgICAgICMgVGhpcyBtaXJyb3JzIHdoYXQgdGhlIHNoZWxsIG5vcm1hbGx5 IGRvZXMuCi0gICAgICAgIElOVEVSUlVQVEVEX0VYSVRfU1RBVFVTID0gc2lnbmFsLlNJR0lOVCAr IDEyOAotICAgICAgICBzeXMuZXhpdChJTlRFUlJVUFRFRF9FWElUX1NUQVRVUykKLSAgICBleGNl cHQgRXhjZXB0aW9uOgotICAgICAgICAjIFRoaXMgaXMgYSByYW5kb21seSBjaG9zZW4gZXhpdCBj b2RlIHRoYXQgY2FuIGJlIHRlc3RlZCBhZ2FpbnN0IHRvCi0gICAgICAgICMgaW5kaWNhdGUgdGhh dCBhbiB1bmV4cGVjdGVkIGV4Y2VwdGlvbiBvY2N1cnJlZC4KLSAgICAgICAgRVhDRVBUSU9OQUxf RVhJVF9TVEFUVVMgPSAyNTQKKyAgICBleGNlcHQgRXhjZXB0aW9uLCBlOgorICAgICAgICBpZiBl Ll9fY2xhc3NfXyBpbiAoS2V5Ym9hcmRJbnRlcnJ1cHQsIFRlc3RSdW5JbnRlcnJ1cHRlZEV4Y2Vw dGlvbik6CisgICAgICAgICAgICBzeXMuZXhpdChJTlRFUlJVUFRFRF9FWElUX1NUQVRVUykKICAg ICAgICAgc3lzLmV4aXQoRVhDRVBUSU9OQUxfRVhJVF9TVEFUVVMpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0 aW9udGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CmluZGV4IDA0YmM1ZTUwMDQ5MjBlYmQ3ZTM3NDgz MTU0MTBkNTA2NTliYTA2OGYuLjQ3N2E5OGZhNGIwYjNjOWIwZDU1N2M5MmI1Y2ViMThkYTNhYzE2 N2UgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CkBAIC05 MDQsNiArOTA0LDIwIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1U ZXN0aW5nTWl4aW4pOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhmdWxsX3Jlc3VsdHNbJ2hh c193ZGlmZiddLCBGYWxzZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZnVsbF9yZXN1bHRz WydoYXNfcHJldHR5X3BhdGNoJ10sIEZhbHNlKQogCisgICAgZGVmIHRlc3RfdW5zdXBwb3J0ZWRf cGxhdGZvcm0oc2VsZik6CisgICAgICAgIG9jID0gb3V0cHV0Y2FwdHVyZS5PdXRwdXRDYXB0dXJl KCkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQorICAgICAg ICAgICAgcmVzID0gcnVuX3dlYmtpdF90ZXN0cy5tYWluKFsnLS1wbGF0Zm9ybScsICdmb28nXSkK KyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIHN0ZG91dCwgc3RkZXJyLCBsb2dzID0gb2Mu cmVzdG9yZV9vdXRwdXQoKQorCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHJlcywgcnVuX3dl YmtpdF90ZXN0cy5FWENFUFRJT05BTF9FWElUX1NUQVRVUykKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoc3Rkb3V0LCAnJykKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCd1bnN1cHBvcnRlZCBw bGF0Zm9ybScgaW4gc3RkZXJyKQorCisgICAgICAgICMgVGhpcyBpcyBlbXB0eSBiZWNhdXNlIHdl IGRvbid0IGV2ZW4gZ2V0IGEgY2hhbmNlIHRvIGNvbmZpZ3VyZSB0aGUgbG9nZ2VyIGJlZm9yZSBm YWlsaW5nLgorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsb2dzLCAnJykKIAogY2xhc3MgRW5k VG9FbmRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgcGFyc2VfZnVsbF9yZXN1bHRz KHNlbGYsIGZ1bGxfcmVzdWx0c190ZXh0KToK