36429 2010-03-21 14:48:17 -0700 test-webkitpy: Add support for a flag that enables verbose logging 2010-03-31 21:23:33 -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 202322 0 cjerdonek 2010-03-21 14:48:17 -0700 Passing "--debug" should set the logging level to logging.DEBUG instead of logging.INFO. 202447 1 51277 cjerdonek 2010-03-22 04:57:57 -0700 Created attachment 51277 Proposed patch This is preparatory work for revisiting the autoinstall rewrite, now that the versioning stuff is all worked out now: https://bugs.webkit.org/show_bug.cgi?id=35163 202812 2 51366 cjerdonek 2010-03-22 15:51:12 -0700 Created attachment 51366 Proposed patch 2 Changed to using a try-except block instead of using a version check in autoinstalled/__init__.py since it is cleaner. Also FYI, I found a bug in Python 2.6 while working on this patch (which they have now fixed): http://bugs.python.org/issue8200 203861 3 hamaji 2010-03-25 00:24:57 -0700 I think it's better to use --verbose instead of --debug as --debug usually means "debug build" in WebKit. Same discussion was done in Bug 36100. Bug 36521 is also related. 203872 4 51366 eric 2010-03-25 00:42:04 -0700 Comment on attachment 51366 Proposed patch 2 --versbose, or --log-level=debug 203963 5 cjerdonek 2010-03-25 03:14:56 -0700 FYI, --verbose is already taken by Python's unittest module, so we will need to use a different flag name: > test-webkitpy --help [INFO] test-webkitpy: Suppressing most webkitpy logging while running unit tests. Usage: test-webkitpy [options] [test] [...] Options: -h, --help Show this message -v, --verbose Verbose output -q, --quiet Minimal output Also, I do think the functionality in this report should be distinct from what unittest's --verbose flag already does, which is display a line for every unit test. In other words, I don't think we should use the existing flag to do both. 205042 6 51842 cjerdonek 2010-03-27 13:22:36 -0700 Created attachment 51842 Proposed patch 3 205045 7 cjerdonek 2010-03-27 13:33:11 -0700 (In reply to comment #6) > Created an attachment (id=51842) [details] > Proposed patch 3 If you don't like my choice to use --verbose-logging, then how about --verbose-webkit to distinguish from the unittest module's --verbose flag? I chose --verbose-logging because it relates to Python's logging module. I'd prefer not to expose a --logging-level flag since that seems like over-kill. 206927 8 51842 abarth 2010-03-31 20:30:30 -0700 Comment on attachment 51842 Proposed patch 3 I'm not wild about mucking around with argv so much, but I don't think we have any better solutions at the moment. I don't really understand Python logging, but if the code does what it says, that's great. 206930 9 cjerdonek 2010-03-31 20:38:48 -0700 (In reply to comment #8) Thanks! > (From update of attachment 51842 [details]) > I'm not wild about mucking around with argv so much, but I don't think we have > any better solutions at the moment. Yeah, I'm with you. This is an odd case since test-webkitpy wraps unittest.main(). It's along the same lines as your --all hack. There may not be an elegant solution, unfortunately. Maybe the best we can do is re-implementing unittest.main's argument parser so we can get command-line help working for the command options we added, etc. > I don't really understand Python logging, but if the code does what it says, > that's great. It's really not too hard. It's just that test-webkitpy is a bit trickier than the others since we want to avoid rendering to the screen the log messages that occur as a side effect of executing code. 206931 10 abarth 2010-03-31 20:40:54 -0700 I didn't (and don't) like the --all thing either. I just needed to solve that painpoint somehow. :( 206934 11 cjerdonek 2010-03-31 20:47:58 -0700 (In reply to comment #10) > I didn't (and don't) like the --all thing either. I just needed to solve that > painpoint somehow. :( Yeah, we'll solve them both together (--all and --verbose-logging) when the time comes... 206942 12 cjerdonek 2010-03-31 21:23:33 -0700 Committed: http://trac.webkit.org/changeset/56893 51277 2010-03-22 04:57:57 -0700 2010-03-22 15:51:12 -0700 Proposed patch _patch-36429-1.diff text/plain 6578 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxMmI0YTJjLi40MTEyZWNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzEgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig YSAtLWRlYnVnIGZsYWcgdG8gdGVzdC13ZWJraXRweS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY0MjkKKworICAgICAgICBUaGUgZGVidWcgZmxh ZyBpcyB1c2VmdWwgcHJpbWFyaWx5IGZvciBkZWJ1Z2dpbmcgYXV0b2luc3RhbGwKKyAgICAgICAg d2hpbGUgcnVubmluZyB0ZXN0LXdlYmtpdHB5LgorCisgICAgICAgICogU2NyaXB0cy90ZXN0LXdl YmtpdHB5OgorICAgICAgICAgIC0gSW4gdGhlIGNvbmZpZ3VyZV9sb2dnaW5nKCkgbWV0aG9kLS0K KyAgICAgICAgICAgIC0gQWRkZWQgYW4gaXNfZGVidWcgcGFyYW1ldGVyIHRoYXQgc2V0cyB0aGUg bG9nZ2luZyBsZXZlbCB0bworICAgICAgICAgICAgICBsb2dnaW5nLkRFQlVHIGluc3RlYWQgb2Yg bG9nZ2luZy5JTkZPLgorICAgICAgICAgICAgLSBDaGFuZ2VkIHRoZSBtZXRob2QgdG8gdGhyb3R0 bGUgdGhlIGxvZ2dpbmcgbGV2ZWwgb24gdGhlCisgICAgICAgICAgICAgIHJvb3QgbG9nZ2VyJ3Mg aGFuZGxlciBpbnN0ZWFkIG9mIGRpcmVjdGx5IG9uIHRoZSByb290IGxvZ2dlcgorICAgICAgICAg ICAgICBpdHNlbGYuCisgICAgICAgICAgICAtIEVuYWJsZWQgbG9nZ2luZyBvZiB0aGUgYXV0b2lu c3RhbGwgbW9kdWxlIHdoZW4gdGhlIGRlYnVnCisgICAgICAgICAgICAgIGZsYWcgaXMgdHJ1ZS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9hdXRvaW5zdGFsbGVkL19f aW5pdF9fLnB5OgorICAgICAgICAgIC0gQWRkZWQgYSB3b3JrLWFyb3VuZCBmb3IgYSBidWcgaW4g UHl0aG9uIDIuNidzIGxvZ2dpbmcgbW9kdWxlCisgICAgICAgICAgICB0aGF0IHdhcyBkaXNjb3Zl cmVkIHdoaWxlIHdvcmtpbmcgb24gdGhpcyBwYXRjaC4KKworMjAxMC0wMy0yMiAgQ2hyaXMgSmVy ZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKwogICAgICAgICBSZWZhY3RvcmVkIHRoZSBjcHVfY291bnQoKSBjb2RlIGlu IGV4ZWN1dGl2ZS5weS4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzY0MzcKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJr aXRweSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweQppbmRleCA2MTVlMWMyLi4x MjMzODE2IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5CkBAIC0zNywyMCArMzcsMzkgQEAg aW1wb3J0IHdlYmtpdHB5LmluaXQudmVyc2lvbmluZyBhcyB2ZXJzaW9uaW5nCiBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoInRlc3Qtd2Via2l0cHkiKQogCiAKLWRlZiBjb25maWd1cmVfbG9nZ2lu ZygpOgorIyBUaGUgImlzX2RlYnVnIiBwYXJhbWV0ZXIgaXMgcHJpbWFyaWx5IHVzZWZ1bCBmb3Ig ZGVidWdnaW5nIGF1dG9pbnN0YWxsCisjIHdoaWxlIHJ1bm5pbmcgdGVzdC13ZWJraXRweS4KK2Rl ZiBjb25maWd1cmVfbG9nZ2luZyhpc19kZWJ1Zyk6CiAgICAgIiIiQ29uZmlndXJlIHRoZSByb290 IGxvZ2dlci4KIAotICAgIENvbmZpZ3VyZSB0aGUgcm9vdCBsb2dnZXIgbm90IHRvIGxvZyBhbnkg bWVzc2FnZXMgZnJvbSB3ZWJraXRweSwKLSAgICBhbmQgdG8gbG9nIGFsbCBvdGhlciBtZXNzYWdl cyB0aGF0IGFyZSBJTkZPIGFuZCBhYm92ZS4KKyAgICBDb25maWd1cmUgdGhlIHJvb3QgbG9nZ2Vy IG5vdCB0byBsb2cgYW55IG1lc3NhZ2VzIGZyb20gd2Via2l0cHkgLS0KKyAgICBleGNlcHQgZm9y IG1lc3NhZ2VzIGZyb20gdGhlIGF1dG9pbnN0YWxsIG1vZHVsZS4gIEFsc28gc2V0IHRoZQorICAg IGxvZ2dpbmcgbGV2ZWwgYXMgZGVzY3JpYmVkIGJlbG93LgorCisgICAgQXJnczoKKyAgICAgIGlz X2RlYnVnOiBBIGJvb2xlYW4gdmFsdWUgb2Ygd2hldGhlciB0aGUgYXBwbGljYXRpb24gaXMgYmVp bmcKKyAgICAgICAgICAgICAgICBkZWJ1Z2dlZC4gIElmIHRoaXMgcGFyYW1ldGVyIGlzIHRydWUs IHRoZSBsb2dnaW5nIGxldmVsCisgICAgICAgICAgICAgICAgZm9yIHRoZSBoYW5kbGVyIG9uIHRo ZSByb290IGxvZ2dlciBpcyBzZXQgdG8gbG9nZ2luZy5ERUJVRy4KKyAgICAgICAgICAgICAgICBP dGhlcndpc2UsIGl0IGlzIHNldCB0byBsb2dnaW5nLklORk8uCiAKICAgICAiIiIKKyAgICBsb2dn aW5nX2xldmVsID0gbG9nZ2luZy5ERUJVRyBpZiBpc19kZWJ1ZyBlbHNlIGxvZ2dpbmcuSU5GTwor CiAgICAgaGFuZGxlciA9IGxvZ2dpbmcuU3RyZWFtSGFuZGxlcihzeXMuc3RkZXJyKQotICAgIGZv cm1hdHRlciA9IGxvZ2dpbmcuRm9ybWF0dGVyKCJbJShsZXZlbG5hbWUpc10gJShuYW1lKXM6ICUo bWVzc2FnZSlzIikKKyAgICAjIFdlIGNvbnN0cmFpbiB0aGUgbGV2ZWwgb24gdGhlIGhhbmRsZXIg cmF0aGVyIHRoYW4gb24gdGhlIHJvb3QKKyAgICAjIGxvZ2dlciBpdHNlbGYuICBUaGlzIGlzIHBy b2JhYmx5IGJldHRlciBiZWNhdXNlIHRoZSBoYW5kbGVyIGlzCisgICAgIyBjb25maWd1cmVkIGFu ZCBrbm93biBvbmx5IHRvIHRoaXMgbW9kdWxlLCB3aGVyZWFzIHRoZSByb290IGxvZ2dlcgorICAg ICMgaXMgYW4gb2JqZWN0IHNoYXJlZCAoYW5kIHBvdGVudGlhbGx5IG1vZGlmaWVkKSBieSBtYW55 IG1vZHVsZXMuCisgICAgIyBNb2RpZnlpbmcgdGhlIGhhbmRsZXIsIHRoZW4sIGlzIGxlc3MgaW50 cnVzaXZlIGFuZCBsZXNzIGxpa2VseSB0bworICAgICMgaW50ZXJmZXJlIHdpdGggbW9kaWZpY2F0 aW9ucyBtYWRlIGJ5IG90aGVyIG1vZHVsZXMgKGUuZy4gaW4gdW5pdAorICAgICMgdGVzdHMpLgor ICAgIGhhbmRsZXIuc2V0TGV2ZWwobG9nZ2luZ19sZXZlbCkKKyAgICBmb3JtYXR0ZXIgPSBsb2dn aW5nLkZvcm1hdHRlcigiJShuYW1lKXM6ICUobGV2ZWxuYW1lKS04cyAlKG1lc3NhZ2UpcyIpCiAg ICAgaGFuZGxlci5zZXRGb3JtYXR0ZXIoZm9ybWF0dGVyKQogCiAgICAgbG9nZ2VyID0gbG9nZ2lu Zy5nZXRMb2dnZXIoKQotICAgIGxvZ2dlci5zZXRMZXZlbChsb2dnaW5nLklORk8pCiAgICAgbG9n Z2VyLmFkZEhhbmRsZXIoaGFuZGxlcikKKyAgICBsb2dnZXIuc2V0TGV2ZWwobG9nZ2luZy5OT1RT RVQpCiAKICAgICAjIEZpbHRlciBvdXQgbW9zdCB3ZWJraXRweSBtZXNzYWdlcy4KICAgICAjCkBA IC01OCwxMCArNzcsMTIgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6CiAgICAgIyB0aGlzIG1l dGhvZCBhY2NvcmRpbmdseS4KICAgICBkZWYgZmlsdGVyKHJlY29yZCk6CiAgICAgICAgICIiIkZp bHRlciBvdXQgYXV0b2luc3RhbGwgYW5kIG5vbi10aGlyZC1wYXJ0eSB3ZWJraXRweSBtZXNzYWdl cy4iIiIKLSAgICAgICAgIyBGSVhNRTogRW5hYmxlIHRoZSBsb2dnaW5nIG9mIGF1dG9pbnN0YWxs IG1lc3NhZ2VzIG9uY2UKLSAgICAgICAgIyAgICAgICAgYXV0b2luc3RhbGwgaXMgYWRqdXN0ZWQu ICBDdXJyZW50bHksIGF1dG9pbnN0YWxsIGxvZ3MKLSAgICAgICAgIyAgICAgICAgSU5GTyBtZXNz YWdlcyB3aGVuIGltcG9ydGluZyBhbHJlYWR5LWRvd25sb2FkZWQgcGFja2FnZXMsCi0gICAgICAg ICMgICAgICAgIHdoaWNoIGlzIHRvbyB2ZXJib3NlLgorICAgICAgICAjIEZJWE1FOiBFbmFibGUg dGhlIGxvZ2dpbmcgb2YgYXV0b2luc3RhbGwgbWVzc2FnZXMgZXZlbiB3aGVuCisgICAgICAgICMg ICAgICAgIGlzX2RlYnVnIGlzIGZhbHNlIC0tIG9uY2UgYXV0b2luc3RhbGwgaXMgcmV3cml0dGVu LgorICAgICAgICAjICAgICAgICBDdXJyZW50bHksIGF1dG9pbnN0YWxsIGxvZ3MgSU5GTyBtZXNz YWdlcyB3aGVuIGltcG9ydGluZworICAgICAgICAjICAgICAgICBhbHJlYWR5LWRvd25sb2FkZWQg cGFja2FnZXMsIHdoaWNoIGlzIHRvbyB2ZXJib3NlLgorICAgICAgICBpZiBpc19kZWJ1ZyBhbmQg cmVjb3JkLm5hbWUgPT0gIndlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGwiOgorICAgICAg ICAgICAgcmV0dXJuIFRydWUKICAgICAgICAgaWYgcmVjb3JkLm5hbWUuc3RhcnRzd2l0aCgid2Vi a2l0cHkiKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICByZXR1cm4gVHJ1ZQpA QCAtNzUsOSArOTYsMjkgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6CiAgICAgaGFuZGxlci5h ZGRGaWx0ZXIodGVzdGluZ19maWx0ZXIpCiAKIAotZGVmIGluaXQoKToKLSAgICAiIiJFeGVjdXRl IGNvZGUgcHJpb3IgdG8gaW1wb3J0aW5nIGZyb20gd2Via2l0cHkudW5pdHRlc3RzLiIiIgotICAg IGNvbmZpZ3VyZV9sb2dnaW5nKCkKK2RlZiBpbml0KGNvbW1hbmRfYXJncyk6CisgICAgIiIiRXhl Y3V0ZSBjb2RlIHByaW9yIHRvIGltcG9ydGluZyBmcm9tIHdlYmtpdHB5LnVuaXR0ZXN0cy4KKwor ICAgIEFyZ3M6CisgICAgICAgIGNvbW1hbmRfYXJnczogVGhlIGxpc3Qgb2YgY29tbWFuZC1saW5l IGFyZ3VtZW50cyAtLSB1c3VhbGx5CisgICAgICAgICAgICAgICAgICAgICAgc3lzLmFyZ3ZbMTpd LgorCisgICAgIiIiCisgICAgZGVidWdfZmxhZyA9ICItLWRlYnVnIgorICAgIGlzX2RlYnVnID0g ZGVidWdfZmxhZyBpbiBjb21tYW5kX2FyZ3MKKyAgICBpZiBpc19kZWJ1ZzoKKyAgICAgICAgIyBS ZW1vdmUgdGhlIGZsYWcgc28gaXQgZG9lc24ndCBjYXVzZSB1bml0dGVzdC5tYWluKCkgdG8gZXJy b3Igb3V0LgorICAgICAgICAjCisgICAgICAgICMgRklYTUU6IEdldCBkb2N1bWVudGF0aW9uIGZv ciB0aGUgLS1kZWJ1ZyBmbGFnIHRvIHNob3cgdXAgaW4gdGhlCisgICAgICAgICMgICAgICAgIHVz YWdlIGluc3RydWN0aW9ucywgd2hpY2ggYXJlIGN1cnJlbnRseSBnZW5lcmF0ZWQgYnkKKyAgICAg ICAgIyAgICAgICAgdW5pdHRlc3QubWFpbigpLiAgSXQncyBwb3NzaWJsZSB0aGF0IHRoaXMgd2ls bCByZXF1aXJlCisgICAgICAgICMgICAgICAgIHJlLWltcGxlbWVudGluZyB0aGUgb3B0aW9uIHBh cnNlciBmb3IgdW5pdHRlc3QubWFpbigpCisgICAgICAgICMgICAgICAgIHNpbmNlIHRoZXJlIG1h eSBub3QgYmUgYW4gZWFzeSB3YXkgdG8gbW9kaWZ5IGl0cyBleGlzdGluZworICAgICAgICAjICAg ICAgICBvcHRpb24gcGFyc2VyLgorICAgICAgICBzeXMuYXJndi5yZW1vdmUoZGVidWdfZmxhZykK KworICAgIGNvbmZpZ3VyZV9sb2dnaW5nKGlzX2RlYnVnKQorICAgIF9sb2cuZGVidWcoIkRlYnVn IGxvZ2dpbmcgZW5hYmxlZC4iKQogCiAgICAgdmVyc2lvbmluZy5jaGVja192ZXJzaW9uKGxvZz1f bG9nKQogCkBAIC05NCw3ICsxMzUsNyBAQCBkZWYgaW5pdCgpOgogCiBpZiBfX25hbWVfXyA9PSAi X19tYWluX18iOgogCi0gICAgaW5pdCgpCisgICAgaW5pdChzeXMuYXJndlsxOl0pCiAKICAgICAj IFdlIGltcG9ydCB0aGUgdW5pdCB0ZXN0IGNvZGUgYWZ0ZXIgaW5pdCgpIHRvIGVuc3VyZSB0aGF0 IGFueQogICAgICMgUHl0aG9uIHZlcnNpb24gd2FybmluZ3MgYXJlIGRpc3BsYXllZCBpbiBjYXNl IGFuIGVycm9yIG9jY3VycwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90aGlyZHBhcnR5L2F1dG9pbnN0YWxsZWQvX19pbml0X18ucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQppbmRleCA4 ZTQ2MTQ1Li5iMjA1YjAzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQpAQCAt MSw1ICsxLDE0IEBACiAjIFJlcXVpcmVkIGZvciBQeXRob24gdG8gc2VhcmNoIHRoaXMgZGlyZWN0 b3J5IGZvciBtb2R1bGUgZmlsZXMKIAorZnJvbSB3ZWJraXRweS5pbml0LnZlcnNpb25pbmcgaW1w b3J0IGNvbXBhcmVfdmVyc2lvbgorCisjIFdlIGltcG9ydCBtdWx0aXByb2Nlc3NpbmcgcHJpb3Ig dG8gaW1wb3J0aW5nIGF1dG9pbnN0YWxsIHRvIGNpcmN1bXZlbnQKKyMgdGhlIGZvbGxvd2luZyBi dWcgaW4gUHl0aG9uIDIuNjoKKyMKKyMgaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1ZTgyMDAK K2lmIGNvbXBhcmVfdmVyc2lvbih0YXJnZXRfdmVyc2lvbj0iMi42IilbMF0gPT0gMDoKKyAgICBp bXBvcnQgbXVsdGlwcm9jZXNzaW5nICAjIG11bHRpcHJvY2Vzc2luZyBpcyBuZXcgaW4gUHl0aG9u IDIuNi4KKwogaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGwgYXMgYXV0b2lu c3RhbGwKIAogIyBMaXN0IG91ciB0aGlyZC1wYXJ0eSBsaWJyYXJ5IGRlcGVuZGVuY2llcyBoZXJl IGFuZCB3aGVyZSB0aGV5IGNhbiBiZQo= 51366 2010-03-22 15:51:12 -0700 2010-03-27 13:22:36 -0700 Proposed patch 2 _patch-36429-2.diff text/plain 6588 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxMmI0YTJjLi40MTEyZWNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzEgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig YSAtLWRlYnVnIGZsYWcgdG8gdGVzdC13ZWJraXRweS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY0MjkKKworICAgICAgICBUaGUgZGVidWcgZmxh ZyBpcyB1c2VmdWwgcHJpbWFyaWx5IGZvciBkZWJ1Z2dpbmcgYXV0b2luc3RhbGwKKyAgICAgICAg d2hpbGUgcnVubmluZyB0ZXN0LXdlYmtpdHB5LgorCisgICAgICAgICogU2NyaXB0cy90ZXN0LXdl YmtpdHB5OgorICAgICAgICAgIC0gSW4gdGhlIGNvbmZpZ3VyZV9sb2dnaW5nKCkgbWV0aG9kLS0K KyAgICAgICAgICAgIC0gQWRkZWQgYW4gaXNfZGVidWcgcGFyYW1ldGVyIHRoYXQgc2V0cyB0aGUg bG9nZ2luZyBsZXZlbCB0bworICAgICAgICAgICAgICBsb2dnaW5nLkRFQlVHIGluc3RlYWQgb2Yg bG9nZ2luZy5JTkZPLgorICAgICAgICAgICAgLSBDaGFuZ2VkIHRoZSBtZXRob2QgdG8gdGhyb3R0 bGUgdGhlIGxvZ2dpbmcgbGV2ZWwgb24gdGhlCisgICAgICAgICAgICAgIHJvb3QgbG9nZ2VyJ3Mg aGFuZGxlciBpbnN0ZWFkIG9mIGRpcmVjdGx5IG9uIHRoZSByb290IGxvZ2dlcgorICAgICAgICAg ICAgICBpdHNlbGYuCisgICAgICAgICAgICAtIEVuYWJsZWQgbG9nZ2luZyBvZiB0aGUgYXV0b2lu c3RhbGwgbW9kdWxlIHdoZW4gdGhlIGRlYnVnCisgICAgICAgICAgICAgIGZsYWcgaXMgdHJ1ZS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9hdXRvaW5zdGFsbGVkL19f aW5pdF9fLnB5OgorICAgICAgICAgIC0gQWRkZWQgYSB3b3JrLWFyb3VuZCBmb3IgYSBidWcgaW4g UHl0aG9uIDIuNidzIGxvZ2dpbmcgbW9kdWxlCisgICAgICAgICAgICB0aGF0IHdhcyBkaXNjb3Zl cmVkIHdoaWxlIHdvcmtpbmcgb24gdGhpcyBwYXRjaC4KKworMjAxMC0wMy0yMiAgQ2hyaXMgSmVy ZG9uZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKwogICAgICAgICBSZWZhY3RvcmVkIHRoZSBjcHVfY291bnQoKSBjb2RlIGlu IGV4ZWN1dGl2ZS5weS4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzY0MzcKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJr aXRweSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweQppbmRleCA2MTVlMWMyLi4x MjMzODE2IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5CkBAIC0zNywyMCArMzcsMzkgQEAg aW1wb3J0IHdlYmtpdHB5LmluaXQudmVyc2lvbmluZyBhcyB2ZXJzaW9uaW5nCiBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoInRlc3Qtd2Via2l0cHkiKQogCiAKLWRlZiBjb25maWd1cmVfbG9nZ2lu ZygpOgorIyBUaGUgImlzX2RlYnVnIiBwYXJhbWV0ZXIgaXMgcHJpbWFyaWx5IHVzZWZ1bCBmb3Ig ZGVidWdnaW5nIGF1dG9pbnN0YWxsCisjIHdoaWxlIHJ1bm5pbmcgdGVzdC13ZWJraXRweS4KK2Rl ZiBjb25maWd1cmVfbG9nZ2luZyhpc19kZWJ1Zyk6CiAgICAgIiIiQ29uZmlndXJlIHRoZSByb290 IGxvZ2dlci4KIAotICAgIENvbmZpZ3VyZSB0aGUgcm9vdCBsb2dnZXIgbm90IHRvIGxvZyBhbnkg bWVzc2FnZXMgZnJvbSB3ZWJraXRweSwKLSAgICBhbmQgdG8gbG9nIGFsbCBvdGhlciBtZXNzYWdl cyB0aGF0IGFyZSBJTkZPIGFuZCBhYm92ZS4KKyAgICBDb25maWd1cmUgdGhlIHJvb3QgbG9nZ2Vy IG5vdCB0byBsb2cgYW55IG1lc3NhZ2VzIGZyb20gd2Via2l0cHkgLS0KKyAgICBleGNlcHQgZm9y IG1lc3NhZ2VzIGZyb20gdGhlIGF1dG9pbnN0YWxsIG1vZHVsZS4gIEFsc28gc2V0IHRoZQorICAg IGxvZ2dpbmcgbGV2ZWwgYXMgZGVzY3JpYmVkIGJlbG93LgorCisgICAgQXJnczoKKyAgICAgIGlz X2RlYnVnOiBBIGJvb2xlYW4gdmFsdWUgb2Ygd2hldGhlciB0aGUgYXBwbGljYXRpb24gaXMgYmVp bmcKKyAgICAgICAgICAgICAgICBkZWJ1Z2dlZC4gIElmIHRoaXMgcGFyYW1ldGVyIGlzIHRydWUs IHRoZSBsb2dnaW5nIGxldmVsCisgICAgICAgICAgICAgICAgZm9yIHRoZSBoYW5kbGVyIG9uIHRo ZSByb290IGxvZ2dlciBpcyBzZXQgdG8gbG9nZ2luZy5ERUJVRy4KKyAgICAgICAgICAgICAgICBP dGhlcndpc2UsIGl0IGlzIHNldCB0byBsb2dnaW5nLklORk8uCiAKICAgICAiIiIKKyAgICBsb2dn aW5nX2xldmVsID0gbG9nZ2luZy5ERUJVRyBpZiBpc19kZWJ1ZyBlbHNlIGxvZ2dpbmcuSU5GTwor CiAgICAgaGFuZGxlciA9IGxvZ2dpbmcuU3RyZWFtSGFuZGxlcihzeXMuc3RkZXJyKQotICAgIGZv cm1hdHRlciA9IGxvZ2dpbmcuRm9ybWF0dGVyKCJbJShsZXZlbG5hbWUpc10gJShuYW1lKXM6ICUo bWVzc2FnZSlzIikKKyAgICAjIFdlIGNvbnN0cmFpbiB0aGUgbGV2ZWwgb24gdGhlIGhhbmRsZXIg cmF0aGVyIHRoYW4gb24gdGhlIHJvb3QKKyAgICAjIGxvZ2dlciBpdHNlbGYuICBUaGlzIGlzIHBy b2JhYmx5IGJldHRlciBiZWNhdXNlIHRoZSBoYW5kbGVyIGlzCisgICAgIyBjb25maWd1cmVkIGFu ZCBrbm93biBvbmx5IHRvIHRoaXMgbW9kdWxlLCB3aGVyZWFzIHRoZSByb290IGxvZ2dlcgorICAg ICMgaXMgYW4gb2JqZWN0IHNoYXJlZCAoYW5kIHBvdGVudGlhbGx5IG1vZGlmaWVkKSBieSBtYW55 IG1vZHVsZXMuCisgICAgIyBNb2RpZnlpbmcgdGhlIGhhbmRsZXIsIHRoZW4sIGlzIGxlc3MgaW50 cnVzaXZlIGFuZCBsZXNzIGxpa2VseSB0bworICAgICMgaW50ZXJmZXJlIHdpdGggbW9kaWZpY2F0 aW9ucyBtYWRlIGJ5IG90aGVyIG1vZHVsZXMgKGUuZy4gaW4gdW5pdAorICAgICMgdGVzdHMpLgor ICAgIGhhbmRsZXIuc2V0TGV2ZWwobG9nZ2luZ19sZXZlbCkKKyAgICBmb3JtYXR0ZXIgPSBsb2dn aW5nLkZvcm1hdHRlcigiJShuYW1lKXM6ICUobGV2ZWxuYW1lKS04cyAlKG1lc3NhZ2UpcyIpCiAg ICAgaGFuZGxlci5zZXRGb3JtYXR0ZXIoZm9ybWF0dGVyKQogCiAgICAgbG9nZ2VyID0gbG9nZ2lu Zy5nZXRMb2dnZXIoKQotICAgIGxvZ2dlci5zZXRMZXZlbChsb2dnaW5nLklORk8pCiAgICAgbG9n Z2VyLmFkZEhhbmRsZXIoaGFuZGxlcikKKyAgICBsb2dnZXIuc2V0TGV2ZWwobG9nZ2luZy5OT1RT RVQpCiAKICAgICAjIEZpbHRlciBvdXQgbW9zdCB3ZWJraXRweSBtZXNzYWdlcy4KICAgICAjCkBA IC01OCwxMCArNzcsMTIgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6CiAgICAgIyB0aGlzIG1l dGhvZCBhY2NvcmRpbmdseS4KICAgICBkZWYgZmlsdGVyKHJlY29yZCk6CiAgICAgICAgICIiIkZp bHRlciBvdXQgYXV0b2luc3RhbGwgYW5kIG5vbi10aGlyZC1wYXJ0eSB3ZWJraXRweSBtZXNzYWdl cy4iIiIKLSAgICAgICAgIyBGSVhNRTogRW5hYmxlIHRoZSBsb2dnaW5nIG9mIGF1dG9pbnN0YWxs IG1lc3NhZ2VzIG9uY2UKLSAgICAgICAgIyAgICAgICAgYXV0b2luc3RhbGwgaXMgYWRqdXN0ZWQu ICBDdXJyZW50bHksIGF1dG9pbnN0YWxsIGxvZ3MKLSAgICAgICAgIyAgICAgICAgSU5GTyBtZXNz YWdlcyB3aGVuIGltcG9ydGluZyBhbHJlYWR5LWRvd25sb2FkZWQgcGFja2FnZXMsCi0gICAgICAg ICMgICAgICAgIHdoaWNoIGlzIHRvbyB2ZXJib3NlLgorICAgICAgICAjIEZJWE1FOiBFbmFibGUg dGhlIGxvZ2dpbmcgb2YgYXV0b2luc3RhbGwgbWVzc2FnZXMgZXZlbiB3aGVuCisgICAgICAgICMg ICAgICAgIGlzX2RlYnVnIGlzIGZhbHNlIC0tIG9uY2UgYXV0b2luc3RhbGwgaXMgcmV3cml0dGVu LgorICAgICAgICAjICAgICAgICBDdXJyZW50bHksIGF1dG9pbnN0YWxsIGxvZ3MgSU5GTyBtZXNz YWdlcyB3aGVuIGltcG9ydGluZworICAgICAgICAjICAgICAgICBhbHJlYWR5LWRvd25sb2FkZWQg cGFja2FnZXMsIHdoaWNoIGlzIHRvbyB2ZXJib3NlLgorICAgICAgICBpZiBpc19kZWJ1ZyBhbmQg cmVjb3JkLm5hbWUgPT0gIndlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGwiOgorICAgICAg ICAgICAgcmV0dXJuIFRydWUKICAgICAgICAgaWYgcmVjb3JkLm5hbWUuc3RhcnRzd2l0aCgid2Vi a2l0cHkiKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICByZXR1cm4gVHJ1ZQpA QCAtNzUsOSArOTYsMjkgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6CiAgICAgaGFuZGxlci5h ZGRGaWx0ZXIodGVzdGluZ19maWx0ZXIpCiAKIAotZGVmIGluaXQoKToKLSAgICAiIiJFeGVjdXRl IGNvZGUgcHJpb3IgdG8gaW1wb3J0aW5nIGZyb20gd2Via2l0cHkudW5pdHRlc3RzLiIiIgotICAg IGNvbmZpZ3VyZV9sb2dnaW5nKCkKK2RlZiBpbml0KGNvbW1hbmRfYXJncyk6CisgICAgIiIiRXhl Y3V0ZSBjb2RlIHByaW9yIHRvIGltcG9ydGluZyBmcm9tIHdlYmtpdHB5LnVuaXR0ZXN0cy4KKwor ICAgIEFyZ3M6CisgICAgICAgIGNvbW1hbmRfYXJnczogVGhlIGxpc3Qgb2YgY29tbWFuZC1saW5l IGFyZ3VtZW50cyAtLSB1c3VhbGx5CisgICAgICAgICAgICAgICAgICAgICAgc3lzLmFyZ3ZbMTpd LgorCisgICAgIiIiCisgICAgZGVidWdfZmxhZyA9ICItLWRlYnVnIgorICAgIGlzX2RlYnVnID0g ZGVidWdfZmxhZyBpbiBjb21tYW5kX2FyZ3MKKyAgICBpZiBpc19kZWJ1ZzoKKyAgICAgICAgIyBS ZW1vdmUgdGhlIGZsYWcgc28gaXQgZG9lc24ndCBjYXVzZSB1bml0dGVzdC5tYWluKCkgdG8gZXJy b3Igb3V0LgorICAgICAgICAjCisgICAgICAgICMgRklYTUU6IEdldCBkb2N1bWVudGF0aW9uIGZv ciB0aGUgLS1kZWJ1ZyBmbGFnIHRvIHNob3cgdXAgaW4gdGhlCisgICAgICAgICMgICAgICAgIHVz YWdlIGluc3RydWN0aW9ucywgd2hpY2ggYXJlIGN1cnJlbnRseSBnZW5lcmF0ZWQgYnkKKyAgICAg ICAgIyAgICAgICAgdW5pdHRlc3QubWFpbigpLiAgSXQncyBwb3NzaWJsZSB0aGF0IHRoaXMgd2ls bCByZXF1aXJlCisgICAgICAgICMgICAgICAgIHJlLWltcGxlbWVudGluZyB0aGUgb3B0aW9uIHBh cnNlciBmb3IgdW5pdHRlc3QubWFpbigpCisgICAgICAgICMgICAgICAgIHNpbmNlIHRoZXJlIG1h eSBub3QgYmUgYW4gZWFzeSB3YXkgdG8gbW9kaWZ5IGl0cyBleGlzdGluZworICAgICAgICAjICAg ICAgICBvcHRpb24gcGFyc2VyLgorICAgICAgICBzeXMuYXJndi5yZW1vdmUoZGVidWdfZmxhZykK KworICAgIGNvbmZpZ3VyZV9sb2dnaW5nKGlzX2RlYnVnKQorICAgIF9sb2cuZGVidWcoIkRlYnVn IGxvZ2dpbmcgZW5hYmxlZC4iKQogCiAgICAgdmVyc2lvbmluZy5jaGVja192ZXJzaW9uKGxvZz1f bG9nKQogCkBAIC05NCw3ICsxMzUsNyBAQCBkZWYgaW5pdCgpOgogCiBpZiBfX25hbWVfXyA9PSAi X19tYWluX18iOgogCi0gICAgaW5pdCgpCisgICAgaW5pdChzeXMuYXJndlsxOl0pCiAKICAgICAj IFdlIGltcG9ydCB0aGUgdW5pdCB0ZXN0IGNvZGUgYWZ0ZXIgaW5pdCgpIHRvIGVuc3VyZSB0aGF0 IGFueQogICAgICMgUHl0aG9uIHZlcnNpb24gd2FybmluZ3MgYXJlIGRpc3BsYXllZCBpbiBjYXNl IGFuIGVycm9yIG9jY3VycwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90aGlyZHBhcnR5L2F1dG9pbnN0YWxsZWQvX19pbml0X18ucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQppbmRleCA4 ZTQ2MTQ1Li5jNTVkMjdlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQpAQCAt MSw1ICsxLDE3IEBACiAjIFJlcXVpcmVkIGZvciBQeXRob24gdG8gc2VhcmNoIHRoaXMgZGlyZWN0 b3J5IGZvciBtb2R1bGUgZmlsZXMKIAorZnJvbSB3ZWJraXRweS5pbml0LnZlcnNpb25pbmcgaW1w b3J0IGNvbXBhcmVfdmVyc2lvbgorCisjIFdlIGltcG9ydCBtdWx0aXByb2Nlc3NpbmcgcHJpb3Ig dG8gaW1wb3J0aW5nIGF1dG9pbnN0YWxsIHRvIGNpcmN1bXZlbnQKKyMgdGhlIGZvbGxvd2luZyBi dWcgaW4gUHl0aG9uIDIuNjoKKyMKKyMgaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1ZTgyMDAK K3RyeToKKyAgICBpbXBvcnQgbXVsdGlwcm9jZXNzaW5nCitleGNlcHQgSW1wb3J0RXJyb3I6Cisg ICAgIyBCdXJ5IHRoZSBleGNlcHRpb24gc2luY2UgdGhlIG1vZHVsZSBpcyBuZXcgaW4gUHl0aG9u IDIuNi4KKyAgICBwYXNzCisKIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxs IGFzIGF1dG9pbnN0YWxsCiAKICMgTGlzdCBvdXIgdGhpcmQtcGFydHkgbGlicmFyeSBkZXBlbmRl bmNpZXMgaGVyZSBhbmQgd2hlcmUgdGhleSBjYW4gYmUK 51842 2010-03-27 13:22:36 -0700 2010-03-31 20:30:30 -0700 Proposed patch 3 _patch-36429-3.diff text/plain 7065 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5MjQyNDZiLi5kMmMyMWY0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDMt MjIgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgc3VwcG9ydCBmb3IgYSAt LXZlcmJvc2UtbG9nZ2luZyBmbGFnIHRvIHRlc3Qtd2Via2l0cHkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDI5CisKKyAgICAgICAgVmVyYm9z ZSBsb2dnaW5nIGlzIHVzZWZ1bCBmb3IgZGVidWdnaW5nIHRlc3Qtd2Via2l0cHkgY29kZSB0aGF0 CisgICAgICAgIHJ1bnMgYmVmb3JlIHRoZSBhY3R1YWwgdW5pdCB0ZXN0cyAtLSB0aGluZ3MgbGlr ZSBhdXRvaW5zdGFsbGluZyBhbmQKKyAgICAgICAgdW5pdC10ZXN0IGF1dG8tZGV0ZWN0aW9uIGxv Z2ljLiAgVGhpcyBpcyBkaWZmZXJlbnQgZnJvbSB2ZXJib3NlCisgICAgICAgIGxvZ2dpbmcgb2Yg dGhlIHVuaXQgdGVzdHMgdGhlbXNlbHZlcyAod2hpY2ggY29ycmVzcG9uZHMgdG8gdGhlCisgICAg ICAgIHVuaXR0ZXN0IG1vZHVsZSdzIC0tdmVyYm9zZSBmbGFnKS4KKworICAgICAgICAqIFNjcmlw dHMvdGVzdC13ZWJraXRweToKKyAgICAgICAgICAtIEluIHRoZSBjb25maWd1cmVfbG9nZ2luZygp IG1ldGhvZC0tCisgICAgICAgICAgICAtIEFkZGVkIGFuIGlzX3ZlcmJvc2VfbG9nZ2luZyBwYXJh bWV0ZXIgdGhhdCBzZXRzIHRoZSBsb2dnaW5nCisgICAgICAgICAgICAgIGxldmVsIHRvIGxvZ2dp bmcuREVCVUcgaW5zdGVhZCBvZiBsb2dnaW5nLklORk8uCisgICAgICAgICAgICAtIENoYW5nZWQg dGhlIG1ldGhvZCB0byB0aHJvdHRsZSB0aGUgbG9nZ2luZyBsZXZlbCBvbiB0aGUKKyAgICAgICAg ICAgICAgcm9vdCBsb2dnZXIncyBoYW5kbGVyIGluc3RlYWQgb2YgZGlyZWN0bHkgb24gdGhlIHJv b3QgbG9nZ2VyCisgICAgICAgICAgICAgIGl0c2VsZi4KKyAgICAgICAgICAgIC0gRW5hYmxlZCBs b2dnaW5nIG9mIHRoZSBhdXRvaW5zdGFsbCBtb2R1bGUgd2hlbiB0aGUgZmxhZyBpcyBzZXQuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2lu aXRfXy5weToKKyAgICAgICAgICAtIEFkZGVkIGEgd29yay1hcm91bmQgZm9yIGEgYnVnIGluIFB5 dGhvbiAyLjYncyBsb2dnaW5nIG1vZHVsZQorICAgICAgICAgICAgdGhhdCB3YXMgZGlzY292ZXJl ZCB3aGlsZSB3b3JraW5nIG9uIHRoaXMgcGF0Y2guCisKIDIwMTAtMDMtMjcgIFJvYmVydCBIb2dh biAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNl ci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweQppbmRleCBhNjI3NTIzLi5hOTMyMTZkIDEwMDc1 NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkKKysrIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5CkBAIC0zNywyMCArMzcsNDEgQEAgaW1wb3J0IHdlYmtp dHB5LnB5dGhvbjI0LnZlcnNpb25pbmcgYXMgdmVyc2lvbmluZwogX2xvZyA9IGxvZ2dpbmcuZ2V0 TG9nZ2VyKCJ0ZXN0LXdlYmtpdHB5IikKIAogCi1kZWYgY29uZmlndXJlX2xvZ2dpbmcoKToKKyMg VmVyYm9zZSBsb2dnaW5nIGlzIHVzZWZ1bCBmb3IgZGVidWdnaW5nIHRlc3Qtd2Via2l0cHkgY29k ZSB0aGF0IHJ1bnMKKyMgYmVmb3JlIHRoZSBhY3R1YWwgdW5pdCB0ZXN0cyAtLSB0aGluZ3MgbGlr ZSBhdXRvaW5zdGFsbCBkb3dubG9hZGluZyBhbmQKKyMgdW5pdC10ZXN0IGF1dG8tZGV0ZWN0aW9u IGxvZ2ljLiAgVGhpcyBpcyBkaWZmZXJlbnQgZnJvbSB2ZXJib3NlIGxvZ2dpbmcKKyMgb2YgdGhl IHVuaXQgdGVzdHMgdGhlbXNlbHZlcyAoaS5lLiB0aGUgdW5pdHRlc3QgbW9kdWxlJ3MgLS12ZXJi b3NlIGZsYWcpLgorZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKGlzX3ZlcmJvc2VfbG9nZ2luZyk6CiAg ICAgIiIiQ29uZmlndXJlIHRoZSByb290IGxvZ2dlci4KIAotICAgIENvbmZpZ3VyZSB0aGUgcm9v dCBsb2dnZXIgbm90IHRvIGxvZyBhbnkgbWVzc2FnZXMgZnJvbSB3ZWJraXRweSwKLSAgICBhbmQg dG8gbG9nIGFsbCBvdGhlciBtZXNzYWdlcyB0aGF0IGFyZSBJTkZPIGFuZCBhYm92ZS4KKyAgICBD b25maWd1cmUgdGhlIHJvb3QgbG9nZ2VyIG5vdCB0byBsb2cgYW55IG1lc3NhZ2VzIGZyb20gd2Vi a2l0cHkgLS0KKyAgICBleGNlcHQgZm9yIG1lc3NhZ2VzIGZyb20gdGhlIGF1dG9pbnN0YWxsIG1v ZHVsZS4gIEFsc28gc2V0IHRoZQorICAgIGxvZ2dpbmcgbGV2ZWwgYXMgZGVzY3JpYmVkIGJlbG93 LgorCisgICAgQXJnczoKKyAgICAgIGlzX3ZlcmJvc2VfbG9nZ2luZzogQSBib29sZWFuIHZhbHVl IG9mIHdoZXRoZXIgbG9nZ2luZyBzaG91bGQgYmUKKyAgICAgICAgICAgICAgICAgICAgICAgICAg dmVyYm9zZS4gIElmIHRoaXMgcGFyYW1ldGVyIGlzIHRydWUsIHRoZSBsb2dnaW5nCisgICAgICAg ICAgICAgICAgICAgICAgICAgIGxldmVsIGZvciB0aGUgaGFuZGxlciBvbiB0aGUgcm9vdCBsb2dn ZXIgaXMgc2V0IHRvCisgICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2dpbmcuREVCVUcuICBP dGhlcndpc2UsIGl0IGlzIHNldCB0byBsb2dnaW5nLklORk8uCiAKICAgICAiIiIKKyAgICBsb2dn aW5nX2xldmVsID0gbG9nZ2luZy5ERUJVRyBpZiBpc192ZXJib3NlX2xvZ2dpbmcgZWxzZSBsb2dn aW5nLklORk8KKwogICAgIGhhbmRsZXIgPSBsb2dnaW5nLlN0cmVhbUhhbmRsZXIoc3lzLnN0ZGVy cikKLSAgICBmb3JtYXR0ZXIgPSBsb2dnaW5nLkZvcm1hdHRlcigiWyUobGV2ZWxuYW1lKXNdICUo bmFtZSlzOiAlKG1lc3NhZ2UpcyIpCisgICAgIyBXZSBjb25zdHJhaW4gdGhlIGxldmVsIG9uIHRo ZSBoYW5kbGVyIHJhdGhlciB0aGFuIG9uIHRoZSByb290CisgICAgIyBsb2dnZXIgaXRzZWxmLiAg VGhpcyBpcyBwcm9iYWJseSBiZXR0ZXIgYmVjYXVzZSB0aGUgaGFuZGxlciBpcworICAgICMgY29u ZmlndXJlZCBhbmQga25vd24gb25seSB0byB0aGlzIG1vZHVsZSwgd2hlcmVhcyB0aGUgcm9vdCBs b2dnZXIKKyAgICAjIGlzIGFuIG9iamVjdCBzaGFyZWQgKGFuZCBwb3RlbnRpYWxseSBtb2RpZmll ZCkgYnkgbWFueSBtb2R1bGVzLgorICAgICMgTW9kaWZ5aW5nIHRoZSBoYW5kbGVyLCB0aGVuLCBp cyBsZXNzIGludHJ1c2l2ZSBhbmQgbGVzcyBsaWtlbHkgdG8KKyAgICAjIGludGVyZmVyZSB3aXRo IG1vZGlmaWNhdGlvbnMgbWFkZSBieSBvdGhlciBtb2R1bGVzIChlLmcuIGluIHVuaXQKKyAgICAj IHRlc3RzKS4KKyAgICBoYW5kbGVyLnNldExldmVsKGxvZ2dpbmdfbGV2ZWwpCisgICAgZm9ybWF0 dGVyID0gbG9nZ2luZy5Gb3JtYXR0ZXIoIiUobmFtZSlzOiAlKGxldmVsbmFtZSktOHMgJShtZXNz YWdlKXMiKQogICAgIGhhbmRsZXIuc2V0Rm9ybWF0dGVyKGZvcm1hdHRlcikKIAogICAgIGxvZ2dl ciA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCkKLSAgICBsb2dnZXIuc2V0TGV2ZWwobG9nZ2luZy5JTkZP KQogICAgIGxvZ2dlci5hZGRIYW5kbGVyKGhhbmRsZXIpCisgICAgbG9nZ2VyLnNldExldmVsKGxv Z2dpbmcuTk9UU0VUKQogCiAgICAgIyBGaWx0ZXIgb3V0IG1vc3Qgd2Via2l0cHkgbWVzc2FnZXMu CiAgICAgIwpAQCAtNTgsMTAgKzc5LDEzIEBAIGRlZiBjb25maWd1cmVfbG9nZ2luZygpOgogICAg ICMgdGhpcyBtZXRob2QgYWNjb3JkaW5nbHkuCiAgICAgZGVmIGZpbHRlcihyZWNvcmQpOgogICAg ICAgICAiIiJGaWx0ZXIgb3V0IGF1dG9pbnN0YWxsIGFuZCBub24tdGhpcmQtcGFydHkgd2Via2l0 cHkgbWVzc2FnZXMuIiIiCi0gICAgICAgICMgRklYTUU6IEVuYWJsZSB0aGUgbG9nZ2luZyBvZiBh dXRvaW5zdGFsbCBtZXNzYWdlcyBvbmNlCi0gICAgICAgICMgICAgICAgIGF1dG9pbnN0YWxsIGlz IGFkanVzdGVkLiAgQ3VycmVudGx5LCBhdXRvaW5zdGFsbCBsb2dzCi0gICAgICAgICMgICAgICAg IElORk8gbWVzc2FnZXMgd2hlbiBpbXBvcnRpbmcgYWxyZWFkeS1kb3dubG9hZGVkIHBhY2thZ2Vz LAotICAgICAgICAjICAgICAgICB3aGljaCBpcyB0b28gdmVyYm9zZS4KKyAgICAgICAgIyBGSVhN RTogRW5hYmxlIHRoZSBsb2dnaW5nIG9mIGF1dG9pbnN0YWxsIG1lc3NhZ2VzIGV2ZW4gd2hlbgor ICAgICAgICAjICAgICAgICBpc192ZXJib3NlX2xvZ2dpbmcgaXMgZmFsc2UgLS0gb25jZSBhdXRv aW5zdGFsbCBpcyByZXdyaXR0ZW4uCisgICAgICAgICMgICAgICAgIEN1cnJlbnRseSwgYXV0b2lu c3RhbGwgbG9ncyBJTkZPIG1lc3NhZ2VzIHdoZW4gaW1wb3J0aW5nCisgICAgICAgICMgICAgICAg IGFscmVhZHktZG93bmxvYWRlZCBwYWNrYWdlcywgd2hpY2ggaXMgdG9vIHZlcmJvc2UuCisgICAg ICAgIGlmIGlzX3ZlcmJvc2VfbG9nZ2luZyBhbmQgXAorICAgICAgICAgICAgcmVjb3JkLm5hbWUg PT0gIndlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGwiOgorICAgICAgICAgICAgcmV0dXJu IFRydWUKICAgICAgICAgaWYgcmVjb3JkLm5hbWUuc3RhcnRzd2l0aCgid2Via2l0cHkiKToKICAg ICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICByZXR1cm4gVHJ1ZQpAQCAtNzUsOSArOTks MjkgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6CiAgICAgaGFuZGxlci5hZGRGaWx0ZXIodGVz dGluZ19maWx0ZXIpCiAKIAotZGVmIGluaXQoKToKLSAgICAiIiJFeGVjdXRlIGNvZGUgcHJpb3Ig dG8gaW1wb3J0aW5nIGZyb20gd2Via2l0cHkudW5pdHRlc3RzLiIiIgotICAgIGNvbmZpZ3VyZV9s b2dnaW5nKCkKK2RlZiBpbml0KGNvbW1hbmRfYXJncyk6CisgICAgIiIiRXhlY3V0ZSBjb2RlIHBy aW9yIHRvIGltcG9ydGluZyBmcm9tIHdlYmtpdHB5LnVuaXR0ZXN0cy4KKworICAgIEFyZ3M6Cisg ICAgICAgIGNvbW1hbmRfYXJnczogVGhlIGxpc3Qgb2YgY29tbWFuZC1saW5lIGFyZ3VtZW50cyAt LSB1c3VhbGx5CisgICAgICAgICAgICAgICAgICAgICAgc3lzLmFyZ3ZbMTpdLgorCisgICAgIiIi CisgICAgdmVyYm9zZV9sb2dnaW5nX2ZsYWcgPSAiLS12ZXJib3NlLWxvZ2dpbmciCisgICAgaXNf dmVyYm9zZV9sb2dnaW5nID0gdmVyYm9zZV9sb2dnaW5nX2ZsYWcgaW4gY29tbWFuZF9hcmdzCisg ICAgaWYgaXNfdmVyYm9zZV9sb2dnaW5nOgorICAgICAgICAjIFJlbW92ZSB0aGUgZmxhZyBzbyBp dCBkb2Vzbid0IGNhdXNlIHVuaXR0ZXN0Lm1haW4oKSB0byBlcnJvciBvdXQuCisgICAgICAgICMK KyAgICAgICAgIyBGSVhNRTogR2V0IGRvY3VtZW50YXRpb24gZm9yIHRoZSAtLXZlcmJvc2UtbG9n Z2luZyBmbGFnIHRvIHNob3cKKyAgICAgICAgIyAgICAgICAgdXAgaW4gdGhlIHVzYWdlIGluc3Ry dWN0aW9ucywgd2hpY2ggYXJlIGN1cnJlbnRseSBnZW5lcmF0ZWQKKyAgICAgICAgIyAgICAgICAg YnkgdW5pdHRlc3QubWFpbigpLiAgSXQncyBwb3NzaWJsZSB0aGF0IHRoaXMgd2lsbCByZXF1aXJl CisgICAgICAgICMgICAgICAgIHJlLWltcGxlbWVudGluZyB0aGUgb3B0aW9uIHBhcnNlciBmb3Ig dW5pdHRlc3QubWFpbigpCisgICAgICAgICMgICAgICAgIHNpbmNlIHRoZXJlIG1heSBub3QgYmUg YW4gZWFzeSB3YXkgdG8gbW9kaWZ5IGl0cyBleGlzdGluZworICAgICAgICAjICAgICAgICBvcHRp b24gcGFyc2VyLgorICAgICAgICBzeXMuYXJndi5yZW1vdmUodmVyYm9zZV9sb2dnaW5nX2ZsYWcp CisKKyAgICBjb25maWd1cmVfbG9nZ2luZyhpc192ZXJib3NlX2xvZ2dpbmcpCisgICAgX2xvZy5k ZWJ1ZygiVmVyYm9zZSBXZWJLaXQgbG9nZ2luZyBlbmFibGVkLiIpCiAKICAgICB2ZXJzaW9uaW5n LmNoZWNrX3ZlcnNpb24obG9nPV9sb2cpCiAKQEAgLTk0LDcgKzEzOCw3IEBAIGRlZiBpbml0KCk6 CiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAKLSAgICBpbml0KCkKKyAgICBpbml0KHN5 cy5hcmd2WzE6XSkKIAogICAgICMgV2UgaW1wb3J0IHRoZSB1bml0IHRlc3QgY29kZSBhZnRlciBp bml0KCkgdG8gZW5zdXJlIHRoYXQgYW55CiAgICAgIyBQeXRob24gdmVyc2lvbiB3YXJuaW5ncyBh cmUgZGlzcGxheWVkIGluIGNhc2UgYW4gZXJyb3Igb2NjdXJzCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9hdXRvaW5zdGFsbGVk L19faW5pdF9fLnB5CmluZGV4IDhlNDYxNDUuLmExY2Y1ODkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9hdXRvaW5zdGFsbGVkL19faW5pdF9fLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9hdXRvaW5zdGFs bGVkL19faW5pdF9fLnB5CkBAIC0xLDUgKzEsMTUgQEAKICMgUmVxdWlyZWQgZm9yIFB5dGhvbiB0 byBzZWFyY2ggdGhpcyBkaXJlY3RvcnkgZm9yIG1vZHVsZSBmaWxlcwogCisjIFdlIGltcG9ydCBt dWx0aXByb2Nlc3NpbmcgcHJpb3IgdG8gaW1wb3J0aW5nIGF1dG9pbnN0YWxsIHRvIGNpcmN1bXZl bnQKKyMgdGhlIGZvbGxvd2luZyBidWcgaW4gUHl0aG9uIDIuNjoKKyMKKyMgaHR0cDovL2J1Z3Mu cHl0aG9uLm9yZy9pc3N1ZTgyMDAKK3RyeToKKyAgICBpbXBvcnQgbXVsdGlwcm9jZXNzaW5nCitl eGNlcHQgSW1wb3J0RXJyb3I6CisgICAgIyBCdXJ5IHRoZSBleGNlcHRpb24gc2luY2UgdGhlIG1v ZHVsZSBpcyBuZXcgaW4gUHl0aG9uIDIuNi4KKyAgICBwYXNzCisKIGltcG9ydCB3ZWJraXRweS50 aGlyZHBhcnR5LmF1dG9pbnN0YWxsIGFzIGF1dG9pbnN0YWxsCiAKICMgTGlzdCBvdXIgdGhpcmQt cGFydHkgbGlicmFyeSBkZXBlbmRlbmNpZXMgaGVyZSBhbmQgd2hlcmUgdGhleSBjYW4gYmUK