68823 2011-09-26 12:00:33 -0700 Add skeleton parsing for a WatchList. 2011-09-26 16:48:16 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 68822 1 levin levin oldest_to_newest 473270 0 levin 2011-09-26 12:00:33 -0700 This will serve as a basis for reading and applying watch lists. 473335 1 108716 levin 2011-09-26 13:17:29 -0700 Created attachment 108716 Patch 473337 2 108716 eric 2011-09-26 13:24:10 -0700 Comment on attachment 108716 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108716&action=review > Tools/Scripts/webkitpy/tool/steps/applywatchlist.py:34 > +class WatchList: new-style classes (python 2.5 and above?) always subclass from (object) > Tools/Scripts/webkitpy/tool/steps/applywatchlist.py:46 > + # Parse the top level sections in the watch list. > + for section in watch_list: > + parser = watch_list_parsers.get(section) > + if not parse_method: > + raise Exception('Unknown section in watch list: %s' % section) > + parser(watch_list[section]) I would think you'd want a separate WatchListParser class or Factory class which could produce these, leaving WatchList to just be the model. > Tools/Scripts/webkitpy/tool/steps/applywatchlist_unittest.py:38 > + def _verifyException(self, regex_message, callable, *args): > + try: Sad. Python 2.7 has something like this in unittest, but pre-2.7 doesn't. 473375 3 108720 levin 2011-09-26 14:14:17 -0700 Created attachment 108720 Patch 473378 4 108720 abarth 2011-09-26 14:21:01 -0700 Comment on attachment 108720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108720&action=review > Tools/Scripts/webkitpy/common/watchlist/parsewatchlist.py:36 > +def parse_watch_list(watch_list_contents): Normally we'd name the package with a noun, so watchlistparser.py 473536 5 levin 2011-09-26 16:48:16 -0700 Committed as http://trac.webkit.org/changeset/95995 108716 2011-09-26 13:17:29 -0700 2011-09-26 14:09:41 -0700 Patch bug-68823-20110926131728.patch text/plain 6176 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTU5NjMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2MTJlYjA1MDYxOTI3OWIyMTJkN2Q0N2RiNzY1NTExZjhi MGMxMTNjLi4wOGM5NzBkMGQ3NGE4YjQ5MzM4MDM4MDZjN2VkNmVhYmU3NDMwNzNhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDktMjYgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIEFkZCBhIHNrZWxldG9uIFdhdGNoTGlzdCBjbGFzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4ODIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv YXBwbHl3YXRjaGxpc3QucHk6IEFkZGVkLgorICAgICAgICBQYXJzZXMgdGhlIHRvcCBsZXZlbCB3 YXRjaCBsaXN0IHNlY3Rpb25zIC0tIG5vbmUgYXJlIGRlZmluZWQgeWV0IC0tIGFuZAorICAgICAg ICB0aHJvd3MgYW4gZXhjZXB0aW9uIGlmIGFuIGludmFsaWQgb25lIGlzIGxpc3RlZC4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYXBwbHl3YXRjaGxpc3RfdW5pdHRlc3Qu cHk6IEFkZGVkLgorICAgICAgICBWZXJpZnkgdGhlIGV4Y2VwdGlvbiBmb3IgYW4gaW52YWxpZCBz ZWN0aW9uIGluIGEgd2F0Y2ggbGlzdC4KKwogMjAxMS0wOS0yNiAgQWRhbSBSb2JlbiAgPGFyb2Jl bkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgY29kZSBpbXBvcnRlZCBmcm9tIFdlYktp dEFQSVRlc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9h cHBseXdhdGNobGlzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hcHBs eXdhdGNobGlzdC5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43YTFiNTgyOTczNzNiNDQ4OWUyNThlYjg5MGJkMzRi NjkxYmIzMDBhCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3N0ZXBzL2FwcGx5d2F0Y2hsaXN0LnB5CkBAIC0wLDAgKzEsNDkgQEAKKyMgQ29weXJpZ2h0IChD KSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor IyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAg KiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl CisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRo ZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJp YnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVk IGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hU IEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMg QSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRI RSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisj IERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorCitpbXBvcnQgcmUKKworZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuZGlmZl9wYXJz ZXIgaW1wb3J0IERpZmZQYXJzZXIKKworCitjbGFzcyBXYXRjaExpc3Q6CisgICAgJycnQWxsb3dz IG9uZSB0byBleHRyYWN0IGluZm9ybWF0aW9uIGZyb20gYSB3YXRjaCBsaXN0LicnJworICAgIGRl ZiBfX2luaXRfXyhzZWxmLCB3YXRjaF9saXN0X2NvbnRlbnRzKToKKyAgICAgICAgIyBDaGFuZ2Ug dGhlIHdhdGNoIGxpc3QgdGV4dCBpbnRvIGEgZGljdGlvbmFyeS4KKyAgICAgICAgd2F0Y2hfbGlz dCA9IHNlbGYuX2V2YWxfd2F0Y2hfbGlzdCh3YXRjaF9saXN0X2NvbnRlbnRzKQorICAgICAgICB3 YXRjaF9saXN0X3BhcnNlcnMgPSB7fQorCisgICAgICAgICMgUGFyc2UgdGhlIHRvcCBsZXZlbCBz ZWN0aW9ucyBpbiB0aGUgd2F0Y2ggbGlzdC4KKyAgICAgICAgZm9yIHNlY3Rpb24gaW4gd2F0Y2hf bGlzdDoKKyAgICAgICAgICAgIHBhcnNlciA9IHdhdGNoX2xpc3RfcGFyc2Vycy5nZXQoc2VjdGlv bikKKyAgICAgICAgICAgIGlmIG5vdCBwYXJzZV9tZXRob2Q6CisgICAgICAgICAgICAgICAgcmFp c2UgRXhjZXB0aW9uKCdVbmtub3duIHNlY3Rpb24gaW4gd2F0Y2ggbGlzdDogJXMnICUgc2VjdGlv bikKKyAgICAgICAgICAgIHBhcnNlcih3YXRjaF9saXN0W3NlY3Rpb25dKQorCisgICAgZGVmIF9l dmFsX3dhdGNoX2xpc3Qoc2VsZiwgd2F0Y2hfbGlzdF9jb250ZW50cyk6CisgICAgICAgIHJldHVy biBldmFsKHdhdGNoX2xpc3RfY29udGVudHMsIHsnX19idWlsdGluc19fJzogTm9uZX0sIE5vbmUp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYXBwbHl3YXRj aGxpc3RfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYXBw bHl3YXRjaGxpc3RfdW5pdHRlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjFmNGRkZGZkNmQ4Yzc1MGVjMzE0 Mjc2MTFkOWU4NTBkMWU0MWNjOAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9hcHBseXdhdGNobGlzdF91bml0dGVzdC5weQpAQCAtMCwwICsxLDQ3 IEBACisjIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICogUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorIyAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlv bi4KKyMgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMg b2YgaXRzCisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUg cHJvZHVjdHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBw cmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMg TElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisj IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKworJycnVW5pdCB0ZXN0cyBmb3IgYXBwbHl3YXRjaGxpc3RzLnB5 LicnJworCitpbXBvcnQgcmUKK2ltcG9ydCB1bml0dGVzdAorZnJvbSBhcHBseXdhdGNobGlzdCBp bXBvcnQgV2F0Y2hMaXN0CisKKworY2xhc3MgQXBwbHlXYXRjaGxpc3RzVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CisgICAgZGVmIF92ZXJpZnlFeGNlcHRpb24oc2VsZiwgcmVnZXhfbWVzc2FnZSwg Y2FsbGFibGUsICphcmdzKToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgY2FsbGFibGUoKmFy Z3MpCisgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoRmFsc2UsICdObyBhc3NlcnQgcmFpc2Vk LicpCisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZXhjZXB0aW9uOgorICAgICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHJlLm1hdGNoKHJlZ2V4X21lc3NhZ2UsIGV4Y2VwdGlvbi5fX3N0cl9f KCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICdFeHBlY3RlZCByZWdleCAiJXMiXG5H b3QgIiVzIicgJSAocmVnZXhfbWVzc2FnZSwgZXhjZXB0aW9uLl9fc3RyX18oKSkpCisKKyAgICBk ZWYgdGVzdF9iYWRfc2VjdGlvbihzZWxmKToKKyAgICAgICAgd2F0Y2hfbGlzdF93aXRoX2JhZF9z ZWN0aW9uID0gKCd7IkZPTyI6IHt9fScpCisgICAgICAgIHNlbGYuX3ZlcmlmeUV4Y2VwdGlvbign VW5rbm93biBzZWN0aW9uIGluIHdhdGNoIGxpc3Q6IEZPTycsIFdhdGNoTGlzdCwgd2F0Y2hfbGlz dF93aXRoX2JhZF9zZWN0aW9uKQo= 108720 2011-09-26 14:14:17 -0700 2011-09-26 14:21:01 -0700 Patch bug-68823-20110926141416.patch text/plain 8729 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTU5NjMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2MTJlYjA1MDYxOTI3OWIyMTJkN2Q0N2RiNzY1NTExZjhi MGMxMTNjLi4xYmE1YzBmMWEwNTJjMmU4ZmM3MTZhZTNhOTJhMzA1N2ExYmY2ZjE3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDktMjYgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIEFkZCBhIHNrZWxldG9uIFdhdGNoTGlzdCBjbGFzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4ODIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRj aGxpc3QvcGFyc2V3YXRjaGxpc3QucHk6IEFkZGVkLgorICAgICAgICBQYXJzZXMgdGhlIHRvcCBs ZXZlbCB3YXRjaCBsaXN0IHNlY3Rpb25zIC0tIG5vbmUgYXJlIGRlZmluZWQgeWV0IC0tIGFuZAor ICAgICAgICB0aHJvd3MgYW4gZXhjZXB0aW9uIGlmIGFuIGludmFsaWQgb25lIGlzIGxpc3RlZC4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvcGFyc2V3YXRjaGxp c3RfdW5pdHRlc3QucHk6IEFkZGVkLgorICAgICAgICBWZXJpZnkgdGhlIGV4Y2VwdGlvbiBmb3Ig YW4gaW52YWxpZCBzZWN0aW9uIGluIGEgd2F0Y2ggbGlzdC4KKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0LnB5OiBBZGRlZC4KKwogMjAxMS0wOS0y NiAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgY29k ZSBpbXBvcnRlZCBmcm9tIFdlYktpdEFQSVRlc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3dhdGNobGlzdC9fX2luaXRfXy5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lZjY1YmVlNWJi NzdlOTZlYmM3Y2Q5YzQ3NjQwNjkwZmJkYThhYzE5Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L19faW5pdF9fLnB5CkBAIC0wLDAgKzEg QEAKKyMgUmVxdWlyZWQgZm9yIFB5dGhvbiB0byBzZWFyY2ggdGhpcyBkaXJlY3RvcnkgZm9yIG1v ZHVsZSBmaWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0 Y2hsaXN0L3BhcnNld2F0Y2hsaXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v d2F0Y2hsaXN0L3BhcnNld2F0Y2hsaXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUyYTZhMTAxOTc3YTNkMGQ3 OTRjZWQxYzcxNDYwNmM0ODBlYmUwMjgKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvcGFyc2V3YXRjaGxpc3QucHkKQEAgLTAsMCArMSw1 MCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1 dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9t b3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lm aWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIg QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U CisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMg QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2Zyb20gd2Via2l0cHkuY29tbW9uLndhdGNobGlzdC53 YXRjaGxpc3QgaW1wb3J0IFdhdGNoTGlzdAorCisKK2RlZiBfZXZhbF93YXRjaF9saXN0KHdhdGNo X2xpc3RfY29udGVudHMpOgorICAgIHJldHVybiBldmFsKHdhdGNoX2xpc3RfY29udGVudHMsIHsn X19idWlsdGluc19fJzogTm9uZX0sIE5vbmUpCisKKworZGVmIHBhcnNlX3dhdGNoX2xpc3Qod2F0 Y2hfbGlzdF9jb250ZW50cyk6CisgICAgd2F0Y2hfbGlzdCA9IFdhdGNoTGlzdCgpCisKKyAgICAj IENoYW5nZSB0aGUgd2F0Y2ggbGlzdCB0ZXh0IGludG8gYSBkaWN0aW9uYXJ5LgorICAgIGRpY3Rp b25hcnkgPSBfZXZhbF93YXRjaF9saXN0KHdhdGNoX2xpc3RfY29udGVudHMpCisgICAgcGFyc2Vy cyA9IHt9CisKKyAgICAjIFBhcnNlIHRoZSB0b3AgbGV2ZWwgc2VjdGlvbnMgaW4gdGhlIHdhdGNo IGxpc3QuCisgICAgZm9yIHNlY3Rpb24gaW4gZGljdGlvbmFyeToKKyAgICAgICAgcGFyc2VyID0g cGFyc2Vycy5nZXQoc2VjdGlvbikKKyAgICAgICAgaWYgbm90IHBhcnNlcjoKKyAgICAgICAgICAg IHJhaXNlIEV4Y2VwdGlvbignVW5rbm93biBzZWN0aW9uIGluIHdhdGNoIGxpc3Q6ICVzJyAlIHNl Y3Rpb24pCisgICAgICAgIHBhcnNlcihkaWN0aW9uYXJ5W3NlY3Rpb25dLCB3YXRjaF9saXN0KQor CisgICAgcmV0dXJuIHdhdGNoX2xpc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3dhdGNobGlzdC9wYXJzZXdhdGNobGlzdF91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC9wYXJzZXdhdGNobGlzdF91bml0dGVzdC5w eQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi4wZDMyYjJiNjZjNzZlZjEyMDUyNDdmZTUwMGM1ZjkwNTBmZThlMDgyCi0t LSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0 L3BhcnNld2F0Y2hsaXN0X3VuaXR0ZXN0LnB5CkBAIC0wLDAgKzEsNTIgQEAKKyMgQ29weXJpZ2h0 IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAg ICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAqIE5laXRo ZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJp YnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVk IGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hU IEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMg QSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRI RSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisj IERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorCisnJydVbml0IHRlc3RzIGZvciB3YXRjaGxpc3RzcGFyc2VyLnB5LicnJworCitpbXBvcnQg cmUKK2ltcG9ydCB1bml0dGVzdAorZnJvbSB3ZWJraXRweS5jb21tb24ud2F0Y2hsaXN0LnBhcnNl d2F0Y2hsaXN0IGltcG9ydCBwYXJzZV93YXRjaF9saXN0CisKKworY2xhc3MgUGFyc2VXYXRjaExp c3RUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAg ICMgRm9yIHZlcnNpb25zIG9mIFB5dGhvbiBiZWZvcmUgMi43LgorICAgICAgICBpZiBub3QgJ2Fz c2VydFJhaXNlc1JlZ2V4cCcgaW4gZGlyKHNlbGYpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRS YWlzZXNSZWdleHAgPSBzZWxmLl92ZXJpZnlFeGNlcHRpb24KKworICAgIGRlZiBfdmVyaWZ5RXhj ZXB0aW9uKHNlbGYsIHJlZ2V4X21lc3NhZ2UsIGNhbGxhYmxlLCAqYXJncyk6CisgICAgICAgIHRy eToKKyAgICAgICAgICAgIGNhbGxhYmxlKCphcmdzKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRU cnVlKEZhbHNlLCAnTm8gYXNzZXJ0IHJhaXNlZC4nKQorICAgICAgICBleGNlcHQgRXhjZXB0aW9u IGFzIGV4Y2VwdGlvbjoKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShyZS5tYXRjaChyZWdl eF9tZXNzYWdlLCBleGNlcHRpb24uX19zdHJfXygpKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnRXhwZWN0ZWQgcmVnZXggIiVzIlxuR290ICIlcyInICUgKHJlZ2V4X21lc3NhZ2UsIGV4 Y2VwdGlvbi5fX3N0cl9fKCkpKQorCisgICAgZGVmIHRlc3RfYmFkX3NlY3Rpb24oc2VsZik6Cisg ICAgICAgIHdhdGNoX2xpc3Rfd2l0aF9iYWRfc2VjdGlvbiA9ICgneyJGT08iOiB7fX0nKQorICAg ICAgICBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cCgnVW5rbm93biBzZWN0aW9uIGluIHdhdGNoIGxp c3Q6IEZPTycsIHBhcnNlX3dhdGNoX2xpc3QsIHdhdGNoX2xpc3Rfd2l0aF9iYWRfc2VjdGlvbikK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRj aGxpc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hs aXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjJkNjliMGFmMzllYzdlNmQ2NDZhMDdkMjNkZjVlOThjYzRmNjc1 NDMKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRj aGxpc3Qvd2F0Y2hsaXN0LnB5CkBAIC0wLDAgKzEsMzIgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEx IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNv cHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhl IG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3Jz IG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20K KyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lv bi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERF UlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZ UklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCisK K2NsYXNzIFdhdGNoTGlzdChvYmplY3QpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAg ICAgcGFzcwo=