37064 2010-04-03 14:06:27 -0700 check-webkit-style: refactor the option-parsing code 2010-04-04 01:27:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek cjerdonek commit-queue hamaji oldest_to_newest 208304 0 cjerdonek 2010-04-03 14:06:27 -0700 There is some minor refactoring the option-parsing code could use. This includes one FIXME and some other things. 208306 1 52501 cjerdonek 2010-04-03 14:24:45 -0700 Created attachment 52501 Proposed patch 208339 2 52501 hamaji 2010-04-04 00:15:40 -0700 Comment on attachment 52501 Proposed patch Looks good! 208340 3 52501 commit-queue 2010-04-04 00:44:24 -0700 Comment on attachment 52501 Proposed patch Rejecting patch 52501 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--quiet']" exit_code: 1 Running build-dumprendertree Compiling Java tests make: Nothing to be done for `default'. Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 12625 test cases. fast/canvas/webgl/drawArraysOutOfBounds.html -> failed Exiting early after 1 failures. 5073 tests run. 88.37s total testing time 5072 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 1 test case (<1%) had stderr output Full output: http://webkit-commit-queue.appspot.com/results/1553245 208343 4 52501 cjerdonek 2010-04-04 01:27:05 -0700 Comment on attachment 52501 Proposed patch Clearing flags on attachment: 52501 Committed r57056: <http://trac.webkit.org/changeset/57056> 208344 5 cjerdonek 2010-04-04 01:27:11 -0700 All reviewed patches have been landed. Closing bug. 52501 2010-04-03 14:24:45 -0700 2010-04-04 01:27:05 -0700 Proposed patch _patch-37064-1.diff text/plain 14968 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlNTg4ODEyLi4xNWFhMWQyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzggQEAKIDIwMTAtMDQt MDMgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3JlZCBjaGVjay13ZWJr aXQtc3R5bGUncyBvcHRpb24tcGFyc2luZyBjb2RlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzA2NAorCisgICAgICAgICogU2NyaXB0cy9jaGVj ay13ZWJraXQtc3R5bGU6CisgICAgICAgICAgLSBNb3ZlZCB0aGUgIldlYktpdCBjaGVja291dCBu b3QgZm91bmQiIGNoZWNrIGZyb20KKyAgICAgICAgICAgIEFyZ3VtZW50UGFyc2VyLnBhcnNlKCkg dG8gdGhlIGNhbGxpbmcgY29kZS4KKyAgICAgICAgICAtIE1vdmVkIHRoZSAtLWdpdC1jb21taXQg YXJndW1lbnQgdmFsaWRhdGlvbiBmcm9tIHRoZSBjYWxsaW5nCisgICAgICAgICAgICBjb2RlIHRv IEFyZ3VtZW50UGFyc2VyLnBhcnNlKCkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXJfdW5pdHRlc3QucHk6CisgICAgICAgICAgLSBVcGRhdGVkIGEgdW5pdCB0ZXN0 IGFzIG5lY2Vzc2FyeS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvb3B0cGFy c2VyLnB5OgorICAgICAgICAgIC0gUmVuYW1lZCBBcmd1bWVudFBhcnNlci5fZXhpdF93aXRoX2hl bHAoKSB0byBfcGFyc2VfZXJyb3IoKQorICAgICAgICAgICAgYW5kIG1hZGUgaXRzIGVycm9yX21l c3NhZ2UgcGFyYW1ldGVyIHJlcXVpcmVkLgorICAgICAgICAgIC0gUmVtb3ZlZCB0aGUgZm91bmRf Y2hlY2tvdXQgcGFyYW1ldGVyIGZyb20gQXJndW1lbnRQYXJzZXIucGFyc2UoKS4KKyAgICAgICAg ICAtIFJlbW92ZWQgdGhlICJXZWJLaXQgY2hlY2tvdXQgbm90IGZvdW5kIiBjaGVjayBhbmQgbW92 ZWQgaXQKKyAgICAgICAgICAgIHRvIHRoZSBjYWxsaW5nIGNvZGUuCisgICAgICAgICAgLSBBZGRl ZCAtLWdpdC1jb21taXQgYXJndW1lbnQgY2hlY2tpbmcuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3N0eWxlL29wdHBhcnNlcl91bml0dGVzdC5weToKKyAgICAgICAgICAtIEFkanVzdGVk IHRoZSBpbXBvcnQgc3RhdGVtZW50cyB0byBiZSBmdWxseSBxdWFsaWZpZWQuCisgICAgICAgICAg LSBDaGFuZ2VkIHRoZSBBcmd1bWVudFBhcnNlclRlc3QgY2xhc3MgdG8gaW5oZXJpdCBmcm9tCisg ICAgICAgICAgICBMb2dnaW5nVGVzdENhc2UsIGFuZCB1cGRhdGVkIHRoZSBjbGFzcyBhcyBuZWNl c3NhcnkuCisgICAgICAgICAgLSBBZGRlZCBhIHVuaXQtdGVzdCBmb3IgdGhlIC0tZ2l0LWNvbW1p dCB2YWxpZGF0aW9uLgorICAgICAgICAgIC0gQWRkZWQgdW5pdCB0ZXN0cyBmb3IgdGhlIC0tZ2l0 LWRpZmYgYW5kIC0tZ2l0LXNpbmNlIHZhcmlhbnRzCisgICAgICAgICAgICBvZiAtLWdpdC1jb21t aXQuCisKKzIwMTAtMDQtMDMgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+ CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCiAKICAgICAgICAgVGhl IGNoZWNrLXdlYmtpdC1zdHlsZSBzY3JpcHQgbm93IGxvZ3MgYW4gRVJST1IgYW5kIGV4aXRzIHdo ZW4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvY2hlY2std2Via2l0LXN0eWxlIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKaW5kZXggYjdiNDk2Ny4uOTVm ZmY3OSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKQEAgLTkzLDggKzkz LDEzIEBAIGRlZiBtYWluKCk6CiAgICAgICAgIF9sb2cuZGVidWcoIldlYktpdCBjaGVja291dCBm b3VuZCB3aXRoIHJvb3Q6ICVzIiAlIGNoZWNrb3V0X3Jvb3QpCiAKICAgICBwYXJzZXIgPSBjaGVj a2VyLmNoZWNrX3dlYmtpdF9zdHlsZV9wYXJzZXIoKQotICAgIGZvdW5kX2NoZWNrb3V0ID0gY2hl Y2tvdXQgaXMgbm90IE5vbmUKLSAgICAocGF0aHMsIG9wdGlvbnMpID0gcGFyc2VyLnBhcnNlKGFy Z3MsIGZvdW5kX2NoZWNrb3V0PWZvdW5kX2NoZWNrb3V0KQorICAgIChwYXRocywgb3B0aW9ucykg PSBwYXJzZXIucGFyc2UoYXJncykKKworICAgIGlmIGNoZWNrb3V0IGlzIE5vbmUgYW5kIG5vdCBw YXRoczoKKyAgICAgICAgX2xvZy5lcnJvcigiV2ViS2l0IGNoZWNrb3V0IG5vdCBmb3VuZDogWW91 IG11c3QgcnVuIHRoaXMgc2NyaXB0ICIKKyAgICAgICAgICAgICAgICAgICAiZnJvbSB3aXRoaW4g YSBXZWJLaXQgY2hlY2tvdXQgaWYgeW91IGFyZSBub3QgcGFzc2luZyAiCisgICAgICAgICAgICAg ICAgICAgInNwZWNpZmljIHBhdGhzIHRvIGNoZWNrLiIpCisgICAgICAgIHN5cy5leGl0KDEpCiAK ICAgICBjb25maWd1cmF0aW9uID0gY2hlY2tlci5jaGVja193ZWJraXRfc3R5bGVfY29uZmlndXJh dGlvbihvcHRpb25zKQogICAgIHN0eWxlX2NoZWNrZXIgPSBjaGVja2VyLlN0eWxlQ2hlY2tlcihj b25maWd1cmF0aW9uKQpAQCAtMTA1LDE0ICsxMTAsNyBAQCBkZWYgbWFpbigpOgogICAgICAgICBz dHlsZV9jaGVja2VyLmNoZWNrX3BhdGhzKHBhdGhzKQogICAgIGVsc2U6CiAgICAgICAgIGlmIG9w dGlvbnMuZ2l0X2NvbW1pdDoKLSAgICAgICAgICAgIGNvbW1pdCA9IG9wdGlvbnMuZ2l0X2NvbW1p dAotICAgICAgICAgICAgaWYgJy4uJyBpbiBjb21taXQ6Ci0gICAgICAgICAgICAgICAgIyBGSVhN RTogSWYgdGhlIHJhbmdlIGlzIGEgIi4uLiIsIHRoZSBjb2RlIHNob3VsZCBmaW5kIHRoZSBjb21t b24gYW5jZXN0b3IgYW5kCi0gICAgICAgICAgICAgICAgIyBzdGFydCB0aGVyZSAoc2VlIGdpdCBk aWZmIC0taGVscCBmb3IgaW5mb3JtYXRpb24gYWJvdXQgaG93IC4uLiB1c3VhbGx5IHdvcmtzKS4K LSAgICAgICAgICAgICAgICBjb21taXQgPSBjb21taXRbOmNvbW1pdC5maW5kKCcuLicpXQotICAg ICAgICAgICAgICAgIF9sb2cud2FybigiUmFuZ2VzIGFyZSBub3Qgc3VwcG9ydGVkIGZvciAtLWdp dC1jb21taXQuICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIkNoZWNraW5nIGFsbCBjaGFu Z2VzIHNpbmNlICVzLiIgJSBjb21taXQpCi0gICAgICAgICAgICBwYXRjaCA9IGNoZWNrb3V0LmNy ZWF0ZV9wYXRjaF9zaW5jZV9sb2NhbF9jb21taXQoY29tbWl0KQorICAgICAgICAgICAgcGF0Y2gg PSBjaGVja291dC5jcmVhdGVfcGF0Y2hfc2luY2VfbG9jYWxfY29tbWl0KG9wdGlvbnMuZ2l0X2Nv bW1pdCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHBhdGNoID0gY2hlY2tvdXQuY3JlYXRl X3BhdGNoKCkKICAgICAgICAgc3R5bGVfY2hlY2tlci5jaGVja19wYXRjaChwYXRjaCkKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVz dC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVz dC5weQppbmRleCAzNDYxYjcwLi42YzE2ZDE3IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CkBAIC0xODUsNyArMTg1 LDcgQEAgY2xhc3MgR2xvYmFsVmFyaWFibGVzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgICMgb24gdmFsaWQgYXJndW1lbnRzIGVsc2V3aGVyZS4KICAgICAgICAgIwogICAgICAgICAj IFRoZSBkZWZhdWx0IG9wdGlvbnMgYXJlIHZhbGlkOiBubyBlcnJvciBvciBTeXN0ZW1FeGl0Lgot ICAgICAgICBwYXJzZXIucGFyc2UoYXJncz1bXSwgZm91bmRfY2hlY2tvdXQ9VHJ1ZSkKKyAgICAg ICAgcGFyc2VyLnBhcnNlKGFyZ3M9W10pCiAKICAgICBkZWYgdGVzdF9wYXRoX3J1bGVzX3NwZWNp ZmllcihzZWxmKToKICAgICAgICAgYWxsX2NhdGVnb3JpZXMgPSBzZWxmLl9hbGxfY2F0ZWdvcmll cygpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL29wdHBh cnNlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvb3B0cGFyc2VyLnB5 CmluZGV4IDMzOWZiM2YuLjU3NmMxNmEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvb3B0cGFyc2VyLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvb3B0cGFyc2VyLnB5CkBAIC0yMiw4ICsyMiw4IEBACiAKICIiIlN1cHBvcnRz IHRoZSBwYXJzaW5nIG9mIGNvbW1hbmQtbGluZSBvcHRpb25zIGZvciBjaGVjay13ZWJraXQtc3R5 bGUuIiIiCiAKLWZyb20gb3B0cGFyc2UgaW1wb3J0IE9wdGlvblBhcnNlcgogaW1wb3J0IGxvZ2dp bmcKK2Zyb20gb3B0cGFyc2UgaW1wb3J0IE9wdGlvblBhcnNlcgogaW1wb3J0IG9zLnBhdGgKIGlt cG9ydCBzeXMKIApAQCAtMzMwLDcgKzMzMCw3IEBAIGNsYXNzIEFyZ3VtZW50UGFyc2VyKG9iamVj dCk6CiAgICAgICAgICMgT3ZlcnJpZGUgT3B0aW9uUGFyc2VyJ3MgZXJyb3IoKSBtZXRob2Qgc28g dGhhdCBvcHRpb24gaGVscCB3aWxsCiAgICAgICAgICMgYWxzbyBkaXNwbGF5IHdoZW4gYW4gZXJy b3Igb2NjdXJzLiAgTm9ybWFsbHksIGp1c3QgdGhlIHVzYWdlCiAgICAgICAgICMgc3RyaW5nIGRp c3BsYXlzIGFuZCBub3Qgb3B0aW9uIGhlbHAuCi0gICAgICAgIHBhcnNlci5lcnJvciA9IHNlbGYu X2V4aXRfd2l0aF9oZWxwCisgICAgICAgIHBhcnNlci5lcnJvciA9IHNlbGYuX3BhcnNlX2Vycm9y CiAKICAgICAgICAgIyBPdmVycmlkZSBPcHRpb25QYXJzZXIncyBwcmludF9oZWxwKCkgbWV0aG9k IHNvIHRoYXQgaGVscCBvdXRwdXQKICAgICAgICAgIyBkb2VzIG5vdCByZW5kZXIgdG8gdGhlIHNj cmVlbiB3aGlsZSBydW5uaW5nIHVuaXQgdGVzdHMuCkBAIC0zMzksMTMgKzMzOSw4IEBAIGNsYXNz IEFyZ3VtZW50UGFyc2VyKG9iamVjdCk6CiAKICAgICAgICAgcmV0dXJuIHBhcnNlcgogCi0gICAg ZGVmIF9leGl0X3dpdGhfaGVscChzZWxmLCBlcnJvcl9tZXNzYWdlPU5vbmUpOgotICAgICAgICAi IiJFeGl0IGFuZCBwcmludCBhIHVzYWdlIHN0cmluZyB3aXRoIGFuIG9wdGlvbmFsIGVycm9yIG1l c3NhZ2UuCi0KLSAgICAgICAgQXJnczoKLSAgICAgICAgICBlcnJvcl9tZXNzYWdlOiBBIHN0cmlu ZyB0aGF0IGlzIGFuIGVycm9yIG1lc3NhZ2UgdG8gcHJpbnQuCi0KLSAgICAgICAgIiIiCisgICAg ZGVmIF9wYXJzZV9lcnJvcihzZWxmLCBlcnJvcl9tZXNzYWdlKToKKyAgICAgICAgIiIiUHJpbnQg dGhlIGhlbHAgc3RyaW5nIGFuZCBhbiBlcnJvciBtZXNzYWdlLCBhbmQgZXhpdC4iIiIKICAgICAg ICAgIyBUaGUgbWV0aG9kIGZvcm1hdF9oZWxwKCkgaW5jbHVkZXMgYm90aCB0aGUgdXNhZ2Ugc3Ry aW5nIGFuZAogICAgICAgICAjIHRoZSBmbGFnIG9wdGlvbnMuCiAgICAgICAgIGhlbHAgPSBzZWxm Ll9wYXJzZXIuZm9ybWF0X2hlbHAoKQpAQCAtMzk2LDEzICszOTEsMTEgQEAgY2xhc3MgQXJndW1l bnRQYXJzZXIob2JqZWN0KToKICAgICAgICAgICAgIGZpbHRlcnMuYXBwZW5kKGZpbHRlcikKICAg ICAgICAgcmV0dXJuIGZpbHRlcnMKIAotICAgIGRlZiBwYXJzZShzZWxmLCBhcmdzLCBmb3VuZF9j aGVja291dCk6CisgICAgZGVmIHBhcnNlKHNlbGYsIGFyZ3MpOgogICAgICAgICAiIiJQYXJzZSB0 aGUgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyB0byBjaGVjay13ZWJraXQtc3R5bGUuCiAKICAgICAg ICAgQXJnczoKICAgICAgICAgICBhcmdzOiBBIGxpc3Qgb2YgY29tbWFuZC1saW5lIGFyZ3VtZW50 cyBhcyByZXR1cm5lZCBieSBzeXMuYXJndlsxOl0uCi0gICAgICAgICAgZm91bmRfY2hlY2tvdXQ6 IEEgYm9vbGVhbiB2YWx1ZSBvZiB3aGV0aGVyIHRoZSBjdXJyZW50IHdvcmtpbmcKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgZGlyZWN0b3J5IHdhcyBmb3VuZCB0byBiZSBpbnNpZGUgYSBXZWJL aXQgY2hlY2tvdXQuCiAKICAgICAgICAgUmV0dXJuczoKICAgICAgICAgICBBIHR1cGxlIG9mIChw YXRocywgb3B0aW9ucykKQEAgLTQyNiwyMyArNDE5LDIzIEBAIGNsYXNzIEFyZ3VtZW50UGFyc2Vy KG9iamVjdCk6CiAKICAgICAgICAgIyBWYWxpZGF0ZSB1c2VyLXByb3ZpZGVkIHZhbHVlcy4KIAot ICAgICAgICAjIEZJWE1FOiBNb3ZlIHRoZSBjaGVja291dCBlcnJvciBvdXRzaWRlIG9mIHRoaXMg bW9kdWxlLiAgVGhlIHBhcnNlCi0gICAgICAgICMgICAgICAgIG1ldGhvZCBzaG91bGQgbm90IG5l ZWQgdG8ga25vdyB3aGV0aGVyIGEgY2hlY2tvdXQgd2FzIGZvdW5kLgotICAgICAgICBpZiBub3Qg Zm91bmRfY2hlY2tvdXQgYW5kIG5vdCBwYXRoczoKLSAgICAgICAgICAgIF9sb2cuZXJyb3IoIldl YktpdCBjaGVja291dCBub3QgZm91bmQ6IFlvdSBtdXN0IHJ1biB0aGlzIHNjcmlwdCAiCi0gICAg ICAgICAgICAgICAgICAgICAgICJmcm9tIGluc2lkZSBhIFdlYktpdCBjaGVja291dCBpZiB5b3Ug YXJlIG5vdCBwYXNzaW5nICIKLSAgICAgICAgICAgICAgICAgICAgICAgInNwZWNpZmljIHBhdGhz IHRvIGNoZWNrLiIpCi0gICAgICAgICAgICBzeXMuZXhpdCgxKQotCiAgICAgICAgIGlmIHBhdGhz IGFuZCBnaXRfY29tbWl0OgotICAgICAgICAgICAgc2VsZi5fZXhpdF93aXRoX2hlbHAoJ1lvdSBj YW5ub3QgcHJvdmlkZSBib3RoIHBhdGhzIGFuZCBhIGdpdCAnCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnY29tbWl0IGF0IHRoZSBzYW1lIHRpbWUuJykKKyAgICAgICAgICAgIHNl bGYuX3BhcnNlX2Vycm9yKCdZb3UgY2Fubm90IHByb3ZpZGUgYm90aCBwYXRocyBhbmQgYSBnaXQg JworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2NvbW1pdCBhdCB0aGUgc2FtZSB0aW1l LicpCisKKyAgICAgICAgIyBGSVhNRTogQWRkIHVuaXQgdGVzdHMuCisgICAgICAgIGlmIGdpdF9j b21taXQgYW5kICcuLicgaW4gZ2l0X2NvbW1pdDoKKyAgICAgICAgICAgICMgRklYTUU6IElmIHRo ZSByYW5nZSBpcyBhICIuLi4iLCB0aGUgY29kZSBzaG91bGQgZmluZCB0aGUgY29tbW9uCisgICAg ICAgICAgICAjICAgICAgICBhbmNlc3RvciBhbmQgc3RhcnQgdGhlcmUuICBTZWUgZ2l0IGRpZmYg LS1oZWxwIGZvciBob3cKKyAgICAgICAgICAgICMgICAgICAgICIuLi4iIHVzdWFsbHkgd29ya3Mu CisgICAgICAgICAgICBzZWxmLl9wYXJzZV9lcnJvcignaW52YWxpZCAtLWdpdC1jb21taXQgb3B0 aW9uOiBvcHRpb24gZG9lcyAnCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbm90IHN1 cHBvcnQgcmFuZ2VzICIuLiI6ICVzJyAlIGdpdF9jb21taXQpCiAKICAgICAgICAgbWluX2NvbmZp ZGVuY2UgPSBpbnQobWluX2NvbmZpZGVuY2UpCiAgICAgICAgIGlmIChtaW5fY29uZmlkZW5jZSA8 IDEpIG9yIChtaW5fY29uZmlkZW5jZSA+IDUpOgotICAgICAgICAgICAgc2VsZi5fZXhpdF93aXRo X2hlbHAoJ29wdGlvbiAtLW1pbi1jb25maWRlbmNlOiBpbnZhbGlkIGludGVnZXI6ICcKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICclczogdmFsdWUgbXVzdCBiZSBiZXR3ZWVuIDEg YW5kIDUnCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAlIG1pbl9jb25maWRlbmNl KQorICAgICAgICAgICAgc2VsZi5fcGFyc2VfZXJyb3IoJ29wdGlvbiAtLW1pbi1jb25maWRlbmNl OiBpbnZhbGlkIGludGVnZXI6ICcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICclczog dmFsdWUgbXVzdCBiZSBiZXR3ZWVuIDEgYW5kIDUnCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAlIG1pbl9jb25maWRlbmNlKQogCiAgICAgICAgIGlmIGZpbHRlcl92YWx1ZToKICAgICAg ICAgICAgIGZpbHRlcl9ydWxlcyA9IHNlbGYuX3BhcnNlX2ZpbHRlcl9mbGFnKGZpbHRlcl92YWx1 ZSkKQEAgLTQ1Miw3ICs0NDUsNyBAQCBjbGFzcyBBcmd1bWVudFBhcnNlcihvYmplY3QpOgogICAg ICAgICB0cnk6CiAgICAgICAgICAgICB2YWxpZGF0ZV9maWx0ZXJfcnVsZXMoZmlsdGVyX3J1bGVz LCBzZWxmLl9hbGxfY2F0ZWdvcmllcykKICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IsIGVycjoK LSAgICAgICAgICAgIHNlbGYuX2V4aXRfd2l0aF9oZWxwKGVycikKKyAgICAgICAgICAgIHNlbGYu X3BhcnNlX2Vycm9yKGVycikKIAogICAgICAgICBvcHRpb25zID0gQ29tbWFuZE9wdGlvblZhbHVl cyhmaWx0ZXJfcnVsZXM9ZmlsdGVyX3J1bGVzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBnaXRfY29tbWl0PWdpdF9jb21taXQsCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL29wdHBhcnNlcl91bml0dGVzdC5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvb3B0cGFyc2VyX3VuaXR0ZXN0LnB5CmluZGV4IDY2 YzFkNzUuLjFjNTI1YzYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvb3B0cGFyc2VyX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvb3B0cGFyc2VyX3VuaXR0ZXN0LnB5CkBAIC0yNCwxMSArMjQsMTEgQEAKIAog aW1wb3J0IHVuaXR0ZXN0CiAKLWZyb20gb3B0cGFyc2VyIGltcG9ydCBBcmd1bWVudFBhcnNlcgot ZnJvbSBvcHRwYXJzZXIgaW1wb3J0IEFyZ3VtZW50UHJpbnRlcgotZnJvbSBvcHRwYXJzZXIgaW1w b3J0IENvbW1hbmRPcHRpb25WYWx1ZXMgYXMgUHJvY2Vzc29yT3B0aW9ucwotZnJvbSBvcHRwYXJz ZXIgaW1wb3J0IERlZmF1bHRDb21tYW5kT3B0aW9uVmFsdWVzCi1mcm9tIHdlYmtpdHB5LnN0eWxl X3JlZmVyZW5jZXMgaW1wb3J0IExvZ1Rlc3RpbmcKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5sb2d0ZXN0aW5nIGltcG9ydCBMb2dnaW5nVGVzdENhc2UKK2Zyb20gd2Via2l0cHkuc3R5bGUu b3B0cGFyc2VyIGltcG9ydCBBcmd1bWVudFBhcnNlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5vcHRw YXJzZXIgaW1wb3J0IEFyZ3VtZW50UHJpbnRlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5vcHRwYXJz ZXIgaW1wb3J0IENvbW1hbmRPcHRpb25WYWx1ZXMgYXMgUHJvY2Vzc29yT3B0aW9ucworZnJvbSB3 ZWJraXRweS5zdHlsZS5vcHRwYXJzZXIgaW1wb3J0IERlZmF1bHRDb21tYW5kT3B0aW9uVmFsdWVz CiAKIAogY2xhc3MgQXJndW1lbnRQcmludGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CkBAIC02 MCw3ICs2MCw3IEBAIGNsYXNzIEFyZ3VtZW50UHJpbnRlclRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wcmludGVyLnRvX2ZsYWdfc3RyaW5n KG9wdGlvbnMpKQogCiAKLWNsYXNzIEFyZ3VtZW50UGFyc2VyVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CitjbGFzcyBBcmd1bWVudFBhcnNlclRlc3QoTG9nZ2luZ1Rlc3RDYXNlKToKIAogICAgICIi IlRlc3QgdGhlIEFyZ3VtZW50UGFyc2VyIGNsYXNzLiIiIgogCkBAIC03MSwxNyArNzEsMTAgQEAg Y2xhc3MgQXJndW1lbnRQYXJzZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAg ICMgdG8gcHJpbnQgZHVyaW5nIHVuaXQgdGVzdHMsIHNvIHByaW50IG5vdGhpbmcuCiAgICAgICAg ICAgICByZXR1cm4KIAotICAgIGRlZiBzZXRVcChzZWxmKToKLSAgICAgICAgc2VsZi5fbG9nID0g TG9nVGVzdGluZy5zZXRVcChzZWxmKQotCi0gICAgZGVmIHRlYXJEb3duKHNlbGYpOgotICAgICAg ICBzZWxmLl9sb2cudGVhckRvd24oKQotCi0gICAgIyBXZSB3aWxsIHB1dCB0aGUgdGVzdHMgZm9y IGZvdW5kX3NjbSBGYWxzZSBpbiBhIGNvbW1vbiBsb2NhdGlvbi4KLSAgICBkZWYgX3BhcnNlKHNl bGYsIGFyZ3MsIGZvdW5kX3NjbT1UcnVlKToKKyAgICBkZWYgX3BhcnNlKHNlbGYsIGFyZ3MpOgog ICAgICAgICAiIiJDYWxsIGEgdGVzdCBwYXJzZXIucGFyc2UoKS4iIiIKICAgICAgICAgcGFyc2Vy ID0gc2VsZi5fY3JlYXRlX3BhcnNlcigpCi0gICAgICAgIHJldHVybiBwYXJzZXIucGFyc2UoYXJn cywgZm91bmRfc2NtKQorICAgICAgICByZXR1cm4gcGFyc2VyLnBhcnNlKGFyZ3MpCiAKICAgICBk ZWYgX2NyZWF0ZV9kZWZhdWx0cyhzZWxmKToKICAgICAgICAgIiIiUmV0dXJuIGEgRGVmYXVsdENv bW1hbmRPcHRpb25WYWx1ZXMgaW5zdGFuY2UgZm9yIHRlc3RpbmcuIiIiCkBAIC0xMTksNTEgKzEx MiwzOSBAQCBjbGFzcyBBcmd1bWVudFBhcnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAg ICAgICAgICMgUGFzcyBhbiB1bnN1cHBvcnRlZCBhcmd1bWVudC4KICAgICAgICAgc2VsZi5hc3Nl cnRSYWlzZXMoU3lzdGVtRXhpdCwgcGFyc2UsIFsnLS1iYWQnXSkKLSAgICAgICAgc2VsZi5fbG9n LmFzc2VydE1lc3NhZ2VzKFsnRVJST1I6IG5vIHN1Y2ggb3B0aW9uOiAtLWJhZFxuJ10pCisgICAg ICAgIHNlbGYuYXNzZXJ0TG9nKFsnRVJST1I6IG5vIHN1Y2ggb3B0aW9uOiAtLWJhZFxuJ10pCisK KyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3lzdGVtRXhpdCwgcGFyc2UsIFsnLS1naXQtZGlm Zj1hYS4uYmInXSkKKyAgICAgICAgc2VsZi5hc3NlcnRMb2coWydFUlJPUjogaW52YWxpZCAtLWdp dC1jb21taXQgb3B0aW9uOiAnCisgICAgICAgICAgICAgICAgICAgICAgICAnb3B0aW9uIGRvZXMg bm90IHN1cHBvcnQgcmFuZ2VzICIuLiI6IGFhLi5iYlxuJ10pCiAKICAgICAgICAgc2VsZi5hc3Nl cnRSYWlzZXMoU3lzdGVtRXhpdCwgcGFyc2UsIFsnLS1taW4tY29uZmlkZW5jZT1iYWQnXSkKLSAg ICAgICAgc2VsZi5fbG9nLmFzc2VydE1lc3NhZ2VzKFsiRVJST1I6IG9wdGlvbiAtLW1pbi1jb25m aWRlbmNlOiBpbnZhbGlkICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW50 ZWdlciB2YWx1ZTogJ2JhZCdcbiJdKQorICAgICAgICBzZWxmLmFzc2VydExvZyhbJ0VSUk9SOiBv cHRpb24gLS1taW4tY29uZmlkZW5jZTogJworICAgICAgICAgICAgICAgICAgICAgICAgImludmFs aWQgaW50ZWdlciB2YWx1ZTogJ2JhZCdcbiJdKQogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhT eXN0ZW1FeGl0LCBwYXJzZSwgWyctLW1pbi1jb25maWRlbmNlPTAnXSkKLSAgICAgICAgc2VsZi5f bG9nLmFzc2VydE1lc3NhZ2VzKFsnRVJST1I6IG9wdGlvbiAtLW1pbi1jb25maWRlbmNlOiBpbnZh bGlkICcKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnaW50ZWdlcjogMDogdmFs dWUgbXVzdCBiZSBiZXR3ZWVuIDEgYW5kICcKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnNVxuJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0TG9nKFsnRVJST1I6IG9wdGlvbiAtLW1p bi1jb25maWRlbmNlOiBpbnZhbGlkIGludGVnZXI6IDA6ICcKKyAgICAgICAgICAgICAgICAgICAg ICAgICd2YWx1ZSBtdXN0IGJlIGJldHdlZW4gMSBhbmQgNVxuJ10pCiAgICAgICAgIHNlbGYuYXNz ZXJ0UmFpc2VzKFN5c3RlbUV4aXQsIHBhcnNlLCBbJy0tbWluLWNvbmZpZGVuY2U9NiddKQotICAg ICAgICBzZWxmLl9sb2cuYXNzZXJ0TWVzc2FnZXMoWydFUlJPUjogb3B0aW9uIC0tbWluLWNvbmZp ZGVuY2U6IGludmFsaWQgJwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdpbnRl Z2VyOiA2OiB2YWx1ZSBtdXN0IGJlIGJldHdlZW4gMSBhbmQgJwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICc1XG4nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRMb2coWydFUlJPUjog b3B0aW9uIC0tbWluLWNvbmZpZGVuY2U6IGludmFsaWQgaW50ZWdlcjogNjogJworICAgICAgICAg ICAgICAgICAgICAgICAgJ3ZhbHVlIG11c3QgYmUgYmV0d2VlbiAxIGFuZCA1XG4nXSkKICAgICAg ICAgcGFyc2UoWyctLW1pbi1jb25maWRlbmNlPTEnXSkgIyB3b3JrcwogICAgICAgICBwYXJzZShb Jy0tbWluLWNvbmZpZGVuY2U9NSddKSAjIHdvcmtzCiAKICAgICAgICAgc2VsZi5hc3NlcnRSYWlz ZXMoU3lzdGVtRXhpdCwgcGFyc2UsIFsnLS1vdXRwdXQ9YmFkJ10pCi0gICAgICAgIHNlbGYuX2xv Zy5hc3NlcnRNZXNzYWdlcyhbIkVSUk9SOiBvcHRpb24gLS1vdXRwdXQtZm9ybWF0OiBpbnZhbGlk ICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiY2hvaWNlOiAnYmFkJyAoY2hv b3NlIGZyb20gJ2VtYWNzJywgIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIn dnM3JylcbiJdKQorICAgICAgICBzZWxmLmFzc2VydExvZyhbJ0VSUk9SOiBvcHRpb24gLS1vdXRw dXQtZm9ybWF0OiBpbnZhbGlkIGNob2ljZTogJworICAgICAgICAgICAgICAgICAgICAgICAgIidi YWQnIChjaG9vc2UgZnJvbSAnZW1hY3MnLCAndnM3JylcbiJdKQogICAgICAgICBwYXJzZShbJy0t b3V0cHV0PXZzNyddKSAjIHdvcmtzCiAKICAgICAgICAgIyBQYXNzIGEgZmlsdGVyIHJ1bGUgbm90 IGJlZ2lubmluZyB3aXRoICsgb3IgLS4KICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3lzdGVt RXhpdCwgcGFyc2UsIFsnLS1maWx0ZXI9YnVpbGQnXSkKLSAgICAgICAgc2VsZi5fbG9nLmFzc2Vy dE1lc3NhZ2VzKFsnRVJST1I6IEludmFsaWQgZmlsdGVyIHJ1bGUgImJ1aWxkIjogZXZlcnkgJwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdydWxlIG11c3Qgc3RhcnQgd2l0aCAr IG9yIC0uXG4nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRMb2coWydFUlJPUjogSW52YWxpZCBmaWx0 ZXIgcnVsZSAiYnVpbGQiOiAnCisgICAgICAgICAgICAgICAgICAgICAgICAnZXZlcnkgcnVsZSBt dXN0IHN0YXJ0IHdpdGggKyBvciAtLlxuJ10pCiAgICAgICAgIHBhcnNlKFsnLS1maWx0ZXI9K2J1 aWxkJ10pICMgd29ya3MKICAgICAgICAgIyBQYXNzIGZpbGVzIGFuZCBnaXQtY29tbWl0IGF0IHRo ZSBzYW1lIHRpbWUuCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFN5c3RlbUV4aXQsIHBhcnNl LCBbJy0tZ2l0LWNvbW1pdD1jb21taXR0aXNoJywKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnZmlsZS50eHQnXSkKLSAgICAgICAgc2VsZi5fbG9nLmFzc2Vy dE1lc3NhZ2VzKFsnRVJST1I6IFlvdSBjYW5ub3QgcHJvdmlkZSBib3RoIHBhdGhzIGFuZCAnCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2EgZ2l0IGNvbW1pdCBhdCB0aGUgc2Ft ZSB0aW1lLlxuJ10pCi0KLSAgICBkZWYgdGVzdF9wYXJzZV9ub19wYXRoc193aXRob3V0X3NjbShz ZWxmKToKLSAgICAgICAgcGFyc2UgPSBzZWxmLl9wYXJzZQotCi0gICAgICAgICMgUGF0aHMgbXVz dCBiZSBwYXNzZWQgd2hlbiBmb3VuZF9zY20gaXMgRmFsc2UuCi0gICAgICAgIHNlbGYuYXNzZXJ0 UmFpc2VzKFN5c3RlbUV4aXQsIHBhcnNlLCBbXSwgZm91bmRfc2NtPUZhbHNlKQotICAgICAgICBt ZXNzYWdlcyA9IFsiRVJST1I6IFdlYktpdCBjaGVja291dCBub3QgZm91bmQ6IFlvdSBtdXN0IHJ1 biB0aGlzICIKLSAgICAgICAgICAgICAgICAgICAgInNjcmlwdCBmcm9tIGluc2lkZSBhIFdlYktp dCBjaGVja291dCBpZiB5b3UgYXJlIG5vdCAiCi0gICAgICAgICAgICAgICAgICAgICJwYXNzaW5n IHNwZWNpZmljIHBhdGhzIHRvIGNoZWNrLlxuIl0KLSAgICAgICAgc2VsZi5fbG9nLmFzc2VydE1l c3NhZ2VzKG1lc3NhZ2VzKQotICAgICAgICAjIFRlc3Qgb25lIG1vcmUgdmFyaWFudC4KLSAgICAg ICAgc2VsZi5hc3NlcnRSYWlzZXMoU3lzdGVtRXhpdCwgcGFyc2UsIFsnLS1vdXRwdXQ9dnM3J10s IGZvdW5kX3NjbT1GYWxzZSkKLSAgICAgICAgc2VsZi5fbG9nLmFzc2VydE1lc3NhZ2VzKG1lc3Nh Z2VzKQorICAgICAgICBzZWxmLmFzc2VydExvZyhbJ0VSUk9SOiBZb3UgY2Fubm90IHByb3ZpZGUg Ym90aCBwYXRocyBhbmQgJworICAgICAgICAgICAgICAgICAgICAgICAgJ2EgZ2l0IGNvbW1pdCBh dCB0aGUgc2FtZSB0aW1lLlxuJ10pCiAKICAgICBkZWYgdGVzdF9wYXJzZV9kZWZhdWx0X2FyZ3Vt ZW50cyhzZWxmKToKICAgICAgICAgcGFyc2UgPSBzZWxmLl9wYXJzZQpAQCAtMTg2LDggKzE2Nywx NCBAQCBjbGFzcyBBcmd1bWVudFBhcnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhvcHRpb25zLm1pbl9jb25maWRlbmNlLCA0KQogICAgICAgICAo ZmlsZXMsIG9wdGlvbnMpID0gcGFyc2UoWyctLW91dHB1dD1lbWFjcyddKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhvcHRpb25zLm91dHB1dF9mb3JtYXQsICdlbWFjcycpCisgICAgICAgIChm aWxlcywgb3B0aW9ucykgPSBwYXJzZShbJy1nJywgJ2NvbW1pdCddKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhvcHRpb25zLmdpdF9jb21taXQsICdjb21taXQnKQogICAgICAgICAoZmlsZXMs IG9wdGlvbnMpID0gcGFyc2UoWyctLWdpdC1jb21taXQ9Y29tbWl0J10pCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKG9wdGlvbnMuZ2l0X2NvbW1pdCwgJ2NvbW1pdCcpCisgICAgICAgIChmaWxl cywgb3B0aW9ucykgPSBwYXJzZShbJy0tZ2l0LWRpZmY9Y29tbWl0J10pCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKG9wdGlvbnMuZ2l0X2NvbW1pdCwgJ2NvbW1pdCcpCisgICAgICAgIChmaWxl cywgb3B0aW9ucykgPSBwYXJzZShbJy0tZ2l0LXNpbmNlPWNvbW1pdCddKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhvcHRpb25zLmdpdF9jb21taXQsICdjb21taXQnKQogICAgICAgICAoZmls ZXMsIG9wdGlvbnMpID0gcGFyc2UoWyctLXZlcmJvc2UnXSkKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMob3B0aW9ucy5pc192ZXJib3NlLCBUcnVlKQogCg==