35821 2010-03-05 17:02:21 -0800 python: Create a function for getting a module-specific logger 2010-03-22 05:52:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek abarth cjerdonek eric hamaji levin oldest_to_newest 196815 0 cjerdonek 2010-03-05 17:02:21 -0800 We should create a function for getting a logging.logger with the fully-qualified name of a module. That way we don't have to hard-code the fully-qualified module name in every module, like so-- _log = logging.getLogger("webkitpy.layout_tests.port.http_server_base") The function can probably go in webkitpy/init (soon to be something like webkit/infra). It will probably take something like __file__ as a parameter. Eric originally suggested this idea here: https://bugs.webkit.org/show_bug.cgi?id=35194#c11 196980 1 50168 cjerdonek 2010-03-06 22:43:11 -0800 Created attachment 50168 Proposed patch 199347 2 50168 abarth 2010-03-13 02:17:10 -0800 Comment on attachment 50168 Proposed patch Straightforward. I suppose the next step is to convert our existing call sites to the new hotness. 202453 3 cjerdonek 2010-03-22 05:52:19 -0700 (In reply to comment #2) > (From update of attachment 50168 [details]) > Straightforward. I suppose the next step is to convert our existing call sites > to the new hotness. Thanks again, Adam! Yes, I think that would be the natural next step. 202454 4 cjerdonek 2010-03-22 05:52:52 -0700 Manually committed after rebasing (via "git svn dcommit"): http://trac.webkit.org/changeset/56331 50168 2010-03-06 22:43:11 -0800 2010-03-13 02:17:10 -0800 Proposed patch _patch-35821-1.diff text/plain 10530 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkZjZmMTZlLi45OGFmMDhmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTAtMDMt MDYgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3JlYXRlZCBhIGZ1bmN0aW9uIGZv ciBnZXR0aW5nIGEgbW9kdWxlLXNwZWNpZmljIGxvZ2dpbmcubG9nZ2VyCisgICAgICAgIGJhc2Vk IG9uIHRoZSBfX2ZpbGVfXyB2YWx1ZSBvZiB0aGUgbW9kdWxlLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTgyMQorCisgICAgICAgIFRoaXMgZnVu Y3Rpb24gYWxsb3dzIHVzIHRvIGdldCB0aGUgbW9kdWxlLXNwZWNpZmljIGxvZ2dlciBmb3IKKyAg ICAgICAgYSBtb2R1bGUgd2l0aG91dCBoYXZpbmcgdG8gaGFyZC1jb2RlIHRoZSBmdWxseS1xdWFs aWZpZWQgbmFtZQorICAgICAgICBvZiB0aGUgbW9kdWxlIGluIHRoZSBtb2R1bGUgaXRzZWxmLiAg VGhlIGNvZGUgY2FuIGJlIHRoZSBzYW1lCisgICAgICAgIGluIGV2ZXJ5IGNhc2U6ICAiX2xvZyA9 IGxvZ3V0aWxzLmdldF9sb2dnZXIoX19maWxlX18pIi4KKworICAgICAgICAqIFNjcmlwdHMvdGVz dC13ZWJraXRweToKKyAgICAgICAgICAtIEFkZGVkIHdlYmtpdHB5LmluaXQudW5pdHRlc3RzIHRv IHRoZSBsaXN0IG9mIHVuaXQgdGVzdCBpbXBvcnRzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9pbml0L2xvZ3V0aWxzLnB5OiBBZGRlZC4KKyAgICAgICAgICAtIEFkZGVkIGEgbW9kdWxl IHdpdGggYSBnZXRfbG9nZ2VyKCkgZnVuY3Rpb24gdG8gcmV0dXJuCisgICAgICAgICAgICBhIG1v ZHVsZS1zcGVjaWZpYyBsb2dnZXIgYmFzZWQgb24gdGhlIG1vZHVsZSdzIF9fZmlsZV9fCisgICAg ICAgICAgICB2YXJpYWJsZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvaW5pdC9sb2d1 dGlsc191bml0dGVzdC5weTogQWRkZWQuCisgICAgICAgICAgLSBBZGRlZCB1bml0IHRlc3RzIGZv ciBsb2d1dGlscy5weS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvaW5pdC91bml0dGVz dHMucHk6IEFkZGVkLgorICAgICAgICAgIC0gQWRkZWQgYSBmaWxlIHRvIGltcG9ydCBhbGwgdW5p dCB0ZXN0IG1vZHVsZXMgaW4gdGhlCisgICAgICAgICAgICB3ZWJraXRweS5pbml0IHBhY2thZ2Uu CisKIDIwMTAtMDMtMDYgIEhpcm9ub3JpIEJvbm8gIDxoYm9ub0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3Rlc3Qtd2Via2l0cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkK aW5kZXggODYxNzMzMC4uMjU3MThlNyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy90 ZXN0LXdlYmtpdHB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweQpAQCAt NDQsNiArNDQsNyBAQCBmcm9tIHdlYmtpdHB5LmNyZWRlbnRpYWxzX3VuaXR0ZXN0IGltcG9ydCAq CiBmcm9tIHdlYmtpdHB5LmRpZmZfcGFyc2VyX3VuaXR0ZXN0IGltcG9ydCAqCiBmcm9tIHdlYmtp dHB5LmV4ZWN1dGl2ZV91bml0dGVzdCBpbXBvcnQgKgogZnJvbSB3ZWJraXRweS5ncmFtbWFyX3Vu aXR0ZXN0IGltcG9ydCAqCitmcm9tIHdlYmtpdHB5LmluaXQudW5pdHRlc3RzIGltcG9ydCAqCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0Lm1hY191bml0dGVzdCBpbXBvcnQgKgogZnJv bSB3ZWJraXRweS5tdWx0aWNvbW1hbmR0b29sX3VuaXR0ZXN0IGltcG9ydCAqCiBmcm9tIHdlYmtp dHB5Lm5ldHdvcmt0cmFuc2FjdGlvbl91bml0dGVzdCBpbXBvcnQgKgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9pbml0L2xvZ3V0aWxzLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9pbml0L2xvZ3V0aWxzLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLjBhOGE1MGMKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2luaXQvbG9ndXRpbHMucHkKQEAgLTAsMCArMSwxMTAgQEAKKyMgQ29weXJp Z2h0IChDKSAyMDEwIENocmlzIEplcmRvbmVrIChjamVyZG9uZWtAd2Via2l0Lm9yZykKKyMKKyMg UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor IworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUg R09PRFMgT1IKKyMgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworIiIiU3VwcG9ydHMgdGhlIHVu aXQtdGVzdGluZyBvZiBsb2dnaW5nLiIiIgorCitpbXBvcnQgbG9nZ2luZworaW1wb3J0IG9zCisK K2ltcG9ydCB3ZWJraXRweQorCisjIFdlIHNldCB0aGVzZSBkaXJlY3RvcnkgcGF0aHMgbGF6aWx5 IGluIGdldF9sb2dnZXIoKSBiZWxvdy4KK19zY3JpcHRzX2RpciA9ICIiCisiIiJUaGUgbm9ybWFs aXplZCwgYWJzb2x1dGUgcGF0aCB0byB0aGUgLi4uU2NyaXB0cyBkaXJlY3RvcnkuIiIiCisKK193 ZWJraXRweV9kaXIgPSAiIgorIiIiVGhlIG5vcm1hbGl6ZWQsIGFic29sdXRlIHBhdGggdG8gdGhl IC4uLlNjcmlwdHMvd2Via2l0cHkgZGlyZWN0b3J5LiIiIgorCisKK2RlZiBfbm9ybWFsaXplX3Bh dGgocGF0aCk6CisgICAgIiIiUmV0dXJuIHRoZSBnaXZlbiBwYXRoIG5vcm1hbGl6ZWQuCisKKyAg ICBDb252ZXJ0cyBhIHBhdGggdG8gYW4gYWJzb2x1dGUgcGF0aCwgcmVtb3ZlcyBhbnkgdHJhaWxp bmcgc2xhc2hlcywKKyAgICByZW1vdmVzIGFueSBleHRlbnNpb24sIGFuZCBsb3dlci1jYXNlcyBp dC4KKworICAgICIiIgorICAgIHBhdGggPSBvcy5wYXRoLmFic3BhdGgocGF0aCkKKyAgICBwYXRo ID0gb3MucGF0aC5ub3JtcGF0aChwYXRoKQorICAgIHBhdGggPSBvcy5wYXRoLnNwbGl0ZXh0KHBh dGgpWzBdICAjIFJlbW92ZSB0aGUgZXh0ZW5zaW9uLCBpZiBhbnkuCisgICAgcGF0aCA9IHBhdGgu bG93ZXIoKQorCisgICAgcmV0dXJuIHBhdGgKKworCisjIE9ic2VydmUgdGhhdCB0aGUgaW1wbGVt ZW50YXRpb24gb2YgdGhpcyBmdW5jdGlvbiBkb2VzIG5vdCByZXF1aXJlCisjIHRoZSB1c2Ugb2Yg YW55IGhhcmQtY29kZWQgc3RyaW5ncyBsaWtlICJ3ZWJraXRweSIsIGV0Yy4KK2RlZiBnZXRfbG9n Z2VyKHBhdGgpOgorICAgICIiIlJldHVybiBhIGxvZ2dpbmcubG9nZ2VyIGZvciB0aGUgZ2l2ZW4g cGF0aC4KKworICAgIFJldHVybnM6CisgICAgICBBIGxvZ2dlciB3aG9zZSBuYW1lIGlzIHRoZSBu YW1lIG9mIHRoZSBtb2R1bGUgY29ycmVzcG9uZGluZyB0bworICAgICAgdGhlIGdpdmVuIHBhdGgu ICBJZiB0aGUgbW9kdWxlIGlzIGluIHdlYmtpdHB5LCB0aGUgbmFtZSBpcworICAgICAgdGhlIGZ1 bGx5LXF1YWxpZmllZCBkb3R0ZWQgbW9kdWxlIG5hbWUgYmVnaW5uaW5nIHdpdGggd2Via2l0cHku Li4uCisgICAgICBPdGhlcndpc2UsIHRoZSBuYW1lIGlzIHRoZSBiYXNlIG5hbWUgb2YgdGhlIG1v ZHVsZSAoaS5lLiB3aXRob3V0CisgICAgICBhbnkgZG90dGVkIG1vZHVsZSBuYW1lIHByZWZpeCku CisKKyAgICBBcmdzOgorICAgICAgcGF0aDogVGhlIHBhdGggb2YgdGhlIG1vZHVsZS4gIE5vcm1h bGx5LCB0aGlzIHBhcmFtZXRlciBzaG91bGQgYmUKKyAgICAgICAgICAgIHRoZSBfX2ZpbGVfXyB2 YXJpYWJsZSBvZiB0aGUgbW9kdWxlLgorCisgICAgU2FtcGxlIHVzYWdlOgorCisgICAgICBpbXBv cnQgd2Via2l0cHkuaW5pdC5sb2d1dGlscyBhcyBsb2d1dGlscworCisgICAgICBfbG9nID0gbG9n dXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKKworICAgICIiIgorICAgICMgU2luY2Ugd2UgYXNz aWduIHRvIF9zY3JpcHRzX2RpciBhbmQgX3dlYmtpdHB5X2RpciBpbiB0aGlzIGZ1bmN0aW9uLAor ICAgICMgd2UgbmVlZCB0byBkZWNsYXJlIHRoZW0gZ2xvYmFsLgorICAgIGdsb2JhbCBfc2NyaXB0 c19kaXIKKyAgICBnbG9iYWwgX3dlYmtpdHB5X2RpcgorCisgICAgcGF0aCA9IF9ub3JtYWxpemVf cGF0aChwYXRoKQorCisgICAgIyBMYXppbHkgZXZhbHVhdGUgX3dlYmtpdHB5X2RpciBhbmQgX3Nj cmlwdHNfZGlyLgorICAgIGlmIG5vdCBfc2NyaXB0c19kaXI6CisgICAgICAgICMgVGhlIG5vcm1h bGl6ZWQsIGFic29sdXRlIHBhdGggdG8gLi4uU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy4KKyAg ICAgICAgd2Via2l0cHlfcGF0aCA9IF9ub3JtYWxpemVfcGF0aCh3ZWJraXRweS5fX2ZpbGVfXykK KworICAgICAgICBfd2Via2l0cHlfZGlyID0gb3MucGF0aC5zcGxpdCh3ZWJraXRweV9wYXRoKVsw XQorICAgICAgICBfc2NyaXB0c19kaXIgPSBvcy5wYXRoLnNwbGl0KF93ZWJraXRweV9kaXIpWzBd CisKKyAgICBpZiBwYXRoLnN0YXJ0c3dpdGgoX3dlYmtpdHB5X2Rpcik6CisgICAgICAgICMgUmVt b3ZlIHRoZSBpbml0aWFsIFNjcmlwdHMgZGlyZWN0b3J5IHBvcnRpb24sIHNvIHRoZSBwYXRoCisg ICAgICAgICMgc3RhcnRzIHdpdGggL3dlYmtpdHB5LCBmb3IgZXhhbXBsZSAiL3dlYmtpdHB5L2lu aXQvbG9ndXRpbHMiLgorICAgICAgICBwYXRoID0gcGF0aFtsZW4oX3NjcmlwdHNfZGlyKTpdCisK KyAgICAgICAgcGFydHMgPSBbXQorICAgICAgICB3aGlsZSBUcnVlOgorICAgICAgICAgICAgKHBh dGgsIHRhaWwpID0gb3MucGF0aC5zcGxpdChwYXRoKQorICAgICAgICAgICAgaWYgbm90IHRhaWw6 CisgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgIHBhcnRzLmluc2VydCgwLCB0YWls KQorCisgICAgICAgIGxvZ2dlcl9uYW1lID0gIi4iLmpvaW4ocGFydHMpICAjIEZvciBleGFtcGxl LCB3ZWJraXRweS5pbml0LmxvZ3V0aWxzLgorICAgIGVsc2U6CisgICAgICAgICMgVGhlIHBhdGgg aXMgb3V0c2lkZSBvZiB3ZWJraXRweS4gIERlZmF1bHQgdG8gdGhlIGJhc2VuYW1lCisgICAgICAg ICMgd2l0aG91dCB0aGUgZXh0ZW5zaW9uLgorICAgICAgICBiYXNlbmFtZSA9IG9zLnBhdGguYmFz ZW5hbWUocGF0aCkKKyAgICAgICAgbG9nZ2VyX25hbWUgPSBvcy5wYXRoLnNwbGl0ZXh0KGJhc2Vu YW1lKVswXQorCisgICAgcmV0dXJuIGxvZ2dpbmcuZ2V0TG9nZ2VyKGxvZ2dlcl9uYW1lKQpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9pbml0L2xvZ3V0aWxzX3VuaXR0 ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9pbml0L2xvZ3V0aWxzX3VuaXR0 ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVjNzhhZTQKLS0tIC9k ZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2luaXQvbG9ndXRpbHNf dW5pdHRlc3QucHkKQEAgLTAsMCArMSw1MCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTAgQ2hyaXMg SmVyZG9uZWsgKGNocmlzLmplcmRvbmVrQGdtYWlsLmNvbSkKKyMKKyMgUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJ UycnIEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SIEFOWQorIyBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUworIyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7CisjIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTgorIyBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UgT0YgVEhJUworIyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKworIiIiVW5pdCB0ZXN0cyBmb3IgbG9ndXRpbHMucHkuIiIi CisKK2ltcG9ydCBvcworaW1wb3J0IHVuaXR0ZXN0CisKK2ltcG9ydCBsb2d1dGlscworCisKK2Ns YXNzIEdldExvZ2dlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgorCisgICAgIiIiVGVzdHMgZ2V0 X2xvZ2dlcigpLiIiIgorCisgICAgZGVmIHRlc3RfZ2V0X2xvZ2dlcl9pbl93ZWJraXRweShzZWxm KToKKyAgICAgICAgbG9nZ2VyID0gbG9ndXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMobG9nZ2VyLm5hbWUsICJ3ZWJraXRweS5pbml0LmxvZ3V0aWxz X3VuaXR0ZXN0IikKKworICAgIGRlZiB0ZXN0X2dldF9sb2dnZXJfbm90X2luX3dlYmtpdHB5KHNl bGYpOgorICAgICAgICAjIFRlbXBvcmFyaWx5IGNoYW5nZSB0aGUgd29ya2luZyBkaXJlY3Rvcnkg c28gdGhhdCB3ZQorICAgICAgICAjIGNhbiB0ZXN0IGdldF9sb2dnZXIoKSBmb3IgcGF0aHMgb3V0 c2lkZSBvZiB3ZWJraXRweS4KKyAgICAgICAgd29ya2luZ19kaXJlY3RvcnkgPSBvcy5nZXRjd2Qo KQorCisgICAgICAgIHJvb3RfZGlyID0gIi8iCisgICAgICAgIG9zLmNoZGlyKHJvb3RfZGlyKQor CisgICAgICAgIGxvZ2dlciA9IGxvZ3V0aWxzLmdldF9sb2dnZXIoIi9XZWJLaXRUb29scy9TY3Jp cHRzL3Rlc3Qtd2Via2l0cHkiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsb2dnZXIubmFt ZSwgInRlc3Qtd2Via2l0cHkiKQorCisgICAgICAgIG9zLmNoZGlyKHdvcmtpbmdfZGlyZWN0b3J5 KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9pbml0L3VuaXR0ZXN0 cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvaW5pdC91bml0dGVzdHMucHkKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGQwY2M2MwotLS0gL2Rldi9udWxsCisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvaW5pdC91bml0dGVzdHMucHkKQEAgLTAs MCArMSwyOCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTAgQ2hyaXMgSmVyZG9uZWsgKGNqZXJkb25l a0B3ZWJraXQub3JnKQorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6Cisj IDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl IGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUK KyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQ TEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycgQU5ECisjIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRI RSBJTVBMSUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IKKyMgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VR VUVOVElBTAorIyBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUgorIyBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUgorIyBDQVVT RUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLAorIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor CisiIiJSdW5zIGluaXQgcGFja2FnZSB1bml0IHRlc3RzLiIiIgorCisjIFRoaXMgbW9kdWxlIGlz IGltcG9ydGVkIGJ5IHRoZSBtb2R1bGUgdGhhdCBpbXBvcnRzIGFsbCB3ZWJraXRweSB1bml0IHRl c3RzLgorCisKK2Zyb20gbG9ndXRpbHNfdW5pdHRlc3QgaW1wb3J0ICoK