112732 2013-03-19 12:18:28 -0700 svn-apply has trouble applying a patch that adds a Windows newline to EOF 2013-03-19 13:29:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbates dbates darin ddkilzer eric jamesr webkit.review.bot oldest_to_newest 858590 0 dbates 2013-03-19 12:18:28 -0700 When using svn-apply to applying attachment 193158 (bug 112306) on my Mac with an SVN checkout at r145854, svn-apply failed with the following output: dbates:WebKit dbates$ Tools/Scripts/svn-apply /Users/dbates/Desktop/bug-112306-20130314112306.patch.txt Parsed 20 diffs from patch file(s). patching file LayoutTests/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file LayoutTests/editing/inserting/insert-text-into-empty-frameset-crash.html patching file LayoutTests/editing/style/apply-style-crash.html patching file LayoutTests/fast/block/float/float-originating-line-deleted-crash.html Hunk #2 FAILED at 11. 1 out of 2 hunks FAILED -- saving rejects to file LayoutTests/fast/block/float/float-originating-line-deleted-crash.html.rej Calling "patch -p0" for file "LayoutTests/fast/block/float/float-originating-line-deleted-crash.html" returned status 1. Pass --force to ignore patch failures. 858596 1 193896 dbates 2013-03-19 12:20:58 -0700 Created attachment 193896 Patch and unit tests 858607 2 jamesr 2013-03-19 12:24:21 -0700 Thanks for the patch! Unfortunately I don't know enough about perl or patch to be able to review this. 858609 3 webkit.review.bot 2013-03-19 12:24:51 -0700 Attachment 193896 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/VCSUtils.pm', u'Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl']" exit_code: 1 Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:181: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:182: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:197: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:198: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:221: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:222: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:232: Line contains tab character. [whitespace/tab] [5] Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:233: Line contains tab character. [whitespace/tab] [5] Total errors found: 8 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 858613 4 dbates 2013-03-19 12:27:35 -0700 (In reply to comment #3) > Attachment 193896 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/VCSUtils.pm', u'Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl']" exit_code: 1 > Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:181: Line contains tab character. [whitespace/tab] [5] > [...] > Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl:233: Line contains tab character. [whitespace/tab] [5] > Total errors found: 8 in 3 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. These tabs are intentional as the unit tests contain diff snippets that are representative of actual diffs. 858650 5 193896 eric 2013-03-19 13:02:27 -0700 Comment on attachment 193896 Patch and unit tests Seems reasonable. Darin Adler is probably your best reviewer here. 858678 6 dbates 2013-03-19 13:26:27 -0700 CC'ing Darin Adler so that he can see this patch go by per Eric Seidel's remark in comment 5. 858684 7 dbates 2013-03-19 13:29:49 -0700 Committed r146249: <http://trac.webkit.org/changeset/146249> 193896 2013-03-19 12:20:58 -0700 2013-03-19 13:02:27 -0700 Patch and unit tests Bug112732.patch text/plain 11383 dbates SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0NjIyNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM0IEBACisyMDEzLTAzLTE5ICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4K KworICAgICAgICBzdm4tYXBwbHkgaGFzIHRyb3VibGUgYXBwbHlpbmcgYSBwYXRjaCB0aGF0IGFk ZHMgYSBXaW5kb3dzIG5ld2xpbmUgdG8gRU9GCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGaXhlcyBhbiBpc3N1ZXMgd2hlcmUgYSBkaWZmIHRoYXQgYWRk cyBhIFdpbmRvd3MgbGluZSBlbmRpbmcgKENSTEYpIHRvIHRoZSBlbmQKKyAgICAgICAgb2YgYW4g ZXhpc3RpbmcgZmlsZSBjYW5ub3QgYmUgYXBwbGllZC4KKworICAgICAgICBJbiBwYXJ0aWN1bGFy LCBzdm4te2FwcGx5LCB1bmFwcGx5fSBjb21wZW5zYXRlIGZvciBkaWZmZXJlbmNlcyBpbiBsaW5l IGVuZGluZ3MKKyAgICAgICAgYnkgY29udmVydGluZyB0aGUgbGluZSBlbmRpbmdzIGluIGEgZGlm ZiB0byBtYXRjaCB0aGUgbGluZSBlbmRpbmdzIGluIHRoZSB0YXJnZXQKKyAgICAgICAgZmlsZS4g VGhlIGRpZmYoMSkgY29tbWFuZCBwcmVjZWRlcyB0aGUgbGFzdCBsaW5lIG9mIGEgZGlmZiB0aGF0 IGFkZHMgYSBuZXdsaW5lCisgICAgICAgIGNoYXJhY3RlciB0byB0aGUgZW5kIG9mIGEgZmlsZSB3 aXRoIHRoZSBzcGVjaWFsIGNoYXJhY3RlciBzZXF1ZW5jZSAiXG4gXFwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZVxuIgorICAgICAgICBTdm4te2FwcGx5LCB1bmFwcGx5fSBjb252ZXJ0cyB0aGUg bmV3bGluZSBjaGFyYWN0ZXJzIChcbikgaW4gdGhpcyBjaGFyYWN0ZXIgc2VxdWVuY2UKKyAgICAg ICAgdG8gXHJcbiAoQ1JMRikgd2hlbiB0aGUgdGFyZ2V0IGZpbGUgaGFzIFdpbmRvd3MgbGluZSBl bmRpbmdzIGFuZCBwYXRjaCgxKSBjb21wbGFpbnMKKyAgICAgICAgd2hlbiBhcHBseWluZyB0aGlz IG1vZGlmaWVkIGRpZmYuIEluc3RlYWQsIHN2bi17YXBwbHksIHVuYXBwbHl9IHNob3VsZCBub3Qg bW9kaWZ5CisgICAgICAgIHRoZSBuZXdsaW5lIGNoYXJhY3RlcnMgaW4gdGhpcyBzcGVjaWFsIGNo YXJhY3RlciBzZXF1ZW5jZSB0byBtYXRjaCB0aGUgbGluZSBlbmRpbmdzCisgICAgICAgIGluIHRo ZSB0YXJnZXQgZmlsZS4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAg IChwYXJzZURpZmYpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0 dGVzdC9wYXJzZURpZmZXaXRoTW9ja0ZpbGVzLnBsOgorICAgICAgICBBZGRlZCB0ZXN0czoKKyAg ICAgICAgICAgIC0gIlNWTjogUGF0Y2ggYWRkcyBXaW5kb3dzIG5ld2xpbmUgdG8gRU9GIGFuZCBJ bmRleFBhdGggaGFzIFdpbmRvd3MgbGluZSBlbmRpbmdzIgorICAgICAgICAgICAgLSAiU1ZOOiBQ YXRjaCBhZGRzIE1hYyBuZXdsaW5lIHRvIEVPRiBhbmQgSW5kZXhQYXRoIGhhcyBNYWMgbGluZSBl bmRpbmdzIgorICAgICAgICAgICAgLSAiR2l0OiBQYXRjaCBhZGRzIFdpbmRvd3MgbmV3bGluZSB0 byBFT0YgYW5kIEluZGV4UGF0aCBoYXMgV2luZG93cyBsaW5lIGVuZGluZ3MiCisgICAgICAgICAg ICAtICJHaXQ6IFBhdGNoIGFkZHMgTWFjIG5ld2xpbmUgdG8gRU9GIGFuZCBJbmRleFBhdGggaGFz IE1hYyBsaW5lIGVuZGluZ3MiCisgICAgICAgIChlc2NhcGVOZXdMaW5lQ2hhcmFjdGVycyk6IEFk ZGVkLgorICAgICAgICAodG9NYWNMaW5lRW5kaW5ncyk6IEFkZGVkLgorCiAyMDEzLTAzLTE5ICBB bGJlcnRvIEdhcmNpYSAgPGFnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJy eV0gRW5hYmxlIFVTRV9TWVNURU1fTUFMTE9DIGJ5IGRlZmF1bHQKSW5kZXg6IFRvb2xzL1Njcmlw dHMvVkNTVXRpbHMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQko cmV2aXNpb24gMTQ1ODU0KQorKysgVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQkod29ya2luZyBj b3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5IEFw cGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAwNywgMjAw OCwgMjAwOSwgMjAxMCwgMjAxMSwgMjAxMiwgMjAxMyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJl c2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQ2hyaXMgSmVyZG9uZWsgKGNocmlz LmplcmRvbmVrQGdtYWlsLmNvbSkKICMgQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExIFJlc2VhcmNo IEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMp IDIwMTIgRGFuaWVsIEJhdGVzIChkYmF0ZXNAaW50dWRhdGEuY29tKQpAQCAtMTAwNSwxMyArMTAw NSwyMyBAQCBzdWIgcGFyc2VEaWZmKCQkOyQpCiAgICAgICAgICAgICAjIFRoZW4gd2UgYXJlIGlu IHRoZSBib2R5IG9mIHRoZSBkaWZmLgogICAgICAgICAgICAgbXkgJGlzQ2h1bmtSYW5nZSA9IGRl ZmluZWQocGFyc2VDaHVua1JhbmdlKCRsaW5lKSk7CiAgICAgICAgICAgICAkbnVtVGV4dENodW5r cyArPSAxIGlmICRpc0NodW5rUmFuZ2U7CisgICAgICAgICAgICBteSAkbmV4dExpbmUgPSA8JGZp bGVIYW5kbGU+OworICAgICAgICAgICAgbXkgJHdpbGxBZGROZXdMaW5lQXRFbmRPZkZpbGUgPSBk ZWZpbmVkKCRuZXh0TGluZSkgJiYgJG5leHRMaW5lID1+IC9eXFwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZSQvOworICAgICAgICAgICAgaWYgKCR3aWxsQWRkTmV3TGluZUF0RW5kT2ZGaWxlKSB7 CisgICAgICAgICAgICAgICAgIyBEaWZmKDEpIGFsd2F5cyBlbWl0cyBhIExGIGNoYXJhY3RlciBw cmVjZWVkaW5nIHRoZSBsaW5lICJcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUiLgorICAgICAg ICAgICAgICAgICMgV2UgbXVzdCBwcmVzZXJ2ZSBib3RoIHRoZSBhZGRlZCBMRiBjaGFyYWN0ZXIg YW5kIHRoZSBsaW5lIGVuZGluZyBvZiB0aGlzIHNlbnRpbmVsIGxpbmUKKyAgICAgICAgICAgICAg ICAjIG9yIHBhdGNoKDEpIHdpbGwgY29tcGxhaW4uCisgICAgICAgICAgICAgICAgJHN2blRleHQg Lj0gJGxpbmUgLiAkbmV4dExpbmU7CisgICAgICAgICAgICAgICAgJGxpbmUgPSA8JGZpbGVIYW5k bGU+OworICAgICAgICAgICAgICAgIG5leHQ7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBp ZiAoJGluZGV4UGF0aEVPTCAmJiAhJGlzQ2h1bmtSYW5nZSkgewogICAgICAgICAgICAgICAgICMg VGhlIGNodW5rIHJhbmdlIGlzIHBhcnQgb2YgdGhlIGJvZHkgb2YgdGhlIGRpZmYsIGJ1dCBpdHMg bGluZSBlbmRpbmdzIHNob3VsZCd0IGJlCiAgICAgICAgICAgICAgICAgIyBtb2RpZmllZCBvciBw YXRjaCgxKSB3aWxsIGNvbXBsYWluLiBTbywgd2Ugb25seSBtb2RpZnkgbm9uLWNodW5rIHJhbmdl IGxpbmVzLgogICAgICAgICAgICAgICAgICRsaW5lID1+IHMvXHJcbnxccnxcbi8kaW5kZXhQYXRo RU9ML2c7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAkc3ZuVGV4dCAuPSAkbGluZTsKLSAg ICAgICAgICAgICRsaW5lID0gPCRmaWxlSGFuZGxlPjsKKyAgICAgICAgICAgICRsaW5lID0gJG5l eHRMaW5lOwogICAgICAgICAgICAgbmV4dDsKICAgICAgICAgfSAjIE90aGVyd2lzZSwgd2UgZm91 bmQgYSBkaWZmIGhlYWRlci4KIApAQCAtMTAyMyw2ICsxMDMzLDEwIEBAIHN1YiBwYXJzZURpZmYo JCQ7JCkKIAogICAgICAgICAoJGhlYWRlckhhc2hSZWYsICRsaW5lKSA9IHBhcnNlRGlmZkhlYWRl cigkZmlsZUhhbmRsZSwgJGxpbmUpOwogICAgICAgICBpZiAoISRvcHRpb25zSGFzaFJlZiB8fCAh JG9wdGlvbnNIYXNoUmVmLT57c2hvdWxkTm90VXNlSW5kZXhQYXRoRU9MfSkgeworICAgICAgICAg ICAgIyBGSVhNRTogV2Ugc2hvdWxkbid0IHF1ZXJ5IHRoZSBmaWxlIHN5c3RlbSAodmlhIGZpcnN0 RU9MSW5GaWxlKCkpIHRvIGRldGVybWluZSB0aGUKKyAgICAgICAgICAgICMgICAgICAgIGxpbmUg ZW5kaW5ncyBvZiB0aGUgZmlsZSBpbmRleFBhdGguIEluc3RlYWQsIGVpdGhlciB0aGUgY2FsbGVy IHRvIHBhcnNlRGlmZigpCisgICAgICAgICAgICAjICAgICAgICBzaG91bGQgcHJvdmlkZSB0aGlz IGluZm9ybWF0aW9uIG9yIHBhcnNlRGlmZigpIHNob3VsZCB0YWtlIGEgZGVsZWdhdGUgdGhhdCBp dAorICAgICAgICAgICAgIyAgICAgICAgY2FuIHVzZSB0byBxdWVyeSBmb3IgdGhpcyBpbmZvcm1h dGlvbi4KICAgICAgICAgICAgICRpbmRleFBhdGhFT0wgPSBmaXJzdEVPTEluRmlsZSgkaGVhZGVy SGFzaFJlZi0+e2luZGV4UGF0aH0pIGlmICEkaGVhZGVySGFzaFJlZi0+e2lzTmV3fSAmJiAhJGhl YWRlckhhc2hSZWYtPntpc0JpbmFyeX07CiAgICAgICAgIH0KIApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZldpdGhNb2NrRmlsZXMucGwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0 L3BhcnNlRGlmZldpdGhNb2NrRmlsZXMucGwJKHJldmlzaW9uIDE0NTg1NCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmZXaXRoTW9ja0ZpbGVz LnBsCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNyBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAj CiAjIENvcHlyaWdodCAoQykgMjAxMSBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICMKICMgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4g cmVkaXN0cmlidXRlIGl0IGFuZC9vcgogIyBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo ZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCkBAIC0yNiw2ICsyNywzMyBAQCB1c2UgUE9TSVgg cXcvZ2V0Y3dkLzsKIHVzZSBUZXN0OjpNb3JlOwogdXNlIFZDU1V0aWxzOwogCisjIFdlIHNob3Vs ZCBjb25zaWRlciBtb3ZpbmcgZXNjYXBlTmV3TGluZUNoYXJhY3RlcnMoKSBhbmQgdG9NYWNMaW5l RW5kaW5ncygpCisjIHRvIFZDU1V0aWxzLnBtIGlmIHRoZXkncmUgdXNlZnVsIGluIG90aGVyIHBs YWNlcy4KK3N1YiBlc2NhcGVOZXdMaW5lQ2hhcmFjdGVycygkKQoreworICAgIG15ICgkdGV4dCkg PSBAXzsKKyAgICBteSBAY2hhcmFjdGVycyA9IHNwbGl0KC8vLCAkdGV4dCk7CisgICAgbXkgJHJl c3VsdCA9ICIiOworICAgIGZvcmVhY2ggKEBjaGFyYWN0ZXJzKSB7CisgICAgICAgIGlmICgvXlxy JC8pIHsKKyAgICAgICAgICAgICRyZXN1bHQgLj0gJ1xyJzsKKyAgICAgICAgICAgIG5leHQ7Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKC9eXG4kLykgeworICAgICAgICAgICAgJHJlc3VsdCAuPSAn XG4nOworICAgICAgICB9CisgICAgICAgICRyZXN1bHQgLj0gJF87CisgICAgfQorICAgIHJldHVy biAkcmVzdWx0OworfQorCitzdWIgdG9NYWNMaW5lRW5kaW5ncygkKQoreworICAgIG15ICgkdGV4 dCkgPSBAXzsKKyAgICAkdGV4dCA9fiBzL1xuL1xyL2c7CisgICAgcmV0dXJuICR0ZXh0OworfQor CiBteSAkZ2l0RGlmZkhlYWRlckZvck5ld0ZpbGUgPSA8PEVPRjsKIGRpZmYgLS1naXQgYS9NYWtl ZmlsZSBiL01ha2VmaWxlCiBuZXcgZmlsZSBtb2RlIDEwMDY0NApAQCAtOTIsNiArMTIwLDcgQEAg RU9GCiBteSAkbW9ja0RpciA9IEZpbGU6OlRlbXAtPnRlbXBkaXIoInBhcnNlRGlmZlhYWFgiLCBD TEVBTlVQID0+IDEpOwogd3JpdGVUb0ZpbGUoRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkbW9ja0Rpciwg Ik1ha2VmaWxlV2l0aFVuaXhFT0wiKSwgJE1ha2VmaWxlQ29udGVudHMpOwogd3JpdGVUb0ZpbGUo RmlsZTo6U3BlYy0+Y2F0ZmlsZSgkbW9ja0RpciwgIk1ha2VmaWxlV2l0aFdpbmRvd3NFT0wiKSwg dG9XaW5kb3dzTGluZUVuZGluZ3MoJE1ha2VmaWxlQ29udGVudHMpKTsKK3dyaXRlVG9GaWxlKEZp bGU6OlNwZWMtPmNhdGZpbGUoJG1vY2tEaXIsICJNYWtlZmlsZVdpdGhNYWNFT0wiKSwgdG9NYWNM aW5lRW5kaW5ncygkTWFrZWZpbGVDb250ZW50cykpOwogCiAjIFRoZSBhcnJheSBvZiB0ZXN0IGNh c2VzLgogbXkgQHRlc3RDYXNlSGFzaFJlZnMgPSAoCkBAIC0xNDUsNiArMTc0LDc2IEBAIHVuZGVm XSwKIH0sCiB7CiAgICAgIyBOZXcgdGVzdAorICAgIGRpZmZOYW1lID0+ICJTVk46IFBhdGNoIGFk ZHMgV2luZG93cyBuZXdsaW5lIHRvIEVPRiBhbmQgSW5kZXhQYXRoIGhhcyBXaW5kb3dzIGxpbmUg ZW5kaW5ncyIsCisgICAgaW5wdXRUZXh0ID0+IDw8IkVPRiIsCitJbmRleDogTWFrZWZpbGVXaXRo V2luZG93c0VPTAorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQorLS0tIE1ha2VmaWxlV2l0aFdpbmRvd3NFT0wJKHJldmlz aW9uIDUzMDUyKQorKysrIE1ha2VmaWxlV2l0aFdpbmRvd3NFT0wJKHdvcmtpbmcgY29weSkKK0BA IC0xLDMgKzEsNCBAQFxyCisgTU9EVUxFUyA9IEphdmFTY3JpcHRDb3JlIEphdmFTY3JpcHRHbHVl IFdlYkNvcmUgV2ViS2l0IFdlYktpdFRvb2xzXHIKKyBccgorLWFsbDoKK1xcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKKythbGw6XHIKKytccgorRU9GCisgICAgZXhwZWN0ZWRSZXR1cm4gPT4g WworW3sKKyAgICAjIFNhbWUgYXMgaW5wdXQgdGV4dAorICAgIHN2bkNvbnZlcnRlZFRleHQgPT4g PDwiRU9GIiwKK0luZGV4OiBNYWtlZmlsZVdpdGhXaW5kb3dzRU9MCis9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CistLS0g TWFrZWZpbGVXaXRoV2luZG93c0VPTAkocmV2aXNpb24gNTMwNTIpCisrKysgTWFrZWZpbGVXaXRo V2luZG93c0VPTAkod29ya2luZyBjb3B5KQorQEAgLTEsMyArMSw0IEBAXHIKKyBNT0RVTEVTID0g SmF2YVNjcmlwdENvcmUgSmF2YVNjcmlwdEdsdWUgV2ViQ29yZSBXZWJLaXQgV2ViS2l0VG9vbHNc cgorIFxyCistYWxsOgorXFwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorK2FsbDpccgorK1xy CitFT0YKKyAgICBpbmRleFBhdGggPT4gIk1ha2VmaWxlV2l0aFdpbmRvd3NFT0wiLAorICAgIGlz U3ZuID0+IDEsCisgICAgbnVtVGV4dENodW5rcyA9PiAxLAorICAgIHNvdXJjZVJldmlzaW9uID0+ IDUzMDUyCit9XSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwK K3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gIlNWTjogUGF0Y2ggYWRkcyBNYWMg bmV3bGluZSB0byBFT0YgYW5kIEluZGV4UGF0aCBoYXMgTWFjIGxpbmUgZW5kaW5ncyIsCisgICAg aW5wdXRUZXh0ID0+IDw8IkVPRiIsCitJbmRleDogTWFrZWZpbGVXaXRoTWFjRU9MCis9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09CistLS0gTWFrZWZpbGVXaXRoTWFjRU9MCShyZXZpc2lvbiA1MzA1MikKKysrKyBNYWtlZmls ZVdpdGhNYWNFT0wJKHdvcmtpbmcgY29weSkKK0BAIC0xLDMgKzEsNCBAQFxyIE1PRFVMRVMgPSBK YXZhU2NyaXB0Q29yZSBKYXZhU2NyaXB0R2x1ZSBXZWJDb3JlIFdlYktpdCBXZWJLaXRUb29sc1xy IFxyLWFsbDoKK1xcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKythbGw6XHIrXHIKK0VPRgor ICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKK1t7CisgICAgIyBTYW1lIGFzIGlucHV0IHRleHQKKyAg ICBzdm5Db252ZXJ0ZWRUZXh0ID0+IHEoSW5kZXg6IE1ha2VmaWxlV2l0aE1hY0VPTAorPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQorLS0tIE1ha2VmaWxlV2l0aE1hY0VPTAkocmV2aXNpb24gNTMwNTIpCisrKysgTWFrZWZp bGVXaXRoTWFjRU9MCSh3b3JraW5nIGNvcHkpCitAQCAtMSwzICsxLDQgQEBcciBNT0RVTEVTID0g SmF2YVNjcmlwdENvcmUgSmF2YVNjcmlwdEdsdWUgV2ViQ29yZSBXZWJLaXQgV2ViS2l0VG9vbHNc ciBcci1hbGw6CitcXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCisrYWxsOlxyK1xyKSwKKyAg ICBpbmRleFBhdGggPT4gIk1ha2VmaWxlV2l0aE1hY0VPTCIsCisgICAgaXNTdm4gPT4gMSwKKyAg ICBudW1UZXh0Q2h1bmtzID0+IDEsCisgICAgc291cmNlUmV2aXNpb24gPT4gNTMwNTIKK31dLAor dW5kZWZdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCit9LAoreworICAgICMgTmV3 IHRlc3QKICAgICBkaWZmTmFtZSA9PiAiU1ZOOiBQYXRjaCB3aXRoIFVuaXggbGluZSBlbmRpbmdz IGFuZCBJbmRleFBhdGggaGFzIFdpbmRvd3MgbGluZSBlbmRpbmdzIiwKICAgICBpbnB1dFRleHQg PT4gc3Vic3RpdHV0ZVN0cmluZygkc3ZuRGlmZkhlYWRlciwgIk1ha2VmaWxlIiwgIk1ha2VmaWxl V2l0aFdpbmRvd3NFT0wiKSAuICRkaWZmQm9keSwKICAgICBleHBlY3RlZFJldHVybiA9PiBbCkBA IC0yMzUsNiArMzM0LDc0IEBAIHVuZGVmXSwKIH0sCiB7CiAgICAgIyBOZXcgdGVzdAorICAgIGRp ZmZOYW1lID0+ICJHaXQ6IFBhdGNoIGFkZHMgbmV3bGluZSB0byBFT0Ygd2l0aCBXaW5kb3dzIGxp bmUgZW5kaW5ncyBhbmQgSW5kZXhQYXRoIGhhcyBXaW5kb3dzIGxpbmUgZW5kaW5ncyIsCisgICAg aW5wdXRUZXh0ID0+IDw8IkVPRiIsCitkaWZmIC0tZ2l0IGEvTWFrZWZpbGVXaXRoV2luZG93c0VP TCBiL01ha2VmaWxlV2l0aFdpbmRvd3NFT0wKK2luZGV4IGU3ZTg0NzUuLmFlMTZmYzMgMTAwNjQ0 CistLS0gYS9NYWtlZmlsZVdpdGhXaW5kb3dzRU9MCisrKysgYi9NYWtlZmlsZVdpdGhXaW5kb3dz RU9MCitAQCAtMSwzICsxLDQgQEBccgorIE1PRFVMRVMgPSBKYXZhU2NyaXB0Q29yZSBKYXZhU2Ny aXB0R2x1ZSBXZWJDb3JlIFdlYktpdCBXZWJLaXRUb29sc1xyCisgXHIKKy1hbGw6CitcXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCisrYWxsOlxyCisrXHIKK0VPRgorICAgIGV4cGVjdGVkUmV0 dXJuID0+IFsKK1t7CisgICAgIyBTYW1lIGFzIGlucHV0IHRleHQKKyAgICBzdm5Db252ZXJ0ZWRU ZXh0ID0+IDw8IkVPRiIsCitJbmRleDogTWFrZWZpbGVXaXRoV2luZG93c0VPTAoraW5kZXggZTdl ODQ3NS4uYWUxNmZjMyAxMDA2NDQKKy0tLSBNYWtlZmlsZVdpdGhXaW5kb3dzRU9MCisrKysgTWFr ZWZpbGVXaXRoV2luZG93c0VPTAorQEAgLTEsMyArMSw0IEBAXHIKKyBNT0RVTEVTID0gSmF2YVNj cmlwdENvcmUgSmF2YVNjcmlwdEdsdWUgV2ViQ29yZSBXZWJLaXQgV2ViS2l0VG9vbHNccgorIFxy CistYWxsOgorXFwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorK2FsbDpccgorK1xyCitFT0YK KyAgICBpbmRleFBhdGggPT4gIk1ha2VmaWxlV2l0aFdpbmRvd3NFT0wiLAorICAgIGlzR2l0ID0+ IDEsCisgICAgbnVtVGV4dENodW5rcyA9PiAxCit9XSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5l eHRMaW5lID0+IHVuZGVmLAorfSwKK3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4g IkdpdDogUGF0Y2ggYWRkcyBNYWMgbmV3bGluZSB0byBFT0YgYW5kIEluZGV4UGF0aCBoYXMgTWFj IGxpbmUgZW5kaW5ncyIsCisgICAgaW5wdXRUZXh0ID0+IDw8IkVPRiIsCitkaWZmIC0tZ2l0IGEv TWFrZWZpbGVXaXRoTWFjRU9MIGIvTWFrZWZpbGVXaXRoTWFjRU9MCitpbmRleCBlN2U4NDc1Li5h ZTE2ZmMzIDEwMDY0NAorLS0tIGEvTWFrZWZpbGVXaXRoTWFjRU9MCisrKysgYi9NYWtlZmlsZVdp dGhNYWNFT0wKK0BAIC0xLDMgKzEsNCBAQFxyIE1PRFVMRVMgPSBKYXZhU2NyaXB0Q29yZSBKYXZh U2NyaXB0R2x1ZSBXZWJDb3JlIFdlYktpdCBXZWJLaXRUb29sc1xyIFxyLWFsbDoKK1xcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUKKythbGw6XHIrXHIKK0VPRgorICAgIGV4cGVjdGVkUmV0dXJu ID0+IFsKK1t7CisgICAgIyBTYW1lIGFzIGlucHV0IHRleHQKKyAgICBzdm5Db252ZXJ0ZWRUZXh0 ID0+IHEoSW5kZXg6IE1ha2VmaWxlV2l0aE1hY0VPTAoraW5kZXggZTdlODQ3NS4uYWUxNmZjMyAx MDA2NDQKKy0tLSBNYWtlZmlsZVdpdGhNYWNFT0wKKysrKyBNYWtlZmlsZVdpdGhNYWNFT0wKK0BA IC0xLDMgKzEsNCBAQFxyIE1PRFVMRVMgPSBKYXZhU2NyaXB0Q29yZSBKYXZhU2NyaXB0R2x1ZSBX ZWJDb3JlIFdlYktpdCBXZWJLaXRUb29sc1xyIFxyLWFsbDoKK1xcIE5vIG5ld2xpbmUgYXQgZW5k IG9mIGZpbGUKKythbGw6XHIrXHIpLAorICAgIGluZGV4UGF0aCA9PiAiTWFrZWZpbGVXaXRoTWFj RU9MIiwKKyAgICBpc0dpdCA9PiAxLAorICAgIG51bVRleHRDaHVua3MgPT4gMQorfV0sCit1bmRl Zl0sCisgICAgZXhwZWN0ZWROZXh0TGluZSA9PiB1bmRlZiwKK30sCit7CisgICAgIyBOZXcgdGVz dAogICAgIGRpZmZOYW1lID0+ICJHaXQ6IFBhdGNoIHdpdGggVW5peCBsaW5lIGVuZGluZ3MgYW5k IEluZGV4UGF0aCBoYXMgV2luZG93cyBsaW5lIGVuZGluZ3MiLAogICAgIGlucHV0VGV4dCA9PiBz dWJzdGl0dXRlU3RyaW5nKCRnaXREaWZmSGVhZGVyLCAiTWFrZWZpbGUiLCAiTWFrZWZpbGVXaXRo V2luZG93c0VPTCIpIC4gJGRpZmZCb2R5LAogICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKQEAgLTI5 NCw2ICs0NjEsOCBAQCBmb3JlYWNoIG15ICR0ZXN0Q2FzZSAoQHRlc3RDYXNlSGFzaFJlZnMpCiAg ICAgbXkgQGdvdCA9IFZDU1V0aWxzOjpwYXJzZURpZmYoJGZpbGVIYW5kbGUsICRsaW5lKTsKICAg ICBteSAkZXhwZWN0ZWRSZXR1cm4gPSAkdGVzdENhc2UtPntleHBlY3RlZFJldHVybn07CiAKKyAg ICAkZ290WzBdWzBdLT57c3ZuQ29udmVydGVkVGV4dH0gPSBlc2NhcGVOZXdMaW5lQ2hhcmFjdGVy cygkZ290WzBdWzBdLT57c3ZuQ29udmVydGVkVGV4dH0pOworICAgICRleHBlY3RlZFJldHVybi0+ WzBdWzBdLT57c3ZuQ29udmVydGVkVGV4dH0gPSBlc2NhcGVOZXdMaW5lQ2hhcmFjdGVycygkZXhw ZWN0ZWRSZXR1cm4tPlswXVswXS0+e3N2bkNvbnZlcnRlZFRleHR9KTsKICAgICBpc19kZWVwbHko XEBnb3QsICRleHBlY3RlZFJldHVybiwgIiR0ZXN0TmFtZVN0YXJ0IHJldHVybiB2YWx1ZS4iKTsK IAogICAgIG15ICRnb3ROZXh0TGluZSA9IDwkZmlsZUhhbmRsZT47Cg==