47959 2010-10-19 17:52:52 -0700 Add support for --tolerance in NRWT 2010-10-21 17:06:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip commit-queue dpranke eric fishd ojan oldest_to_newest 296562 0 mihaip 2010-10-19 17:52:52 -0700 Add support for --tolerance in NRWT 296564 1 71234 mihaip 2010-10-19 17:55:18 -0700 Created attachment 71234 Patch 296609 2 71234 dpranke 2010-10-19 19:58:53 -0700 Comment on attachment 71234 Patch LGTM, but I'm not a reviewer. 296809 3 71234 ojan 2010-10-20 08:23:35 -0700 Comment on attachment 71234 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71234&action=review Is there anyway to test this? Not that the tolerance actually does the right thing, just a test that the code doesn't crash when you pass a tolerance would be enough for me. > WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:1567 > + "ports may ignore this option)", type="float", default=0.1), I'd prefer if we default to 0 and then allow individual ports to override the tolerance somehow. As it is, each port currently has a different default. 297609 4 71483 mihaip 2010-10-21 13:35:08 -0700 Created attachment 71483 Patch 297610 5 mihaip 2010-10-21 13:36:01 -0700 (In reply to comment #3) > Is there anyway to test this? Not that the tolerance actually does the right thing, just a test that the code doesn't crash when you pass a tolerance would be enough for me. Added a test. > I'd prefer if we default to 0 and then allow individual ports to override the tolerance somehow. As it is, each port currently has a different default. I changed it so that the port's default value is used if the flag is not specified. 297611 6 71483 mihaip 2010-10-21 13:38:46 -0700 Comment on attachment 71483 Patch Oops, doesn't actually work for --tolerance is 0. 297612 7 71484 mihaip 2010-10-21 13:41:24 -0700 Created attachment 71484 Patch 297613 8 mihaip 2010-10-21 13:41:53 -0700 (In reply to comment #6) > Oops, doesn't actually work for --tolerance is 0. New patch should fix this. 297618 9 dpranke 2010-10-21 13:58:41 -0700 Okay, after thinking about this more, I suggest you not land this at all, since you don't need most of this code. All you need is the command line parameter. Once that's set, it's passed to the port in the constructor (as part of the options keyword). diff_image() can then pull that and use it accordingly, and shouldn't even take a tolerance parameter (since it will never vary between tests). 297637 10 71492 mihaip 2010-10-21 14:22:19 -0700 Created attachment 71492 Patch 297641 11 mihaip 2010-10-21 14:23:07 -0700 (In reply to comment #9) > Okay, after thinking about this more, I suggest you not land this at all, since you don't need most of this code. > > All you need is the command line parameter. Once that's set, it's passed to the port in the constructor (as part of the options keyword). diff_image() can then pull that and use it accordingly, and shouldn't even take a tolerance parameter (since it will never vary between tests). Agreed that tolerance is not a per-test setting, so it probably doesn't make sense as a test_arg. How about the new version of the patch? 297656 12 71492 dpranke 2010-10-21 14:41:08 -0700 Comment on attachment 71492 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71492&action=review You might want a test or two in port/webkit_unittest.py that checks that the webkit-specific default is preserved/propagated correctly, as well. > WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py:140 > + tolerance = 0.1 self.get_option('tolerance') and add a line to the constructor: self.set_option_default('tolerance', 0.1) That way the correct port-specific value actually gets propagated up into the options. (as an aside, I really need to re-work this, because this will all break if the default= value is set in optparse.make_option, even if we use default=None, I think ... need to test this.) 297669 13 71498 mihaip 2010-10-21 15:00:27 -0700 Created attachment 71498 Patch 297672 14 mihaip 2010-10-21 15:02:52 -0700 (In reply to comment #12) > self.get_option('tolerance') > self.set_option_default('tolerance', 0.1) Dirk and I chatted about this, and I can't use that since options.tolerance is always present (just set to None if the flag is omitted), and get_option just checks for hasattr. Added a FIXME for now, Dirk will be redoing per-port flags separately. 297679 15 71498 dpranke 2010-10-21 15:15:29 -0700 Comment on attachment 71498 Patch patch LGTM. I waffled a bit as to whether the test_tolerance() test really should be in port/base_unittest or port/port_testcase.py, and whether there should be a test in port/webkit_unittest.py that is verifying that the webkit default is being honored, but ultimately decided that those could be deferred to bug 48095 where I revamp this whole mechanism. 297721 16 71498 commit-queue 2010-10-21 16:45:52 -0700 Comment on attachment 71498 Patch Rejecting patch 71498 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']" exit_code: 2 Last 500 characters of output: ebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py", line 133, in diff_image sp = self._diff_image_request(expected_contents, actual_contents) File "/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py", line 140, in _diff_image_request if self._options.tolerance is not None: AttributeError: 'MockOptions' object has no attribute 'tolerance' ---------------------------------------------------------------------- Ran 647 tests in 46.321s FAILED (errors=1) Full output: http://queues.webkit.org/results/4670020 297730 17 mihaip 2010-10-21 17:04:55 -0700 Committed r70277: <http://trac.webkit.org/changeset/70277> 297731 18 71498 mihaip 2010-10-21 17:05:59 -0700 Comment on attachment 71498 Patch I fixed the unit test failure before committing. 71234 2010-10-19 17:55:18 -0700 2010-10-21 13:35:04 -0700 Patch bug-47959-20101019175516.patch text/plain 4468 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmN2JhNTM2ZGE1MTJhOTc3ZmU5ZWNkZjdhOTUyNWU1MDY2NzcyZjE2Li5mNGYzMTAz ZTY0Y2E5OWE3NmZmMmNlNmZiMjIzNjY5YmIyYzgxMjhkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMTAtMTkgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIC0tdG9sZXJhbmNlIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ3OTU5CisgICAgICAgIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig dGhlIC0tdG9sZXJhbmNlIGZsYWcgaW4gTlJXVC4gVGhlIFBvcnQuZGlmZl9pbWFnZQorICAgICAg ICBzaWduYXR1cmUgYWxyZWFkeSBpbmNsdWRlZCBhIHRvbGVyYW5jZSBwYXJhbWV0ZXIgKHRob3Vn aCBvbmx5IHRoZQorICAgICAgICBXZWJLaXRQb3J0IGltcGxlbWVudGF0aW9uIGFjdHVhbGx5IHVz ZXMgaXQpLCBpdCB3YXMganVzdCBhIG1hdHRlciBvZgorICAgICAgICBwYXNzaW5nIGl0IHRocm91 Z2guCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3Rf dHlwZXMvaW1hZ2VfZGlmZi5weToKKwogMjAxMC0xMC0xOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwganVzdCBmaXhpbmcgdGVzdC13ZWJraXRw eS4gIEknbSByZWFsbHkgb24gYSByb2xsIHRvZGF5LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkK aW5kZXggOWNjNzg5NWYzYWE4ZTM4YTdhNjEzMzgxOTgwNjJhNjVmMjNjNmM5NC4uNjMzNmY2NTk0 MjBmMDdmNTdlNTUwZDRlYTA4YWI3N2U5YTQ4OTYwNyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5CkBAIC01NzUsNiArNTc1LDcgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgIHRl c3RfYXJncy5wbmdfcGF0aCA9IHBuZ19wYXRoCiAgICAgICAgIHRlc3RfYXJncy5uZXdfYmFzZWxp bmUgPSBzZWxmLl9vcHRpb25zLm5ld19iYXNlbGluZQogICAgICAgICB0ZXN0X2FyZ3MucmVzZXRf cmVzdWx0cyA9IHNlbGYuX29wdGlvbnMucmVzZXRfcmVzdWx0cworICAgICAgICB0ZXN0X2FyZ3Mu dG9sZXJhbmNlID0gc2VsZi5fb3B0aW9ucy50b2xlcmFuY2UKIAogICAgICAgICByZXR1cm4gdGVz dF9hcmdzCiAKQEAgLTE1NjEsOCArMTU2Miw5IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6 CiAgICAgICAgICAgICBkZXN0PSJwaXhlbF90ZXN0cyIsIGhlbHA9IkVuYWJsZSBwaXhlbC10by1w aXhlbCBQTkcgY29tcGFyaXNvbnMiKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0t bm8tcGl4ZWwtdGVzdHMiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwKICAgICAgICAgICAgIGRlc3Q9 InBpeGVsX3Rlc3RzIiwgaGVscD0iRGlzYWJsZSBwaXhlbC10by1waXhlbCBQTkcgY29tcGFyaXNv bnMiKSwKLSAgICAgICAgIyBvbGQtcnVuLXdlYmtpdC10ZXN0cyBhbGxvd3MgYSBzcGVjaWZpYyB0 b2xlcmFuY2U6IC0tdG9sZXJhbmNlIHQKLSAgICAgICAgIyBJZ25vcmUgaW1hZ2UgZGlmZmVyZW5j ZXMgbGVzcyB0aGFuIHRoaXMgcGVyY2VudGFnZSAoZGVmYXVsdDogMC4xKQorICAgICAgICBvcHRw YXJzZS5tYWtlX29wdGlvbigiLS10b2xlcmFuY2UiLAorICAgICAgICAgICAgaGVscD0iSWdub3Jl IGltYWdlIGRpZmZlcmVuY2VzIGxlc3MgdGhhbiB0aGlzIHBlcmNlbnRhZ2UgKHNvbWUgIgorICAg ICAgICAgICAgICAgICJwb3J0cyBtYXkgaWdub3JlIHRoaXMgb3B0aW9uKSIsIHR5cGU9ImZsb2F0 IiwgZGVmYXVsdD0wLjEpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1yZXN1bHRz LWRpcmVjdG9yeSIsCiAgICAgICAgICAgICBkZWZhdWx0PSJsYXlvdXQtdGVzdC1yZXN1bHRzIiwK ICAgICAgICAgICAgIGhlbHA9Ik91dHB1dCByZXN1bHRzIGRpcmVjdG9yeSBzb3VyY2UgZGlyLCBy ZWxhdGl2ZSB0byBEZWJ1ZyBvciAiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkK aW5kZXggMGIwNTgwMjBjMDhmNGY1MWMxMTYyMDRkYzU0Y2JmNWQ5YzNlN2M2Zi4uZWJmMzAxZmUx NjUxZGM5ZDU2M2NkMWE4YTdiMjg0NTVkNzg5YmViMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMv aW1hZ2VfZGlmZi5weQpAQCAtODgsNyArODgsNyBAQCBjbGFzcyBJbWFnZURpZmYodGVzdF90eXBl X2Jhc2UuVGVzdFR5cGVCYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVu Y29kaW5nPSJhc2NpaSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZW5lcmF0 ZV9uZXdfYmFzZWxpbmU9Z2VuZXJhdGVfbmV3X2Jhc2VsaW5lKQogCi0gICAgZGVmIF9jcmVhdGVf aW1hZ2VfZGlmZihzZWxmLCBwb3J0LCBmaWxlbmFtZSwgY29uZmlndXJhdGlvbik6CisgICAgZGVm IF9jcmVhdGVfaW1hZ2VfZGlmZihzZWxmLCBwb3J0LCBmaWxlbmFtZSwgY29uZmlndXJhdGlvbiwg dG9sZXJhbmNlKToKICAgICAgICAgIiIiQ3JlYXRlcyB0aGUgdmlzdWFsIGRpZmYgb2YgdGhlIGV4 cGVjdGVkL2FjdHVhbCBQTkdzLgogCiAgICAgICAgIEFyZ3M6CkBAIC0xMDcsOCArMTA3LDExIEBA IGNsYXNzIEltYWdlRGlmZih0ZXN0X3R5cGVfYmFzZS5UZXN0VHlwZUJhc2UpOgogICAgICAgICB3 aXRoIGNvZGVjcy5vcGVuKGFjdHVhbF9maWxlbmFtZSwgJ3IrYicsIE5vbmUpIGFzIGZpbGU6CiAg ICAgICAgICAgICBhY3R1YWxfaW1hZ2UgPSBmaWxlLnJlYWQoKQogCi0gICAgICAgIHJlc3VsdCA9 IHBvcnQuZGlmZl9pbWFnZShleHBlY3RlZF9pbWFnZSwgYWN0dWFsX2ltYWdlLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZSkKKyAgICAgICAgcmVzdWx0ID0g cG9ydC5kaWZmX2ltYWdlKAorICAgICAgICAgICAgZXhwZWN0ZWRfY29udGVudHM9ZXhwZWN0ZWRf aW1hZ2UsCisgICAgICAgICAgICBhY3R1YWxfY29udGVudHM9YWN0dWFsX2ltYWdlLAorICAgICAg ICAgICAgZGlmZl9maWxlbmFtZT1kaWZmX2ZpbGVuYW1lLAorICAgICAgICAgICAgdG9sZXJhbmNl PXRvbGVyYW5jZSkKICAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAgICAgZGVmIGNvbXBhcmVfb3V0 cHV0KHNlbGYsIHBvcnQsIGZpbGVuYW1lLCBvdXRwdXQsIHRlc3RfYXJncywgY29uZmlndXJhdGlv bik6CkBAIC0xNTcsNyArMTYwLDExIEBAIGNsYXNzIEltYWdlRGlmZih0ZXN0X3R5cGVfYmFzZS5U ZXN0VHlwZUJhc2UpOgogCiAgICAgICAgICMgRXZlbiB0aG91Z2ggd2Ugb25seSB1c2UgdGhlIHJl c3VsdCBpbiBvbmUgY29kZXBhdGggYmVsb3cgYnV0IHdlCiAgICAgICAgICMgc3RpbGwgbmVlZCB0 byBjYWxsIENyZWF0ZUltYWdlRGlmZiBmb3Igb3RoZXIgY29kZXBhdGhzLgotICAgICAgICBpbWFn ZXNfYXJlX2RpZmZlcmVudCA9IHNlbGYuX2NyZWF0ZV9pbWFnZV9kaWZmKHBvcnQsIGZpbGVuYW1l LCBjb25maWd1cmF0aW9uKQorICAgICAgICBpbWFnZXNfYXJlX2RpZmZlcmVudCA9IHNlbGYuX2Ny ZWF0ZV9pbWFnZV9kaWZmKAorICAgICAgICAgICAgcG9ydD1wb3J0LAorICAgICAgICAgICAgZmls ZW5hbWU9ZmlsZW5hbWUsCisgICAgICAgICAgICBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24s CisgICAgICAgICAgICB0b2xlcmFuY2U9dGVzdF9hcmdzLnRvbGVyYW5jZSkKICAgICAgICAgaWYg bm90IGV4cGVjdGVkX2hhc2g6CiAgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9mYWls dXJlcy5GYWlsdXJlTWlzc2luZ0ltYWdlSGFzaCgpKQogICAgICAgICBlbGlmIHRlc3RfYXJncy5o YXNoICE9IGV4cGVjdGVkX2hhc2g6Cg== 71483 2010-10-21 13:35:08 -0700 2010-10-21 13:38:46 -0700 Patch bug-47959-20101021133506.patch text/plain 6850 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwNDQzMjRkYjg0ZDRhYWFiNjFiN2Q1YWY1ZDVjMzA4MmVlY2E5ZGUxLi44ODI0Yzk5 N2NkMjkzZjFkMDNhNWEyOTJhYTRjMjNhZWNhODY5OTZmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTAtMjEgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIC0tdG9sZXJhbmNlIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ3OTU5CisgICAgICAgIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig dGhlIC0tdG9sZXJhbmNlIGZsYWcgaW4gTlJXVC4gVGhlIFBvcnQuZGlmZl9pbWFnZQorICAgICAg ICBzaWduYXR1cmUgYWxyZWFkeSBpbmNsdWRlZCBhIHRvbGVyYW5jZSBwYXJhbWV0ZXIgKHRob3Vn aCBvbmx5IHRoZQorICAgICAgICBXZWJLaXRQb3J0IGltcGxlbWVudGF0aW9uIGFjdHVhbGx5IHVz ZXMgaXQpLCBpdCB3YXMganVzdCBhIG1hdHRlciBvZgorICAgICAgICBwYXNzaW5nIGl0IHRocm91 Z2ggKHRoZSBwZXItcG9ydCBkZWZhdWx0IHZhbHVlIGlzIHN0aWxsIHVzZWQpLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3Vu aXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3Rf dHlwZXMvaW1hZ2VfZGlmZi5weToKKwogMjAxMC0xMC0yMCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBh cHBsZS5jb20+CiAKICAgICAgICAgVGVzdCB0aGF0IHRoZSBVSSBjbGllbnQgZ2V0cyBub3RpZmll ZCB3aGVuIFdLVmlldyByZWNlaXZlcyBhIFdNX0NMT1NFCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQppbmRleCBkYzhhMWY0NmRjN2E0ZjhiZjFmNDViOTM3OGFmZGM5ZDNjNDg5ZjBmLi5kMjViNjI1 YTIxMTIxYTJjYzk0NzkyMmFmMmE2YTJhYmM0ZGY0MTVkIDEwMDc1NQotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHkKQEAgLTU3NSw2ICs1NzUsNyBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAgICAg dGVzdF9hcmdzLnBuZ19wYXRoID0gcG5nX3BhdGgKICAgICAgICAgdGVzdF9hcmdzLm5ld19iYXNl bGluZSA9IHNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5lCiAgICAgICAgIHRlc3RfYXJncy5yZXNl dF9yZXN1bHRzID0gc2VsZi5fb3B0aW9ucy5yZXNldF9yZXN1bHRzCisgICAgICAgIHRlc3RfYXJn cy50b2xlcmFuY2UgPSBzZWxmLl9vcHRpb25zLnRvbGVyYW5jZQogCiAgICAgICAgIHJldHVybiB0 ZXN0X2FyZ3MKIApAQCAtMTU2Miw4ICsxNTYzLDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25l KToKICAgICAgICAgICAgIGRlc3Q9InBpeGVsX3Rlc3RzIiwgaGVscD0iRW5hYmxlIHBpeGVsLXRv LXBpeGVsIFBORyBjb21wYXJpc29ucyIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigi LS1uby1waXhlbC10ZXN0cyIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAogICAgICAgICAgICAgZGVz dD0icGl4ZWxfdGVzdHMiLCBoZWxwPSJEaXNhYmxlIHBpeGVsLXRvLXBpeGVsIFBORyBjb21wYXJp c29ucyIpLAotICAgICAgICAjIG9sZC1ydW4td2Via2l0LXRlc3RzIGFsbG93cyBhIHNwZWNpZmlj IHRvbGVyYW5jZTogLS10b2xlcmFuY2UgdAotICAgICAgICAjIElnbm9yZSBpbWFnZSBkaWZmZXJl bmNlcyBsZXNzIHRoYW4gdGhpcyBwZXJjZW50YWdlIChkZWZhdWx0OiAwLjEpCisgICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXRvbGVyYW5jZSIsCisgICAgICAgICAgICBoZWxwPSJJZ25v cmUgaW1hZ2UgZGlmZmVyZW5jZXMgbGVzcyB0aGFuIHRoaXMgcGVyY2VudGFnZSAoc29tZSAiCisg ICAgICAgICAgICAgICAgInBvcnRzIG1heSBpZ25vcmUgdGhpcyBvcHRpb24pIiwgdHlwZT0iZmxv YXQiKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVzdWx0cy1kaXJlY3Rvcnki LAogICAgICAgICAgICAgZGVmYXVsdD0ibGF5b3V0LXRlc3QtcmVzdWx0cyIsCiAgICAgICAgICAg ICBoZWxwPSJPdXRwdXQgcmVzdWx0cyBkaXJlY3Rvcnkgc291cmNlIGRpciwgcmVsYXRpdmUgdG8g RGVidWcgb3IgIgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5k ZXggYTcxNmNlYzhjNmI2YjE1MjlmY2I1MmI0MzFkMTE3MmJjY2VkMDMxMy4uOTExMDBlMDA3NDdi NDg5YTQxYmY4MGUxYTI0Y2MzNmQ1OTI3MmFmMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC00OCw2ICs0OCw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbSBpbXBvcnQgdXNlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHBv cnQKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzIGltcG9ydCBydW5fd2Via2l0X3Rlc3RzCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZSBpbXBvcnQgZHVtcF9yZW5k ZXJfdHJlZV90aHJlYWQKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQudGVzdCBpbXBv cnQgVGVzdFBvcnQKIAogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1wb3J0IE1vY2sK IApAQCAtMjYwLDYgKzI2MSwyOCBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0c19pbmNsdWRl ZD1UcnVlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHVzZXIudXJsLCAnL3RtcC9mb28vcmVz dWx0cy5odG1sJykKIAorICAgIGRlZiB0ZXN0X3RvbGVyYW5jZShzZWxmKToKKyAgICAgICAgY2xh c3MgSW1hZ2VEaWZmVGVzdFBvcnQoVGVzdFBvcnQpOgorICAgICAgICAgICAgZGVmIGRpZmZfaW1h Z2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cywKKyAgICAgICAgICAg ICAgICAgICBkaWZmX2ZpbGVuYW1lPU5vbmUsIHRvbGVyYW5jZT0wLjIpOgorICAgICAgICAgICAg ICAgIHNlbGYudG9sZXJhbmNlX3VzZWRfZm9yX2RpZmZfaW1hZ2UgPSB0b2xlcmFuY2UKKyAgICAg ICAgICAgICAgICByZXR1cm4gVHJ1ZQorCisgICAgICAgIGRlZiBnZXRfcG9ydF9mb3JfcnVuKGFy Z3MpOgorICAgICAgICAgICAgb3B0aW9ucywgcGFyc2VkX2FyZ3MgPSBydW5fd2Via2l0X3Rlc3Rz LnBhcnNlX2FyZ3MoYXJncykKKyAgICAgICAgICAgIHRlc3RfcG9ydCA9IEltYWdlRGlmZlRlc3RQ b3J0KG9wdGlvbnM9b3B0aW9ucywgdXNlcj1Nb2NrVXNlcigpKQorICAgICAgICAgICAgcGFzc2lu Z19ydW4oYXJncz1hcmdzLCBwb3J0X29iaj10ZXN0X3BvcnQsIHRlc3RzX2luY2x1ZGVkPVRydWUp CisgICAgICAgICAgICByZXR1cm4gdGVzdF9wb3J0CisKKyAgICAgICAgYmFzZV9hcmdzID0gWyct LXBpeGVsLXRlc3RzJywgJ2ZhaWx1cmVzL2V4cGVjdGVkLyonXQorCisgICAgICAgICMgSWYgd2Ug cGFzcyBpbiBhbiBleHBsaWNpdCB0b2xlcmFuY2UgYXJndW1lbnQsIHRoZW4gdGhhdCB3aWxsIGJl IHVzZWQuCisgICAgICAgIHRlc3RfcG9ydCA9IGdldF9wb3J0X2Zvcl9ydW4oYmFzZV9hcmdzICsg WyctLXRvbGVyYW5jZScsICcuMSddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAuMSwgdGVz dF9wb3J0LnRvbGVyYW5jZV91c2VkX2Zvcl9kaWZmX2ltYWdlKQorCisgICAgICAgICMgT3RoZXJ3 aXNlIHRoZSBwb3J0J3MgZGVmYXVsdCB0b2xlcmFuY2UgdmFsdWUgc2hvdWxkIGJlIHVzZWQuCisg ICAgICAgIHRlc3RfcG9ydCA9IGdldF9wb3J0X2Zvcl9ydW4oYmFzZV9hcmdzKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKDAuMiwgdGVzdF9wb3J0LnRvbGVyYW5jZV91c2VkX2Zvcl9kaWZmX2lt YWdlKQogCiAKIGRlZiBfbW9ja2VkX29wZW4ob3JpZ2luYWxfb3BlbiwgZmlsZV9saXN0KToKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3Rf dHlwZXMvaW1hZ2VfZGlmZi5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlmZi5weQppbmRleCAwYjA1ODAyMGMwOGY0ZjUxYzEx NjIwNGRjNTRjYmY1ZDljM2U3YzZmLi5kN2EyMjIyMDdiM2MzODg5ZDc0ZDZiOTkxODY5ZWVjYzJj ZGRhYTBkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5CkBAIC04OCw3ICs4 OCw3IEBAIGNsYXNzIEltYWdlRGlmZih0ZXN0X3R5cGVfYmFzZS5UZXN0VHlwZUJhc2UpOgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW5jb2Rpbmc9ImFzY2lpIiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1nZW5lcmF0ZV9u ZXdfYmFzZWxpbmUpCiAKLSAgICBkZWYgX2NyZWF0ZV9pbWFnZV9kaWZmKHNlbGYsIHBvcnQsIGZp bGVuYW1lLCBjb25maWd1cmF0aW9uKToKKyAgICBkZWYgX2NyZWF0ZV9pbWFnZV9kaWZmKHNlbGYs IHBvcnQsIGZpbGVuYW1lLCBjb25maWd1cmF0aW9uLCB0b2xlcmFuY2UpOgogICAgICAgICAiIiJD cmVhdGVzIHRoZSB2aXN1YWwgZGlmZiBvZiB0aGUgZXhwZWN0ZWQvYWN0dWFsIFBOR3MuCiAKICAg ICAgICAgQXJnczoKQEAgLTEwNyw4ICsxMDcsMTcgQEAgY2xhc3MgSW1hZ2VEaWZmKHRlc3RfdHlw ZV9iYXNlLlRlc3RUeXBlQmFzZSk6CiAgICAgICAgIHdpdGggY29kZWNzLm9wZW4oYWN0dWFsX2Zp bGVuYW1lLCAncitiJywgTm9uZSkgYXMgZmlsZToKICAgICAgICAgICAgIGFjdHVhbF9pbWFnZSA9 IGZpbGUucmVhZCgpCiAKLSAgICAgICAgcmVzdWx0ID0gcG9ydC5kaWZmX2ltYWdlKGV4cGVjdGVk X2ltYWdlLCBhY3R1YWxfaW1hZ2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBk aWZmX2ZpbGVuYW1lKQorICAgICAgICBpZiB0b2xlcmFuY2U6CisgICAgICAgICAgICByZXN1bHQg PSBwb3J0LmRpZmZfaW1hZ2UoCisgICAgICAgICAgICAgICAgZXhwZWN0ZWRfY29udGVudHM9ZXhw ZWN0ZWRfaW1hZ2UsCisgICAgICAgICAgICAgICAgYWN0dWFsX2NvbnRlbnRzPWFjdHVhbF9pbWFn ZSwKKyAgICAgICAgICAgICAgICBkaWZmX2ZpbGVuYW1lPWRpZmZfZmlsZW5hbWUsCisgICAgICAg ICAgICAgICAgdG9sZXJhbmNlPXRvbGVyYW5jZSkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAg IHJlc3VsdCA9IHBvcnQuZGlmZl9pbWFnZSgKKyAgICAgICAgICAgICAgICBleHBlY3RlZF9jb250 ZW50cz1leHBlY3RlZF9pbWFnZSwKKyAgICAgICAgICAgICAgICBhY3R1YWxfY29udGVudHM9YWN0 dWFsX2ltYWdlLAorICAgICAgICAgICAgICAgIGRpZmZfZmlsZW5hbWU9ZGlmZl9maWxlbmFtZSkK ICAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAgICAgZGVmIGNvbXBhcmVfb3V0cHV0KHNlbGYsIHBv cnQsIGZpbGVuYW1lLCBvdXRwdXQsIHRlc3RfYXJncywgY29uZmlndXJhdGlvbik6CkBAIC0xNTcs NyArMTY2LDExIEBAIGNsYXNzIEltYWdlRGlmZih0ZXN0X3R5cGVfYmFzZS5UZXN0VHlwZUJhc2Up OgogCiAgICAgICAgICMgRXZlbiB0aG91Z2ggd2Ugb25seSB1c2UgdGhlIHJlc3VsdCBpbiBvbmUg Y29kZXBhdGggYmVsb3cgYnV0IHdlCiAgICAgICAgICMgc3RpbGwgbmVlZCB0byBjYWxsIENyZWF0 ZUltYWdlRGlmZiBmb3Igb3RoZXIgY29kZXBhdGhzLgotICAgICAgICBpbWFnZXNfYXJlX2RpZmZl cmVudCA9IHNlbGYuX2NyZWF0ZV9pbWFnZV9kaWZmKHBvcnQsIGZpbGVuYW1lLCBjb25maWd1cmF0 aW9uKQorICAgICAgICBpbWFnZXNfYXJlX2RpZmZlcmVudCA9IHNlbGYuX2NyZWF0ZV9pbWFnZV9k aWZmKAorICAgICAgICAgICAgcG9ydD1wb3J0LAorICAgICAgICAgICAgZmlsZW5hbWU9ZmlsZW5h bWUsCisgICAgICAgICAgICBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sCisgICAgICAgICAg ICB0b2xlcmFuY2U9dGVzdF9hcmdzLnRvbGVyYW5jZSkKICAgICAgICAgaWYgbm90IGV4cGVjdGVk X2hhc2g6CiAgICAgICAgICAgICBmYWlsdXJlcy5hcHBlbmQodGVzdF9mYWlsdXJlcy5GYWlsdXJl TWlzc2luZ0ltYWdlSGFzaCgpKQogICAgICAgICBlbGlmIHRlc3RfYXJncy5oYXNoICE9IGV4cGVj dGVkX2hhc2g6Cg== 71484 2010-10-21 13:41:24 -0700 2010-10-21 14:22:15 -0700 Patch bug-47959-20101021134123.patch text/plain 7004 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwNDQzMjRkYjg0ZDRhYWFiNjFiN2Q1YWY1ZDVjMzA4MmVlY2E5ZGUxLi44ODI0Yzk5 N2NkMjkzZjFkMDNhNWEyOTJhYTRjMjNhZWNhODY5OTZmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTAtMjEgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIC0tdG9sZXJhbmNlIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ3OTU5CisgICAgICAgIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig dGhlIC0tdG9sZXJhbmNlIGZsYWcgaW4gTlJXVC4gVGhlIFBvcnQuZGlmZl9pbWFnZQorICAgICAg ICBzaWduYXR1cmUgYWxyZWFkeSBpbmNsdWRlZCBhIHRvbGVyYW5jZSBwYXJhbWV0ZXIgKHRob3Vn aCBvbmx5IHRoZQorICAgICAgICBXZWJLaXRQb3J0IGltcGxlbWVudGF0aW9uIGFjdHVhbGx5IHVz ZXMgaXQpLCBpdCB3YXMganVzdCBhIG1hdHRlciBvZgorICAgICAgICBwYXNzaW5nIGl0IHRocm91 Z2ggKHRoZSBwZXItcG9ydCBkZWZhdWx0IHZhbHVlIGlzIHN0aWxsIHVzZWQpLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3Vu aXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3Rf dHlwZXMvaW1hZ2VfZGlmZi5weToKKwogMjAxMC0xMC0yMCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBh cHBsZS5jb20+CiAKICAgICAgICAgVGVzdCB0aGF0IHRoZSBVSSBjbGllbnQgZ2V0cyBub3RpZmll ZCB3aGVuIFdLVmlldyByZWNlaXZlcyBhIFdNX0NMT1NFCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQppbmRleCBkYzhhMWY0NmRjN2E0ZjhiZjFmNDViOTM3OGFmZGM5ZDNjNDg5ZjBmLi5kMjViNjI1 YTIxMTIxYTJjYzk0NzkyMmFmMmE2YTJhYmM0ZGY0MTVkIDEwMDc1NQotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHkKQEAgLTU3NSw2ICs1NzUsNyBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAgICAg dGVzdF9hcmdzLnBuZ19wYXRoID0gcG5nX3BhdGgKICAgICAgICAgdGVzdF9hcmdzLm5ld19iYXNl bGluZSA9IHNlbGYuX29wdGlvbnMubmV3X2Jhc2VsaW5lCiAgICAgICAgIHRlc3RfYXJncy5yZXNl dF9yZXN1bHRzID0gc2VsZi5fb3B0aW9ucy5yZXNldF9yZXN1bHRzCisgICAgICAgIHRlc3RfYXJn cy50b2xlcmFuY2UgPSBzZWxmLl9vcHRpb25zLnRvbGVyYW5jZQogCiAgICAgICAgIHJldHVybiB0 ZXN0X2FyZ3MKIApAQCAtMTU2Miw4ICsxNTYzLDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25l KToKICAgICAgICAgICAgIGRlc3Q9InBpeGVsX3Rlc3RzIiwgaGVscD0iRW5hYmxlIHBpeGVsLXRv LXBpeGVsIFBORyBjb21wYXJpc29ucyIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigi LS1uby1waXhlbC10ZXN0cyIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLAogICAgICAgICAgICAgZGVz dD0icGl4ZWxfdGVzdHMiLCBoZWxwPSJEaXNhYmxlIHBpeGVsLXRvLXBpeGVsIFBORyBjb21wYXJp c29ucyIpLAotICAgICAgICAjIG9sZC1ydW4td2Via2l0LXRlc3RzIGFsbG93cyBhIHNwZWNpZmlj IHRvbGVyYW5jZTogLS10b2xlcmFuY2UgdAotICAgICAgICAjIElnbm9yZSBpbWFnZSBkaWZmZXJl bmNlcyBsZXNzIHRoYW4gdGhpcyBwZXJjZW50YWdlIChkZWZhdWx0OiAwLjEpCisgICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXRvbGVyYW5jZSIsCisgICAgICAgICAgICBoZWxwPSJJZ25v cmUgaW1hZ2UgZGlmZmVyZW5jZXMgbGVzcyB0aGFuIHRoaXMgcGVyY2VudGFnZSAoc29tZSAiCisg ICAgICAgICAgICAgICAgInBvcnRzIG1heSBpZ25vcmUgdGhpcyBvcHRpb24pIiwgdHlwZT0iZmxv YXQiKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVzdWx0cy1kaXJlY3Rvcnki LAogICAgICAgICAgICAgZGVmYXVsdD0ibGF5b3V0LXRlc3QtcmVzdWx0cyIsCiAgICAgICAgICAg ICBoZWxwPSJPdXRwdXQgcmVzdWx0cyBkaXJlY3Rvcnkgc291cmNlIGRpciwgcmVsYXRpdmUgdG8g RGVidWcgb3IgIgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5k ZXggYTcxNmNlYzhjNmI2YjE1MjlmY2I1MmI0MzFkMTE3MmJjY2VkMDMxMy4uYTdmMjBkZmVkYWMz NDc4NTVhMmEyODk5YzZkMTk1NTlkMzE1NGQxYiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC00OCw2ICs0OCw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbSBpbXBvcnQgdXNlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHBv cnQKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzIGltcG9ydCBydW5fd2Via2l0X3Rlc3RzCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZSBpbXBvcnQgZHVtcF9yZW5k ZXJfdHJlZV90aHJlYWQKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQudGVzdCBpbXBv cnQgVGVzdFBvcnQKIAogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1wb3J0IE1vY2sK IApAQCAtMjYwLDYgKzI2MSwzMCBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0c19pbmNsdWRl ZD1UcnVlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHVzZXIudXJsLCAnL3RtcC9mb28vcmVz dWx0cy5odG1sJykKIAorICAgIGRlZiB0ZXN0X3RvbGVyYW5jZShzZWxmKToKKyAgICAgICAgY2xh c3MgSW1hZ2VEaWZmVGVzdFBvcnQoVGVzdFBvcnQpOgorICAgICAgICAgICAgZGVmIGRpZmZfaW1h Z2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cywKKyAgICAgICAgICAg ICAgICAgICBkaWZmX2ZpbGVuYW1lPU5vbmUsIHRvbGVyYW5jZT0wLjIpOgorICAgICAgICAgICAg ICAgIHNlbGYudG9sZXJhbmNlX3VzZWRfZm9yX2RpZmZfaW1hZ2UgPSB0b2xlcmFuY2UKKyAgICAg ICAgICAgICAgICByZXR1cm4gVHJ1ZQorCisgICAgICAgIGRlZiBnZXRfcG9ydF9mb3JfcnVuKGFy Z3MpOgorICAgICAgICAgICAgb3B0aW9ucywgcGFyc2VkX2FyZ3MgPSBydW5fd2Via2l0X3Rlc3Rz LnBhcnNlX2FyZ3MoYXJncykKKyAgICAgICAgICAgIHRlc3RfcG9ydCA9IEltYWdlRGlmZlRlc3RQ b3J0KG9wdGlvbnM9b3B0aW9ucywgdXNlcj1Nb2NrVXNlcigpKQorICAgICAgICAgICAgcGFzc2lu Z19ydW4oYXJncz1hcmdzLCBwb3J0X29iaj10ZXN0X3BvcnQsIHRlc3RzX2luY2x1ZGVkPVRydWUp CisgICAgICAgICAgICByZXR1cm4gdGVzdF9wb3J0CisKKyAgICAgICAgYmFzZV9hcmdzID0gWyct LXBpeGVsLXRlc3RzJywgJ2ZhaWx1cmVzL2V4cGVjdGVkLyonXQorCisgICAgICAgICMgSWYgd2Ug cGFzcyBpbiBhbiBleHBsaWNpdCB0b2xlcmFuY2UgYXJndW1lbnQsIHRoZW4gdGhhdCB3aWxsIGJl IHVzZWQuCisgICAgICAgIHRlc3RfcG9ydCA9IGdldF9wb3J0X2Zvcl9ydW4oYmFzZV9hcmdzICsg WyctLXRvbGVyYW5jZScsICcuMSddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAuMSwgdGVz dF9wb3J0LnRvbGVyYW5jZV91c2VkX2Zvcl9kaWZmX2ltYWdlKQorICAgICAgICB0ZXN0X3BvcnQg PSBnZXRfcG9ydF9mb3JfcnVuKGJhc2VfYXJncyArIFsnLS10b2xlcmFuY2UnLCAnMCddKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHRlc3RfcG9ydC50b2xlcmFuY2VfdXNlZF9mb3JfZGlm Zl9pbWFnZSkKKworICAgICAgICAjIE90aGVyd2lzZSB0aGUgcG9ydCdzIGRlZmF1bHQgdG9sZXJh bmNlIHZhbHVlIHNob3VsZCBiZSB1c2VkLgorICAgICAgICB0ZXN0X3BvcnQgPSBnZXRfcG9ydF9m b3JfcnVuKGJhc2VfYXJncykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgwLjIsIHRlc3RfcG9y dC50b2xlcmFuY2VfdXNlZF9mb3JfZGlmZl9pbWFnZSkKIAogCiBkZWYgX21vY2tlZF9vcGVuKG9y aWdpbmFsX29wZW4sIGZpbGVfbGlzdCk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYu cHkKaW5kZXggMGIwNTgwMjBjMDhmNGY1MWMxMTYyMDRkYzU0Y2JmNWQ5YzNlN2M2Zi4uM2M5MDU1 OGI1YmM0YWJlMTdlNzg2ZTI5Yzc5MDUxNzM3YmVjZmIzNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlw ZXMvaW1hZ2VfZGlmZi5weQpAQCAtODgsNyArODgsNyBAQCBjbGFzcyBJbWFnZURpZmYodGVzdF90 eXBlX2Jhc2UuVGVzdFR5cGVCYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGVuY29kaW5nPSJhc2NpaSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZW5l cmF0ZV9uZXdfYmFzZWxpbmU9Z2VuZXJhdGVfbmV3X2Jhc2VsaW5lKQogCi0gICAgZGVmIF9jcmVh dGVfaW1hZ2VfZGlmZihzZWxmLCBwb3J0LCBmaWxlbmFtZSwgY29uZmlndXJhdGlvbik6CisgICAg ZGVmIF9jcmVhdGVfaW1hZ2VfZGlmZihzZWxmLCBwb3J0LCBmaWxlbmFtZSwgY29uZmlndXJhdGlv biwgdG9sZXJhbmNlKToKICAgICAgICAgIiIiQ3JlYXRlcyB0aGUgdmlzdWFsIGRpZmYgb2YgdGhl IGV4cGVjdGVkL2FjdHVhbCBQTkdzLgogCiAgICAgICAgIEFyZ3M6CkBAIC0xMDcsOCArMTA3LDE3 IEBAIGNsYXNzIEltYWdlRGlmZih0ZXN0X3R5cGVfYmFzZS5UZXN0VHlwZUJhc2UpOgogICAgICAg ICB3aXRoIGNvZGVjcy5vcGVuKGFjdHVhbF9maWxlbmFtZSwgJ3IrYicsIE5vbmUpIGFzIGZpbGU6 CiAgICAgICAgICAgICBhY3R1YWxfaW1hZ2UgPSBmaWxlLnJlYWQoKQogCi0gICAgICAgIHJlc3Vs dCA9IHBvcnQuZGlmZl9pbWFnZShleHBlY3RlZF9pbWFnZSwgYWN0dWFsX2ltYWdlLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZSkKKyAgICAgICAgaWYgdG9s ZXJhbmNlIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgcmVzdWx0ID0gcG9ydC5kaWZmX2ltYWdl KAorICAgICAgICAgICAgICAgIGV4cGVjdGVkX2NvbnRlbnRzPWV4cGVjdGVkX2ltYWdlLAorICAg ICAgICAgICAgICAgIGFjdHVhbF9jb250ZW50cz1hY3R1YWxfaW1hZ2UsCisgICAgICAgICAgICAg ICAgZGlmZl9maWxlbmFtZT1kaWZmX2ZpbGVuYW1lLAorICAgICAgICAgICAgICAgIHRvbGVyYW5j ZT10b2xlcmFuY2UpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByZXN1bHQgPSBwb3J0LmRp ZmZfaW1hZ2UoCisgICAgICAgICAgICAgICAgZXhwZWN0ZWRfY29udGVudHM9ZXhwZWN0ZWRfaW1h Z2UsCisgICAgICAgICAgICAgICAgYWN0dWFsX2NvbnRlbnRzPWFjdHVhbF9pbWFnZSwKKyAgICAg ICAgICAgICAgICBkaWZmX2ZpbGVuYW1lPWRpZmZfZmlsZW5hbWUpCiAgICAgICAgIHJldHVybiBy ZXN1bHQKIAogICAgIGRlZiBjb21wYXJlX291dHB1dChzZWxmLCBwb3J0LCBmaWxlbmFtZSwgb3V0 cHV0LCB0ZXN0X2FyZ3MsIGNvbmZpZ3VyYXRpb24pOgpAQCAtMTU3LDcgKzE2NiwxMSBAQCBjbGFz cyBJbWFnZURpZmYodGVzdF90eXBlX2Jhc2UuVGVzdFR5cGVCYXNlKToKIAogICAgICAgICAjIEV2 ZW4gdGhvdWdoIHdlIG9ubHkgdXNlIHRoZSByZXN1bHQgaW4gb25lIGNvZGVwYXRoIGJlbG93IGJ1 dCB3ZQogICAgICAgICAjIHN0aWxsIG5lZWQgdG8gY2FsbCBDcmVhdGVJbWFnZURpZmYgZm9yIG90 aGVyIGNvZGVwYXRocy4KLSAgICAgICAgaW1hZ2VzX2FyZV9kaWZmZXJlbnQgPSBzZWxmLl9jcmVh dGVfaW1hZ2VfZGlmZihwb3J0LCBmaWxlbmFtZSwgY29uZmlndXJhdGlvbikKKyAgICAgICAgaW1h Z2VzX2FyZV9kaWZmZXJlbnQgPSBzZWxmLl9jcmVhdGVfaW1hZ2VfZGlmZigKKyAgICAgICAgICAg IHBvcnQ9cG9ydCwKKyAgICAgICAgICAgIGZpbGVuYW1lPWZpbGVuYW1lLAorICAgICAgICAgICAg Y29uZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLAorICAgICAgICAgICAgdG9sZXJhbmNlPXRlc3Rf YXJncy50b2xlcmFuY2UpCiAgICAgICAgIGlmIG5vdCBleHBlY3RlZF9oYXNoOgogICAgICAgICAg ICAgZmFpbHVyZXMuYXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZU1pc3NpbmdJbWFnZUhhc2go KSkKICAgICAgICAgZWxpZiB0ZXN0X2FyZ3MuaGFzaCAhPSBleHBlY3RlZF9oYXNoOgo= 71492 2010-10-21 14:22:19 -0700 2010-10-21 15:00:23 -0700 Patch bug-47959-20101021142218.patch text/plain 7694 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwNDQzMjRkYjg0ZDRhYWFiNjFiN2Q1YWY1ZDVjMzA4MmVlY2E5ZGUxLi44YWNmMTJm MzRhYTA4NTc1ODM2MGU2OWU3NDcwOGE1NTkwYTY3ZjNmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMTAtMjEgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIC0tdG9sZXJhbmNlIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ3OTU5CisgICAgICAgIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig dGhlIC0tdG9sZXJhbmNlIGZsYWcgaW4gTlJXVC4gVGhlIFBvcnQuZGlmZl9pbWFnZQorICAgICAg ICBzaWduYXR1cmUgc2hvdWxkbid0IG5lZWQgYSB0b2xlcmFuY2UgcGFyYW1ldGVyIChpdCdzIG5v dCBzZXQgcGVyIHRlc3QpLAorICAgICAgICBqdXN0IGhhdmUgcG9ydHMgdGhhdCB1c2UgaXQgKGN1 cnJlbnRseSBvbmx5IFdlYktpdFBvcnQpIHJlYWQgaXQgZnJvbSAKKyAgICAgICAgdGhlIG9wdGlv bnMgb2JqZWN0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC93ZWJraXQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorCiAyMDEwLTEwLTIwICBBZGFtIFJvYmVu ICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0IHRoYXQgdGhlIFVJIGNsaWVudCBn ZXRzIG5vdGlmaWVkIHdoZW4gV0tWaWV3IHJlY2VpdmVzIGEgV01fQ0xPU0UKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0u cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtLnB5CmluZGV4IDRkMTdiNTFjODI4YTcyZTMzYmQ5YWMyM2UxOTQ2NDY2ZTUwMzJiZWIuLjQy ZWExMWQ3N2M3ZGNiOTZlYWY0OTU0ZWJlODY0ODAwNmNlODQ2ZGIgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bS5weQpAQCAtMTM1LDcgKzEzNSw3IEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3ZlcnJpZGVfc3RlcCwgbG9nZ2luZykK IAogICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29u dGVudHMsCi0gICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZT1Ob25lLCB0b2xlcmFuY2U9 MCk6CisgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZT1Ob25lKToKICAgICAgICAgZXhl Y3V0YWJsZSA9IHNlbGYuX3BhdGhfdG9faW1hZ2VfZGlmZigpCiAKICAgICAgICAgdGVtcGRpciA9 IHRlbXBmaWxlLm1rZHRlbXAoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CmluZGV4IDM2OTFjNWFhZTlmYzMyMWM5NTE3 ODYzNmNkY2QwM2I2OWJkZGQ3M2YuLmZmNDA4NmM3NGRjMTgyYmE4NDcxMjNlNjM1NTAwZDE0NDEx ZDk5M2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3QucHkKQEAgLTEzNyw3ICsxMzcsNyBAQCBjbGFzcyBUZXN0UG9ydChi YXNlLlBvcnQpOgogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIGRpZmZfaW1hZ2Uoc2Vs ZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cywKLSAgICAgICAgICAgICAgICAg ICBkaWZmX2ZpbGVuYW1lPU5vbmUsIHRvbGVyYW5jZT0wKToKKyAgICAgICAgICAgICAgICAgICBk aWZmX2ZpbGVuYW1lPU5vbmUpOgogICAgICAgICBkaWZmZWQgPSBhY3R1YWxfY29udGVudHMgIT0g ZXhwZWN0ZWRfY29udGVudHMKICAgICAgICAgaWYgZGlmZmVkIGFuZCBkaWZmX2ZpbGVuYW1lOgog ICAgICAgICAgICAgd2l0aCBjb2RlY3Mub3BlbihkaWZmX2ZpbGVuYW1lLCAidyIsICJ1dGYtOCIp IGFzIGRpZmZfZmg6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IGM5NDBmMWU3YTA3MGE2MDc0MGU0OWJl OWRhNmVmYmJhYTljZDZhOTAuLmUwNmVlY2NmNDVkYjg3Y2IxODZkZmE5ZjFmNjNlYjVjODdkN2Qy OWQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2Via2l0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC0xMjIsMjIgKzEyMiwyMiBAQCBjbGFzcyBXZWJLaXRQ b3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgZGlmZl9pbWFn ZShzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLAotICAgICAgICAgICAg ICAgICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSwgdG9sZXJhbmNlPTAuMSk6CisgICAgICAgICAgICAg ICAgICAgZGlmZl9maWxlbmFtZT1Ob25lKToKICAgICAgICAgIiIiUmV0dXJuIFRydWUgaWYgdGhl IHR3byBmaWxlcyBhcmUgZGlmZmVyZW50LiBBbHNvIHdyaXRlIGEgZGVsdGEKICAgICAgICAgaW1h Z2Ugb2YgdGhlIHR3byBpbWFnZXMgaW50byB8ZGlmZl9maWxlbmFtZXwgaWYgaXQgaXMgbm90IE5v bmUuIiIiCiAKLSAgICAgICAgIyBGSVhNRTogZWl0aGVyIGV4cG9zZSB0aGUgdG9sZXJhbmNlIGFy Z3VtZW50IGFzIGEgY29tbWFuZC1saW5lCi0gICAgICAgICMgcGFyYW1ldGVyLCBvciBtYWtlIGl0 IGdvIGF3YXkgYW5kIGFsd2F5cyB1c2UgZXhhY3QgbWF0Y2hlcy4KLQogICAgICAgICAjIEhhbmRs ZSB0aGUgY2FzZSB3aGVyZSB0aGUgdGVzdCBkaWRuJ3QgYWN0dWFsbHkgZ2VuZXJhdGUgYW4gaW1h Z2UuCiAgICAgICAgIGlmIG5vdCBhY3R1YWxfY29udGVudHM6CiAgICAgICAgICAgICByZXR1cm4g VHJ1ZQogCi0gICAgICAgIHNwID0gc2VsZi5fZGlmZl9pbWFnZV9yZXF1ZXN0KGV4cGVjdGVkX2Nv bnRlbnRzLCBhY3R1YWxfY29udGVudHMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRvbGVyYW5jZSkKKyAgICAgICAgc3AgPSBzZWxmLl9kaWZmX2ltYWdlX3JlcXVlc3Qo ZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cykKICAgICAgICAgcmV0dXJuIHNlbGYu X2RpZmZfaW1hZ2VfcmVwbHkoc3AsIGRpZmZfZmlsZW5hbWUpCiAKLSAgICBkZWYgX2RpZmZfaW1h Z2VfcmVxdWVzdChzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xl cmFuY2UpOgorICAgIGRlZiBfZGlmZl9pbWFnZV9yZXF1ZXN0KHNlbGYsIGV4cGVjdGVkX2NvbnRl bnRzLCBhY3R1YWxfY29udGVudHMpOgorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnRvbGVyYW5j ZSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgIHRvbGVyYW5jZSA9IHNlbGYuX29wdGlvbnMudG9s ZXJhbmNlCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0b2xlcmFuY2UgPSAwLjEKICAgICAg ICAgY29tbWFuZCA9IFtzZWxmLl9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgJy0tdG9sZXJhbmNlJywg c3RyKHRvbGVyYW5jZSldCiAgICAgICAgIHNwID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2Vz cyhzZWxmLCAnSW1hZ2VEaWZmJywgY29tbWFuZCkKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkK aW5kZXggZGM4YTFmNDZkYzdhNGY4YmYxZjQ1YjkzNzhhZmRjOWQzYzQ4OWYwZi4uODk2M2QxYzA2 YTRjMjkzY2FkZTZlYjM4YzBkNTZmNzRhN2U0NzQ0MiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5CkBAIC0xNTYyLDggKzE1NjIsOSBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAg ICAgICAgICAgZGVzdD0icGl4ZWxfdGVzdHMiLCBoZWxwPSJFbmFibGUgcGl4ZWwtdG8tcGl4ZWwg UE5HIGNvbXBhcmlzb25zIiksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5vLXBp eGVsLXRlc3RzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAgICAgICAgICAgICBkZXN0PSJwaXhl bF90ZXN0cyIsIGhlbHA9IkRpc2FibGUgcGl4ZWwtdG8tcGl4ZWwgUE5HIGNvbXBhcmlzb25zIiks Ci0gICAgICAgICMgb2xkLXJ1bi13ZWJraXQtdGVzdHMgYWxsb3dzIGEgc3BlY2lmaWMgdG9sZXJh bmNlOiAtLXRvbGVyYW5jZSB0Ci0gICAgICAgICMgSWdub3JlIGltYWdlIGRpZmZlcmVuY2VzIGxl c3MgdGhhbiB0aGlzIHBlcmNlbnRhZ2UgKGRlZmF1bHQ6IDAuMSkKKyAgICAgICAgb3B0cGFyc2Uu bWFrZV9vcHRpb24oIi0tdG9sZXJhbmNlIiwKKyAgICAgICAgICAgIGhlbHA9Iklnbm9yZSBpbWFn ZSBkaWZmZXJlbmNlcyBsZXNzIHRoYW4gdGhpcyBwZXJjZW50YWdlIChzb21lICIKKyAgICAgICAg ICAgICAgICAicG9ydHMgbWF5IGlnbm9yZSB0aGlzIG9wdGlvbikiLCB0eXBlPSJmbG9hdCIpLAog ICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1yZXN1bHRzLWRpcmVjdG9yeSIsCiAgICAg ICAgICAgICBkZWZhdWx0PSJsYXlvdXQtdGVzdC1yZXN1bHRzIiwKICAgICAgICAgICAgIGhlbHA9 Ik91dHB1dCByZXN1bHRzIGRpcmVjdG9yeSBzb3VyY2UgZGlyLCByZWxhdGl2ZSB0byBEZWJ1ZyBv ciAiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCBhNzE2 Y2VjOGM2YjZiMTUyOWZjYjUyYjQzMWQxMTcyYmNjZWQwMzEzLi4wZjA5ZmZhMDQzNDIzZDczNWNj MGEzZDNjNjY3MTVkNTM3YWFhNjE0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNf dW5pdHRlc3QucHkKQEAgLTQ4LDYgKzQ4LDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVt IGltcG9ydCB1c2VyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cyBpbXBvcnQgcG9ydAogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHJ1bl93ZWJraXRfdGVzdHMKIGZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLmxheW91dF9wYWNrYWdlIGltcG9ydCBkdW1wX3JlbmRlcl90cmVl X3RocmVhZAorZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC50ZXN0IGltcG9ydCBUZXN0 UG9ydAogCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9jayBpbXBvcnQgTW9jawogCkBAIC0y NjAsNiArMjYxLDMxIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RzX2luY2x1ZGVkPVRydWUp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodXNlci51cmwsICcvdG1wL2Zvby9yZXN1bHRzLmh0 bWwnKQogCisgICAgZGVmIHRlc3RfdG9sZXJhbmNlKHNlbGYpOgorICAgICAgICBjbGFzcyBJbWFn ZURpZmZUZXN0UG9ydChUZXN0UG9ydCk6CisgICAgICAgICAgICBkZWYgZGlmZl9pbWFnZShzZWxm LCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLAorICAgICAgICAgICAgICAgICAg IGRpZmZfZmlsZW5hbWU9Tm9uZSk6CisgICAgICAgICAgICAgICAgc2VsZi50b2xlcmFuY2VfdXNl ZF9mb3JfZGlmZl9pbWFnZSA9IHNlbGYuX29wdGlvbnMudG9sZXJhbmNlCisgICAgICAgICAgICAg ICAgcmV0dXJuIFRydWUKKworICAgICAgICBkZWYgZ2V0X3BvcnRfZm9yX3J1bihhcmdzKToKKyAg ICAgICAgICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcnVuX3dlYmtpdF90ZXN0cy5wYXJzZV9h cmdzKGFyZ3MpCisgICAgICAgICAgICB0ZXN0X3BvcnQgPSBJbWFnZURpZmZUZXN0UG9ydChvcHRp b25zPW9wdGlvbnMsIHVzZXI9TW9ja1VzZXIoKSkKKyAgICAgICAgICAgIHBhc3NpbmdfcnVuKGFy Z3M9YXJncywgcG9ydF9vYmo9dGVzdF9wb3J0LCB0ZXN0c19pbmNsdWRlZD1UcnVlKQorICAgICAg ICAgICAgcmV0dXJuIHRlc3RfcG9ydAorCisgICAgICAgIGJhc2VfYXJncyA9IFsnLS1waXhlbC10 ZXN0cycsICdmYWlsdXJlcy9leHBlY3RlZC8qJ10KKworICAgICAgICAjIElmIHdlIHBhc3MgaW4g YW4gZXhwbGljaXQgdG9sZXJhbmNlIGFyZ3VtZW50LCB0aGVuIHRoYXQgd2lsbCBiZSB1c2VkLgor ICAgICAgICB0ZXN0X3BvcnQgPSBnZXRfcG9ydF9mb3JfcnVuKGJhc2VfYXJncyArIFsnLS10b2xl cmFuY2UnLCAnLjEnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgwLjEsIHRlc3RfcG9ydC50 b2xlcmFuY2VfdXNlZF9mb3JfZGlmZl9pbWFnZSkKKyAgICAgICAgdGVzdF9wb3J0ID0gZ2V0X3Bv cnRfZm9yX3J1bihiYXNlX2FyZ3MgKyBbJy0tdG9sZXJhbmNlJywgJzAnXSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbCgwLCB0ZXN0X3BvcnQudG9sZXJhbmNlX3VzZWRfZm9yX2RpZmZfaW1hZ2Up CisKKyAgICAgICAgIyBPdGhlcndpc2UgdGhlIHBvcnQncyBkZWZhdWx0IHRvbGVyYW5jZSBiZWhh dmlvciAoaW5jbHVkaW5nIGlnbm9yaW5nIGl0KQorICAgICAgICAjIHNob3VsZCBiZSB1c2VkLgor ICAgICAgICB0ZXN0X3BvcnQgPSBnZXRfcG9ydF9mb3JfcnVuKGJhc2VfYXJncykKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChOb25lLCB0ZXN0X3BvcnQudG9sZXJhbmNlX3VzZWRfZm9yX2RpZmZf aW1hZ2UpCiAKIAogZGVmIF9tb2NrZWRfb3BlbihvcmlnaW5hbF9vcGVuLCBmaWxlX2xpc3QpOgo= 71498 2010-10-21 15:00:27 -0700 2010-10-21 17:06:14 -0700 Patch bug-47959-20101021150026.patch text/plain 7862 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwNDQzMjRkYjg0ZDRhYWFiNjFiN2Q1YWY1ZDVjMzA4MmVlY2E5ZGUxLi44YWNmMTJm MzRhYTA4NTc1ODM2MGU2OWU3NDcwOGE1NTkwYTY3ZjNmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMTAtMjEgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIC0tdG9sZXJhbmNlIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ3OTU5CisgICAgICAgIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig dGhlIC0tdG9sZXJhbmNlIGZsYWcgaW4gTlJXVC4gVGhlIFBvcnQuZGlmZl9pbWFnZQorICAgICAg ICBzaWduYXR1cmUgc2hvdWxkbid0IG5lZWQgYSB0b2xlcmFuY2UgcGFyYW1ldGVyIChpdCdzIG5v dCBzZXQgcGVyIHRlc3QpLAorICAgICAgICBqdXN0IGhhdmUgcG9ydHMgdGhhdCB1c2UgaXQgKGN1 cnJlbnRseSBvbmx5IFdlYktpdFBvcnQpIHJlYWQgaXQgZnJvbSAKKyAgICAgICAgdGhlIG9wdGlv bnMgb2JqZWN0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC93ZWJraXQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorCiAyMDEwLTEwLTIwICBBZGFtIFJvYmVu ICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0IHRoYXQgdGhlIFVJIGNsaWVudCBn ZXRzIG5vdGlmaWVkIHdoZW4gV0tWaWV3IHJlY2VpdmVzIGEgV01fQ0xPU0UKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0u cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtLnB5CmluZGV4IDRkMTdiNTFjODI4YTcyZTMzYmQ5YWMyM2UxOTQ2NDY2ZTUwMzJiZWIuLjQy ZWExMWQ3N2M3ZGNiOTZlYWY0OTU0ZWJlODY0ODAwNmNlODQ2ZGIgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bS5weQpAQCAtMTM1LDcgKzEzNSw3IEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3ZlcnJpZGVfc3RlcCwgbG9nZ2luZykK IAogICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29u dGVudHMsCi0gICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZT1Ob25lLCB0b2xlcmFuY2U9 MCk6CisgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZT1Ob25lKToKICAgICAgICAgZXhl Y3V0YWJsZSA9IHNlbGYuX3BhdGhfdG9faW1hZ2VfZGlmZigpCiAKICAgICAgICAgdGVtcGRpciA9 IHRlbXBmaWxlLm1rZHRlbXAoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CmluZGV4IDM2OTFjNWFhZTlmYzMyMWM5NTE3 ODYzNmNkY2QwM2I2OWJkZGQ3M2YuLmZmNDA4NmM3NGRjMTgyYmE4NDcxMjNlNjM1NTAwZDE0NDEx ZDk5M2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3QucHkKQEAgLTEzNyw3ICsxMzcsNyBAQCBjbGFzcyBUZXN0UG9ydChi YXNlLlBvcnQpOgogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIGRpZmZfaW1hZ2Uoc2Vs ZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cywKLSAgICAgICAgICAgICAgICAg ICBkaWZmX2ZpbGVuYW1lPU5vbmUsIHRvbGVyYW5jZT0wKToKKyAgICAgICAgICAgICAgICAgICBk aWZmX2ZpbGVuYW1lPU5vbmUpOgogICAgICAgICBkaWZmZWQgPSBhY3R1YWxfY29udGVudHMgIT0g ZXhwZWN0ZWRfY29udGVudHMKICAgICAgICAgaWYgZGlmZmVkIGFuZCBkaWZmX2ZpbGVuYW1lOgog ICAgICAgICAgICAgd2l0aCBjb2RlY3Mub3BlbihkaWZmX2ZpbGVuYW1lLCAidyIsICJ1dGYtOCIp IGFzIGRpZmZfZmg6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IGM5NDBmMWU3YTA3MGE2MDc0MGU0OWJl OWRhNmVmYmJhYTljZDZhOTAuLjI0ZDMxYTdiYTRkNTljZTA0MTQ5NTMzYjQ3YjM0NDY5NWI2NWRl MjQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2Via2l0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC0xMjIsMjIgKzEyMiwyNSBAQCBjbGFzcyBXZWJLaXRQ b3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgZGlmZl9pbWFn ZShzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLAotICAgICAgICAgICAg ICAgICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSwgdG9sZXJhbmNlPTAuMSk6CisgICAgICAgICAgICAg ICAgICAgZGlmZl9maWxlbmFtZT1Ob25lKToKICAgICAgICAgIiIiUmV0dXJuIFRydWUgaWYgdGhl IHR3byBmaWxlcyBhcmUgZGlmZmVyZW50LiBBbHNvIHdyaXRlIGEgZGVsdGEKICAgICAgICAgaW1h Z2Ugb2YgdGhlIHR3byBpbWFnZXMgaW50byB8ZGlmZl9maWxlbmFtZXwgaWYgaXQgaXMgbm90IE5v bmUuIiIiCiAKLSAgICAgICAgIyBGSVhNRTogZWl0aGVyIGV4cG9zZSB0aGUgdG9sZXJhbmNlIGFy Z3VtZW50IGFzIGEgY29tbWFuZC1saW5lCi0gICAgICAgICMgcGFyYW1ldGVyLCBvciBtYWtlIGl0 IGdvIGF3YXkgYW5kIGFsd2F5cyB1c2UgZXhhY3QgbWF0Y2hlcy4KLQogICAgICAgICAjIEhhbmRs ZSB0aGUgY2FzZSB3aGVyZSB0aGUgdGVzdCBkaWRuJ3QgYWN0dWFsbHkgZ2VuZXJhdGUgYW4gaW1h Z2UuCiAgICAgICAgIGlmIG5vdCBhY3R1YWxfY29udGVudHM6CiAgICAgICAgICAgICByZXR1cm4g VHJ1ZQogCi0gICAgICAgIHNwID0gc2VsZi5fZGlmZl9pbWFnZV9yZXF1ZXN0KGV4cGVjdGVkX2Nv bnRlbnRzLCBhY3R1YWxfY29udGVudHMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRvbGVyYW5jZSkKKyAgICAgICAgc3AgPSBzZWxmLl9kaWZmX2ltYWdlX3JlcXVlc3Qo ZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cykKICAgICAgICAgcmV0dXJuIHNlbGYu X2RpZmZfaW1hZ2VfcmVwbHkoc3AsIGRpZmZfZmlsZW5hbWUpCiAKLSAgICBkZWYgX2RpZmZfaW1h Z2VfcmVxdWVzdChzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xl cmFuY2UpOgorICAgIGRlZiBfZGlmZl9pbWFnZV9yZXF1ZXN0KHNlbGYsIGV4cGVjdGVkX2NvbnRl bnRzLCBhY3R1YWxfY29udGVudHMpOgorICAgICAgICAjIEZJWE1FOiB1c2Ugc2VsZi5nZXRfb3B0 aW9uKCd0b2xlcmFuY2UnKSBhbmQKKyAgICAgICAgIyBzZWxmLnNldF9vcHRpb25fZGVmYXVsdCgn dG9sZXJhbmNlJywgMC4xKSBvbmNlIHRoYXQgYmVoYXZlcyBjb3JyZWN0bHkKKyAgICAgICAgIyB3 aXRoIGRlZmF1bHQgdmFsdWVzLgorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnRvbGVyYW5jZSBp cyBub3QgTm9uZToKKyAgICAgICAgICAgIHRvbGVyYW5jZSA9IHNlbGYuX29wdGlvbnMudG9sZXJh bmNlCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0b2xlcmFuY2UgPSAwLjEKICAgICAgICAg Y29tbWFuZCA9IFtzZWxmLl9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgJy0tdG9sZXJhbmNlJywgc3Ry KHRvbGVyYW5jZSldCiAgICAgICAgIHNwID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2Vzcyhz ZWxmLCAnSW1hZ2VEaWZmJywgY29tbWFuZCkKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5k ZXggZGM4YTFmNDZkYzdhNGY4YmYxZjQ1YjkzNzhhZmRjOWQzYzQ4OWYwZi4uODk2M2QxYzA2YTRj MjkzY2FkZTZlYjM4YzBkNTZmNzRhN2U0NzQ0MiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 CkBAIC0xNTYyLDggKzE1NjIsOSBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAg ICAgICAgZGVzdD0icGl4ZWxfdGVzdHMiLCBoZWxwPSJFbmFibGUgcGl4ZWwtdG8tcGl4ZWwgUE5H IGNvbXBhcmlzb25zIiksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5vLXBpeGVs LXRlc3RzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsCiAgICAgICAgICAgICBkZXN0PSJwaXhlbF90 ZXN0cyIsIGhlbHA9IkRpc2FibGUgcGl4ZWwtdG8tcGl4ZWwgUE5HIGNvbXBhcmlzb25zIiksCi0g ICAgICAgICMgb2xkLXJ1bi13ZWJraXQtdGVzdHMgYWxsb3dzIGEgc3BlY2lmaWMgdG9sZXJhbmNl OiAtLXRvbGVyYW5jZSB0Ci0gICAgICAgICMgSWdub3JlIGltYWdlIGRpZmZlcmVuY2VzIGxlc3Mg dGhhbiB0aGlzIHBlcmNlbnRhZ2UgKGRlZmF1bHQ6IDAuMSkKKyAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0tdG9sZXJhbmNlIiwKKyAgICAgICAgICAgIGhlbHA9Iklnbm9yZSBpbWFnZSBk aWZmZXJlbmNlcyBsZXNzIHRoYW4gdGhpcyBwZXJjZW50YWdlIChzb21lICIKKyAgICAgICAgICAg ICAgICAicG9ydHMgbWF5IGlnbm9yZSB0aGlzIG9wdGlvbikiLCB0eXBlPSJmbG9hdCIpLAogICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1yZXN1bHRzLWRpcmVjdG9yeSIsCiAgICAgICAg ICAgICBkZWZhdWx0PSJsYXlvdXQtdGVzdC1yZXN1bHRzIiwKICAgICAgICAgICAgIGhlbHA9Ik91 dHB1dCByZXN1bHRzIGRpcmVjdG9yeSBzb3VyY2UgZGlyLCByZWxhdGl2ZSB0byBEZWJ1ZyBvciAi CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCBhNzE2Y2Vj OGM2YjZiMTUyOWZjYjUyYjQzMWQxMTcyYmNjZWQwMzEzLi4wZjA5ZmZhMDQzNDIzZDczNWNjMGEz ZDNjNjY3MTVkNTM3YWFhNjE0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5p dHRlc3QucHkKQEAgLTQ4LDYgKzQ4LDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGlt cG9ydCB1c2VyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cyBpbXBvcnQgcG9ydAogZnJvbSB3 ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHJ1bl93ZWJraXRfdGVzdHMKIGZyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLmxheW91dF9wYWNrYWdlIGltcG9ydCBkdW1wX3JlbmRlcl90cmVlX3Ro cmVhZAorZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC50ZXN0IGltcG9ydCBUZXN0UG9y dAogCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9jayBpbXBvcnQgTW9jawogCkBAIC0yNjAs NiArMjYxLDMxIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RzX2luY2x1ZGVkPVRydWUpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodXNlci51cmwsICcvdG1wL2Zvby9yZXN1bHRzLmh0bWwn KQogCisgICAgZGVmIHRlc3RfdG9sZXJhbmNlKHNlbGYpOgorICAgICAgICBjbGFzcyBJbWFnZURp ZmZUZXN0UG9ydChUZXN0UG9ydCk6CisgICAgICAgICAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBl eHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLAorICAgICAgICAgICAgICAgICAgIGRp ZmZfZmlsZW5hbWU9Tm9uZSk6CisgICAgICAgICAgICAgICAgc2VsZi50b2xlcmFuY2VfdXNlZF9m b3JfZGlmZl9pbWFnZSA9IHNlbGYuX29wdGlvbnMudG9sZXJhbmNlCisgICAgICAgICAgICAgICAg cmV0dXJuIFRydWUKKworICAgICAgICBkZWYgZ2V0X3BvcnRfZm9yX3J1bihhcmdzKToKKyAgICAg ICAgICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcnVuX3dlYmtpdF90ZXN0cy5wYXJzZV9hcmdz KGFyZ3MpCisgICAgICAgICAgICB0ZXN0X3BvcnQgPSBJbWFnZURpZmZUZXN0UG9ydChvcHRpb25z PW9wdGlvbnMsIHVzZXI9TW9ja1VzZXIoKSkKKyAgICAgICAgICAgIHBhc3NpbmdfcnVuKGFyZ3M9 YXJncywgcG9ydF9vYmo9dGVzdF9wb3J0LCB0ZXN0c19pbmNsdWRlZD1UcnVlKQorICAgICAgICAg ICAgcmV0dXJuIHRlc3RfcG9ydAorCisgICAgICAgIGJhc2VfYXJncyA9IFsnLS1waXhlbC10ZXN0 cycsICdmYWlsdXJlcy9leHBlY3RlZC8qJ10KKworICAgICAgICAjIElmIHdlIHBhc3MgaW4gYW4g ZXhwbGljaXQgdG9sZXJhbmNlIGFyZ3VtZW50LCB0aGVuIHRoYXQgd2lsbCBiZSB1c2VkLgorICAg ICAgICB0ZXN0X3BvcnQgPSBnZXRfcG9ydF9mb3JfcnVuKGJhc2VfYXJncyArIFsnLS10b2xlcmFu Y2UnLCAnLjEnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgwLjEsIHRlc3RfcG9ydC50b2xl cmFuY2VfdXNlZF9mb3JfZGlmZl9pbWFnZSkKKyAgICAgICAgdGVzdF9wb3J0ID0gZ2V0X3BvcnRf Zm9yX3J1bihiYXNlX2FyZ3MgKyBbJy0tdG9sZXJhbmNlJywgJzAnXSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbCgwLCB0ZXN0X3BvcnQudG9sZXJhbmNlX3VzZWRfZm9yX2RpZmZfaW1hZ2UpCisK KyAgICAgICAgIyBPdGhlcndpc2UgdGhlIHBvcnQncyBkZWZhdWx0IHRvbGVyYW5jZSBiZWhhdmlv ciAoaW5jbHVkaW5nIGlnbm9yaW5nIGl0KQorICAgICAgICAjIHNob3VsZCBiZSB1c2VkLgorICAg ICAgICB0ZXN0X3BvcnQgPSBnZXRfcG9ydF9mb3JfcnVuKGJhc2VfYXJncykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChOb25lLCB0ZXN0X3BvcnQudG9sZXJhbmNlX3VzZWRfZm9yX2RpZmZfaW1h Z2UpCiAKIAogZGVmIF9tb2NrZWRfb3BlbihvcmlnaW5hbF9vcGVuLCBmaWxlX2xpc3QpOgo=