47466 2010-10-09 23:45:33 -0700 new-run-webkit-tests: handle missing ruby/prettypatch better 2010-10-14 20:02:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 292261 0 dpranke 2010-10-09 23:45:33 -0700 new-run-webkit-tests: handle missing ruby/prettypatch better 292263 1 70389 dpranke 2010-10-09 23:48:59 -0700 Created attachment 70389 Patch 292791 2 70389 tony 2010-10-11 17:50:25 -0700 Comment on attachment 70389 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70389&action=review > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:131 > + def check_pretty_patch(self, override_step=None, logging=True): What are the parameters for? override_step doesn't seem to be used and logging is not set by the single caller of this function. > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:673 > + command = ["ruby", "-I", os.path.dirname(self._pretty_patch_path), > + self._pretty_patch_path, diff_path] Nit: Use a tuple instead of a list since we don't plan on mutating this. > WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py:122 > + if not self._pretty_patch_available: > + _log.error('') Why an empty error? It looks like check_pretty_patch already logs a bunch of stuff, so do we really need this? 292801 3 dpranke 2010-10-11 17:59:53 -0700 (In reply to comment #2) > (From update of attachment 70389 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=70389&action=review > > > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:131 > > + def check_pretty_patch(self, override_step=None, logging=True): > > What are the parameters for? override_step doesn't seem to be used and logging is not set by the single caller of this function. > This was from chromium.py:_check_file_exists() as a template, but you're right that neither argument is needed. Good catch. > > WebKitTools/Scripts/webkitpy/layout_tests/port/base.py:673 > > + command = ["ruby", "-I", os.path.dirname(self._pretty_patch_path), > > + self._pretty_patch_path, diff_path] > > Nit: Use a tuple instead of a list since we don't plan on mutating this. > Done. > > WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py:122 > > + if not self._pretty_patch_available: > > + _log.error('') > > Why an empty error? It looks like check_pretty_patch already logs a bunch of stuff, so do we really need this? It makes the output slightly more legible by putting whitespace in between the up-front checks and the output of the next phase of the run. 293268 4 dpranke 2010-10-12 21:49:47 -0700 (In reply to comment #3) > > > WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py:122 > > > + if not self._pretty_patch_available: > > > + _log.error('') > > > > Why an empty error? It looks like check_pretty_patch already logs a bunch of stuff, so do we really need this? > > It makes the output slightly more legible by putting whitespace in between the up-front checks and the output of the next phase of the run. Hm. I was thinking of a different code path. It would be better if the blank line was next to the other output, so I've moved it there. 293271 5 70582 dpranke 2010-10-12 22:01:52 -0700 Created attachment 70582 Patch 293405 6 70582 eric 2010-10-13 06:55:38 -0700 Comment on attachment 70582 Patch Seems we want to do the same magic for wdiff. Generally looks fine to me. 294553 7 dpranke 2010-10-14 20:02:36 -0700 fixed in http://trac.webkit.org/changeset/69820 . 70389 2010-10-09 23:48:59 -0700 2010-10-12 22:01:47 -0700 Patch bug-47466-20101009234858.patch text/plain 11012 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwYmRlYjgwMWI5MzIzNzQ4NTJmZjgxYWQ1M2M2Y2VhY2Y5Y2FhNjZkLi41YTVkNzQ3 NjAyNWE4NjcxNjNjOWM2Njg1OWJjMjQ2NWUxYjgxZWFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAK KzIwMTAtMTAtMDkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQt dGVzdHMgd2lsbCBub3cgaGFuZGxlIG1pc3NpbmcgUnVieSBpbnN0YWxscyAob3IKKyAgICAgICAg bWlzc2luZyBQcmV0dHlQYXRjaCBzY3JpcHRzKSBtb3JlIGNsZWFubHkgLSBwcmV2aW91c2x5IHRo aXMKKyAgICAgICAgd291bGQgYmUgZGV0ZWN0ZWQgd2hlbiB3ZSBhY3R1YWxseSB0cmllZCB0byBj cmVhdGUgdGhlIGRpZmYsIGFuZAorICAgICAgICB0aGUgZXJyb3IgbWVzc2FnZSB3YXMgb2JzY3Vy ZS4gTm93IHdlJ2xsIGxvZyBhIHdhcm5pbmcgdXAgZnJvbnQKKyAgICAgICAgYW5kIG90aGVyd2lz ZSBiZSBzaWxlbnQuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxzbyByZWZhY3RvcnMgc29tZSBn bG9iYWwgdmFyaWFibGVzIHRvIGJlIGNsYXNzIG9yCisgICAgICAgIGluc3RhbmNlIHZhcmlhYmxl cyB0byBiZSBzbGlnaHRseSBtb3JlIHRlc3RhYmxlIGFuZCBtb3JlCisgICAgICAgIG1vZHVsYXIu IFRoZXJlIGFyZSBubyBjYXNlcyB3aGVyZSB3ZSBjcmVhdGUgbG90cyBvZiBwb3J0IG9iamVjdHMK KyAgICAgICAgYW5kIGNhbid0IGFmZm9yZCB0byB0ZXN0IGZvciBjb25maWd1cmF0aW9ucyByZXBl YXRlZGx5LCBzbworICAgICAgICB0aGVyZSdzIG5vIHBlcmZvcm1hbmNlIGNvbmNlcm4gaGVyZS4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc0NjYK KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRl c3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bS5weToKKwogMjAxMC0xMC0wNyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDU2 Y2EwY2FjOTdlMjY1N2Y3MWQ5NTBjNmIxY2I5OWM1Y2EzZDJmYWEuLjg1YWU4ODQ4MDE4NmU4OWYy ZmFlOGNmNTViNDY3ZmZhYmRlZTMwNjIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTU0LDIyICs1NCw2IEBA IGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS51c2VyIGltcG9ydCBVc2VyCiBfbG9nID0gbG9n dXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKIAogCi0jIFB5dGhvbidzIFBvcGVuIGhhcyBhIGJ1 ZyB0aGF0IGNhdXNlcyBhbnkgcGlwZXMgb3BlbmVkIHRvIGEKLSMgcHJvY2VzcyB0aGF0IGNhbid0 IGJlIGV4ZWN1dGVkIHRvIGJlIGxlYWtlZC4gIFNpbmNlIHRoaXMKLSMgY29kZSBpcyBzcGVjaWZp Y2FsbHkgZGVzaWduZWQgdG8gdG9sZXJhdGUgZXhlYyBmYWlsdXJlcwotIyB0byBncmFjZWZ1bGx5 IGhhbmRsZSBjYXNlcyB3aGVyZSB3ZGlmZiBpcyBub3QgaW5zdGFsbGVkLAotIyB0aGUgYnVnIHJl c3VsdHMgaW4gYSBtYXNzaXZlIGZpbGUgZGVzY3JpcHRvciBsZWFrLiBBcyBhCi0jIHdvcmthcm91 bmQsIGlmIGFuIGV4ZWMgZmFpbHVyZSBpcyBldmVyIGV4cGVyaWVuY2VkIGZvcgotIyB3ZGlmZiwg YXNzdW1lIGl0J3Mgbm90IGF2YWlsYWJsZS4gIFRoaXMgd2lsbCBsZWFrIG9uZQotIyBmaWxlIGRl c2NyaXB0b3IgYnV0IHRoYXQncyBiZXR0ZXIgdGhhbiBsZWFraW5nIGVhY2ggdGltZQotIyB3ZGlm ZiB3b3VsZCBiZSBydW4uCi0jCi0jIGh0dHA6Ly9tYWlsLnB5dGhvbi5vcmcvcGlwZXJtYWlsL3B5 dGhvbi1saXN0LwotIyAgICAyMDA4LUF1Z3VzdC81MDU3NTMuaHRtbAotIyBodHRwOi8vYnVncy5w eXRob24ub3JnL2lzc3VlMzIxMAotX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKLV9wcmV0dHlfcGF0 Y2hfYXZhaWxhYmxlID0gVHJ1ZQotCiAjIEZJWE1FOiBUaGlzIGNsYXNzIHNob3VsZCBtZXJnZSB3 aXRoIHdlYmtpdHB5LndlYmtpdF9wb3J0IGF0IHNvbWUgcG9pbnQuCiBjbGFzcyBQb3J0KG9iamVj dCk6CiAgICAgIiIiQWJzdHJhY3QgY2xhc3MgZm9yIFBvcnQtc3BlY2lmaWMgaG9va3MgZm9yIHRo ZSBsYXlvdXRfdGVzdCBwYWNrYWdlLgpAQCAtOTMsNiArNzcsMjUgQEAgY2xhc3MgUG9ydChvYmpl Y3QpOgogICAgICAgICBzZWxmLl93ZWJraXRfYmFzZV9kaXIgPSBOb25lCiAgICAgICAgIHNlbGYu X3dlYnNvY2tldF9zZXJ2ZXIgPSBOb25lCiAKKyAgICAgICAgIyBQeXRob24ncyBQb3BlbiBoYXMg YSBidWcgdGhhdCBjYXVzZXMgYW55IHBpcGVzIG9wZW5lZCB0byBhCisgICAgICAgICMgcHJvY2Vz cyB0aGF0IGNhbid0IGJlIGV4ZWN1dGVkIHRvIGJlIGxlYWtlZC4gIFNpbmNlIHRoaXMKKyAgICAg ICAgIyBjb2RlIGlzIHNwZWNpZmljYWxseSBkZXNpZ25lZCB0byB0b2xlcmF0ZSBleGVjIGZhaWx1 cmVzCisgICAgICAgICMgdG8gZ3JhY2VmdWxseSBoYW5kbGUgY2FzZXMgd2hlcmUgd2RpZmYgaXMg bm90IGluc3RhbGxlZCwKKyAgICAgICAgIyB0aGUgYnVnIHJlc3VsdHMgaW4gYSBtYXNzaXZlIGZp bGUgZGVzY3JpcHRvciBsZWFrLiBBcyBhCisgICAgICAgICMgd29ya2Fyb3VuZCwgaWYgYW4gZXhl YyBmYWlsdXJlIGlzIGV2ZXIgZXhwZXJpZW5jZWQgZm9yCisgICAgICAgICMgd2RpZmYsIGFzc3Vt ZSBpdCdzIG5vdCBhdmFpbGFibGUuICBUaGlzIHdpbGwgbGVhayBvbmUKKyAgICAgICAgIyBmaWxl IGRlc2NyaXB0b3IgYnV0IHRoYXQncyBiZXR0ZXIgdGhhbiBsZWFraW5nIGVhY2ggdGltZQorICAg ICAgICAjIHdkaWZmIHdvdWxkIGJlIHJ1bi4KKyAgICAgICAgIworICAgICAgICAjIGh0dHA6Ly9t YWlsLnB5dGhvbi5vcmcvcGlwZXJtYWlsL3B5dGhvbi1saXN0LworICAgICAgICAjICAgIDIwMDgt QXVndXN0LzUwNTc1My5odG1sCisgICAgICAgICMgaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1 ZTMyMTAKKyAgICAgICAgc2VsZi5fd2RpZmZfYXZhaWxhYmxlID0gVHJ1ZQorCisgICAgICAgIHNl bGYuX3ByZXR0eV9wYXRjaF9wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkJ1Z3NT aXRlIiwKKyAgICAgICAgICAgICAgIlByZXR0eVBhdGNoIiwgInByZXR0aWZ5LnJiIikKKyAgICAg ICAgc2VsZi5fcHJldHR5X3BhdGNoX2F2YWlsYWJsZSA9IFRydWUKKwogICAgIGRlZiBkZWZhdWx0 X2NoaWxkX3Byb2Nlc3NlcyhzZWxmKToKICAgICAgICAgIiIiUmV0dXJuIHRoZSBudW1iZXIgb2Yg RHVtcFJlbmRlclRyZWUgaW5zdGFuY2VzIHRvIHVzZSBmb3IgdGhpcwogICAgICAgICBwb3J0LiIi IgpAQCAtMTI1LDYgKzEyOCwyNiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICIiIlRo aXMgcm91dGluZSBpcyB1c2VkIHRvIGNoZWNrIHdoZXRoZXIgaW1hZ2VfZGlmZiBiaW5hcnkgZXhp c3RzLiIiIgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdQb3J0LmNoZWNrX2lt YWdlX2RpZmYnKQogCisgICAgZGVmIGNoZWNrX3ByZXR0eV9wYXRjaChzZWxmLCBvdmVycmlkZV9z dGVwPU5vbmUsIGxvZ2dpbmc9VHJ1ZSk6CisgICAgICAgICIiIkNoZWNrcyB3aGV0aGVyIHdlIGNh biB1c2UgdGhlIFByZXR0eVBhdGNoIHJ1Ynkgc2NyaXB0LiIiIgorCisgICAgICAgICMgY2hlY2sg aWYgUnVieSBpcyBpbnN0YWxsZWQKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmVzdWx0ID0g c2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsncnVieScsICctLXZlcnNpb24nXSkKKyAgICAg ICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAgICAgICBpZiBlLmVycm5vIGluIFtlcnJuby5F Tk9FTlQsIGVycm5vLkVBQ0NFUywgZXJybm8uRUNISUxEXToKKyAgICAgICAgICAgICAgICBpZiBs b2dnaW5nOgorICAgICAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCJSdWJ5IGlzIG5vdCBpbnN0 YWxsZWQ7ICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiY2FuJ3QgZ2VuZXJhdGUg cHJldHR5IHBhdGNoZXMuIikKKyAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKworICAgICAg ICBpZiBub3Qgc2VsZi5wYXRoX2V4aXN0cyhzZWxmLl9wcmV0dHlfcGF0Y2hfcGF0aCk6CisgICAg ICAgICAgICBfbG9nLmVycm9yKCdVbmFibGUgdG8gZmluZCAlcycgJSBzZWxmLl9wcmV0dHlfcGF0 Y2hfcGF0aCkKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoIkNhbid0IGdlbmVyYXRlIHByZXR0eSBw YXRjaGVzIikKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIHJldHVybiBUcnVl CisKICAgICBkZWYgY29tcGFyZV90ZXh0KHNlbGYsIGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0 KToKICAgICAgICAgIiIiUmV0dXJuIHdoZXRoZXIgb3Igbm90IHRoZSB0d28gc3RyaW5ncyBhcmUg Km5vdCogZXF1YWwuIFRoaXMKICAgICAgICAgcm91dGluZSBpcyB1c2VkIHRvIGRpZmYgdGV4dCBv dXRwdXQuCkBAIC02MjgsOCArNjUxLDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAi IiJSZXR1cm5zIGEgc3RyaW5nIG9mIEhUTUwgaW5kaWNhdGluZyB0aGUgd29yZC1sZXZlbCBkaWZm IG9mIHRoZQogICAgICAgICBjb250ZW50cyBvZiB0aGUgdHdvIGZpbGVuYW1lcy4gUmV0dXJucyBh biBlbXB0eSBzdHJpbmcgaWYgd29yZC1sZXZlbAogICAgICAgICBkaWZmaW5nIGlzbid0IGF2YWls YWJsZS4iIiIKLSAgICAgICAgZ2xvYmFsIF93ZGlmZl9hdmFpbGFibGUgICMgU2VlIGV4cGxhaW5h dGlvbiBhdCB0b3Agb2YgZmlsZS4KLSAgICAgICAgaWYgbm90IF93ZGlmZl9hdmFpbGFibGU6Cisg ICAgICAgIGlmIG5vdCBzZWxmLl93ZGlmZl9hdmFpbGFibGU6CiAgICAgICAgICAgICByZXR1cm4g IiIKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRvIHJhaXNlIGEg U2NyaXB0RXJyb3Igd2UgcGFzcyB3ZGlmZiBpbnZhbGlkIHBhdGhzLgpAQCAtNjM3LDMzICs2NTks MzMgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKICAg ICAgICAgICAgIGlmIGUuZXJybm8gaW4gW2Vycm5vLkVOT0VOVCwgZXJybm8uRUFDQ0VTLCBlcnJu by5FQ0hJTERdOgogICAgICAgICAgICAgICAgICMgU2lsZW50bHkgaWdub3JlIGNhc2VzIHdoZXJl IHdkaWZmIGlzIG1pc3NpbmcuCi0gICAgICAgICAgICAgICAgX3dkaWZmX2F2YWlsYWJsZSA9IEZh bHNlCisgICAgICAgICAgICAgICAgc2VsZi5fd2RpZmZfYXZhaWxhYmxlID0gRmFsc2UKICAgICAg ICAgICAgICAgICByZXR1cm4gIiIKICAgICAgICAgICAgIHJhaXNlCiAKLSAgICBfcHJldHR5X3Bh dGNoX2Vycm9yX2h0bWwgPSAiRmFpbGVkIHRvIHJ1biBQcmV0dHlQYXRjaCwgc2VlIGVycm9yIGNv bnNvbGUuIgorICAgICMgVGhpcyBpcyBhIGNsYXNzIHZhcmlhYmxlIHNvIHdlIGNhbiB0ZXN0IGVy cm9yIG91dHB1dCBlYXNpbHkuCisgICAgX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1sID0gIkZhaWxl ZCB0byBydW4gUHJldHR5UGF0Y2gsIHNlZSBlcnJvciBsb2cuIgogCiAgICAgZGVmIHByZXR0eV9w YXRjaF90ZXh0KHNlbGYsIGRpZmZfcGF0aCk6Ci0gICAgICAgICMgRklYTUU6IE11Y2ggb2YgdGhp cyBmdW5jdGlvbiBjb3VsZCBtb3ZlIHRvIHByZXR0eXBhdGNoLnJiCi0gICAgICAgIGdsb2JhbCBf cHJldHR5X3BhdGNoX2F2YWlsYWJsZQotICAgICAgICBpZiBub3QgX3ByZXR0eV9wYXRjaF9hdmFp bGFibGU6CisgICAgICAgIGlmIG5vdCBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlOgogICAg ICAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1sCi0gICAgICAgIHBy ZXR0eV9wYXRjaF9wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkJ1Z3NTaXRlIiwg IlByZXR0eVBhdGNoIikKLSAgICAgICAgcHJldHRpZnlfcGF0aCA9IG9zLnBhdGguam9pbihwcmV0 dHlfcGF0Y2hfcGF0aCwgInByZXR0aWZ5LnJiIikKLSAgICAgICAgY29tbWFuZCA9IFsicnVieSIs ICItSSIsIHByZXR0eV9wYXRjaF9wYXRoLCBwcmV0dGlmeV9wYXRoLCBkaWZmX3BhdGhdCisgICAg ICAgIGNvbW1hbmQgPSBbInJ1YnkiLCAiLUkiLCBvcy5wYXRoLmRpcm5hbWUoc2VsZi5fcHJldHR5 X3BhdGNoX3BhdGgpLAorICAgICAgICAgICAgICAgICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9wYXRo LCBkaWZmX3BhdGhdCiAgICAgICAgIHRyeToKICAgICAgICAgICAgICMgRGlmZnMgYXJlIHRyZWF0 ZWQgYXMgYmluYXJ5ICh3ZSBwYXNzIGRlY29kZV9vdXRwdXQ9RmFsc2UpIGFzIHRoZXkKICAgICAg ICAgICAgICMgbWF5IGNvbnRhaW4gbXVsdGlwbGUgZmlsZXMgb2YgY29uZmxpY3RpbmcgZW5jb2Rp bmdzLgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21t YW5kLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQogICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKICAg ICAgICAgICAgICMgSWYgdGhlIHN5c3RlbSBpcyBtaXNzaW5nIHJ1YnkgbG9nIHRoZSBlcnJvciBh bmQgc3RvcCB0cnlpbmcuCi0gICAgICAgICAgICBfcHJldHR5X3BhdGNoX2F2YWlsYWJsZSA9IEZh bHNlCisgICAgICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlID0gRmFsc2UKICAg ICAgICAgICAgIF9sb2cuZXJyb3IoIkZhaWxlZCB0byBydW4gUHJldHR5UGF0Y2ggKCVzKTogJXMi ICUgKGNvbW1hbmQsIGUpKQogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9l cnJvcl9odG1sCiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKLSAgICAgICAgICAgICMg SWYgcnVieSBmYWlsZWQgdG8gcnVuIGZvciBzb21lIHJlYXNvbiwgbG9nIHRoZSBjb21tYW5kIG91 dHB1dCBhbmQgc3RvcCB0cnlpbmcuCi0gICAgICAgICAgICBfcHJldHR5X3BhdGNoX2F2YWlsYWJs ZSA9IEZhbHNlCi0gICAgICAgICAgICBfbG9nLmVycm9yKCJGYWlsZWQgdG8gcnVuIFByZXR0eVBh dGNoICglcyk6XG4lcyIgJSAoY29tbWFuZCwgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkpKQorICAg ICAgICAgICAgIyBJZiBydWJ5IGZhaWxlZCB0byBydW4gZm9yIHNvbWUgcmVhc29uLCBsb2cgdGhl IGNvbW1hbmQKKyAgICAgICAgICAgICMgb3V0cHV0IGFuZCBzdG9wIHRyeWluZy4KKyAgICAgICAg ICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBGYWxzZQorICAgICAgICAgICAgX2xv Zy5lcnJvcigiRmFpbGVkIHRvIHJ1biBQcmV0dHlQYXRjaCAoJXMpOlxuJXMiICUgKGNvbW1hbmQs CisgICAgICAgICAgICAgICAgICAgICAgIGUubWVzc2FnZV93aXRoX291dHB1dCgpKSkKICAgICAg ICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbAogCiAgICAgZGVmIF93 ZWJraXRfYnVpbGRfZGlyZWN0b3J5KHNlbGYsIGFyZ3MpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0 ZXN0LnB5CmluZGV4IGU2NmM2NGRiZTg3ZGQ0N2ViODYxMTdkYWMyOGRlNDNlNjQ0NTE4YTMuLjQw ZWI5ODRjYjkxNGE1OTUwOTY5OTAyMDgwOWEzYjBkNjAyMmExMGMgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2VfdW5pdHRlc3QucHkKQEAgLTEzOSwxMSArMTM5LDExIEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIGV4cGVjdGVkX3dkaWZmID0gIjxoZWFkPjxzdHls ZT4uZGVsIHsgYmFja2dyb3VuZDogI2ZhYTsgfSAuYWRkIHsgYmFja2dyb3VuZDogI2FmYTsgfTwv c3R5bGU+PC9oZWFkPjxwcmU+PHNwYW4gY2xhc3M9ZGVsPmZvbzwvc3Bhbj48c3BhbiBjbGFzcz1h ZGQ+YmFyPC9zcGFuPjwvcHJlPiIKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwod2RpZmYs IGV4cGVjdGVkX3dkaWZmKQogICAgICAgICAgICAgIyBSdW5uaW5nIHRoZSBmdWxsIHdkaWZmX3Rl eHQgbWV0aG9kIHNob3VsZCBnaXZlIHRoZSBzYW1lIHJlc3VsdC4KLSAgICAgICAgICAgIGJhc2Uu X3dkaWZmX2F2YWlsYWJsZSA9IFRydWUgICMgSW4gY2FzZSBpdCdzIHNvbWVob3cgYWxyZWFkeSBk aXNhYmxlZC4KKyAgICAgICAgICAgIHBvcnQuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUgICMgSW4g Y2FzZSBpdCdzIHNvbWVob3cgYWxyZWFkeSBkaXNhYmxlZC4KICAgICAgICAgICAgIHdkaWZmID0g cG9ydC53ZGlmZl90ZXh0KGFjdHVhbC5uYW1lLCBleHBlY3RlZC5uYW1lKQogICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCh3ZGlmZiwgZXhwZWN0ZWRfd2RpZmYpCiAgICAgICAgICAgICAjIHdk aWZmIHNob3VsZCBzdGlsbCBiZSBhdmFpbGFibGUgYWZ0ZXIgcnVubmluZyB3ZGlmZl90ZXh0IHdp dGggYSB2YWxpZCBkaWZmLgotICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGJhc2UuX3dkaWZm X2F2YWlsYWJsZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll93ZGlmZl9hdmFp bGFibGUpCiAgICAgICAgICAgICBhY3R1YWwuY2xvc2UoKQogICAgICAgICAgICAgZXhwZWN0ZWQu Y2xvc2UoKQogCkBAIC0xNTEsNyArMTUxLDcgQEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3IsIHBvcnQu X3J1bl93ZGlmZiwgIi9kb2VzL25vdC9leGlzdCIsICIvZG9lcy9ub3QvZXhpc3QyIikKICAgICAg ICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVycm9yLCBwb3J0LndkaWZmX3RleHQsICIv ZG9lcy9ub3QvZXhpc3QiLCAiL2RvZXMvbm90L2V4aXN0MiIpCiAgICAgICAgICAgICAjIHdkaWZm IHdpbGwgc3RpbGwgYmUgYXZhaWxhYmxlIGFmdGVyIHJ1bm5pbmcgd2RpZmZfdGV4dCB3aXRoIGlu dmFsaWQgcGF0aHMuCi0gICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoYmFzZS5fd2RpZmZfYXZh aWxhYmxlKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX3dkaWZmX2F2YWlsYWJs ZSkKICAgICAgICAgICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKIAogICAgICAgICAj IElmIHdkaWZmIGRvZXMgbm90IGV4aXN0IF9ydW5fd2RpZmYgc2hvdWxkIHRocm93IGFuIE9TRXJy b3IuCkBAIC0xNjEsOCArMTYxLDcgQEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAjIHdkaWZmX3RleHQgc2hvdWxkIG5vdCB0aHJvdyBhbiBlcnJvciBpZiB3ZGlm ZiBkb2VzIG5vdCBleGlzdC4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LndkaWZmX3Rl eHQoImZvbyIsICJiYXIiKSwgIiIpCiAgICAgICAgICMgSG93ZXZlciB3ZGlmZiBzaG91bGQgbm90 IGJlIGF2YWlsYWJsZSBhZnRlciBydW5uaW5nIHdkaWZmX3RleHQgaWYgd2RpZmYgaXMgbWlzc2lu Zy4KLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShiYXNlLl93ZGlmZl9hdmFpbGFibGUpCi0gICAg ICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShwb3J0Ll93ZGlmZl9hdmFpbGFibGUpCiAKICAgICBkZWYgdGVzdF9kaWZmX3RleHQoc2VsZik6 CiAgICAgICAgIHBvcnQgPSBiYXNlLlBvcnQoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggMzAx ZDRiMTg5YjA5YzgzZDI3MDZlMzYwYTczZTg4MjNmYzFiMDgwOC4uMzQxMGMyZTRiZTU3Njk1MGM4 YWJmOTdkYjZhN2M2MjhlODhkZDUzZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0xMTUsNiAr MTE1LDEyIEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgICAgICAgICAgcmVz dWx0ID0gc2VsZi5jaGVja19pbWFnZV9kaWZmKAogICAgICAgICAgICAgICAgICdUbyBvdmVycmlk ZSwgaW52b2tlIHdpdGggLS1uby1waXhlbC10ZXN0cycpIGFuZCByZXN1bHQKIAorICAgICAgICAj IEl0J3Mgb2theSBpZiBwcmV0dHkgcGF0Y2ggaXNuJ3QgYXZhaWxhYmxlLCBidXQgd2UgbG9nIGEg bWVzc2FnZQorICAgICAgICAjIGF0IGxlYXN0LgorICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hf YXZhaWxhYmxlID0gc2VsZi5jaGVja19wcmV0dHlfcGF0Y2goKQorICAgICAgICBpZiBub3Qgc2Vs Zi5fcHJldHR5X3BhdGNoX2F2YWlsYWJsZToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJycpCisK ICAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAgICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYsIG5l ZWRzX2h0dHApOgo= 70582 2010-10-12 22:01:52 -0700 2010-10-13 06:55:38 -0700 Patch bug-47466-20101012220151.patch text/plain 10969 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlOWJkMzEwN2U1MTgzYTIxYThhMmFmNWE3NjE1YmU2ODI2M2RjMmQ3Li41MzJlYmNk ZjQ2YWE3YmQ4YWMxNGQ2MzcwZGU2YjA0MWYyY2UzYzA2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcgQEAK IDIwMTAtMTAtMTIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQt dGVzdHMgd2lsbCBub3cgaGFuZGxlIG1pc3NpbmcgUnVieSBpbnN0YWxscyAob3IKKyAgICAgICAg bWlzc2luZyBQcmV0dHlQYXRjaCBzY3JpcHRzKSBtb3JlIGNsZWFubHkgLSBwcmV2aW91c2x5IHRo aXMKKyAgICAgICAgd291bGQgYmUgZGV0ZWN0ZWQgd2hlbiB3ZSBhY3R1YWxseSB0cmllZCB0byBj cmVhdGUgdGhlIGRpZmYsIGFuZAorICAgICAgICB0aGUgZXJyb3IgbWVzc2FnZSB3YXMgb2JzY3Vy ZS4gTm93IHdlJ2xsIGxvZyBhIHdhcm5pbmcgdXAgZnJvbnQKKyAgICAgICAgYW5kIG90aGVyd2lz ZSBiZSBzaWxlbnQuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxzbyByZWZhY3RvcnMgc29tZSBn bG9iYWwgdmFyaWFibGVzIHRvIGJlIGNsYXNzIG9yCisgICAgICAgIGluc3RhbmNlIHZhcmlhYmxl cyB0byBiZSBzbGlnaHRseSBtb3JlIHRlc3RhYmxlIGFuZCBtb3JlCisgICAgICAgIG1vZHVsYXIu IFRoZXJlIGFyZSBubyBjYXNlcyB3aGVyZSB3ZSBjcmVhdGUgbG90cyBvZiBwb3J0IG9iamVjdHMK KyAgICAgICAgYW5kIGNhbid0IGFmZm9yZCB0byB0ZXN0IGZvciBjb25maWd1cmF0aW9ucyByZXBl YXRlZGx5LCBzbworICAgICAgICB0aGVyZSdzIG5vIHBlcmZvcm1hbmNlIGNvbmNlcm4gaGVyZS4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc0NjYK KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRl c3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bS5weToKKworMjAxMC0xMC0xMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9y Zz4KKwogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KIAogICAgICAgICBUaGlzIHBh dGNoIGVuYWJsZXMgbmV3LXJ1bi13ZWJraXQtdGVzdHMgKGluIHBhcnRpY3VsYXIgdGhlCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2UucHkKaW5kZXggMDQyZjBhYWZjOTcxZTQwOGZhZjE1MjgyZDk2ODMzMjIyMjk1NzQ4Yi4uN2Qx NjdiYWQxZDQ1ZmYwZjRhYmZkMmI3ZDIzYzhhYjRhZjBkZGMxOCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpAQCAt NTYsMjIgKzU2LDYgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnVzZXIgaW1wb3J0IFVz ZXIKIF9sb2cgPSBsb2d1dGlscy5nZXRfbG9nZ2VyKF9fZmlsZV9fKQogCiAKLSMgUHl0aG9uJ3Mg UG9wZW4gaGFzIGEgYnVnIHRoYXQgY2F1c2VzIGFueSBwaXBlcyBvcGVuZWQgdG8gYQotIyBwcm9j ZXNzIHRoYXQgY2FuJ3QgYmUgZXhlY3V0ZWQgdG8gYmUgbGVha2VkLiAgU2luY2UgdGhpcwotIyBj b2RlIGlzIHNwZWNpZmljYWxseSBkZXNpZ25lZCB0byB0b2xlcmF0ZSBleGVjIGZhaWx1cmVzCi0j IHRvIGdyYWNlZnVsbHkgaGFuZGxlIGNhc2VzIHdoZXJlIHdkaWZmIGlzIG5vdCBpbnN0YWxsZWQs Ci0jIHRoZSBidWcgcmVzdWx0cyBpbiBhIG1hc3NpdmUgZmlsZSBkZXNjcmlwdG9yIGxlYWsuIEFz IGEKLSMgd29ya2Fyb3VuZCwgaWYgYW4gZXhlYyBmYWlsdXJlIGlzIGV2ZXIgZXhwZXJpZW5jZWQg Zm9yCi0jIHdkaWZmLCBhc3N1bWUgaXQncyBub3QgYXZhaWxhYmxlLiAgVGhpcyB3aWxsIGxlYWsg b25lCi0jIGZpbGUgZGVzY3JpcHRvciBidXQgdGhhdCdzIGJldHRlciB0aGFuIGxlYWtpbmcgZWFj aCB0aW1lCi0jIHdkaWZmIHdvdWxkIGJlIHJ1bi4KLSMKLSMgaHR0cDovL21haWwucHl0aG9uLm9y Zy9waXBlcm1haWwvcHl0aG9uLWxpc3QvCi0jICAgIDIwMDgtQXVndXN0LzUwNTc1My5odG1sCi0j IGh0dHA6Ly9idWdzLnB5dGhvbi5vcmcvaXNzdWUzMjEwCi1fd2RpZmZfYXZhaWxhYmxlID0gVHJ1 ZQotX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBUcnVlCi0KICMgRklYTUU6IFRoaXMgY2xhc3Mg c2hvdWxkIG1lcmdlIHdpdGggd2Via2l0cHkud2Via2l0X3BvcnQgYXQgc29tZSBwb2ludC4KIGNs YXNzIFBvcnQob2JqZWN0KToKICAgICAiIiJBYnN0cmFjdCBjbGFzcyBmb3IgUG9ydC1zcGVjaWZp YyBob29rcyBmb3IgdGhlIGxheW91dF90ZXN0IHBhY2thZ2UuCkBAIC05Niw2ICs4MCwyNSBAQCBj bGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3dlYnNvY2tldF9zZXJ2ZXIgPSBOb25l CiAgICAgICAgIHNlbGYuX2h0dHBfbG9jayA9IE5vbmUKIAorICAgICAgICAjIFB5dGhvbidzIFBv cGVuIGhhcyBhIGJ1ZyB0aGF0IGNhdXNlcyBhbnkgcGlwZXMgb3BlbmVkIHRvIGEKKyAgICAgICAg IyBwcm9jZXNzIHRoYXQgY2FuJ3QgYmUgZXhlY3V0ZWQgdG8gYmUgbGVha2VkLiAgU2luY2UgdGhp cworICAgICAgICAjIGNvZGUgaXMgc3BlY2lmaWNhbGx5IGRlc2lnbmVkIHRvIHRvbGVyYXRlIGV4 ZWMgZmFpbHVyZXMKKyAgICAgICAgIyB0byBncmFjZWZ1bGx5IGhhbmRsZSBjYXNlcyB3aGVyZSB3 ZGlmZiBpcyBub3QgaW5zdGFsbGVkLAorICAgICAgICAjIHRoZSBidWcgcmVzdWx0cyBpbiBhIG1h c3NpdmUgZmlsZSBkZXNjcmlwdG9yIGxlYWsuIEFzIGEKKyAgICAgICAgIyB3b3JrYXJvdW5kLCBp ZiBhbiBleGVjIGZhaWx1cmUgaXMgZXZlciBleHBlcmllbmNlZCBmb3IKKyAgICAgICAgIyB3ZGlm ZiwgYXNzdW1lIGl0J3Mgbm90IGF2YWlsYWJsZS4gIFRoaXMgd2lsbCBsZWFrIG9uZQorICAgICAg ICAjIGZpbGUgZGVzY3JpcHRvciBidXQgdGhhdCdzIGJldHRlciB0aGFuIGxlYWtpbmcgZWFjaCB0 aW1lCisgICAgICAgICMgd2RpZmYgd291bGQgYmUgcnVuLgorICAgICAgICAjCisgICAgICAgICMg aHR0cDovL21haWwucHl0aG9uLm9yZy9waXBlcm1haWwvcHl0aG9uLWxpc3QvCisgICAgICAgICMg ICAgMjAwOC1BdWd1c3QvNTA1NzUzLmh0bWwKKyAgICAgICAgIyBodHRwOi8vYnVncy5weXRob24u b3JnL2lzc3VlMzIxMAorICAgICAgICBzZWxmLl93ZGlmZl9hdmFpbGFibGUgPSBUcnVlCisKKyAg ICAgICAgc2VsZi5fcHJldHR5X3BhdGNoX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFz ZSgiQnVnc1NpdGUiLAorICAgICAgICAgICAgICAiUHJldHR5UGF0Y2giLCAicHJldHRpZnkucmIi KQorICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlID0gVHJ1ZQorCiAgICAgZGVm IGRlZmF1bHRfY2hpbGRfcHJvY2Vzc2VzKHNlbGYpOgogICAgICAgICAiIiJSZXR1cm4gdGhlIG51 bWJlciBvZiBEdW1wUmVuZGVyVHJlZSBpbnN0YW5jZXMgdG8gdXNlIGZvciB0aGlzCiAgICAgICAg IHBvcnQuIiIiCkBAIC0xMjgsNiArMTMxLDI3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAg ICAgIiIiVGhpcyByb3V0aW5lIGlzIHVzZWQgdG8gY2hlY2sgd2hldGhlciBpbWFnZV9kaWZmIGJp bmFyeSBleGlzdHMuIiIiCiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoJ1BvcnQu Y2hlY2tfaW1hZ2VfZGlmZicpCiAKKyAgICBkZWYgY2hlY2tfcHJldHR5X3BhdGNoKHNlbGYpOgor ICAgICAgICAiIiJDaGVja3Mgd2hldGhlciB3ZSBjYW4gdXNlIHRoZSBQcmV0dHlQYXRjaCBydWJ5 IHNjcmlwdC4iIiIKKworICAgICAgICAjIGNoZWNrIGlmIFJ1YnkgaXMgaW5zdGFsbGVkCisgICAg ICAgIHRyeToKKyAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFu ZChbJ3J1YnknLCAnLS12ZXJzaW9uJ10pCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAg ICAgICAgICAgaWYgZS5lcnJubyBpbiBbZXJybm8uRU5PRU5ULCBlcnJuby5FQUNDRVMsIGVycm5v LkVDSElMRF06CisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiUnVieSBpcyBub3QgaW5zdGFs bGVkOyAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiY2FuJ3QgZ2VuZXJhdGUgcHJldHR5 IHBhdGNoZXMuIikKKyAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCcnKQorICAgICAgICAgICAg ICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIGlmIG5vdCBzZWxmLnBhdGhfZXhpc3RzKHNlbGYu X3ByZXR0eV9wYXRjaF9wYXRoKToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ1VuYWJsZSB0byBm aW5kICVzIC4nICUgc2VsZi5fcHJldHR5X3BhdGNoX3BhdGgpCisgICAgICAgICAgICBfbG9nLmVy cm9yKCJDYW4ndCBnZW5lcmF0ZSBwcmV0dHkgcGF0Y2hlcy4iKQorICAgICAgICAgICAgX2xvZy5l cnJvcignJykKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIHJldHVybiBUcnVl CisKICAgICBkZWYgY29tcGFyZV90ZXh0KHNlbGYsIGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0 KToKICAgICAgICAgIiIiUmV0dXJuIHdoZXRoZXIgb3Igbm90IHRoZSB0d28gc3RyaW5ncyBhcmUg Km5vdCogZXF1YWwuIFRoaXMKICAgICAgICAgcm91dGluZSBpcyB1c2VkIHRvIGRpZmYgdGV4dCBv dXRwdXQuCkBAIC02MzIsOCArNjU2LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAi IiJSZXR1cm5zIGEgc3RyaW5nIG9mIEhUTUwgaW5kaWNhdGluZyB0aGUgd29yZC1sZXZlbCBkaWZm IG9mIHRoZQogICAgICAgICBjb250ZW50cyBvZiB0aGUgdHdvIGZpbGVuYW1lcy4gUmV0dXJucyBh biBlbXB0eSBzdHJpbmcgaWYgd29yZC1sZXZlbAogICAgICAgICBkaWZmaW5nIGlzbid0IGF2YWls YWJsZS4iIiIKLSAgICAgICAgZ2xvYmFsIF93ZGlmZl9hdmFpbGFibGUgICMgU2VlIGV4cGxhaW5h dGlvbiBhdCB0b3Agb2YgZmlsZS4KLSAgICAgICAgaWYgbm90IF93ZGlmZl9hdmFpbGFibGU6Cisg ICAgICAgIGlmIG5vdCBzZWxmLl93ZGlmZl9hdmFpbGFibGU6CiAgICAgICAgICAgICByZXR1cm4g IiIKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRvIHJhaXNlIGEg U2NyaXB0RXJyb3Igd2UgcGFzcyB3ZGlmZiBpbnZhbGlkIHBhdGhzLgpAQCAtNjQxLDMzICs2NjQs MzMgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKICAg ICAgICAgICAgIGlmIGUuZXJybm8gaW4gW2Vycm5vLkVOT0VOVCwgZXJybm8uRUFDQ0VTLCBlcnJu by5FQ0hJTERdOgogICAgICAgICAgICAgICAgICMgU2lsZW50bHkgaWdub3JlIGNhc2VzIHdoZXJl IHdkaWZmIGlzIG1pc3NpbmcuCi0gICAgICAgICAgICAgICAgX3dkaWZmX2F2YWlsYWJsZSA9IEZh bHNlCisgICAgICAgICAgICAgICAgc2VsZi5fd2RpZmZfYXZhaWxhYmxlID0gRmFsc2UKICAgICAg ICAgICAgICAgICByZXR1cm4gIiIKICAgICAgICAgICAgIHJhaXNlCiAKLSAgICBfcHJldHR5X3Bh dGNoX2Vycm9yX2h0bWwgPSAiRmFpbGVkIHRvIHJ1biBQcmV0dHlQYXRjaCwgc2VlIGVycm9yIGNv bnNvbGUuIgorICAgICMgVGhpcyBpcyBhIGNsYXNzIHZhcmlhYmxlIHNvIHdlIGNhbiB0ZXN0IGVy cm9yIG91dHB1dCBlYXNpbHkuCisgICAgX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1sID0gIkZhaWxl ZCB0byBydW4gUHJldHR5UGF0Y2gsIHNlZSBlcnJvciBsb2cuIgogCiAgICAgZGVmIHByZXR0eV9w YXRjaF90ZXh0KHNlbGYsIGRpZmZfcGF0aCk6Ci0gICAgICAgICMgRklYTUU6IE11Y2ggb2YgdGhp cyBmdW5jdGlvbiBjb3VsZCBtb3ZlIHRvIHByZXR0eXBhdGNoLnJiCi0gICAgICAgIGdsb2JhbCBf cHJldHR5X3BhdGNoX2F2YWlsYWJsZQotICAgICAgICBpZiBub3QgX3ByZXR0eV9wYXRjaF9hdmFp bGFibGU6CisgICAgICAgIGlmIG5vdCBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlOgogICAg ICAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9lcnJvcl9odG1sCi0gICAgICAgIHBy ZXR0eV9wYXRjaF9wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkJ1Z3NTaXRlIiwg IlByZXR0eVBhdGNoIikKLSAgICAgICAgcHJldHRpZnlfcGF0aCA9IG9zLnBhdGguam9pbihwcmV0 dHlfcGF0Y2hfcGF0aCwgInByZXR0aWZ5LnJiIikKLSAgICAgICAgY29tbWFuZCA9IFsicnVieSIs ICItSSIsIHByZXR0eV9wYXRjaF9wYXRoLCBwcmV0dGlmeV9wYXRoLCBkaWZmX3BhdGhdCisgICAg ICAgIGNvbW1hbmQgPSAoInJ1YnkiLCAiLUkiLCBvcy5wYXRoLmRpcm5hbWUoc2VsZi5fcHJldHR5 X3BhdGNoX3BhdGgpLAorICAgICAgICAgICAgICAgICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9wYXRo LCBkaWZmX3BhdGgpCiAgICAgICAgIHRyeToKICAgICAgICAgICAgICMgRGlmZnMgYXJlIHRyZWF0 ZWQgYXMgYmluYXJ5ICh3ZSBwYXNzIGRlY29kZV9vdXRwdXQ9RmFsc2UpIGFzIHRoZXkKICAgICAg ICAgICAgICMgbWF5IGNvbnRhaW4gbXVsdGlwbGUgZmlsZXMgb2YgY29uZmxpY3RpbmcgZW5jb2Rp bmdzLgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21t YW5kLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQogICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKICAg ICAgICAgICAgICMgSWYgdGhlIHN5c3RlbSBpcyBtaXNzaW5nIHJ1YnkgbG9nIHRoZSBlcnJvciBh bmQgc3RvcCB0cnlpbmcuCi0gICAgICAgICAgICBfcHJldHR5X3BhdGNoX2F2YWlsYWJsZSA9IEZh bHNlCisgICAgICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlID0gRmFsc2UKICAg ICAgICAgICAgIF9sb2cuZXJyb3IoIkZhaWxlZCB0byBydW4gUHJldHR5UGF0Y2ggKCVzKTogJXMi ICUgKGNvbW1hbmQsIGUpKQogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9l cnJvcl9odG1sCiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKLSAgICAgICAgICAgICMg SWYgcnVieSBmYWlsZWQgdG8gcnVuIGZvciBzb21lIHJlYXNvbiwgbG9nIHRoZSBjb21tYW5kIG91 dHB1dCBhbmQgc3RvcCB0cnlpbmcuCi0gICAgICAgICAgICBfcHJldHR5X3BhdGNoX2F2YWlsYWJs ZSA9IEZhbHNlCi0gICAgICAgICAgICBfbG9nLmVycm9yKCJGYWlsZWQgdG8gcnVuIFByZXR0eVBh dGNoICglcyk6XG4lcyIgJSAoY29tbWFuZCwgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkpKQorICAg ICAgICAgICAgIyBJZiBydWJ5IGZhaWxlZCB0byBydW4gZm9yIHNvbWUgcmVhc29uLCBsb2cgdGhl IGNvbW1hbmQKKyAgICAgICAgICAgICMgb3V0cHV0IGFuZCBzdG9wIHRyeWluZy4KKyAgICAgICAg ICAgIHNlbGYuX3ByZXR0eV9wYXRjaF9hdmFpbGFibGUgPSBGYWxzZQorICAgICAgICAgICAgX2xv Zy5lcnJvcigiRmFpbGVkIHRvIHJ1biBQcmV0dHlQYXRjaCAoJXMpOlxuJXMiICUgKGNvbW1hbmQs CisgICAgICAgICAgICAgICAgICAgICAgIGUubWVzc2FnZV93aXRoX291dHB1dCgpKSkKICAgICAg ICAgICAgIHJldHVybiBzZWxmLl9wcmV0dHlfcGF0Y2hfZXJyb3JfaHRtbAogCiAgICAgZGVmIF93 ZWJraXRfYnVpbGRfZGlyZWN0b3J5KHNlbGYsIGFyZ3MpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3VuaXR0 ZXN0LnB5CmluZGV4IGQ5Y2I0Njc4YzM1ZGRiNDQ5NjUzMzhiMWU1ZTE0ZjAyYjI5MzUwZDMuLjMw YzQ1OGUzZWQ1YjhhZDliMDg3OTRkZWMzYjAxOGJkNDFiZDZhNzcgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2VfdW5pdHRlc3QucHkKQEAgLTE0MCwxMSArMTQwLDExIEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIGV4cGVjdGVkX3dkaWZmID0gIjxoZWFkPjxzdHls ZT4uZGVsIHsgYmFja2dyb3VuZDogI2ZhYTsgfSAuYWRkIHsgYmFja2dyb3VuZDogI2FmYTsgfTwv c3R5bGU+PC9oZWFkPjxwcmU+PHNwYW4gY2xhc3M9ZGVsPmZvbzwvc3Bhbj48c3BhbiBjbGFzcz1h ZGQ+YmFyPC9zcGFuPjwvcHJlPiIKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwod2RpZmYs IGV4cGVjdGVkX3dkaWZmKQogICAgICAgICAgICAgIyBSdW5uaW5nIHRoZSBmdWxsIHdkaWZmX3Rl eHQgbWV0aG9kIHNob3VsZCBnaXZlIHRoZSBzYW1lIHJlc3VsdC4KLSAgICAgICAgICAgIGJhc2Uu X3dkaWZmX2F2YWlsYWJsZSA9IFRydWUgICMgSW4gY2FzZSBpdCdzIHNvbWVob3cgYWxyZWFkeSBk aXNhYmxlZC4KKyAgICAgICAgICAgIHBvcnQuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUgICMgSW4g Y2FzZSBpdCdzIHNvbWVob3cgYWxyZWFkeSBkaXNhYmxlZC4KICAgICAgICAgICAgIHdkaWZmID0g cG9ydC53ZGlmZl90ZXh0KGFjdHVhbC5uYW1lLCBleHBlY3RlZC5uYW1lKQogICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCh3ZGlmZiwgZXhwZWN0ZWRfd2RpZmYpCiAgICAgICAgICAgICAjIHdk aWZmIHNob3VsZCBzdGlsbCBiZSBhdmFpbGFibGUgYWZ0ZXIgcnVubmluZyB3ZGlmZl90ZXh0IHdp dGggYSB2YWxpZCBkaWZmLgotICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGJhc2UuX3dkaWZm X2F2YWlsYWJsZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll93ZGlmZl9hdmFp bGFibGUpCiAgICAgICAgICAgICBhY3R1YWwuY2xvc2UoKQogICAgICAgICAgICAgZXhwZWN0ZWQu Y2xvc2UoKQogCkBAIC0xNTIsNyArMTUyLDcgQEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3IsIHBvcnQu X3J1bl93ZGlmZiwgIi9kb2VzL25vdC9leGlzdCIsICIvZG9lcy9ub3QvZXhpc3QyIikKICAgICAg ICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVycm9yLCBwb3J0LndkaWZmX3RleHQsICIv ZG9lcy9ub3QvZXhpc3QiLCAiL2RvZXMvbm90L2V4aXN0MiIpCiAgICAgICAgICAgICAjIHdkaWZm IHdpbGwgc3RpbGwgYmUgYXZhaWxhYmxlIGFmdGVyIHJ1bm5pbmcgd2RpZmZfdGV4dCB3aXRoIGlu dmFsaWQgcGF0aHMuCi0gICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoYmFzZS5fd2RpZmZfYXZh aWxhYmxlKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX3dkaWZmX2F2YWlsYWJs ZSkKICAgICAgICAgICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKIAogICAgICAgICAj IElmIHdkaWZmIGRvZXMgbm90IGV4aXN0IF9ydW5fd2RpZmYgc2hvdWxkIHRocm93IGFuIE9TRXJy b3IuCkBAIC0xNjIsOCArMTYyLDcgQEAgY2xhc3MgUG9ydFRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAjIHdkaWZmX3RleHQgc2hvdWxkIG5vdCB0aHJvdyBhbiBlcnJvciBpZiB3ZGlm ZiBkb2VzIG5vdCBleGlzdC4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LndkaWZmX3Rl eHQoImZvbyIsICJiYXIiKSwgIiIpCiAgICAgICAgICMgSG93ZXZlciB3ZGlmZiBzaG91bGQgbm90 IGJlIGF2YWlsYWJsZSBhZnRlciBydW5uaW5nIHdkaWZmX3RleHQgaWYgd2RpZmYgaXMgbWlzc2lu Zy4KLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShiYXNlLl93ZGlmZl9hdmFpbGFibGUpCi0gICAg ICAgIGJhc2UuX3dkaWZmX2F2YWlsYWJsZSA9IFRydWUKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShwb3J0Ll93ZGlmZl9hdmFpbGFibGUpCiAKICAgICBkZWYgdGVzdF9kaWZmX3RleHQoc2VsZik6 CiAgICAgICAgIHBvcnQgPSBiYXNlLlBvcnQoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggMWY3 ODRkYzNiODc1MDc5M2Y2MWQ2OTM5MDY2ZjRhYjY3NDE2NjkzNi4uZTQyZWRlMTg2MzgyYTM2NjZi ZDZlMmI5Y2JkNmMxNzJlMTZiZjk3ZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0xMTYsNiAr MTE2LDEwIEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgICAgICAgICAgcmVz dWx0ID0gc2VsZi5jaGVja19pbWFnZV9kaWZmKAogICAgICAgICAgICAgICAgICdUbyBvdmVycmlk ZSwgaW52b2tlIHdpdGggLS1uby1waXhlbC10ZXN0cycpIGFuZCByZXN1bHQKIAorICAgICAgICAj IEl0J3Mgb2theSBpZiBwcmV0dHkgcGF0Y2ggaXNuJ3QgYXZhaWxhYmxlLCBidXQgd2Ugd2lsbCBh dAorICAgICAgICAjIGxlYXN0IGxvZyBhIG1lc3NhZ2UuCisgICAgICAgIHNlbGYuY2hlY2tfcHJl dHR5X3BhdGNoKCkKKwogICAgICAgICByZXR1cm4gcmVzdWx0CiAKICAgICBkZWYgY2hlY2tfc3lz X2RlcHMoc2VsZiwgbmVlZHNfaHR0cCk6Cg==