46407 2010-09-23 14:38:12 -0700 Allow rebaselines for webkit-patch rebaseline to be chosen 2010-09-24 18:36:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip abarth commit-queue eric webkit.review.bot oldest_to_newest 283965 0 mihaip 2010-09-23 14:38:12 -0700 Allow rebaselines for webkit-patch rebaseline to be chosen 283967 1 68594 mihaip 2010-09-23 14:39:06 -0700 Created attachment 68594 Patch 283969 2 mihaip 2010-09-23 14:39:37 -0700 Adam or Eric, can you review? 283971 3 webkit.review.bot 2010-09-23 14:40:25 -0700 Attachment 68594 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/Scripts/webkitpy/tool/commands/rebaseline.py:77: whitespace before ']' [pep8/E202] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 284616 4 68594 abarth 2010-09-24 12:20:49 -0700 Comment on attachment 68594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68594&action=review Good idea. I'd prefer if we could avoid adding more command line arguments. They add complexity, especially for commands that aren't used that often. > WebKitTools/Scripts/webkitpy/common/system/user.py:77 > - result = int(cls.prompt("Enter a number: ")) - 1 > - return list_items[result] > + if can_choose_multiple: > + response = cls.prompt("Enter one or more numbers (comma-separated): ") > + indices = [int(r) - 1 for r in re.split("\s*,\s*", response)] > + return [list_items[i] for i in indices] > + else: > + result = int(cls.prompt("Enter a number: ")) - 1 > + return list_items[result] Do we want better error handling if the user doesn't enter an int? > WebKitTools/Scripts/webkitpy/tool/commands/rebaseline.py:115 > + if options.choose_rebaselines: > + tests_to_update = self._tool.user.prompt_with_list("Which test(s) to rebaseline:", tests_to_update, can_choose_multiple=True) Rather than making it a command-line option, can we just have prompt_with_list+can_choose_multiple make it easy to choose all? Maybe the empty string is how you choose all? 284618 5 abarth 2010-09-24 12:22:16 -0700 Alternatively, the string "all" could mean choose all. 284799 6 68779 mihaip 2010-09-24 16:02:20 -0700 Created attachment 68779 Patch 284800 7 mihaip 2010-09-24 16:02:54 -0700 (In reply to comment #5) > Alternatively, the string "all" could mean choose all. I like that. Also added basic validation (and a test). 284805 8 68779 abarth 2010-09-24 16:06:54 -0700 Comment on attachment 68779 Patch Great. Thanks! 284807 9 68779 eric 2010-09-24 16:07:50 -0700 Comment on attachment 68779 Patch Interesting. I had assumed that users would just git revert ones they didn't want to change. But this works too. I like the new features in prompt_with_list. I'm torn as to if raw_input should have been mocked through the use of an instance method on User instead of a parameter to the function. In general looks fine. Yay tests! What does enter do? Seems we should test the empty input string/default value too. I would expect enter to just do "all" in the case of rebaseline tool. 284815 10 mihaip 2010-09-24 16:14:21 -0700 (In reply to comment #9) > (From update of attachment 68779 [details]) > Interesting. I had assumed that users would just git revert ones they didn't want to change. My usecase was that I was trying to be a good citizen and updatet the baselines for Windows for a test I had just changed. The Windows bot often has lots of other failing tests, so it was annoying to revert all baselines that got downloaded except for the one that I was interested in. > But this works too. I like the new features in prompt_with_list. I'm torn as to if raw_input should have been mocked through the use of an instance method on User instead of a parameter to the function. But prompt and prompt_with_list are both class methods (not sure if the FIXME above is still relevant). > What does enter do? Seems we should test the empty input string/default value too. I would expect enter to just do "all" in the case of rebaseline tool. Sure, I can do that. 284817 11 68783 mihaip 2010-09-24 16:14:53 -0700 Created attachment 68783 Patch 284900 12 68783 commit-queue 2010-09-24 18:36:44 -0700 Comment on attachment 68783 Patch Clearing flags on attachment: 68783 Committed r68317: <http://trac.webkit.org/changeset/68317> 284901 13 commit-queue 2010-09-24 18:36:49 -0700 All reviewed patches have been landed. Closing bug. 68594 2010-09-23 14:39:06 -0700 2010-09-24 16:02:17 -0700 Patch bug-46407-20100923143905.patch text/plain 4095 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0OGI1ZTE0OGU2OGQwYzQwOWQzNTgwMTcwMGJhZWZiYTU0MWZiM2Y3Li5kODUxZTY4 MDkzOWY1MThmY2M3M2ZkOWJhYjBmM2M2NmZiMjhmYmMyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDktMjMgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgcmViYXNl bGluZXMgZm9yIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIHRvIGJlIGNob3NlbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MDcKKyAgICAgICAgCisg ICAgICAgIEluc3RlYWQgb2YgYWx3YXlzIHJlYmFzZWxpbmluZyBhbGwgZmFpbGluZyB0ZXN0cywg YWxsb3cgYSBzdWJzZXQgdG8gYmUKKyAgICAgICAgY2hvc2VuIHdoZW4gLS1jaG9vc2UtcmViYXNl bGluZXMgaXMgcGFzc2VkIGluLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3VzZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3JlYmFzZWxpbmUucHk6CisKIDIwMTAtMDktMjMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS91c2VyLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKaW5kZXggOTQ0NGMw MGM1OGY1M2QzYzI2MmIxZWFlNWUwYzQ0M2I5NzhiM2YxNy4uOWYzZTI5YmZkNzE5YjYwZDJjNzZj ZTA0ZTMxOTFjYWFiMzg1ZmJiNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKQEAgLTI4LDYgKzI4LDcgQEAKIAogaW1wb3J0IGxv Z2dpbmcKIGltcG9ydCBvcworaW1wb3J0IHJlCiBpbXBvcnQgc2hsZXgKIGltcG9ydCBzdWJwcm9j ZXNzCiBpbXBvcnQgc3lzCkBAIC02MSwxNCArNjIsMTkgQEAgY2xhc3MgVXNlcihvYmplY3QpOgog ICAgICAgICByZXR1cm4gcmVzcG9uc2UKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBwcm9t cHRfd2l0aF9saXN0KGNscywgbGlzdF90aXRsZSwgbGlzdF9pdGVtcyk6CisgICAgZGVmIHByb21w dF93aXRoX2xpc3QoY2xzLCBsaXN0X3RpdGxlLCBsaXN0X2l0ZW1zLCBjYW5fY2hvb3NlX211bHRp cGxlPUZhbHNlKToKICAgICAgICAgcHJpbnQgbGlzdF90aXRsZQogICAgICAgICBpID0gMAogICAg ICAgICBmb3IgaXRlbSBpbiBsaXN0X2l0ZW1zOgogICAgICAgICAgICAgaSArPSAxCiAgICAgICAg ICAgICBwcmludCAiJTJkLiAlcyIgJSAoaSwgaXRlbSkKLSAgICAgICAgcmVzdWx0ID0gaW50KGNs cy5wcm9tcHQoIkVudGVyIGEgbnVtYmVyOiAiKSkgLSAxCi0gICAgICAgIHJldHVybiBsaXN0X2l0 ZW1zW3Jlc3VsdF0KKyAgICAgICAgaWYgY2FuX2Nob29zZV9tdWx0aXBsZToKKyAgICAgICAgICAg IHJlc3BvbnNlID0gY2xzLnByb21wdCgiRW50ZXIgb25lIG9yIG1vcmUgbnVtYmVycyAoY29tbWEt c2VwYXJhdGVkKTogIikKKyAgICAgICAgICAgIGluZGljZXMgPSBbaW50KHIpIC0gMSBmb3IgciBp biByZS5zcGxpdCgiXHMqLFxzKiIsIHJlc3BvbnNlKV0KKyAgICAgICAgICAgIHJldHVybiBbbGlz dF9pdGVtc1tpXSBmb3IgaSBpbiBpbmRpY2VzXQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg cmVzdWx0ID0gaW50KGNscy5wcm9tcHQoIkVudGVyIGEgbnVtYmVyOiAiKSkgLSAxCisgICAgICAg ICAgICByZXR1cm4gbGlzdF9pdGVtc1tyZXN1bHRdCiAKICAgICBkZWYgZWRpdChzZWxmLCBmaWxl cyk6CiAgICAgICAgIGVkaXRvciA9IG9zLmVudmlyb24uZ2V0KCJFRElUT1IiKSBvciAidmkiCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmVi YXNlbGluZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9y ZWJhc2VsaW5lLnB5CmluZGV4IGQ2ZTQ4NDBlODY1YTU0NDA1MmE4N2ZiN2JkNjhjMGNkNTg1ODkw NTIuLjAwY2M1MzY1MzhkNTkyMWY0MmIyZGExNDZhMmQzZTg1ZGE0ZjgxZTMgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lLnB5CkBAIC0zMSw2ICszMSw4IEBAIGltcG9ydCByZQogaW1wb3J0IHNodXRpbAogaW1wb3J0 IHVybGxpYgogCitmcm9tIG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgorCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5uZXQuYnVpbGRib3QgaW1wb3J0IEJ1aWxkQm90LCBMYXlvdXRUZXN0UmVzdWx0 cwogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnVzZXIgaW1wb3J0IFVzZXIKIGZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGZhY3RvcnkKQEAgLTcwLDYgKzcyLDEyIEBA IGNsYXNzIFJlYmFzZWxpbmUoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgogICAgIG5hbWUg PSAicmViYXNlbGluZSIKICAgICBoZWxwX3RleHQgPSAiUmVwbGFjZXMgbG9jYWwgZXhwZWN0ZWQu dHh0IGZpbGVzIHdpdGggbmV3IHJlc3VsdHMgZnJvbSBidWlsZCBib3RzIgogCisgICAgZGVmIF9f aW5pdF9fKHNlbGYpOgorICAgICAgICBvcHRpb25zID0gWworICAgICAgICAgICAgbWFrZV9vcHRp b24oIi0tY2hvb3NlLXJlYmFzZWxpbmVzIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0iY2hv b3NlX3JlYmFzZWxpbmVzIiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iQ2hvb3NlIHdoaWNoIHJlYmFz ZWxpbmVzIHRvIGNvcHkgdmlhIGEgcHJvbXB0LCBpbnN0ZWFkIG9mIGNvcHlpbmcgYWxsIG9mIHRo ZW0uIikKKyAgICAgICAgXQorICAgICAgICBBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZC5fX2lu aXRfXyhzZWxmLCBvcHRpb25zKQorCiAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgc2hhcmUgbW9y ZSBjb2RlIHdpdGggRmFpbHVyZVJlYXNvbi5fYnVpbGRlcl90b19leHBsYWluCiAgICAgZGVmIF9i dWlsZGVyX3RvX3B1bGxfZnJvbShzZWxmKToKICAgICAgICAgYnVpbGRlcl9zdGF0dXNlcyA9IHNl bGYuX3Rvb2wuYnVpbGRib3QuYnVpbGRlcl9zdGF0dXNlcygpCkBAIC0xMDIsNyArMTEwLDExIEBA IGNsYXNzIFJlYmFzZWxpbmUoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgogICAgICAgICBi dWlsZCA9IGJ1aWxkZXIuYnVpbGQoYnVpbGRfbnVtYmVyKQogICAgICAgICBwb3J0ID0gQnVpbGRl clRvUG9ydCgpLnBvcnRfZm9yX2J1aWxkZXIoYnVpbGRlci5uYW1lKCkpCiAKLSAgICAgICAgZm9y IHRlc3QgaW4gc2VsZi5fdGVzdHNfdG9fdXBkYXRlKGJ1aWxkKToKKyAgICAgICAgdGVzdHNfdG9f dXBkYXRlID0gc2VsZi5fdGVzdHNfdG9fdXBkYXRlKGJ1aWxkKQorICAgICAgICBpZiBvcHRpb25z LmNob29zZV9yZWJhc2VsaW5lczoKKyAgICAgICAgICAgIHRlc3RzX3RvX3VwZGF0ZSA9IHNlbGYu X3Rvb2wudXNlci5wcm9tcHRfd2l0aF9saXN0KCJXaGljaCB0ZXN0KHMpIHRvIHJlYmFzZWxpbmU6 IiwgdGVzdHNfdG9fdXBkYXRlLCBjYW5fY2hvb3NlX211bHRpcGxlPVRydWUpCisKKyAgICAgICAg Zm9yIHRlc3QgaW4gdGVzdHNfdG9fdXBkYXRlOgogICAgICAgICAgICAgcmVzdWx0c191cmwgPSBz ZWxmLl9yZXN1bHRzX3VybF9mb3JfdGVzdChidWlsZCwgdGVzdCkKICAgICAgICAgICAgICMgUG9y dCBvcGVyYXRlcyB3aXRoIGFic29sdXRlIHBhdGhzLgogICAgICAgICAgICAgYWJzb2x1dGVfcGF0 aCA9IG9zLnBhdGguam9pbihwb3J0LmxheW91dF90ZXN0c19kaXIoKSwgdGVzdCkK 68779 2010-09-24 16:02:20 -0700 2010-09-24 16:14:50 -0700 Patch bug-46407-20100924160219.patch text/plain 5006 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NDRhNmI5NDliMjAwZmY5MjVkMzNjNWM2Y2IzZmI2M2E3MDRkM2QyLi45MzgxNWIw YWUzYjc1MDg5YzRhMWM4OTIxMTFmZGRlMzc1OGUyNGYyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDktMjQgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgcmViYXNl bGluZXMgZm9yIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIHRvIGJlIGNob3NlbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MDcKKyAgICAgICAgCisg ICAgICAgIEluc3RlYWQgb2YgYWx3YXlzIHJlYmFzZWxpbmluZyBhbGwgZmFpbGluZyB0ZXN0cywg YWxsb3cgYSBzdWJzZXQgdG8gYmUKKyAgICAgICAgY2hvc2VuLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisKIDIwMTAtMDktMjQgIEtlbmljaGkg SXNoaWJhc2hpICA8YmFzaGlAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS91c2VyLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL3VzZXIucHkKaW5kZXggOTQ0NGMwMGM1OGY1M2QzYzI2MmIxZWFlNWUwYzQ0M2I5NzhiM2Yx Ny4uOTdkOTg0MmNhNjk4NGM1YzdjY2QxYmI1YjlmMDEwY2FlYmVjZDJlZiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKQEAgLTI4 LDYgKzI4LDcgQEAKIAogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcworaW1wb3J0IHJlCiBpbXBv cnQgc2hsZXgKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCkBAIC02MSwxNCArNjIsMzAg QEAgY2xhc3MgVXNlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gcmVzcG9uc2UKIAogICAgIEBj bGFzc21ldGhvZAotICAgIGRlZiBwcm9tcHRfd2l0aF9saXN0KGNscywgbGlzdF90aXRsZSwgbGlz dF9pdGVtcyk6CisgICAgZGVmIHByb21wdF93aXRoX2xpc3QoY2xzLCBsaXN0X3RpdGxlLCBsaXN0 X2l0ZW1zLCBjYW5fY2hvb3NlX211bHRpcGxlPUZhbHNlLCByYXdfaW5wdXQ9cmF3X2lucHV0KToK ICAgICAgICAgcHJpbnQgbGlzdF90aXRsZQogICAgICAgICBpID0gMAogICAgICAgICBmb3IgaXRl bSBpbiBsaXN0X2l0ZW1zOgogICAgICAgICAgICAgaSArPSAxCiAgICAgICAgICAgICBwcmludCAi JTJkLiAlcyIgJSAoaSwgaXRlbSkKLSAgICAgICAgcmVzdWx0ID0gaW50KGNscy5wcm9tcHQoIkVu dGVyIGEgbnVtYmVyOiAiKSkgLSAxCi0gICAgICAgIHJldHVybiBsaXN0X2l0ZW1zW3Jlc3VsdF0K KworICAgICAgICAjIExvb3AgdW50aWwgd2UgZ2V0IHZhbGlkIGlucHV0CisgICAgICAgIHdoaWxl IFRydWU6CisgICAgICAgICAgICBpZiBjYW5fY2hvb3NlX211bHRpcGxlOgorICAgICAgICAgICAg ICAgIHJlc3BvbnNlID0gY2xzLnByb21wdCgiRW50ZXIgb25lIG9yIG1vcmUgbnVtYmVycyAoY29t bWEtc2VwYXJhdGVkKSwgb3IgXCJhbGxcIjogIiwgcmF3X2lucHV0PXJhd19pbnB1dCkKKyAgICAg ICAgICAgICAgICBpZiByZXNwb25zZSA9PSAiYWxsIjoKKyAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGxpc3RfaXRlbXMKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAg IGluZGljZXMgPSBbaW50KHIpIC0gMSBmb3IgciBpbiByZS5zcGxpdCgiXHMqLFxzKiIsIHJlc3Bv bnNlKV0KKyAgICAgICAgICAgICAgICBleGNlcHQgVmFsdWVFcnJvciwgZXJyOgorICAgICAgICAg ICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgICAgIHJldHVybiBbbGlzdF9pdGVtc1tp XSBmb3IgaSBpbiBpbmRpY2VzXQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICB0 cnk6CisgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IGludChjbHMucHJvbXB0KCJFbnRlciBh IG51bWJlcjogIiwgcmF3X2lucHV0PXJhd19pbnB1dCkpIC0gMQorICAgICAgICAgICAgICAgIGV4 Y2VwdCBWYWx1ZUVycm9yLCBlcnI6CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgICAg ICAgICAgICAgICAgcmV0dXJuIGxpc3RfaXRlbXNbcmVzdWx0XQogCiAgICAgZGVmIGVkaXQoc2Vs ZiwgZmlsZXMpOgogICAgICAgICBlZGl0b3IgPSBvcy5lbnZpcm9uLmdldCgiRURJVE9SIikgb3Ig InZpIgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL3VzZXJfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vdXNlcl91bml0dGVzdC5weQppbmRleCBkYWRlYWQzZWY2YjY1OWE4YWEzOTZmZWEz ODAyYTZlM2YxM2IzNzIwLi41M2U4ZjQ0ZWE0NTkyYTM5NjE0Nzg1MDg2NjU0OWE3YWNmYmYwN2Mx IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v dXNlcl91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vdXNlcl91bml0dGVzdC5weQpAQCAtNTAsNSArNTAsMjAgQEAgY2xhc3MgVXNlclRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChVc2VyLnByb21wdCgiaW5wdXQiLCByZXBlYXQ9c2VsZi5yZXBlYXRz UmVtYWluaW5nLCByYXdfaW5wdXQ9bW9ja19yYXdfaW5wdXQpLCBOb25lKQogCisgICAgZGVmIHRl c3RfcHJvbXB0X3dpdGhfbGlzdChzZWxmKToKKyAgICAgICAgZGVmIHJ1bl9wcm9tcHRfdGVzdChv cHRpb25zLCBpbnB1dHMsIGV4cGVjdGVkX3Jlc3VsdCwgY2FuX2Nob29zZV9tdWx0aXBsZT1GYWxz ZSk6CisgICAgICAgICAgICBkZWYgbW9ja19yYXdfaW5wdXQobWVzc2FnZSk6CisgICAgICAgICAg ICAgICAgcmV0dXJuIGlucHV0cy5wb3AoMCkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo VXNlci5wcm9tcHRfd2l0aF9saXN0KCJ0aXRsZSIsIG9wdGlvbnMsIGNhbl9jaG9vc2VfbXVsdGlw bGU9Y2FuX2Nob29zZV9tdWx0aXBsZSwgcmF3X2lucHV0PW1vY2tfcmF3X2lucHV0KSwgZXhwZWN0 ZWRfcmVzdWx0KQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oaW5wdXRzKSwgMCkK KworICAgICAgICBydW5fcHJvbXB0X3Rlc3QoWyJmb28iLCAiYmFyIl0sIFsiMSJdLCAiZm9vIikK KyAgICAgICAgcnVuX3Byb21wdF90ZXN0KFsiZm9vIiwgImJhciJdLCBbImJhZGlucHV0IiwgIjIi XSwgImJhciIpCisKKyAgICAgICAgcnVuX3Byb21wdF90ZXN0KFsiZm9vIiwgImJhciJdLCBbIjEs MiJdLCBbImZvbyIsICJiYXIiXSwgY2FuX2Nob29zZV9tdWx0aXBsZT1UcnVlKQorICAgICAgICBy dW5fcHJvbXB0X3Rlc3QoWyJmb28iLCAiYmFyIl0sIFsiICAxLCAgMiAgICJdLCBbImZvbyIsICJi YXIiXSwgY2FuX2Nob29zZV9tdWx0aXBsZT1UcnVlKQorICAgICAgICBydW5fcHJvbXB0X3Rlc3Qo WyJmb28iLCAiYmFyIl0sIFsiYWxsIl0sIFsiZm9vIiwgImJhciJdLCBjYW5fY2hvb3NlX211bHRp cGxlPVRydWUpCisgICAgICAgIHJ1bl9wcm9tcHRfdGVzdChbImZvbyIsICJiYXIiXSwgWyJiYWRp bnB1dCIsICJhbGwiXSwgWyJmb28iLCAiYmFyIl0sIGNhbl9jaG9vc2VfbXVsdGlwbGU9VHJ1ZSkK KwogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmUucHkKaW5kZXggZDZlNDg0MGU4NjVhNTQ0MDUyYTg3ZmI3YmQ2OGMwY2Q1ODU4OTA1Mi4u YWJmYTg1MDVkMTdmYjkwY2Y2ZjNlZTVkNTZlZTIwNjMyNWEzYjFmNiAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUu cHkKQEAgLTkwLDcgKzkwLDggQEAgY2xhc3MgUmViYXNlbGluZShBYnN0cmFjdERlY2xhcmF0aXZl Q29tbWFuZCk6CiAgICAgICAgIHBhcnNlZF9yZXN1bHRzID0gYnVpbGQubGF5b3V0X3Rlc3RfcmVz dWx0cygpLnBhcnNlZF9yZXN1bHRzKCkKICAgICAgICAgIyBGSVhNRTogVGhpcyBwcm9iYWJseSBi ZWxvbmdzIGFzIEFQSSBvbiBMYXlvdXRUZXN0UmVzdWx0cwogICAgICAgICAjIGJ1dCAuZmFpbGlu Z190ZXN0cygpIGFscmVhZHkgbWVhbnMgc29tZXRoaW5nIGVsc2UuCi0gICAgICAgIHJldHVybiBw YXJzZWRfcmVzdWx0c1tMYXlvdXRUZXN0UmVzdWx0cy5mYWlsX2tleV0KKyAgICAgICAgZmFpbGlu Z190ZXN0cyA9IHBhcnNlZF9yZXN1bHRzW0xheW91dFRlc3RSZXN1bHRzLmZhaWxfa2V5XQorICAg ICAgICByZXR1cm4gc2VsZi5fdG9vbC51c2VyLnByb21wdF93aXRoX2xpc3QoIldoaWNoIHRlc3Qo cykgdG8gcmViYXNlbGluZToiLCBmYWlsaW5nX3Rlc3RzLCBjYW5fY2hvb3NlX211bHRpcGxlPVRy dWUpCiAKICAgICBkZWYgX3Jlc3VsdHNfdXJsX2Zvcl90ZXN0KHNlbGYsIGJ1aWxkLCB0ZXN0KToK ICAgICAgICAgdGVzdF9iYXNlID0gb3MucGF0aC5zcGxpdGV4dCh0ZXN0KVswXQo= 68783 2010-09-24 16:14:53 -0700 2010-09-24 18:36:44 -0700 Patch bug-46407-20100924161452.patch text/plain 5210 mihaip ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NDRhNmI5NDliMjAwZmY5MjVkMzNjNWM2Y2IzZmI2M2E3MDRkM2QyLi45MzgxNWIw YWUzYjc1MDg5YzRhMWM4OTIxMTFmZGRlMzc1OGUyNGYyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDktMjQgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgcmViYXNl bGluZXMgZm9yIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIHRvIGJlIGNob3NlbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MDcKKyAgICAgICAgCisg ICAgICAgIEluc3RlYWQgb2YgYWx3YXlzIHJlYmFzZWxpbmluZyBhbGwgZmFpbGluZyB0ZXN0cywg YWxsb3cgYSBzdWJzZXQgdG8gYmUKKyAgICAgICAgY2hvc2VuLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisKIDIwMTAtMDktMjQgIEtlbmljaGkg SXNoaWJhc2hpICA8YmFzaGlAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS91c2VyLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL3VzZXIucHkKaW5kZXggOTQ0NGMwMGM1OGY1M2QzYzI2MmIxZWFlNWUwYzQ0M2I5NzhiM2Yx Ny4uZGZmYTAyNzdhYmQ3ZDNkZjg2ZWZlNjk2Y2RmMjRlZGRjOTJiZGU2ZCAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXIucHkKQEAgLTI4 LDYgKzI4LDcgQEAKIAogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcworaW1wb3J0IHJlCiBpbXBv cnQgc2hsZXgKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCkBAIC02MSwxNCArNjIsMzAg QEAgY2xhc3MgVXNlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gcmVzcG9uc2UKIAogICAgIEBj bGFzc21ldGhvZAotICAgIGRlZiBwcm9tcHRfd2l0aF9saXN0KGNscywgbGlzdF90aXRsZSwgbGlz dF9pdGVtcyk6CisgICAgZGVmIHByb21wdF93aXRoX2xpc3QoY2xzLCBsaXN0X3RpdGxlLCBsaXN0 X2l0ZW1zLCBjYW5fY2hvb3NlX211bHRpcGxlPUZhbHNlLCByYXdfaW5wdXQ9cmF3X2lucHV0KToK ICAgICAgICAgcHJpbnQgbGlzdF90aXRsZQogICAgICAgICBpID0gMAogICAgICAgICBmb3IgaXRl bSBpbiBsaXN0X2l0ZW1zOgogICAgICAgICAgICAgaSArPSAxCiAgICAgICAgICAgICBwcmludCAi JTJkLiAlcyIgJSAoaSwgaXRlbSkKLSAgICAgICAgcmVzdWx0ID0gaW50KGNscy5wcm9tcHQoIkVu dGVyIGEgbnVtYmVyOiAiKSkgLSAxCi0gICAgICAgIHJldHVybiBsaXN0X2l0ZW1zW3Jlc3VsdF0K KworICAgICAgICAjIExvb3AgdW50aWwgd2UgZ2V0IHZhbGlkIGlucHV0CisgICAgICAgIHdoaWxl IFRydWU6CisgICAgICAgICAgICBpZiBjYW5fY2hvb3NlX211bHRpcGxlOgorICAgICAgICAgICAg ICAgIHJlc3BvbnNlID0gY2xzLnByb21wdCgiRW50ZXIgb25lIG9yIG1vcmUgbnVtYmVycyAoY29t bWEtc2VwYXJhdGVkKSwgb3IgXCJhbGxcIjogIiwgcmF3X2lucHV0PXJhd19pbnB1dCkKKyAgICAg ICAgICAgICAgICBpZiBub3QgcmVzcG9uc2Uuc3RyaXAoKSBvciByZXNwb25zZSA9PSAiYWxsIjoK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGxpc3RfaXRlbXMKKyAgICAgICAgICAgICAgICB0 cnk6CisgICAgICAgICAgICAgICAgICAgIGluZGljZXMgPSBbaW50KHIpIC0gMSBmb3IgciBpbiBy ZS5zcGxpdCgiXHMqLFxzKiIsIHJlc3BvbnNlKV0KKyAgICAgICAgICAgICAgICBleGNlcHQgVmFs dWVFcnJvciwgZXJyOgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAg ICAgIHJldHVybiBbbGlzdF9pdGVtc1tpXSBmb3IgaSBpbiBpbmRpY2VzXQorICAgICAgICAgICAg ZWxzZToKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9 IGludChjbHMucHJvbXB0KCJFbnRlciBhIG51bWJlcjogIiwgcmF3X2lucHV0PXJhd19pbnB1dCkp IC0gMQorICAgICAgICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yLCBlcnI6CisgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgICAgICAgICAgcmV0dXJuIGxpc3RfaXRlbXNbcmVz dWx0XQogCiAgICAgZGVmIGVkaXQoc2VsZiwgZmlsZXMpOgogICAgICAgICBlZGl0b3IgPSBvcy5l bnZpcm9uLmdldCgiRURJVE9SIikgb3IgInZpIgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3VzZXJfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vdXNlcl91bml0dGVzdC5weQppbmRleCBk YWRlYWQzZWY2YjY1OWE4YWEzOTZmZWEzODAyYTZlM2YxM2IzNzIwLi5hNDk2NDIxNmY1Y2YwNWUz YzIzY2JkYjY0ODZjYTI1Yzc4N2RkMDAzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vdXNlcl91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vdXNlcl91bml0dGVzdC5weQpAQCAtNTAs NSArNTAsMjIgQEAgY2xhc3MgVXNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAg ICAgcmV0dXJuIE5vbmUKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChVc2VyLnByb21wdCgiaW5w dXQiLCByZXBlYXQ9c2VsZi5yZXBlYXRzUmVtYWluaW5nLCByYXdfaW5wdXQ9bW9ja19yYXdfaW5w dXQpLCBOb25lKQogCisgICAgZGVmIHRlc3RfcHJvbXB0X3dpdGhfbGlzdChzZWxmKToKKyAgICAg ICAgZGVmIHJ1bl9wcm9tcHRfdGVzdChvcHRpb25zLCBpbnB1dHMsIGV4cGVjdGVkX3Jlc3VsdCwg Y2FuX2Nob29zZV9tdWx0aXBsZT1GYWxzZSk6CisgICAgICAgICAgICBkZWYgbW9ja19yYXdfaW5w dXQobWVzc2FnZSk6CisgICAgICAgICAgICAgICAgcmV0dXJuIGlucHV0cy5wb3AoMCkKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVXNlci5wcm9tcHRfd2l0aF9saXN0KCJ0aXRsZSIsIG9w dGlvbnMsIGNhbl9jaG9vc2VfbXVsdGlwbGU9Y2FuX2Nob29zZV9tdWx0aXBsZSwgcmF3X2lucHV0 PW1vY2tfcmF3X2lucHV0KSwgZXhwZWN0ZWRfcmVzdWx0KQorICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChsZW4oaW5wdXRzKSwgMCkKKworICAgICAgICBydW5fcHJvbXB0X3Rlc3QoWyJmb28i LCAiYmFyIl0sIFsiMSJdLCAiZm9vIikKKyAgICAgICAgcnVuX3Byb21wdF90ZXN0KFsiZm9vIiwg ImJhciJdLCBbImJhZGlucHV0IiwgIjIiXSwgImJhciIpCisKKyAgICAgICAgcnVuX3Byb21wdF90 ZXN0KFsiZm9vIiwgImJhciJdLCBbIjEsMiJdLCBbImZvbyIsICJiYXIiXSwgY2FuX2Nob29zZV9t dWx0aXBsZT1UcnVlKQorICAgICAgICBydW5fcHJvbXB0X3Rlc3QoWyJmb28iLCAiYmFyIl0sIFsi ICAxLCAgMiAgICJdLCBbImZvbyIsICJiYXIiXSwgY2FuX2Nob29zZV9tdWx0aXBsZT1UcnVlKQor ICAgICAgICBydW5fcHJvbXB0X3Rlc3QoWyJmb28iLCAiYmFyIl0sIFsiYWxsIl0sIFsiZm9vIiwg ImJhciJdLCBjYW5fY2hvb3NlX211bHRpcGxlPVRydWUpCisgICAgICAgIHJ1bl9wcm9tcHRfdGVz dChbImZvbyIsICJiYXIiXSwgWyIiXSwgWyJmb28iLCAiYmFyIl0sIGNhbl9jaG9vc2VfbXVsdGlw bGU9VHJ1ZSkKKyAgICAgICAgcnVuX3Byb21wdF90ZXN0KFsiZm9vIiwgImJhciJdLCBbIiAgIl0s IFsiZm9vIiwgImJhciJdLCBjYW5fY2hvb3NlX211bHRpcGxlPVRydWUpCisgICAgICAgIHJ1bl9w cm9tcHRfdGVzdChbImZvbyIsICJiYXIiXSwgWyJiYWRpbnB1dCIsICJhbGwiXSwgWyJmb28iLCAi YmFyIl0sIGNhbl9jaG9vc2VfbXVsdGlwbGU9VHJ1ZSkKKwogaWYgX19uYW1lX18gPT0gJ19fbWFp bl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5IGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKaW5kZXggZDZlNDg0MGU4 NjVhNTQ0MDUyYTg3ZmI3YmQ2OGMwY2Q1ODU4OTA1Mi4uYWJmYTg1MDVkMTdmYjkwY2Y2ZjNlZTVk NTZlZTIwNjMyNWEzYjFmNiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKQEAgLTkwLDcgKzkwLDggQEAgY2xh c3MgUmViYXNlbGluZShBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgIHBhcnNl ZF9yZXN1bHRzID0gYnVpbGQubGF5b3V0X3Rlc3RfcmVzdWx0cygpLnBhcnNlZF9yZXN1bHRzKCkK ICAgICAgICAgIyBGSVhNRTogVGhpcyBwcm9iYWJseSBiZWxvbmdzIGFzIEFQSSBvbiBMYXlvdXRU ZXN0UmVzdWx0cwogICAgICAgICAjIGJ1dCAuZmFpbGluZ190ZXN0cygpIGFscmVhZHkgbWVhbnMg c29tZXRoaW5nIGVsc2UuCi0gICAgICAgIHJldHVybiBwYXJzZWRfcmVzdWx0c1tMYXlvdXRUZXN0 UmVzdWx0cy5mYWlsX2tleV0KKyAgICAgICAgZmFpbGluZ190ZXN0cyA9IHBhcnNlZF9yZXN1bHRz W0xheW91dFRlc3RSZXN1bHRzLmZhaWxfa2V5XQorICAgICAgICByZXR1cm4gc2VsZi5fdG9vbC51 c2VyLnByb21wdF93aXRoX2xpc3QoIldoaWNoIHRlc3QocykgdG8gcmViYXNlbGluZToiLCBmYWls aW5nX3Rlc3RzLCBjYW5fY2hvb3NlX211bHRpcGxlPVRydWUpCiAKICAgICBkZWYgX3Jlc3VsdHNf dXJsX2Zvcl90ZXN0KHNlbGYsIGJ1aWxkLCB0ZXN0KToKICAgICAgICAgdGVzdF9iYXNlID0gb3Mu cGF0aC5zcGxpdGV4dCh0ZXN0KVswXQo=