38094 2010-04-25 06:46:45 -0700 svn-apply: Add support for binary patches to new patch-parsing code 2010-04-28 23:20:04 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 38093 34033 1 cjerdonek cjerdonek abarth cjerdonek dbates ddkilzer eric oldest_to_newest 216818 0 cjerdonek 2010-04-25 06:46:45 -0700 parseDiffHeader() needs to handle binary patches. 216821 1 54240 cjerdonek 2010-04-25 07:02:32 -0700 Created attachment 54240 Proposed patch This might not apply correctly until after the patch for bug 38093 lands. 217263 2 eric 2010-04-26 14:04:47 -0700 I'm confused by what this does. 217287 3 cjerdonek 2010-04-26 14:39:27 -0700 (In reply to comment #2) > I'm confused by what this does. This is needed before landing the patch here: https://bugs.webkit.org/show_bug.cgi?id=34033 The parsePatch() code that bug 34033 would activate currently detects the ending of a diff header by looking for a regular expression like the following: +++ $indexPath The problem is that not all diff headers end like this. Git and SVN diffs for binary files don't have a +++ line to end the header (and possibly not at all). Instead they end in "GIT binary patch" or a similar line for SVN. This patch simply adds those possibilities so that the new parsePatch() code will detect the header ending in all cases. Without this change, svn-apply will throw an error that the "header ending could not be found" or something to that effect when running the Python svn-apply unit tests for binary patches. (I have since added binary diff test cases to the Perl unit tests as well.) 218770 4 54664 cjerdonek 2010-04-28 19:51:48 -0700 Created attachment 54664 Proposed patch 2 Re-attaching after landing the patch for bug 38093 and rebasing. 218785 5 54664 eric 2010-04-28 21:03:17 -0700 Comment on attachment 54664 Proposed patch 2 I'm confused by what we do with binary patches. How does this change behavior? 218837 6 cjerdonek 2010-04-28 22:40:19 -0700 (In reply to comment #5) > (From update of attachment 54664 [details]) > I'm confused by what we do with binary patches. How does this change behavior? This patch won't change behavior in two senses. First, it won't actually go live when this patch lands. Only test-webkitperl executes its code paths right now. Second, when it does go live (via bug 34033), there will be no change in behavior. Bug 34033 essentially swaps out a chunk of code in svn-apply and svn-unapply with a bunch of unit-tested code with the same functionality. As for how we currently handle binary patches, there are separate code paths in svn-apply and svn-unapply that look for special strings in the patch header signifying a binary patch. If those special strings are there, then it handles the contents differently. 218840 7 54664 eric 2010-04-28 22:42:35 -0700 Comment on attachment 54664 Proposed patch 2 OK. Thanks for the additional explanation. 218852 8 cjerdonek 2010-04-28 23:05:34 -0700 (In reply to comment #7) > (From update of attachment 54664 [details]) > OK. Thanks for the additional explanation. Thanks for the review, Eric! Some of that explanation will also be available to others in the ChangeLog being cq+'ed. I added extra information to the ChangeLog (namely that the code will go live in a subsequent revision) after reading your comment 2. 218857 9 54664 cjerdonek 2010-04-28 23:19:53 -0700 Comment on attachment 54664 Proposed patch 2 Clearing flags on attachment: 54664 Committed r58478: <http://trac.webkit.org/changeset/58478> 218858 10 cjerdonek 2010-04-28 23:20:04 -0700 All reviewed patches have been landed. Closing bug. 54240 2010-04-25 07:02:32 -0700 2010-04-28 19:51:48 -0700 Proposed patch _patch-38094-1.diff text/plain 4940 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmYTA0NGVlLi44YjI3MzMzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjIgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGRlZCBzdXBwb3J0IGZv ciBiaW5hcnkgcGF0Y2hlcyB0byBuZXcgcGF0Y2gtcGFyc2luZyBjb2RlIGZvcgorICAgICAgICBz dm4tYXBwbHkgYW5kIHN2bi11bmFwcGx5LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zODA5NAorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5w bToKKyAgICAgICAgICAtIEFkZGVkIGxvZ2ljIHRvIHJlY29nbml6ZSB0aGUgZW5kaW5nIG9mIHRo ZSBoZWFkZXIgcG9ydGlvbgorICAgICAgICAgICAgb2YgYSBiaW5hcnkgZGlmZi4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZIZWFkZXIu cGw6CisgICAgICAgICAgLSBBZGRlZCB1bml0IHRlc3QgY2FzZXMgZm9yIFNWTiBhbmQgR2l0IGJp bmFyeSBkaWZmcy4KKworMjAxMC0wNC0yNSAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtAd2Vi a2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAg ICBSZW1vdmVkIHRoZSBkaXZpZGluZyBsaW5lIChpLmUuICI9PT09Li4uIikgbG9naWMgZnJvbSB0 aGUgY29kZQogICAgICAgICBjYWxsZWQgYnkgc3ZuLWFwcGx5IGFuZCBzdm4tdW5hcHBseS4KIApk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvVkNTVXRpbHMucG0KaW5kZXggN2UwOTgzOS4uZjM5MDMxNiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L1ZDU1V0aWxzLnBtCkBAIC00NTEsNyArNDUxLDkgQEAgc3ViIHBhcnNlRGlmZkhlYWRlcigkJCkK ICAgICAgICAgICAgICAgICAgICAgICAgICJzb3VyY2UgcmV2aXNpb24gbnVtYmVyIFwiJHNvdXJj ZVJldmlzaW9uXCIuIikgaWYgKCQyICE9ICRzb3VyY2VSZXZpc2lvbik7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2lmIChzL15cK1wrXCsgXFMrLysrKyAk aW5kZXhQYXRoLykgeworICAgICAgICB9IGVsc2lmIChzL15cK1wrXCsgXFMrLysrKyAkaW5kZXhQ YXRoLyB8fAorICAgICAgICAgICAgICAgICAvXkNhbm5vdCBkaXNwbGF5OiBmaWxlIG1hcmtlZCBh cyBhIGJpbmFyeSB0eXBlLiQvIHx8ICMgU1ZOIGJpbmFyeQorICAgICAgICAgICAgICAgICAvXkdJ VCBiaW5hcnkgcGF0Y2gkLykgewogICAgICAgICAgICAgIyArKysKICAgICAgICAgICAgICRmb3Vu ZEhlYWRlckVuZGluZyA9IDE7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZIZWFkZXIucGwgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZm SGVhZGVyLnBsCmluZGV4IGE4Mjg4MDAuLmQwNGY5NzggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZIZWFkZXIucGwK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3Bh cnNlRGlmZkhlYWRlci5wbApAQCAtMjIxLDYgKzIyMSwxMDMgQEAgRU5ECiAgICAgbGFzdFJlYWRM aW5lID0+ICJAQCAtMCwwICsxLDM0IEBAXG4iLAogICAgIG5leHRMaW5lID0+ICIrPGh0bWw+XG4i LAogfSwKK3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gIlNWTjogYmluYXJ5IGZp bGUiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorSW5kZXg6IHRlc3RfZmlsZS5zd2YKKz09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KK0Nhbm5vdCBkaXNwbGF5OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLgor c3ZuOm1pbWUtdHlwZSA9IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbQorCitQcm9wZXJ0eSBjaGFu Z2VzIG9uOiB0ZXN0X2ZpbGUuc3dmCitfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCitOYW1lOiBzdm46bWltZS10eXBlCisg ICArIGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbQorCisKK1ExZFRCeDBBQUFCNDJpdGc0R2xnWUpq R3dNRER5T0RNeE1EdzM0R0JnUUVBSlBRREpBPT0KK0VORAorICAgICMgSGVhZGVyIGtleXMgdG8g Y2hlY2sKKyAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRleDogdGVzdF9maWxl LnN3ZgorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQorQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5 IHR5cGUuCitFTkQKKyAgICBjb3BpZWRGcm9tUGF0aCA9PiB1bmRlZiwKKyAgICBpbmRleFBhdGgg PT4gInRlc3RfZmlsZS5zd2YiLAorICAgIHNvdXJjZVJldmlzaW9uID0+IHVuZGVmLAorICAgICMg T3RoZXIgdmFsdWVzIHRvIGNoZWNrCisgICAgbGFzdFJlYWRMaW5lID0+ICJzdm46bWltZS10eXBl ID0gYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtXG4iLAorICAgIG5leHRMaW5lID0+ICJcbiIsCit9 LAoreworICAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiR2l0OiBiaW5hcnkgYWRkaXRp b24iLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorZGlmZiAtLWdpdCBhL2Zvby5naWYgYi9m b28uZ2lmCituZXcgZmlsZSBtb2RlIDEwMDY0NAoraW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uNjRhOTUzMmU3Nzk0ZmNkNzkxZjZmMTIxNTc0MDZkOTA2MDE1 MTY5MAorR0lUIGJpbmFyeSBwYXRjaAorbGl0ZXJhbCA1MTIKK3pjbVo/d2JoRUhiUkF4fE1VfD9p V3tLeGN+P0tvZkQ7Y2tZO0grJjVIbkhsISFHUU1EN2grc1V7XyllOWZeVjNjPworemhKUCMjSGRa QyM0S303RjY4QCExamZXUWcyZGFDbS1ncyMzfEpSRURUPmMrcEc0TDxfMjt3IyNXTU8jeXNQUGFw Cit6THFwQWYxT0U5Mzh4QXNTcDQhNWYtbz48P1ZLZSgjMGpFY3dmSEdGNCVNMV5rUnMxNG9WQnAy WkVMe0UxTjwtekoKK3pzZkxtT3RLdGE7Ml87MmMjXlMxLThjZjxuYiFRbkdsPmMhWGU2Ulh2ckV0 QVdCdlNEVGdUTzFqM3ZBMzFQdXchQQorenMoODdxKWpfbVZEVHFCby1QKzAzLVA1bUhDRW5KK3h9 WWRDdVM3I2JDQ3llUFVlKHluSyt8NGItM3FLKVQ/WiYpCit6WUcrYHRsNGg/R1p2XyR0ODJ9WDQq RFRFfCQ7e0RFaVB5RkApVS0xK0ZhWCsrVDlIeyYlY2FnYFcxfHpWUEBgJWIKK3pxaVNrcDZ7QlRw V1RrQ3IhPTxDNlE9PyN+UjheSmZybGlBRjZRXmdWOUl1cDhScUNYcXFocUNgcXN5aGs8LW5sQgor ejAwZntRWnZmSyZ8Tm0jb1owVFFsYFlyJEJJYTZBQDE2TzI2dWQ3SDxRTT14bGB0b0xLbnotM2hA OWM5cSZ3bXxYCit6ezg5SXxXUHlEISpNP2d2P3FgO0w9MllGZVhySlFOdGk0P31zIXpGbz01Q3pl QnhDNjl4QTx6cmpQPHdVY0NSaDQKK3B0VWwtWkc8JWF+I0x3a0lXdiZxIUtTQ0g3dFE4Y0pEaXcr fEdWP01OKVJqWTUwUlRiLXh2VCZICisKK2xpdGVyYWwgMAorSGNtVj9kMDAwMDEKKworRU5ECisg ICAgIyBIZWFkZXIga2V5cyB0byBjaGVjaworICAgIHN2bkNvbnZlcnRlZFRleHQgPT4gPDwnRU5E JywKK0luZGV4OiBmb28uZ2lmCituZXcgZmlsZSBtb2RlIDEwMDY0NAoraW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjRhOTUzMmU3Nzk0ZmNkNzkxZjZmMTIx NTc0MDZkOTA2MDE1MTY5MAorR0lUIGJpbmFyeSBwYXRjaAorRU5ECisgICAgY29waWVkRnJvbVBh dGggPT4gdW5kZWYsCisgICAgaW5kZXhQYXRoID0+ICJmb28uZ2lmIiwKKyAgICBzb3VyY2VSZXZp c2lvbiA9PiB1bmRlZiwKKyAgICAjIE90aGVyIHZhbHVlcyB0byBjaGVjaworICAgIGxhc3RSZWFk TGluZSA9PiAibGl0ZXJhbCA1MTJcbiIsCisgICAgbmV4dExpbmUgPT4gInpjbVo/d2JoRUhiUkF4 fE1VfD9pV3tLeGN+P0tvZkQ7Y2tZO0grJjVIbkhsISFHUU1EN2grc1V7XyllOWZeVjNjP1xuIiwK K30sCit7CisgICAgIyBOZXcgdGVzdAorICAgIGRpZmZOYW1lID0+ICJHaXQ6IGJpbmFyeSBkZWxl dGlvbiIsCisgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCitkaWZmIC0tZ2l0IGEvZm9vLmdpZiBi L2Zvby5naWYKK2RlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAoraW5kZXggMzIzZmFlMC4uMDAwMDAw MAorR0lUIGJpbmFyeSBwYXRjaAorbGl0ZXJhbCAwCitIY21WP2QwMDAwMQorCitsaXRlcmFsIDcK K09jbVlleCZyZUQkO3NPOCpGOUwpQgorCitFTkQKKyAgICAjIEhlYWRlciBrZXlzIHRvIGNoZWNr CisgICAgc3ZuQ29udmVydGVkVGV4dCA9PiA8PCdFTkQnLAorSW5kZXg6IGZvby5naWYKK2RlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAoraW5kZXggMzIzZmFlMC4uMDAwMDAwMAorR0lUIGJpbmFyeSBw YXRjaAorRU5ECisgICAgY29waWVkRnJvbVBhdGggPT4gdW5kZWYsCisgICAgaW5kZXhQYXRoID0+ ICJmb28uZ2lmIiwKKyAgICBzb3VyY2VSZXZpc2lvbiA9PiB1bmRlZiwKKyAgICAjIE90aGVyIHZh bHVlcyB0byBjaGVjaworICAgIGxhc3RSZWFkTGluZSA9PiAibGl0ZXJhbCAwXG4iLAorICAgIG5l eHRMaW5lID0+ICJIY21WP2QwMDAwMVxuIiwKK30sCiApOwogCiAjIFJldHVybiB0aGUgYXJndW1l bnRzIGZvciBlYWNoIGFzc2VydGlvbiBwZXIgdGVzdCBjYXNlLgo= 54664 2010-04-28 19:51:48 -0700 2010-04-28 23:19:53 -0700 Proposed patch 2 _patch-38094-2.diff text/plain 5024 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhNGE5MWY4Li42OWZkM2Y1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQt MjUgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdG8gVkNTVXRpbHMncyBw YXJzZURpZmZIZWFkZXIoKSBzdXBwb3J0IGZvciBiaW5hcnkgcGF0Y2hlcy4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgwOTQKKworICAgICAgICBU aGUgcGFyc2VEaWZmSGVhZGVyKCkgZnVuY3Rpb24gaXMgcGFydCBvZiBuZXcgcGF0Y2gtcGFyc2lu ZyBjb2RlCisgICAgICAgIGZvciBzdm4tYXBwbHkgYW5kIHN2bi11bmFwcGx5IHRoYXQgd2lsbCBn byBsaXZlIGluIGEgc3Vic2VxdWVudAorICAgICAgICByZXZpc2lvbi4KKworICAgICAgICAqIFNj cmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgICAgLSBBZGRlZCBsb2dpYyB0byBwYXJzZURpZmZI ZWFkZXIoKSB0byByZWNvZ25pemUgdGhlIGVuZGluZyBvZgorICAgICAgICAgICAgdGhlIGhlYWRl ciBwb3J0aW9uIG9mIGEgYmluYXJ5IGRpZmYuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBl cmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZmSGVhZGVyLnBsOgorICAgICAgICAgIC0gQWRk ZWQgdW5pdCB0ZXN0IGNhc2VzIGZvciBTVk4gYW5kIEdpdCBiaW5hcnkgZGlmZnMuCisKIDIwMTAt MDQtMjggIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy9WQ1NVdGlscy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KaW5kZXggMDM0 MGIwZC4uNDk5Mzg4MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5w bQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC00NTYsNyArNDU2LDkg QEAgc3ViIHBhcnNlRGlmZkhlYWRlcigkJCkKICAgICAgICAgICAgICAgICAgICAgICAgICJzb3Vy Y2UgcmV2aXNpb24gbnVtYmVyIFwiJHNvdXJjZVJldmlzaW9uXCIuIikgaWYgKCQyICE9ICRzb3Vy Y2VSZXZpc2lvbik7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9 IGVsc2lmIChzL15cK1wrXCsgXFMrLysrKyAkaW5kZXhQYXRoLykgeworICAgICAgICB9IGVsc2lm IChzL15cK1wrXCsgXFMrLysrKyAkaW5kZXhQYXRoLyB8fAorICAgICAgICAgICAgICAgICAvXkNh bm5vdCBkaXNwbGF5OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLiQvIHx8ICMgU1ZOIGJp bmFyeQorICAgICAgICAgICAgICAgICAvXkdJVCBiaW5hcnkgcGF0Y2gkLykgewogICAgICAgICAg ICAgIyArKysKICAgICAgICAgICAgICRmb3VuZEhlYWRlckVuZGluZyA9IDE7CiAgICAgICAgIH0K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0 dGVzdC9wYXJzZURpZmZIZWFkZXIucGwgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VEaWZmSGVhZGVyLnBsCmluZGV4IDBjNzhkYWMuLjYxY2E3 M2QgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191 bml0dGVzdC9wYXJzZURpZmZIZWFkZXIucGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZkhlYWRlci5wbApAQCAtMjIxLDYgKzIy MSwxMDMgQEAgRU5ECiAgICAgbGFzdFJlYWRMaW5lID0+ICJAQCAtMCwwICsxLDM0IEBAXG4iLAog ICAgIG5leHRMaW5lID0+ICIrPGh0bWw+XG4iLAogfSwKK3sKKyAgICAjIE5ldyB0ZXN0CisgICAg ZGlmZk5hbWUgPT4gIlNWTjogYmluYXJ5IGZpbGUiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQn LAorSW5kZXg6IHRlc3RfZmlsZS5zd2YKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK0Nhbm5vdCBkaXNwbGF5OiBmaWxl IG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLgorc3ZuOm1pbWUtdHlwZSA9IGFwcGxpY2F0aW9uL29j dGV0LXN0cmVhbQorCitQcm9wZXJ0eSBjaGFuZ2VzIG9uOiB0ZXN0X2ZpbGUuc3dmCitfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCitOYW1lOiBzdm46bWltZS10eXBlCisgICArIGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbQor CisKK1ExZFRCeDBBQUFCNDJpdGc0R2xnWUpqR3dNRER5T0RNeE1EdzM0R0JnUUVBSlBRREpBPT0K K0VORAorICAgICMgSGVhZGVyIGtleXMgdG8gY2hlY2sKKyAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+ IDw8J0VORCcsCitJbmRleDogdGVzdF9maWxlLnN3ZgorPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorQ2Fubm90IGRpc3Bs YXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCitFTkQKKyAgICBjb3BpZWRGcm9tUGF0 aCA9PiB1bmRlZiwKKyAgICBpbmRleFBhdGggPT4gInRlc3RfZmlsZS5zd2YiLAorICAgIHNvdXJj ZVJldmlzaW9uID0+IHVuZGVmLAorICAgICMgT3RoZXIgdmFsdWVzIHRvIGNoZWNrCisgICAgbGFz dFJlYWRMaW5lID0+ICJzdm46bWltZS10eXBlID0gYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtXG4i LAorICAgIG5leHRMaW5lID0+ICJcbiIsCit9LAoreworICAgICMgTmV3IHRlc3QKKyAgICBkaWZm TmFtZSA9PiAiR2l0OiBiaW5hcnkgYWRkaXRpb24iLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQn LAorZGlmZiAtLWdpdCBhL2Zvby5naWYgYi9mb28uZ2lmCituZXcgZmlsZSBtb2RlIDEwMDY0NAor aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjRhOTUzMmU3 Nzk0ZmNkNzkxZjZmMTIxNTc0MDZkOTA2MDE1MTY5MAorR0lUIGJpbmFyeSBwYXRjaAorbGl0ZXJh bCA1MTIKK3pjbVo/d2JoRUhiUkF4fE1VfD9pV3tLeGN+P0tvZkQ7Y2tZO0grJjVIbkhsISFHUU1E N2grc1V7XyllOWZeVjNjPworemhKUCMjSGRaQyM0S303RjY4QCExamZXUWcyZGFDbS1ncyMzfEpS RURUPmMrcEc0TDxfMjt3IyNXTU8jeXNQUGFwCit6THFwQWYxT0U5Mzh4QXNTcDQhNWYtbz48P1ZL ZSgjMGpFY3dmSEdGNCVNMV5rUnMxNG9WQnAyWkVMe0UxTjwtekoKK3pzZkxtT3RLdGE7Ml87MmMj XlMxLThjZjxuYiFRbkdsPmMhWGU2Ulh2ckV0QVdCdlNEVGdUTzFqM3ZBMzFQdXchQQorenMoODdx KWpfbVZEVHFCby1QKzAzLVA1bUhDRW5KK3h9WWRDdVM3I2JDQ3llUFVlKHluSyt8NGItM3FLKVQ/ WiYpCit6WUcrYHRsNGg/R1p2XyR0ODJ9WDQqRFRFfCQ7e0RFaVB5RkApVS0xK0ZhWCsrVDlIeyYl Y2FnYFcxfHpWUEBgJWIKK3pxaVNrcDZ7QlRwV1RrQ3IhPTxDNlE9PyN+UjheSmZybGlBRjZRXmdW OUl1cDhScUNYcXFocUNgcXN5aGs8LW5sQgorejAwZntRWnZmSyZ8Tm0jb1owVFFsYFlyJEJJYTZB QDE2TzI2dWQ3SDxRTT14bGB0b0xLbnotM2hAOWM5cSZ3bXxYCit6ezg5SXxXUHlEISpNP2d2P3Fg O0w9MllGZVhySlFOdGk0P31zIXpGbz01Q3plQnhDNjl4QTx6cmpQPHdVY0NSaDQKK3B0VWwtWkc8 JWF+I0x3a0lXdiZxIUtTQ0g3dFE4Y0pEaXcrfEdWP01OKVJqWTUwUlRiLXh2VCZICisKK2xpdGVy YWwgMAorSGNtVj9kMDAwMDEKKworRU5ECisgICAgIyBIZWFkZXIga2V5cyB0byBjaGVjaworICAg IHN2bkNvbnZlcnRlZFRleHQgPT4gPDwnRU5EJywKK0luZGV4OiBmb28uZ2lmCituZXcgZmlsZSBt b2RlIDEwMDY0NAoraW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uNjRhOTUzMmU3Nzk0ZmNkNzkxZjZmMTIxNTc0MDZkOTA2MDE1MTY5MAorR0lUIGJpbmFyeSBw YXRjaAorRU5ECisgICAgY29waWVkRnJvbVBhdGggPT4gdW5kZWYsCisgICAgaW5kZXhQYXRoID0+ ICJmb28uZ2lmIiwKKyAgICBzb3VyY2VSZXZpc2lvbiA9PiB1bmRlZiwKKyAgICAjIE90aGVyIHZh bHVlcyB0byBjaGVjaworICAgIGxhc3RSZWFkTGluZSA9PiAibGl0ZXJhbCA1MTJcbiIsCisgICAg bmV4dExpbmUgPT4gInpjbVo/d2JoRUhiUkF4fE1VfD9pV3tLeGN+P0tvZkQ7Y2tZO0grJjVIbkhs ISFHUU1EN2grc1V7XyllOWZeVjNjP1xuIiwKK30sCit7CisgICAgIyBOZXcgdGVzdAorICAgIGRp ZmZOYW1lID0+ICJHaXQ6IGJpbmFyeSBkZWxldGlvbiIsCisgICAgaW5wdXRUZXh0ID0+IDw8J0VO RCcsCitkaWZmIC0tZ2l0IGEvZm9vLmdpZiBiL2Zvby5naWYKK2RlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NAoraW5kZXggMzIzZmFlMC4uMDAwMDAwMAorR0lUIGJpbmFyeSBwYXRjaAorbGl0ZXJhbCAw CitIY21WP2QwMDAwMQorCitsaXRlcmFsIDcKK09jbVlleCZyZUQkO3NPOCpGOUwpQgorCitFTkQK KyAgICAjIEhlYWRlciBrZXlzIHRvIGNoZWNrCisgICAgc3ZuQ29udmVydGVkVGV4dCA9PiA8PCdF TkQnLAorSW5kZXg6IGZvby5naWYKK2RlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAoraW5kZXggMzIz ZmFlMC4uMDAwMDAwMAorR0lUIGJpbmFyeSBwYXRjaAorRU5ECisgICAgY29waWVkRnJvbVBhdGgg PT4gdW5kZWYsCisgICAgaW5kZXhQYXRoID0+ICJmb28uZ2lmIiwKKyAgICBzb3VyY2VSZXZpc2lv biA9PiB1bmRlZiwKKyAgICAjIE90aGVyIHZhbHVlcyB0byBjaGVjaworICAgIGxhc3RSZWFkTGlu ZSA9PiAibGl0ZXJhbCAwXG4iLAorICAgIG5leHRMaW5lID0+ICJIY21WP2QwMDAwMVxuIiwKK30s CiApOwogCiAjIFJldHVybiB0aGUgYXJndW1lbnRzIGZvciBlYWNoIGFzc2VydGlvbiBwZXIgdGVz dCBjYXNlLgo=