125748 2013-12-14 19:57:01 -0800 stylebot should warn when FeatureDefines differ 2014-03-12 03:24:41 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton aestes commit-queue glenn jianli mitz mrowe simon.fraser oldest_to_newest 959890 0 thorton 2013-12-14 19:57:01 -0800 I have a patch that makes something like this happen: ERROR: Source/WebKit2/Configurations/FeatureDefines.xcconfig:0: Any changes made to FeatureDefines should be made to all of them (changed file does not match Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig). [featuredefines/equality] [5] ERROR: Source/WebKit2/Configurations/FeatureDefines.xcconfig:0: Any changes made to FeatureDefines should be made to all of them (changed file does not match Source/WebCore/Configurations/FeatureDefines.xcconfig). [featuredefines/equality] [5] ERROR: Source/WebKit2/Configurations/FeatureDefines.xcconfig:0: Any changes made to FeatureDefines should be made to all of them (changed file does not match Source/WebKit/mac/Configurations/FeatureDefines.xcconfig). [featuredefines/equality] [5] ...if you change only one of the FeatureDefines files. Andy recently got us to zero diffs, so we should keep it that way! 959891 1 219267 thorton 2013-12-14 20:01:00 -0800 Created attachment 219267 patch not sure how kosher the file list is (seems a bit unfortunate) but not sure how else to do it. 959892 2 commit-queue 2013-12-14 20:01:50 -0800 Attachment 219267 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy/style/checker.py', u'Tools/Scripts/webkitpy/style/checkers/featuredefines.py', '--commit-queue']" exit_code: 1 ERROR: Tools/Scripts/webkitpy/style/checkers/featuredefines.py:31: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/Scripts/webkitpy/style/checkers/featuredefines.py:62: no newline at end of file [pep8/W292] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 959893 3 219268 thorton 2013-12-14 20:09:05 -0800 Created attachment 219268 make stylebot happy :\ 959900 4 219268 commit-queue 2013-12-14 20:43:55 -0800 Comment on attachment 219268 make stylebot happy :\ Clearing flags on attachment: 219268 Committed r160611: <http://trac.webkit.org/changeset/160611> 959901 5 commit-queue 2013-12-14 20:43:57 -0800 All reviewed patches have been landed. Closing bug. 960109 6 simon.fraser 2013-12-16 10:11:26 -0800 I wish we could just push all that stuff into a header file. 989571 7 ossy 2014-03-12 03:24:41 -0700 *** Bug 38942 has been marked as a duplicate of this bug. *** 219267 2013-12-14 20:01:00 -0800 2013-12-14 20:09:05 -0800 patch stylebot.diff text/plain 6969 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkZTA5 N2MxLi5jMWM4M2YwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTMtMTItMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgc3R5bGVib3Qgc2hvdWxkIHdhcm4gd2hlbiBG ZWF0dXJlRGVmaW5lcyBkaWZmZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNTc0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIHN0eWxlYm90IGNoZWNrZXIgdGhhdCBlbnN1cmVzIHRoYXQgRmVh dHVyZURlZmluZXMueGNjb25maWcgZmlsZXMKKyAgICAgICAgYXJlIGFsd2F5cyBleGFjdGx5IGVx dWFsIChhbmQgd2FybnMgcGVvcGxlIGFkZGluZyBuZXcgRmVhdHVyZURlZmluZXMueGNjb25maWcg ZmlsZXMsCisgICAgICAgIGFuIHVubGlrZWx5IG9jY3VycmFuY2UsIHRvIGFkZCB0aGVtIHRvIHRo ZSBsaXN0KS4KKworICAgICAgICBJdCdzIGEgYml0IG5vbnRyYWRpdGlvbmFsIGZvciBzdHlsZWJv dCBiZWNhdXNlIGl0IHdpbGwgd2FybiBvbiBleGlzdGluZyBlcnJvcnMgaW4gdGhlIHRyZWUsCisg ICAgICAgIGJ1dCB0aGF0IGlzIHRoZSBtb3N0IHN0cmFpZ2h0Zm9yd2FyZCB3YXkgdG8gaW1wbGVt ZW50IGl0IChhbmQgd2UncmUgYXQgemVybyBkaWZmcyByaWdodCBub3cpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAoX2FsbF9jYXRlZ29y aWVzKToKKyAgICAgICAgKEZpbGVUeXBlKToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyLl9m aWxlX3R5cGUpOgorICAgICAgICAoQ2hlY2tlckRpc3BhdGNoZXIuX2NyZWF0ZV9jaGVja2VyKToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2ZlYXR1cmVkZWZpbmVz LnB5OiBBZGRlZC4KKyAgICAgICAgKEZlYXR1cmVEZWZpbmVzQ2hlY2tlcik6CisgICAgICAgIChG ZWF0dXJlRGVmaW5lc0NoZWNrZXIuX19pbml0X18pOgorICAgICAgICAoRmVhdHVyZURlZmluZXND aGVja2VyLmNoZWNrKToKKwogMjAxMy0xMi0xMyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIEZpeCBBUEkgdGVzdHMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2NoZWNrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXIucHkKaW5kZXggZjcwMzU0Ni4uNDIxZWYyNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weQpAQCAtNDEsNiArNDEsNyBAQCBmcm9tIGNoZWNrZXJzLmNvbW1vbiBp bXBvcnQgQ2FycmlhZ2VSZXR1cm5DaGVja2VyCiBmcm9tIGNoZWNrZXJzLmNoYW5nZWxvZyBpbXBv cnQgQ2hhbmdlTG9nQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5jcHAgaW1wb3J0IENwcENoZWNrZXIK IGZyb20gY2hlY2tlcnMuY21ha2UgaW1wb3J0IENNYWtlQ2hlY2tlcgorZnJvbSBjaGVja2Vycy5m ZWF0dXJlZGVmaW5lcyBpbXBvcnQgRmVhdHVyZURlZmluZXNDaGVja2VyCiBmcm9tIGNoZWNrZXJz LmpzIGltcG9ydCBKU0NoZWNrZXIKIGZyb20gY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpT T05DaGVja2VyCiBmcm9tIGNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ29udHJpYnV0 b3JzQ2hlY2tlcgpAQCAtMzU5LDYgKzM2MCw3IEBAIGRlZiBfYWxsX2NhdGVnb3JpZXMoKToKICAg ICBjYXRlZ29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihUZXN0RXhwZWN0YXRpb25zQ2hlY2tlci5j YXRlZ29yaWVzKQogICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29yaWVzLnVuaW9uKENoYW5nZUxvZ0No ZWNrZXIuY2F0ZWdvcmllcykKICAgICBjYXRlZ29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihQTkdD aGVja2VyLmNhdGVnb3JpZXMpCisgICAgY2F0ZWdvcmllcyA9IGNhdGVnb3JpZXMudW5pb24oRmVh dHVyZURlZmluZXNDaGVja2VyLmNhdGVnb3JpZXMpCiAKICAgICAjIEZJWE1FOiBDb25zaWRlciBh ZGRpbmcgYWxsIG9mIHRoZSBwZXA4IGNhdGVnb3JpZXMuICBTaW5jZSB0aGV5CiAgICAgIyAgICAg ICAgYXJlIG5vdCB0b28gbWVhbmluZ2Z1bCBmb3IgZG9jdW1lbnRhdGlvbiBwdXJwb3NlcywgZm9y CkBAIC01MDgsNiArNTEwLDcgQEAgY2xhc3MgRmlsZVR5cGU6CiAgICAgWE1MID0gOQogICAgIFhD T0RFUFJPSiA9IDEwCiAgICAgQ01BS0UgPSAxMQorICAgIEZFQVRVUkVERUZJTkVTID0gMTIKIAog Y2xhc3MgQ2hlY2tlckRpc3BhdGNoZXIob2JqZWN0KToKIApAQCAtNTkyLDYgKzU5NSw4IEBAIGNs YXNzIENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgIGVsaWYgKChub3QgZmlsZV9l eHRlbnNpb24gYW5kIG9zLnBhdGguam9pbigiVG9vbHMiLCAiU2NyaXB0cyIpIGluIGZpbGVfcGF0 aCkgb3IKICAgICAgICAgICAgICAgZmlsZV9leHRlbnNpb24gaW4gX1RFWFRfRklMRV9FWFRFTlNJ T05TIG9yIG9zLnBhdGguYmFzZW5hbWUoZmlsZV9wYXRoKSA9PSAnVGVzdEV4cGVjdGF0aW9ucycp OgogICAgICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLlRFWFQKKyAgICAgICAgZWxpZiBvcy5wYXRo LmJhc2VuYW1lKGZpbGVfcGF0aCkgPT0gIkZlYXR1cmVEZWZpbmVzLnhjY29uZmlnIjoKKyAgICAg ICAgICAgIHJldHVybiBGaWxlVHlwZS5GRUFUVVJFREVGSU5FUwogICAgICAgICBlbHNlOgogICAg ICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLk5PTkUKIApAQCAtNjQxLDYgKzY0Niw4IEBAIGNsYXNz IENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgY2hlY2tlciA9IFRl eHRDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQogICAgICAgICBlbGlmIGZp bGVfdHlwZSA9PSBGaWxlVHlwZS5XQVRDSExJU1Q6CiAgICAgICAgICAgICBjaGVja2VyID0gV2F0 Y2hMaXN0Q2hlY2tlcihmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAgICAgZWxp ZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuRkVBVFVSRURFRklORVM6CisgICAgICAgICAgICBjaGVj a2VyID0gRmVhdHVyZURlZmluZXNDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9y KQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignSW52YWxpZCBm aWxlIHR5cGUgIiUoZmlsZV90eXBlKXMiOiB0aGUgb25seSB2YWxpZCBmaWxlIHR5cGVzICcKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgImFyZSAlKE5PTkUpcywgJShDUFApcywgYW5kICUo VEVYVClzLiIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvZmVhdHVyZWRlZmluZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNr ZXJzL2ZlYXR1cmVkZWZpbmVzLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjQxZmJmYmIKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2ZlYXR1cmVkZWZpbmVzLnB5CkBAIC0wLDAgKzEsNjIgQEAKKyMgQ29weXJpZ2h0 IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4g IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJ QlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05F UiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKworIiIiU3VwcG9ydHMg ZW5zdXJpbmcgZXF1YWxpdHkgb2YgRmVhdHVyZURlZmluZXMueGNjb25maWcgZmlsZXMuIiIiCisK K2ltcG9ydCBvcworCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBpbXBv cnQgU3lzdGVtSG9zdAorCitjbGFzcyBGZWF0dXJlRGVmaW5lc0NoZWNrZXIob2JqZWN0KToKKyAg ICBjYXRlZ29yaWVzID0gc2V0KFsnZmVhdHVyZWRlZmluZXMvbmV3JywgJ2ZlYXR1cmVkZWZpbmVz L2VxdWFsaXR5J10pCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZmlsZV9wYXRoLCBoYW5kbGVf c3R5bGVfZXJyb3IpOgorICAgICAgICBzZWxmLl9maWxlX3BhdGggPSBmaWxlX3BhdGgKKyAgICAg ICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9yCisgICAgICAg IHNlbGYuX2hhbmRsZV9zdHlsZV9lcnJvci50dXJuX29mZl9saW5lX2ZpbHRlcmluZygpCisgICAg ICAgIHNlbGYuX2hvc3QgPSBTeXN0ZW1Ib3N0KCkKKyAgICAgICAgc2VsZi5fZnMgPSBzZWxmLl9o b3N0LmZpbGVzeXN0ZW0KKworICAgIGRlZiBjaGVjayhzZWxmLCBpbmxpbmU9Tm9uZSk6CisgICAg ICAgIGZlYXR1cmVfZGVmaW5lc19maWxlcyA9IFsKKyAgICAgICAgICAgICJTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ29uZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWciLAorICAgICAg ICAgICAgIlNvdXJjZS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29u ZmlnIiwKKyAgICAgICAgICAgICJTb3VyY2UvV2ViS2l0L21hYy9Db25maWd1cmF0aW9ucy9GZWF0 dXJlRGVmaW5lcy54Y2NvbmZpZyIsCisgICAgICAgICAgICAiU291cmNlL1dlYktpdDIvQ29uZmln dXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWciXQorCisgICAgICAgIGlmIHNlbGYuX2Zp bGVfcGF0aCBub3QgaW4gZmVhdHVyZV9kZWZpbmVzX2ZpbGVzOgorICAgICAgICAgICAgc2VsZi5f aGFuZGxlX3N0eWxlX2Vycm9yKDAsICdmZWF0dXJlZGVmaW5lcy9uZXcnLCA1LCAiUGF0Y2ggaW50 cm9kdWNlcyBhIG5ldyBGZWF0dXJlRGVmaW5lcy54Y2NvbmZpZywgd2hpY2ggY2hlY2std2Via2l0 LXN0eWxlIGRvZXNuJ3Qga25vdyBhYm91dC4gUGxlYXNlIGFkZCBpdCB0byB0aGUgbGlzdCBpbiBm ZWF0dXJlZGVmaW5lcy5weS4iKQorICAgICAgICAgICAgcmV0dXJuCisKKyAgICAgICAgd2l0aCBz ZWxmLl9mcy5vcGVuX2JpbmFyeV9maWxlX2Zvcl9yZWFkaW5nKHNlbGYuX2ZpbGVfcGF0aCkgYXMg ZmlsZWhhbmRsZToKKyAgICAgICAgICAgIGJhc2VsaW5lX2NvbnRlbnQgPSBmaWxlaGFuZGxlLnJl YWQoKQorCisgICAgICAgIG90aGVyX2ZlYXR1cmVfZGVmaW5lc19maWxlcyA9IGZlYXR1cmVfZGVm aW5lc19maWxlcworICAgICAgICBvdGhlcl9mZWF0dXJlX2RlZmluZXNfZmlsZXMucmVtb3ZlKHNl bGYuX2ZpbGVfcGF0aCkKKworICAgICAgICBmb3IgcGF0aCBpbiBvdGhlcl9mZWF0dXJlX2RlZmlu ZXNfZmlsZXM6CisgICAgICAgICAgICB3aXRoIHNlbGYuX2ZzLm9wZW5fYmluYXJ5X2ZpbGVfZm9y X3JlYWRpbmcocGF0aCkgYXMgZmlsZWhhbmRsZToKKyAgICAgICAgICAgICAgICB0ZXN0X2NvbnRl bnQgPSBmaWxlaGFuZGxlLnJlYWQoKQorICAgICAgICAgICAgICAgIGlmIGJhc2VsaW5lX2NvbnRl bnQgIT0gdGVzdF9jb250ZW50OgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5 bGVfZXJyb3IoMCwgJ2ZlYXR1cmVkZWZpbmVzL2VxdWFsaXR5JywgNSwgIkFueSBjaGFuZ2VzIG1h ZGUgdG8gRmVhdHVyZURlZmluZXMgc2hvdWxkIGJlIG1hZGUgdG8gYWxsIG9mIHRoZW0gKGNoYW5n ZWQgZmlsZSBkb2VzIG5vdCBtYXRjaCB7MH0pLiIuZm9ybWF0KHBhdGgpKQpcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUK 219268 2013-12-14 20:09:05 -0800 2013-12-14 20:43:55 -0800 make stylebot happy :\ stylebot.diff text/plain 6943 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkZTA5 N2MxLi5jMWM4M2YwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTMtMTItMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgc3R5bGVib3Qgc2hvdWxkIHdhcm4gd2hlbiBG ZWF0dXJlRGVmaW5lcyBkaWZmZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNTc0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIHN0eWxlYm90IGNoZWNrZXIgdGhhdCBlbnN1cmVzIHRoYXQgRmVh dHVyZURlZmluZXMueGNjb25maWcgZmlsZXMKKyAgICAgICAgYXJlIGFsd2F5cyBleGFjdGx5IGVx dWFsIChhbmQgd2FybnMgcGVvcGxlIGFkZGluZyBuZXcgRmVhdHVyZURlZmluZXMueGNjb25maWcg ZmlsZXMsCisgICAgICAgIGFuIHVubGlrZWx5IG9jY3VycmFuY2UsIHRvIGFkZCB0aGVtIHRvIHRo ZSBsaXN0KS4KKworICAgICAgICBJdCdzIGEgYml0IG5vbnRyYWRpdGlvbmFsIGZvciBzdHlsZWJv dCBiZWNhdXNlIGl0IHdpbGwgd2FybiBvbiBleGlzdGluZyBlcnJvcnMgaW4gdGhlIHRyZWUsCisg ICAgICAgIGJ1dCB0aGF0IGlzIHRoZSBtb3N0IHN0cmFpZ2h0Zm9yd2FyZCB3YXkgdG8gaW1wbGVt ZW50IGl0IChhbmQgd2UncmUgYXQgemVybyBkaWZmcyByaWdodCBub3cpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAoX2FsbF9jYXRlZ29y aWVzKToKKyAgICAgICAgKEZpbGVUeXBlKToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyLl9m aWxlX3R5cGUpOgorICAgICAgICAoQ2hlY2tlckRpc3BhdGNoZXIuX2NyZWF0ZV9jaGVja2VyKToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2ZlYXR1cmVkZWZpbmVz LnB5OiBBZGRlZC4KKyAgICAgICAgKEZlYXR1cmVEZWZpbmVzQ2hlY2tlcik6CisgICAgICAgIChG ZWF0dXJlRGVmaW5lc0NoZWNrZXIuX19pbml0X18pOgorICAgICAgICAoRmVhdHVyZURlZmluZXND aGVja2VyLmNoZWNrKToKKwogMjAxMy0xMi0xMyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIEZpeCBBUEkgdGVzdHMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2NoZWNrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXIucHkKaW5kZXggZjcwMzU0Ni4uNDIxZWYyNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weQpAQCAtNDEsNiArNDEsNyBAQCBmcm9tIGNoZWNrZXJzLmNvbW1vbiBp bXBvcnQgQ2FycmlhZ2VSZXR1cm5DaGVja2VyCiBmcm9tIGNoZWNrZXJzLmNoYW5nZWxvZyBpbXBv cnQgQ2hhbmdlTG9nQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5jcHAgaW1wb3J0IENwcENoZWNrZXIK IGZyb20gY2hlY2tlcnMuY21ha2UgaW1wb3J0IENNYWtlQ2hlY2tlcgorZnJvbSBjaGVja2Vycy5m ZWF0dXJlZGVmaW5lcyBpbXBvcnQgRmVhdHVyZURlZmluZXNDaGVja2VyCiBmcm9tIGNoZWNrZXJz LmpzIGltcG9ydCBKU0NoZWNrZXIKIGZyb20gY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpT T05DaGVja2VyCiBmcm9tIGNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ29udHJpYnV0 b3JzQ2hlY2tlcgpAQCAtMzU5LDYgKzM2MCw3IEBAIGRlZiBfYWxsX2NhdGVnb3JpZXMoKToKICAg ICBjYXRlZ29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihUZXN0RXhwZWN0YXRpb25zQ2hlY2tlci5j YXRlZ29yaWVzKQogICAgIGNhdGVnb3JpZXMgPSBjYXRlZ29yaWVzLnVuaW9uKENoYW5nZUxvZ0No ZWNrZXIuY2F0ZWdvcmllcykKICAgICBjYXRlZ29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihQTkdD aGVja2VyLmNhdGVnb3JpZXMpCisgICAgY2F0ZWdvcmllcyA9IGNhdGVnb3JpZXMudW5pb24oRmVh dHVyZURlZmluZXNDaGVja2VyLmNhdGVnb3JpZXMpCiAKICAgICAjIEZJWE1FOiBDb25zaWRlciBh ZGRpbmcgYWxsIG9mIHRoZSBwZXA4IGNhdGVnb3JpZXMuICBTaW5jZSB0aGV5CiAgICAgIyAgICAg ICAgYXJlIG5vdCB0b28gbWVhbmluZ2Z1bCBmb3IgZG9jdW1lbnRhdGlvbiBwdXJwb3NlcywgZm9y CkBAIC01MDgsNiArNTEwLDcgQEAgY2xhc3MgRmlsZVR5cGU6CiAgICAgWE1MID0gOQogICAgIFhD T0RFUFJPSiA9IDEwCiAgICAgQ01BS0UgPSAxMQorICAgIEZFQVRVUkVERUZJTkVTID0gMTIKIAog Y2xhc3MgQ2hlY2tlckRpc3BhdGNoZXIob2JqZWN0KToKIApAQCAtNTkyLDYgKzU5NSw4IEBAIGNs YXNzIENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgIGVsaWYgKChub3QgZmlsZV9l eHRlbnNpb24gYW5kIG9zLnBhdGguam9pbigiVG9vbHMiLCAiU2NyaXB0cyIpIGluIGZpbGVfcGF0 aCkgb3IKICAgICAgICAgICAgICAgZmlsZV9leHRlbnNpb24gaW4gX1RFWFRfRklMRV9FWFRFTlNJ T05TIG9yIG9zLnBhdGguYmFzZW5hbWUoZmlsZV9wYXRoKSA9PSAnVGVzdEV4cGVjdGF0aW9ucycp OgogICAgICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLlRFWFQKKyAgICAgICAgZWxpZiBvcy5wYXRo LmJhc2VuYW1lKGZpbGVfcGF0aCkgPT0gIkZlYXR1cmVEZWZpbmVzLnhjY29uZmlnIjoKKyAgICAg ICAgICAgIHJldHVybiBGaWxlVHlwZS5GRUFUVVJFREVGSU5FUwogICAgICAgICBlbHNlOgogICAg ICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLk5PTkUKIApAQCAtNjQxLDYgKzY0Niw4IEBAIGNsYXNz IENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgY2hlY2tlciA9IFRl eHRDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQogICAgICAgICBlbGlmIGZp bGVfdHlwZSA9PSBGaWxlVHlwZS5XQVRDSExJU1Q6CiAgICAgICAgICAgICBjaGVja2VyID0gV2F0 Y2hMaXN0Q2hlY2tlcihmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAgICAgZWxp ZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuRkVBVFVSRURFRklORVM6CisgICAgICAgICAgICBjaGVj a2VyID0gRmVhdHVyZURlZmluZXNDaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9y KQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignSW52YWxpZCBm aWxlIHR5cGUgIiUoZmlsZV90eXBlKXMiOiB0aGUgb25seSB2YWxpZCBmaWxlIHR5cGVzICcKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgImFyZSAlKE5PTkUpcywgJShDUFApcywgYW5kICUo VEVYVClzLiIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvZmVhdHVyZWRlZmluZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNr ZXJzL2ZlYXR1cmVkZWZpbmVzLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmYwOWNlZjkKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2ZlYXR1cmVkZWZpbmVzLnB5CkBAIC0wLDAgKzEsNjMgQEAKKyMgQ29weXJpZ2h0 IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4g IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJ QlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05F UiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKworIiIiU3VwcG9ydHMg ZW5zdXJpbmcgZXF1YWxpdHkgb2YgRmVhdHVyZURlZmluZXMueGNjb25maWcgZmlsZXMuIiIiCisK K2ltcG9ydCBvcworCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBpbXBv cnQgU3lzdGVtSG9zdAorCisKK2NsYXNzIEZlYXR1cmVEZWZpbmVzQ2hlY2tlcihvYmplY3QpOgor ICAgIGNhdGVnb3JpZXMgPSBzZXQoWydmZWF0dXJlZGVmaW5lcy9uZXcnLCAnZmVhdHVyZWRlZmlu ZXMvZXF1YWxpdHknXSkKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBmaWxlX3BhdGgsIGhhbmRs ZV9zdHlsZV9lcnJvcik6CisgICAgICAgIHNlbGYuX2ZpbGVfcGF0aCA9IGZpbGVfcGF0aAorICAg ICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKyAgICAg ICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yLnR1cm5fb2ZmX2xpbmVfZmlsdGVyaW5nKCkKKyAg ICAgICAgc2VsZi5faG9zdCA9IFN5c3RlbUhvc3QoKQorICAgICAgICBzZWxmLl9mcyA9IHNlbGYu X2hvc3QuZmlsZXN5c3RlbQorCisgICAgZGVmIGNoZWNrKHNlbGYsIGlubGluZT1Ob25lKToKKyAg ICAgICAgZmVhdHVyZV9kZWZpbmVzX2ZpbGVzID0gWworICAgICAgICAgICAgIlNvdXJjZS9KYXZh U2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2NvbmZpZyIsCisgICAg ICAgICAgICAiU291cmNlL1dlYkNvcmUvQ29uZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNj b25maWciLAorICAgICAgICAgICAgIlNvdXJjZS9XZWJLaXQvbWFjL0NvbmZpZ3VyYXRpb25zL0Zl YXR1cmVEZWZpbmVzLnhjY29uZmlnIiwKKyAgICAgICAgICAgICJTb3VyY2UvV2ViS2l0Mi9Db25m aWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2NvbmZpZyJdCisKKyAgICAgICAgaWYgc2VsZi5f ZmlsZV9wYXRoIG5vdCBpbiBmZWF0dXJlX2RlZmluZXNfZmlsZXM6CisgICAgICAgICAgICBzZWxm Ll9oYW5kbGVfc3R5bGVfZXJyb3IoMCwgJ2ZlYXR1cmVkZWZpbmVzL25ldycsIDUsICJQYXRjaCBp bnRyb2R1Y2VzIGEgbmV3IEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnLCB3aGljaCBjaGVjay13ZWJr aXQtc3R5bGUgZG9lc24ndCBrbm93IGFib3V0LiBQbGVhc2UgYWRkIGl0IHRvIHRoZSBsaXN0IGlu IGZlYXR1cmVkZWZpbmVzLnB5LiIpCisgICAgICAgICAgICByZXR1cm4KKworICAgICAgICB3aXRo IHNlbGYuX2ZzLm9wZW5fYmluYXJ5X2ZpbGVfZm9yX3JlYWRpbmcoc2VsZi5fZmlsZV9wYXRoKSBh cyBmaWxlaGFuZGxlOgorICAgICAgICAgICAgYmFzZWxpbmVfY29udGVudCA9IGZpbGVoYW5kbGUu cmVhZCgpCisKKyAgICAgICAgb3RoZXJfZmVhdHVyZV9kZWZpbmVzX2ZpbGVzID0gZmVhdHVyZV9k ZWZpbmVzX2ZpbGVzCisgICAgICAgIG90aGVyX2ZlYXR1cmVfZGVmaW5lc19maWxlcy5yZW1vdmUo c2VsZi5fZmlsZV9wYXRoKQorCisgICAgICAgIGZvciBwYXRoIGluIG90aGVyX2ZlYXR1cmVfZGVm aW5lc19maWxlczoKKyAgICAgICAgICAgIHdpdGggc2VsZi5fZnMub3Blbl9iaW5hcnlfZmlsZV9m b3JfcmVhZGluZyhwYXRoKSBhcyBmaWxlaGFuZGxlOgorICAgICAgICAgICAgICAgIHRlc3RfY29u dGVudCA9IGZpbGVoYW5kbGUucmVhZCgpCisgICAgICAgICAgICAgICAgaWYgYmFzZWxpbmVfY29u dGVudCAhPSB0ZXN0X2NvbnRlbnQ6CisgICAgICAgICAgICAgICAgICAgIHNlbGYuX2hhbmRsZV9z dHlsZV9lcnJvcigwLCAnZmVhdHVyZWRlZmluZXMvZXF1YWxpdHknLCA1LCAiQW55IGNoYW5nZXMg bWFkZSB0byBGZWF0dXJlRGVmaW5lcyBzaG91bGQgYmUgbWFkZSB0byBhbGwgb2YgdGhlbSAoY2hh bmdlZCBmaWxlIGRvZXMgbm90IG1hdGNoIHswfSkuIi5mb3JtYXQocGF0aCkpCg==