48093 2010-10-21 15:01:06 -0700 EWS does not need to process obsolete patches 2010-10-22 13:19:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 35460 1 eric eric abarth commit-queue eric ojan ossy oldest_to_newest 297670 0 eric 2010-10-21 15:01:06 -0700 EWS does not need to process obsolete patches 297671 1 71499 eric 2010-10-21 15:02:34 -0700 Created attachment 71499 wip 298115 2 71585 eric 2010-10-22 12:47:46 -0700 Created attachment 71585 Patch 298119 3 71585 abarth 2010-10-22 12:56:00 -0700 Comment on attachment 71585 Patch Hum... Feels like a big testing tax. 298125 4 eric 2010-10-22 13:03:03 -0700 I'm not sure what you mean. Are you suggesting that our shared fixtures are a burden? I would agree they are, but the problem is that if we don't use them then we get in to the problems that this patch fixes: of having one part of the code look at one fixture while another looks at different one. Using shared fixtures throughout makes this problem go away, but does cause our tests to be tightly coupled and make changing those central fixures more painful. 298132 5 abarth 2010-10-22 13:08:23 -0700 I just meant that the ratio of code change to test change was really out of whack in this patch. I think you're improving things so that will be less the case going forward, but we need to watch this stuff to make sure new code and new tests won't have the same problem. 298140 6 71585 commit-queue 2010-10-22 13:19:32 -0700 Comment on attachment 71585 Patch Clearing flags on attachment: 71585 Committed r70328: <http://trac.webkit.org/changeset/70328> 298141 7 commit-queue 2010-10-22 13:19:38 -0700 All reviewed patches have been landed. Closing bug. 71499 2010-10-21 15:02:34 -0700 2010-10-22 12:46:45 -0700 wip bug-48093-20101021150232.patch text/plain 1570 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwNDQzMjRkYjg0ZDRhYWFiNjFiN2Q1YWY1ZDVjMzA4MmVlY2E5ZGUxLi4xNTEwMGE4 OWMzOWFhYTEyMThkZWZhZTM3MzU2ZDk2ZmQzODJjNWY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMTAtMjEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVXUyBkb2VzIG5vdCBuZWVkIHRv IHByb2Nlc3Mgb2Jzb2xldGUgcGF0Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDgwOTMKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHk6CisKIDIwMTAtMTAtMjAgIEFkYW0gUm9i ZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFRlc3QgdGhhdCB0aGUgVUkgY2xpZW50 IGdldHMgbm90aWZpZWQgd2hlbiBXS1ZpZXcgcmVjZWl2ZXMgYSBXTV9DTE9TRQpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2Fybmlu Z3N5c3RlbS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9l YXJseXdhcm5pbmdzeXN0ZW0ucHkKaW5kZXggNWVjNDY4ZWI3YWIzZmJiYTg2MjUyYjI4NjI4ZWIy ZjlmOTc4ZTA4ZC4uZmZhMzNkMmZlMDhhMTE2ZTZmZGJkMmE1YjY4YmY2NTc2ZmMwZGEyNCAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5 d2FybmluZ3N5c3RlbS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CkBAIC04MSw2ICs4MSwxNCBAQCBjbGFzcyBB YnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbShBYnN0cmFjdFJldmlld1F1ZXVlKToKICAgICAgICAg ICAgIHJhaXNlCiAKICAgICBkZWYgcmV2aWV3X3BhdGNoKHNlbGYsIHBhdGNoKToKKyAgICAgICAg aWYgbm90IHBhdGNoLmlzX29ic29sZXRlKCk6CisgICAgICAgICAgICBzZWxmLl9kaWRfZXJyb3Io cGF0Y2gsICIlcyBkb2VzIG5vdCBwcm9jZXNzIG9ic29sZXRlIHBhdGNoZXMuIiAlIHNlbGYubmFt ZSkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIGlmIG5vdCBwYXRjaC5idWco KS5pc19jbG9zZWQoKToKKyAgICAgICAgICAgIHNlbGYuX2RpZF9lcnJvcihwYXRjaCwgIiVzIGRv ZXMgbm90IHByb2Nlc3MgcGF0Y2hlcyBvbiBjbG9zZWQgYnVncy4iICUgc2VsZi5uYW1lKQorICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICAgICAgaWYgbm90IHNlbGYuX2J1aWxkKHBhdGNo LCBmaXJzdF9ydW49VHJ1ZSk6CiAgICAgICAgICAgICBpZiBub3Qgc2VsZi5fY2FuX2J1aWxkKCk6 CiAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCg== 71585 2010-10-22 12:47:46 -0700 2010-10-22 13:19:32 -0700 Patch bug-48093-20101022124744.patch text/plain 18975 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhOTFmZTg1ZWEzMzI3N2EzYTBiNjk0Yjc1Y2RjNmNiZTdkN2VjNzhiLi5iMWUwZjYx NzQwYmNiZTc3N2Q4M2Q5ODBiY2JkZjdmZTBiODk4Y2M2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAK KzIwMTAtMTAtMjIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVXUyBkb2VzIG5vdCBuZWVkIHRv IHByb2Nlc3Mgb2Jzb2xldGUgcGF0Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDgwOTMKKworICAgICAgICBUaGlzIHdhcyBhbiBlYXN5IGNoYW5n ZSwgYnV0IHRvIHRlc3QgaXQgSSBoYWQgdG8gcGlwZQorICAgICAgICByZWFsIEF0dGFjaG1lbnQg b2JqZWN0cyBpbnRvIHRoZSBxdWV1ZSB0ZXN0aW5nIHN5c3RlbS4KKyAgICAgICAgRG9pbmcgc28g cmV2ZWFsZWQgYSB3aG9sZSBidW5jaCBvZiBidWdzIGluIG91ciB1bml0IHRlc3RzLAorICAgICAg ICB3aGljaCBJIGZpeGVkIGFzIHBhcnQgb2YgdGhpcyBwYXRjaC4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHk6CisgICAgICAg ICAtIFRoaXMgaXMgdGhlIGFjdHVhbCBjb2RlIGNoYW5nZS4gIFRoaXMgd2lsbCBub3QgcmVkdWNl IHRoZQorICAgICAgICAgICBiYWNrbG9nIGluIHRoZSBFV1MgcXVldWVzIG11Y2gsIGJ1dCBpdCB3 aWxsIG1ha2UgcmVqZWN0aW9ucworICAgICAgICAgICBtdWNoIHF1aWNrZXIgZm9yIG9ic29sZXRl IHBhdGNoZXMgb3IgY2xvc2VkIGJ1Z3MuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbV91bml0dGVzdC5weToKKyAgICAgICAgIC0gVGVz dCBteSBuZXcgY29kZS4KKyAgICAgICAgIC0gVXNlZCBhIHJlYWwgYXR0YWNobWVudCBvYmplY3Qg YW5kIGdvdCByaWQgb2YgTW9ja1BhdGNoCisgICAgICAgICAtIFNoYXJlZCBjb2RlIGJldHdlZW4g dGhlIG1hYy1ld3MgYW5kIGNyLW1hYy1ld3MgdGVzdHMuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weToKKyAgICAgICAgIC0gQ2FuJ3Qg dXNlIE1vY2tQYXRjaCBhbnltb3JlLgorICAgICAgICAgLSBSZW1vdmluZyBNb2NrUGF0Y2ggZm91 bmQgbW9yZSBidWdzIGhlcmUhCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3F1ZXVlc3Rlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3NoZXJpZmZib3RfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90 b29sL21vY2t0b29sLnB5OgorICAgICAgICAgLSBNb2NrQnVnemlsbGEgc2hvdWxkIG5vdCBiZSBh ICJNb2NrIiBvYmplY3QuICBSaWdodCBub3cgdG9vbC5idWdzKCkKKyAgICAgICAgICAgaXMgYWxs b3dlZCwgYnV0IHdyb25nLiAgTWFraW5nIGl0IG5vdCBhIE1vY2sgd2lsbCBtYWtlIHRvb2wuYnVn cygpIGNvcnJlY3RseSBmYWlsLgorCiAyMDEwLTEwLTIyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5y ZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy NzAzMDEuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQppbmRleCA1ZWM0NjhlYjdhYjNm YmJhODYyNTJiMjg2MjhlYjJmOWY5NzhlMDhkLi5iNDMzZGJhOGQ5YjY0MGI5NWE5NjhkMjBlMDNh YjcwYjBjNDI3NGU5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKQEAgLTgxLDYg KzgxLDE0IEBAIGNsYXNzIEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKEFic3RyYWN0UmV2aWV3 UXVldWUpOgogICAgICAgICAgICAgcmFpc2UKIAogICAgIGRlZiByZXZpZXdfcGF0Y2goc2VsZiwg cGF0Y2gpOgorICAgICAgICBpZiBwYXRjaC5pc19vYnNvbGV0ZSgpOgorICAgICAgICAgICAgc2Vs Zi5fZGlkX2Vycm9yKHBhdGNoLCAiJXMgZG9lcyBub3QgcHJvY2VzcyBvYnNvbGV0ZSBwYXRjaGVz LiIgJSBzZWxmLm5hbWUpCisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKworICAgICAgICBpZiBw YXRjaC5idWcoKS5pc19jbG9zZWQoKToKKyAgICAgICAgICAgIHNlbGYuX2RpZF9lcnJvcihwYXRj aCwgIiVzIGRvZXMgbm90IHByb2Nlc3MgcGF0Y2hlcyBvbiBjbG9zZWQgYnVncy4iICUgc2VsZi5u YW1lKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICAgICAgaWYgbm90IHNlbGYuX2J1 aWxkKHBhdGNoLCBmaXJzdF9ydW49VHJ1ZSk6CiAgICAgICAgICAgICBpZiBub3Qgc2VsZi5fY2Fu X2J1aWxkKCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVt X3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L2Vhcmx5d2FybmluZ3N5c3RlbV91bml0dGVzdC5weQppbmRleCA2NzVkZjcyNmRmMzhlZTljMmY4 NzBmZmExNzY0ZGI2Y2Q5MDhmOWVmLi40NDhjMzE0MzA4ZWM3ZTRlMmE1NjhjNWE0ZjE0NDdkNDFh Njc4YTA2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW1fdW5pdHRlc3Qu cHkKQEAgLTMxLDEzICszMSwxNyBAQCBpbXBvcnQgb3MKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0 eS5tb2NrIGltcG9ydCBNb2NrCiBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMuZWFybHl3YXJu aW5nc3lzdGVtIGltcG9ydCAqCiBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMucXVldWVzdGVz dCBpbXBvcnQgUXVldWVzVGVzdAorZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBN b2NrVG9vbAorCiAKIGNsYXNzIEVhcmx5V2FybmluZ1N5dGVtVGVzdChRdWV1ZXNUZXN0KToKICAg ICBkZWYgdGVzdF9mYWlsZWRfYnVpbGRzKHNlbGYpOgogICAgICAgICBld3MgPSBDaHJvbWl1bUxp bnV4RVdTKCkKKyAgICAgICAgZXdzLmJpbmRfdG9fdG9vbChNb2NrVG9vbCgpKQogICAgICAgICBl d3MuX2J1aWxkID0gbGFtYmRhIHBhdGNoLCBmaXJzdF9ydW49RmFsc2U6IEZhbHNlCiAgICAgICAg IGV3cy5fY2FuX2J1aWxkID0gbGFtYmRhOiBUcnVlCi0gICAgICAgIGV3cy5yZXZpZXdfcGF0Y2go TW9jaygpKQorICAgICAgICBtb2NrX3BhdGNoID0gZXdzLl90b29sLmJ1Z3MuZmV0Y2hfYXR0YWNo bWVudCgxOTcpCisgICAgICAgIGV3cy5yZXZpZXdfcGF0Y2gobW9ja19wYXRjaCkKIAogICAgIGRl ZiBfZGVmYXVsdF9leHBlY3RlZF9zdGRlcnIoc2VsZiwgZXdzKToKICAgICAgICAgc3RyaW5nX3Jl cGxhY2VtbnRzID0gewpAQCAtNDYsMjAgKzUwLDI5IEBAIGNsYXNzIEVhcmx5V2FybmluZ1N5dGVt VGVzdChRdWV1ZXNUZXN0KToKICAgICAgICAgICAgICJ3YXRjaGVycyI6IGV3cy53YXRjaGVycywK ICAgICAgICAgfQogICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSB7Ci0gICAgICAgICAgICAiYmVn aW5fd29ya19xdWV1ZSI6IHNlbGYuX2RlZmF1bHRfYmVnaW5fd29ya19xdWV1ZV9zdGRlcnIoZXdz Lm5hbWUsIG9zLmdldGN3ZCgpKSwgICMgRklYTUU6IFVzZSBvZiBvcy5nZXRjd2QoKSBpcyB3cm9u Zywgc2hvdWxkIGJlIHNjbS5jaGVja291dF9yb290CisgICAgICAgICAgICAiYmVnaW5fd29ya19x dWV1ZSI6IHNlbGYuX2RlZmF1bHRfYmVnaW5fd29ya19xdWV1ZV9zdGRlcnIoZXdzLm5hbWUsIGV3 cy5fdG9vbC5zY20oKS5jaGVja291dF9yb290KSwKICAgICAgICAgICAgICJoYW5kbGVfdW5leHBl Y3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCiAgICAgICAgICAgICAibmV4dF93 b3JrX2l0ZW0iOiAiIiwKICAgICAgICAgICAgICJwcm9jZXNzX3dvcmtfaXRlbSI6ICJNT0NLOiB1 cGRhdGVfc3RhdHVzOiAlKG5hbWUpcyBQYXNzXG5NT0NLOiByZWxlYXNlX3dvcmtfaXRlbTogJShu YW1lKXMgMTk3XG4iICUgc3RyaW5nX3JlcGxhY2VtbnRzLAotICAgICAgICAgICAgImhhbmRsZV9z Y3JpcHRfZXJyb3IiOiAiTU9DSzogdXBkYXRlX3N0YXR1czogJShuYW1lKXMgU2NyaXB0RXJyb3Ig ZXJyb3IgbWVzc2FnZVxuTU9DSyBidWcgY29tbWVudDogYnVnX2lkPTE0MiwgY2M9JSh3YXRjaGVy cylzXG4tLS0gQmVnaW4gY29tbWVudCAtLS1cbkF0dGFjaG1lbnQgMTk3IGRpZCBub3QgYnVpbGQg b24gJShwb3J0KXM6XG5CdWlsZCBvdXRwdXQ6IGh0dHA6Ly9kdW1teV91cmxcbi0tLSBFbmQgY29t bWVudCAtLS1cblxuIiAlIHN0cmluZ19yZXBsYWNlbW50cywKKyAgICAgICAgICAgICJoYW5kbGVf c2NyaXB0X2Vycm9yIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6ICUobmFtZSlzIFNjcmlwdEVycm9y IGVycm9yIG1lc3NhZ2Vcbk1PQ0sgYnVnIGNvbW1lbnQ6IGJ1Z19pZD00MiwgY2M9JSh3YXRjaGVy cylzXG4tLS0gQmVnaW4gY29tbWVudCAtLS1cbkF0dGFjaG1lbnQgMTk3IGRpZCBub3QgYnVpbGQg b24gJShwb3J0KXM6XG5CdWlsZCBvdXRwdXQ6IGh0dHA6Ly9kdW1teV91cmxcbi0tLSBFbmQgY29t bWVudCAtLS1cblxuIiAlIHN0cmluZ19yZXBsYWNlbW50cywKICAgICAgICAgfQogICAgICAgICBy ZXR1cm4gZXhwZWN0ZWRfc3RkZXJyCiAKICAgICBkZWYgX3Rlc3RfZXdzKHNlbGYsIGV3cyk6Cisg ICAgICAgIGV3cy5iaW5kX3RvX3Rvb2woTW9ja1Rvb2woKSkKICAgICAgICAgZXhwZWN0ZWRfZXhj ZXB0aW9ucyA9IHsKICAgICAgICAgICAgICJoYW5kbGVfc2NyaXB0X2Vycm9yIjogU3lzdGVtRXhp dCwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKGV3cywgZXhw ZWN0ZWRfc3RkZXJyPXNlbGYuX2RlZmF1bHRfZXhwZWN0ZWRfc3RkZXJyKGV3cyksIGV4cGVjdGVk X2V4Y2VwdGlvbnM9ZXhwZWN0ZWRfZXhjZXB0aW9ucykKIAorICAgIGRlZiBfdGVzdF9jb21taXR0 ZXJfb25seV9ld3Moc2VsZiwgZXdzKToKKyAgICAgICAgZXdzLmJpbmRfdG9fdG9vbChNb2NrVG9v bCgpKQorICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSBzZWxmLl9kZWZhdWx0X2V4cGVjdGVkX3N0 ZGVycihld3MpCisgICAgICAgIHN0cmluZ19yZXBsYWNlbW50cyA9IHsibmFtZSI6IGV3cy5uYW1l fQorICAgICAgICBleHBlY3RlZF9zdGRlcnJbInByb2Nlc3Nfd29ya19pdGVtIl0gPSAiTU9DSzog dXBkYXRlX3N0YXR1czogJShuYW1lKXMgRXJyb3I6ICUobmFtZSlzIGNhbm5vdCBwcm9jZXNzIHBh dGNoZXMgZnJvbSBub24tY29tbWl0dGVycyA6KFxuTU9DSzogcmVsZWFzZV93b3JrX2l0ZW06ICUo bmFtZSlzIDE5N1xuIiAlIHN0cmluZ19yZXBsYWNlbW50cworICAgICAgICBleHBlY3RlZF9leGNl cHRpb25zID0geyJoYW5kbGVfc2NyaXB0X2Vycm9yIjogU3lzdGVtRXhpdH0KKyAgICAgICAgc2Vs Zi5hc3NlcnRfcXVldWVfb3V0cHV0cyhld3MsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRl cnIsIGV4cGVjdGVkX2V4Y2VwdGlvbnM9ZXhwZWN0ZWRfZXhjZXB0aW9ucykKKwogICAgICMgRklY TUU6IElmIGFsbCBFV1NlcyBhcmUgZ29pbmcgdG8gb3V0cHV0IHRoZSBzYW1lIHRleHQsIHdlCiAg ICAgIyBjb3VsZCB0ZXN0IHRoZW0gYWxsIGluIG9uZSBtZXRob2Qgd2l0aCBhIGZvciBsb29wIG92 ZXIgYW4gYXJyYXkuCiAgICAgZGVmIHRlc3RfY2hyb21pdW1fbGludXhfZXdzKHNlbGYpOgpAQCAt NzgsMTkgKzkxLDcgQEAgY2xhc3MgRWFybHlXYXJuaW5nU3l0ZW1UZXN0KFF1ZXVlc1Rlc3QpOgog ICAgICAgICBzZWxmLl90ZXN0X2V3cyhFZmxFV1MoKSkKIAogICAgIGRlZiB0ZXN0X21hY19ld3Mo c2VsZik6Ci0gICAgICAgIGV3cyA9IE1hY0VXUygpCi0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9 IHNlbGYuX2RlZmF1bHRfZXhwZWN0ZWRfc3RkZXJyKGV3cykKLSAgICAgICAgZXhwZWN0ZWRfc3Rk ZXJyWyJwcm9jZXNzX3dvcmtfaXRlbSJdID0gIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IG1hYy1ld3Mg RXJyb3I6IG1hYy1ld3MgY2Fubm90IHByb2Nlc3MgcGF0Y2hlcyBmcm9tIG5vbi1jb21taXR0ZXJz IDooXG5NT0NLOiByZWxlYXNlX3dvcmtfaXRlbTogbWFjLWV3cyAxOTdcbiIKLSAgICAgICAgZXhw ZWN0ZWRfZXhjZXB0aW9ucyA9IHsKLSAgICAgICAgICAgICJoYW5kbGVfc2NyaXB0X2Vycm9yIjog U3lzdGVtRXhpdCwKLSAgICAgICAgfQotICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRz KGV3cywgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRfZXhjZXB0aW9u cz1leHBlY3RlZF9leGNlcHRpb25zKQorICAgICAgICBzZWxmLl90ZXN0X2NvbW1pdHRlcl9vbmx5 X2V3cyhNYWNFV1MoKSkKIAogICAgIGRlZiB0ZXN0X2Nocm9taXVtX21hY19ld3Moc2VsZik6Ci0g ICAgICAgIGV3cyA9IENocm9taXVtTWFjRVdTKCkKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0g c2VsZi5fZGVmYXVsdF9leHBlY3RlZF9zdGRlcnIoZXdzKQotICAgICAgICBleHBlY3RlZF9zdGRl cnJbInByb2Nlc3Nfd29ya19pdGVtIl0gPSAiTU9DSzogdXBkYXRlX3N0YXR1czogY3ItbWFjLWV3 cyBFcnJvcjogY3ItbWFjLWV3cyBjYW5ub3QgcHJvY2VzcyBwYXRjaGVzIGZyb20gbm9uLWNvbW1p dHRlcnMgOihcbk1PQ0s6IHJlbGVhc2Vfd29ya19pdGVtOiBjci1tYWMtZXdzIDE5N1xuIgotICAg ICAgICBleHBlY3RlZF9leGNlcHRpb25zID0gewotICAgICAgICAgICAgImhhbmRsZV9zY3JpcHRf ZXJyb3IiOiBTeXN0ZW1FeGl0LAotICAgICAgICB9Ci0gICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVl X291dHB1dHMoZXdzLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyLCBleHBlY3RlZF9l eGNlcHRpb25zPWV4cGVjdGVkX2V4Y2VwdGlvbnMpCisgICAgICAgIHNlbGYuX3Rlc3RfY29tbWl0 dGVyX29ubHlfZXdzKENocm9taXVtTWFjRVdTKCkpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc191bml0dGVzdC5weQpp bmRleCBlYTI1ODMzNDM2MTM3YTg0N2UxOTIxY2ZhYTAyMzkyMDBmZDFiM2MxLi5mMDRiOWFhMzkz ZjhlOGIyYmJlMjY3OGI2NzM3ZGMzYWYyOGNjMWQ2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXNfdW5pdHRlc3Qu cHkKQEAgLTM0LDcgKzM0LDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNh cHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2Nr IGltcG9ydCBNb2NrCiBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMuY29tbWFuZHRlc3QgaW1w b3J0IENvbW1hbmRzVGVzdAogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnF1ZXVlcyBpbXBv cnQgKgotZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnF1ZXVlc3Rlc3QgaW1wb3J0IFF1ZXVl c1Rlc3QsIE1vY2tQYXRjaAorZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnF1ZXVlc3Rlc3Qg aW1wb3J0IFF1ZXVlc1Rlc3QKIGZyb20gd2Via2l0cHkudG9vbC5jb21tYW5kcy5zdGVwc2VxdWVu Y2UgaW1wb3J0IFN0ZXBTZXF1ZW5jZQogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9y dCBNb2NrVG9vbCwgTW9ja1NDTSwgTW9ja1N0YXR1c1NlcnZlcgogCkBAIC01MSwxMSArNTEsNiBA QCBjbGFzcyBUZXN0RmVlZGVyUXVldWUoRmVlZGVyUXVldWUpOgogICAgIF9zbGVlcF9kdXJhdGlv biA9IDAKIAogCi1jbGFzcyBNb2NrUm9sbG91dFBhdGNoKE1vY2tQYXRjaCk6Ci0gICAgZGVmIGlz X3JvbGxvdXQoc2VsZik6Ci0gICAgICAgIHJldHVybiBUcnVlCi0KLQogY2xhc3MgQWJzdHJhY3RR dWV1ZVRlc3QoQ29tbWFuZHNUZXN0KToKICAgICBkZWYgdGVzdF9sb2dfZGlyZWN0b3J5KHNlbGYp OgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhUZXN0UXVldWUoKS5fbG9nX2RpcmVjdG9yeSgp LCAidGVzdC1xdWV1ZS1sb2dzIikKQEAgLTI2MywyMyArMjU4LDIyIEBAIE1PQ0s6IHJlbGVhc2Vf d29ya19pdGVtOiBjb21taXQtcXVldWUgMTk3CiAgICAgZGVmIHRlc3Rfcm9sbG91dF9sYW5kcyhz ZWxmKToKICAgICAgICAgdG9vbCA9IE1vY2tUb29sKGxvZ19leGVjdXRpdmU9VHJ1ZSkKICAgICAg ICAgdG9vbC5idWlsZGJvdC5saWdodF90cmVlX29uX2ZpcmUoKQotICAgICAgICByb2xsb3V0X3Bh dGNoID0gTW9ja1JvbGxvdXRQYXRjaCgpCisgICAgICAgIHJvbGxvdXRfcGF0Y2ggPSB0b29sLmJ1 Z3MuZmV0Y2hfYXR0YWNobWVudCgxMDYpICAjIF9wYXRjaDYsIGEgcm9sbG91dCBwYXRjaC4KKyAg ICAgICAgYXNzZXJ0KHJvbGxvdXRfcGF0Y2guaXNfcm9sbG91dCgpKQogICAgICAgICBleHBlY3Rl ZF9zdGRlcnIgPSB7CiAgICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSI6IHNlbGYuX2RlZmF1 bHRfYmVnaW5fd29ya19xdWV1ZV9zdGRlcnIoImNvbW1pdC1xdWV1ZSIsIE1vY2tTQ00uZmFrZV9j aGVja291dF9yb290KSwKICAgICAgICAgICAgICJzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRl bSI6ICJNT0NLOiB1cGRhdGVfc3RhdHVzOiBjb21taXQtcXVldWUgUHJvY2Vzc2luZyByb2xsb3V0 IHBhdGNoXG4iLAogICAgICAgICAgICAgIm5leHRfd29ya19pdGVtIjogIiIsCi0gICAgICAgICAg ICAicHJvY2Vzc193b3JrX2l0ZW0iOiAiIiJNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydl Y2hvJywgJy0tc3RhdHVzLWhvc3Q9ZXhhbXBsZS5jb20nLCAnYXBwbHktYXR0YWNobWVudCcsICct LWZvcmNlLWNsZWFuJywgJy0tbm9uLWludGVyYWN0aXZlJywgJy0tcXVpZXQnLCAxOTddCisgICAg ICAgICAgICAicHJvY2Vzc193b3JrX2l0ZW0iOiAiIiJNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFp bDogWydlY2hvJywgJy0tc3RhdHVzLWhvc3Q9ZXhhbXBsZS5jb20nLCAnYXBwbHktYXR0YWNobWVu dCcsICctLWZvcmNlLWNsZWFuJywgJy0tbm9uLWludGVyYWN0aXZlJywgJy0tcXVpZXQnLCAxMDZd CiBNT0NLOiB1cGRhdGVfc3RhdHVzOiBjb21taXQtcXVldWUgQXBwbGllZCBwYXRjaAogTU9DSyBy dW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnZWNobycsICctLXN0YXR1cy1ob3N0PWV4YW1wbGUuY29t JywgJ2J1aWxkJywgJy0tbm8tY2xlYW4nLCAnLS1uby11cGRhdGUnLCAnLS1idWlsZC1zdHlsZT1i b3RoJywgJy0tcXVpZXQnXQogTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIEJ1aWx0 IHBhdGNoCi1NT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydlY2hvJywgJy0tc3RhdHVzLWhv c3Q9ZXhhbXBsZS5jb20nLCAnYnVpbGQtYW5kLXRlc3QnLCAnLS1uby1jbGVhbicsICctLW5vLXVw ZGF0ZScsICctLXRlc3QnLCAnLS1xdWlldCcsICctLW5vbi1pbnRlcmFjdGl2ZSddCi1NT0NLOiB1 cGRhdGVfc3RhdHVzOiBjb21taXQtcXVldWUgUGFzc2VkIHRlc3RzCi1NT0NLIHJ1bl9hbmRfdGhy b3dfaWZfZmFpbDogWydlY2hvJywgJy0tc3RhdHVzLWhvc3Q9ZXhhbXBsZS5jb20nLCAnbGFuZC1h dHRhY2htZW50JywgJy0tZm9yY2UtY2xlYW4nLCAnLS1pZ25vcmUtYnVpbGRlcnMnLCAnLS1xdWll dCcsICctLW5vbi1pbnRlcmFjdGl2ZScsICctLXBhcmVudC1jb21tYW5kPWNvbW1pdC1xdWV1ZScs IDE5N10KK01PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ2VjaG8nLCAnLS1zdGF0dXMtaG9z dD1leGFtcGxlLmNvbScsICdsYW5kLWF0dGFjaG1lbnQnLCAnLS1mb3JjZS1jbGVhbicsICctLWln bm9yZS1idWlsZGVycycsICctLXF1aWV0JywgJy0tbm9uLWludGVyYWN0aXZlJywgJy0tcGFyZW50 LWNvbW1hbmQ9Y29tbWl0LXF1ZXVlJywgMTA2XQogTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0 LXF1ZXVlIExhbmRlZCBwYXRjaAogTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1ZXVlIFBh c3MKLU1PQ0s6IHJlbGVhc2Vfd29ya19pdGVtOiBjb21taXQtcXVldWUgMTk3CitNT0NLOiByZWxl YXNlX3dvcmtfaXRlbTogY29tbWl0LXF1ZXVlIDEwNgogIiIiLAotICAgICAgICAgICAgImhhbmRs ZV91bmV4cGVjdGVkX2Vycm9yIjogIk1PQ0sgc2V0dGluZyBmbGFnICdjb21taXQtcXVldWUnIHRv ICctJyBvbiBhdHRhY2htZW50ICcxOTcnIHdpdGggY29tbWVudCAnUmVqZWN0aW5nIHBhdGNoIDE5 NyBmcm9tIGNvbW1pdC1xdWV1ZS4nIGFuZCBhZGRpdGlvbmFsIGNvbW1lbnQgJ01vY2sgZXJyb3Ig bWVzc2FnZSdcbiIsCisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTU9D SyBzZXR0aW5nIGZsYWcgJ2NvbW1pdC1xdWV1ZScgdG8gJy0nIG9uIGF0dGFjaG1lbnQgJzEwNicg d2l0aCBjb21tZW50ICdSZWplY3RpbmcgcGF0Y2ggMTA2IGZyb20gY29tbWl0LXF1ZXVlLicgYW5k IGFkZGl0aW9uYWwgY29tbWVudCAnTW9jayBlcnJvciBtZXNzYWdlJ1xuIiwKICAgICAgICAgICAg ICJoYW5kbGVfc2NyaXB0X2Vycm9yIjogIlNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2VcbiIsCiAg ICAgICAgIH0KICAgICAgICAgc2VsZi5hc3NlcnRfcXVldWVfb3V0cHV0cyhDb21taXRRdWV1ZSgp LCB0b29sPXRvb2wsIHdvcmtfaXRlbT1yb2xsb3V0X3BhdGNoLCBleHBlY3RlZF9zdGRlcnI9ZXhw ZWN0ZWRfc3RkZXJyKQpAQCAtMzEwLDEyICszMDQsMTIgQEAgTU9DSzogdXBkYXRlX3N0YXR1czog Y29tbWl0LXF1ZXVlIFBhc3NlZCB0ZXN0cwogTU9DSzogdXBkYXRlX3N0YXR1czogY29tbWl0LXF1 ZXVlIFJldHJ5CiBNT0NLOiByZWxlYXNlX3dvcmtfaXRlbTogY29tbWl0LXF1ZXVlIDE5NwogIiIi Ci0gICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBxdWV1ZS5wcm9j ZXNzX3dvcmtfaXRlbSwgW01vY2tQYXRjaCgpXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0 ZGVycikKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHF1ZXVl LnByb2Nlc3Nfd29ya19pdGVtLCBbUXVldWVzVGVzdC5tb2NrX3dvcmtfaXRlbV0sIGV4cGVjdGVk X3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9yZXBvcnRfZmxha3lfdGVz dHMoc2VsZik6CiAgICAgICAgIHF1ZXVlID0gQ29tbWl0UXVldWUoKQogICAgICAgICBxdWV1ZS5i aW5kX3RvX3Rvb2woTW9ja1Rvb2woKSkKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIiIiTU9D SyBidWcgY29tbWVudDogYnVnX2lkPTE0MiwgY2M9Tm9uZQorICAgICAgICBleHBlY3RlZF9zdGRl cnIgPSAiIiJNT0NLIGJ1ZyBjb21tZW50OiBidWdfaWQ9NDIsIGNjPU5vbmUKIC0tLSBCZWdpbiBj b21tZW50IC0tLQogVGhlIGNvbW1pdC1xdWV1ZSBlbmNvdW50ZXJlZCB0aGUgZm9sbG93aW5nIGZs YWt5IHRlc3RzIHdoaWxlIHByb2Nlc3NpbmcgYXR0YWNobWVudCAxOTc6CiAKQEAgLTMyNiw3ICsz MjAsNyBAQCBQbGVhc2UgZmlsZSBidWdzIGFnYWluc3QgdGhlIHRlc3RzLiAgVGhlIGF1dGhvcihz KSBvZiB0aGUgdGVzdChzKSBhcmUgYWJhcnRoQHdlYgogLS0tIEVuZCBjb21tZW50IC0tLQogCiAi IiIKLSAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHF1ZXVlLnJl cG9ydF9mbGFreV90ZXN0cywgW01vY2tQYXRjaCgpLCBbImZvby9iYXIuaHRtbCIsICJiYXIvYmF6 Lmh0bWwiXV0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCisgICAgICAgIE91dHB1 dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBxdWV1ZS5yZXBvcnRfZmxha3lfdGVzdHMs IFtRdWV1ZXNUZXN0Lm1vY2tfd29ya19pdGVtLCBbImZvby9iYXIuaHRtbCIsICJiYXIvYmF6Lmh0 bWwiXV0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9s YXlvdXRfdGVzdF9yZXN1bHRzKHNlbGYpOgogICAgICAgICBxdWV1ZSA9IENvbW1pdFF1ZXVlKCkK QEAgLTM1Niw3ICszNTAsNyBAQCBjbGFzcyBTdHlsZVF1ZXVlVGVzdChRdWV1ZXNUZXN0KToKICAg ICAgICAgICAgICJzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSI6ICJNT0NLOiB1cGRhdGVf c3RhdHVzOiBzdHlsZS1xdWV1ZSBDaGVja2luZyBzdHlsZVxuIiwKICAgICAgICAgICAgICJwcm9j ZXNzX3dvcmtfaXRlbSI6ICJNT0NLOiB1cGRhdGVfc3RhdHVzOiBzdHlsZS1xdWV1ZSBQYXNzXG5N T0NLOiByZWxlYXNlX3dvcmtfaXRlbTogc3R5bGUtcXVldWUgMTk3XG4iLAogICAgICAgICAgICAg ImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIjogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKLSAgICAg ICAgICAgICJoYW5kbGVfc2NyaXB0X2Vycm9yIjogIk1PQ0s6IHVwZGF0ZV9zdGF0dXM6IHN0eWxl LXF1ZXVlIFNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcbk1PQ0sgYnVnIGNvbW1lbnQ6IGJ1Z19p ZD0xNDIsIGNjPVtdXG4tLS0gQmVnaW4gY29tbWVudCAtLS1cbkF0dGFjaG1lbnQgMTk3IGRpZCBu b3QgcGFzcyBzdHlsZS1xdWV1ZTpcblxuU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZVxuXG5JZiBh bnkgb2YgdGhlc2UgZXJyb3JzIGFyZSBmYWxzZSBwb3NpdGl2ZXMsIHBsZWFzZSBmaWxlIGEgYnVn IGFnYWluc3QgY2hlY2std2Via2l0LXN0eWxlLlxuLS0tIEVuZCBjb21tZW50IC0tLVxuXG4iLAor ICAgICAgICAgICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiAiTU9DSzogdXBkYXRlX3N0YXR1czog c3R5bGUtcXVldWUgU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZVxuTU9DSyBidWcgY29tbWVudDog YnVnX2lkPTQyLCBjYz1bXVxuLS0tIEJlZ2luIGNvbW1lbnQgLS0tXG5BdHRhY2htZW50IDE5NyBk aWQgbm90IHBhc3Mgc3R5bGUtcXVldWU6XG5cblNjcmlwdEVycm9yIGVycm9yIG1lc3NhZ2Vcblxu SWYgYW55IG9mIHRoZXNlIGVycm9ycyBhcmUgZmFsc2UgcG9zaXRpdmVzLCBwbGVhc2UgZmlsZSBh IGJ1ZyBhZ2FpbnN0IGNoZWNrLXdlYmtpdC1zdHlsZS5cbi0tLSBFbmQgY29tbWVudCAtLS1cblxu IiwKICAgICAgICAgfQogICAgICAgICBleHBlY3RlZF9leGNlcHRpb25zID0gewogICAgICAgICAg ICAgImhhbmRsZV9zY3JpcHRfZXJyb3IiOiBTeXN0ZW1FeGl0LApkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlc3Rlc3QucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQppbmRl eCAzNzlkMzgwODQ0ZWU0MGUxMmY4OTVmY2Q3ODlkZWMwYjlmNTAzYTQxLi42NDU1NjE3MjRmYmJl YzcxMzZhOTE3ZTEwZWFlYThiYzk1ZjFkOGNiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzdGVzdC5weQpAQCAtNDQsMjUg KzQ0LDkgQEAgY2xhc3MgTW9ja1F1ZXVlRW5naW5lKG9iamVjdCk6CiAgICAgICAgIHBhc3MKIAog Ci1jbGFzcyBNb2NrUGF0Y2goKToKLSAgICBkZWYgaWQoc2VsZik6Ci0gICAgICAgIHJldHVybiAx OTcKLQotICAgIGRlZiBidWdfaWQoc2VsZik6Ci0gICAgICAgIHJldHVybiAxNDIKLQotICAgIGRl ZiBpc19yb2xsb3V0KHNlbGYpOgotICAgICAgICByZXR1cm4gRmFsc2UKLQotCiBjbGFzcyBRdWV1 ZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKLSAgICAjIElkcyBtYXRjaCBwYXRjaDEgaW4gbW9j a3Rvb2wucHkKLSAgICBtb2NrX3dvcmtfaXRlbSA9IEF0dGFjaG1lbnQoewotICAgICAgICAiaWQi OiAxOTcsCi0gICAgICAgICJidWdfaWQiOiAxNDIsCi0gICAgICAgICJuYW1lIjogIlBhdGNoIiwK LSAgICAgICAgImF0dGFjaGVyX2VtYWlsIjogImFkYW1AZXhhbXBsZS5jb20iLAotICAgIH0sIE5v bmUpCisgICAgIyBUaGlzIGlzIF9wYXRjaDEgaW4gbW9ja3Rvb2wucHkKKyAgICBtb2NrX3dvcmtf aXRlbSA9IE1vY2tUb29sKCkuYnVncy5mZXRjaF9hdHRhY2htZW50KDE5NykKIAogICAgIGRlZiBh c3NlcnRfb3V0cHV0cyhzZWxmLCBmdW5jLCBmdW5jX25hbWUsIGFyZ3MsIGV4cGVjdGVkX3N0ZG91 dCwgZXhwZWN0ZWRfc3RkZXJyLCBleHBlY3RlZF9leGNlcHRpb25zKToKICAgICAgICAgZXhjZXB0 aW9uID0gTm9uZQpAQCAtMTA4LDQgKzkyLDQgQEAgY2xhc3MgUXVldWVzVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0X291dHB1dHMocXVldWUuaGFuZGxlX3VuZXhw ZWN0ZWRfZXJyb3IsICJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciIsIFt3b3JrX2l0ZW0sICJNb2Nr IGVycm9yIG1lc3NhZ2UiXSwgZXhwZWN0ZWRfc3Rkb3V0LCBleHBlY3RlZF9zdGRlcnIsIGV4cGVj dGVkX2V4Y2VwdGlvbnMpCiAgICAgICAgICMgU2hvdWxkIHdlIGhhdmUgYSBkaWZmZXJlbnQgZnVu Y3Rpb24gZm9yIHRlc3RpbmcgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVycz8KICAgICAgICAgaWYg aXNpbnN0YW5jZShxdWV1ZSwgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVyKToKLSAgICAgICAgICAg IHNlbGYuYXNzZXJ0X291dHB1dHMocXVldWUuaGFuZGxlX3NjcmlwdF9lcnJvciwgImhhbmRsZV9z Y3JpcHRfZXJyb3IiLCBbdG9vbCwgeyJwYXRjaCI6IE1vY2tQYXRjaCgpfSwgU2NyaXB0RXJyb3Io bWVzc2FnZT0iU2NyaXB0RXJyb3IgZXJyb3IgbWVzc2FnZSIsIHNjcmlwdF9hcmdzPSJNb2NrRXJy b3JDb21tYW5kIildLCBleHBlY3RlZF9zdGRvdXQsIGV4cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRf ZXhjZXB0aW9ucykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0X291dHB1dHMocXVldWUuaGFuZGxl X3NjcmlwdF9lcnJvciwgImhhbmRsZV9zY3JpcHRfZXJyb3IiLCBbdG9vbCwgeyJwYXRjaCI6IHNl bGYubW9ja193b3JrX2l0ZW19LCBTY3JpcHRFcnJvcihtZXNzYWdlPSJTY3JpcHRFcnJvciBlcnJv ciBtZXNzYWdlIiwgc2NyaXB0X2FyZ3M9Ik1vY2tFcnJvckNvbW1hbmQiKV0sIGV4cGVjdGVkX3N0 ZG91dCwgZXhwZWN0ZWRfc3RkZXJyLCBleHBlY3RlZF9leGNlcHRpb25zKQpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZib3RfdW5p dHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hl cmlmZmJvdF91bml0dGVzdC5weQppbmRleCAzMmViMDE2ZTJjODRkODMyNTQ5Mzc1OTU4YzNkMzdi ZTMwZGQ3NjZjLi40ZGI0NjNlYWQ5ZTUyMzgyNmYzZDUyM2Q5NTBhN2FhMTNiZjdiNjdhIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlm ZmJvdF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvc2hlcmlmZmJvdF91bml0dGVzdC5weQpAQCAtMzgsOSArMzgsMTAgQEAgY2xhc3Mg U2hlcmlmZkJvdFRlc3QoUXVldWVzVGVzdCk6CiAgICAgYnVpbGRlcjIgPSBNb2NrQnVpbGRlcigi QnVpbGRlcjIiKQogCiAgICAgZGVmIHRlc3Rfc2hlcmlmZl9ib3Qoc2VsZik6Ci0gICAgICAgIG1v Y2tfd29ya19pdGVtID0gTW9ja0ZhaWx1cmVNYXAoTW9ja1Rvb2woKS5idWlsZGJvdCkKKyAgICAg ICAgdG9vbCA9IE1vY2tUb29sKCkKKyAgICAgICAgbW9ja193b3JrX2l0ZW0gPSBNb2NrRmFpbHVy ZU1hcCh0b29sLmJ1aWxkYm90KQogICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSB7Ci0gICAgICAg ICAgICAiYmVnaW5fd29ya19xdWV1ZSI6IHNlbGYuX2RlZmF1bHRfYmVnaW5fd29ya19xdWV1ZV9z dGRlcnIoInNoZXJpZmYtYm90Iiwgb3MuZ2V0Y3dkKCkpLAorICAgICAgICAgICAgImJlZ2luX3dv cmtfcXVldWUiOiBzZWxmLl9kZWZhdWx0X2JlZ2luX3dvcmtfcXVldWVfc3RkZXJyKCJzaGVyaWZm LWJvdCIsIHRvb2wuc2NtKCkuY2hlY2tvdXRfcm9vdCksCiAgICAgICAgICAgICAibmV4dF93b3Jr X2l0ZW0iOiAiIiwKICAgICAgICAgICAgICJwcm9jZXNzX3dvcmtfaXRlbSI6ICIiIk1PQ0s6IGly Yy5wb3N0OiBhYmFydGgsIGRhcmluLCBlc2VpZGVsOiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC8yOTgzNyBtaWdodCBoYXZlIGJyb2tlbiBCdWlsZGVyMQogTU9DSyBidWcgY29tbWVu dDogYnVnX2lkPTQyLCBjYz1bJ2FiYXJ0aEB3ZWJraXQub3JnJywgJ2VyaWNAd2Via2l0Lm9yZydd CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wu cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKaW5kZXgg OTRmMTEwNjJjMjNmNjNjZmEzYmY4N2IxNWJlMjU0ZTkxY2I2M2QwMy4uMDk3MDkzMDhiOTNlNGZh MDUwODFhYmFkMTFlZWFlZWVjYWI4ODg4NCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9tb2NrdG9vbC5weQpAQCAtMTkyLDYgKzE5Miw3IEBAIF9idWc0ID0gewogfQog CiAKKyMgRklYTUU6IFRoaXMgc2hvdWxkIG5vdCBpbmhlcml0IGZyb20gTW9jawogY2xhc3MgTW9j a0J1Z3ppbGxhUXVlcmllcyhNb2NrKToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBidWd6aWxs YSk6CkBAIC0yNDMsNiArMjQ0LDcgQEAgX21vY2tfcmV2aWV3ZXIgPSBSZXZpZXdlcigiRm9vIEJh ciIsICJmb29AYmFyLmNvbSIpCiAjIEZJWE1FOiBCdWd6aWxsYSBpcyB0aGUgd3JvbmcgTW9jay1w b2ludC4gIE9uY2Ugd2UgaGF2ZSBhIEJ1Z3ppbGxhTmV0d29yawogIyAgICAgICAgY2xhc3Mgd2Ug c2hvdWxkIG1vY2sgdGhhdCBpbnN0ZWFkLgogIyBNb3N0IG9mIHRoaXMgY2xhc3MgaXMganVzdCBj b3B5L3Bhc3RlIGZyb20gQnVnemlsbGEuCisjIEZJWE1FOiBUaGlzIHNob3VsZCBub3QgaW5oZXJp dCBmcm9tIE1vY2sKIGNsYXNzIE1vY2tCdWd6aWxsYShNb2NrKToKIAogICAgIGJ1Z19zZXJ2ZXJf dXJsID0gImh0dHA6Ly9leGFtcGxlLmNvbSIKQEAgLTQyMCw2ICs0MjIsNyBAQCBjbGFzcyBNb2Nr QnVpbGRCb3Qob2JqZWN0KToKICAgICAgICAgcmV0dXJuIE1vY2tGYWlsdXJlTWFwKHNlbGYpCiAK IAorIyBGSVhNRTogVGhpcyBzaG91bGQgbm90IGluaGVyaXQgZnJvbSBNb2NrCiBjbGFzcyBNb2Nr U0NNKE1vY2spOgogCiAgICAgZmFrZV9jaGVja291dF9yb290ID0gb3MucGF0aC5yZWFscGF0aCgi L3RtcCIpICMgcmVhbHBhdGggaXMgbmVlZGVkIHRvIGFsbG93IGZvciBNYWMgT1MgWCdzIC9wcml2 YXRlL3RtcApAQCAtNTczLDYgKzU3Niw3IEBAIGNsYXNzIE1vY2tTdGF0dXNTZXJ2ZXIob2JqZWN0 KToKICAgICAgICAgcmV0dXJuICJodHRwOi8vZHVtbXlfdXJsIgogCiAKKyMgRklYTUU6IFRoaXMg c2hvdWxkIG5vdCBpbmhlcml0IGZyb20gTW9jawogY2xhc3MgTW9ja0V4ZWN1dGUoTW9jayk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIHNob3VsZF9sb2cpOgogICAgICAgICBzZWxmLl9zaG91bGRf bG9nID0gc2hvdWxkX2xvZwpAQCAtNjA4LDcgKzYxMiw3IEBAIGNsYXNzIE1vY2tPcHRpb25zKG9i amVjdCk6CiAgICAgICAgICAgICBzZWxmLl9fZGljdF9fW2tleV0gPSB2YWx1ZQogCiAKLWNsYXNz IE1vY2tSaWV0dmVsZCgpOgorY2xhc3MgTW9ja1JpZXR2ZWxkKG9iamVjdCk6CiAKICAgICBkZWYg X19pbml0X18oc2VsZiwgZXhlY3V0aXZlLCBkcnlydW49RmFsc2UpOgogICAgICAgICBwYXNzCkBA IC02MTcsMjUgKzYyMSwyNSBAQCBjbGFzcyBNb2NrUmlldHZlbGQoKToKICAgICAgICAgbG9nKCJN T0NLOiBVcGxvYWRpbmcgcGF0Y2ggdG8gcmlldHZlbGQiKQogCiAKLWNsYXNzIE1vY2tUZXN0UG9y dDEoKToKK2NsYXNzIE1vY2tUZXN0UG9ydDEob2JqZWN0KToKIAogICAgIGRlZiBza2lwc19sYXlv dXRfdGVzdChzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICByZXR1cm4gdGVzdF9uYW1lIGluIFsi bWVkaWEvZm9vL2Jhci5odG1sIiwgImZvbyJdCiAKIAotY2xhc3MgTW9ja1Rlc3RQb3J0MigpOgor Y2xhc3MgTW9ja1Rlc3RQb3J0MihvYmplY3QpOgogCiAgICAgZGVmIHNraXBzX2xheW91dF90ZXN0 KHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgIHJldHVybiB0ZXN0X25hbWUgPT0gIm1lZGlhL2Zv by9iYXIuaHRtbCIKIAogCi1jbGFzcyBNb2NrUG9ydEZhY3RvcnkoKToKK2NsYXNzIE1vY2tQb3J0 RmFjdG9yeShvYmplY3QpOgogCiAgICAgZGVmIGdldF9hbGwoc2VsZiwgb3B0aW9ucz1Ob25lKToK ICAgICAgICAgcmV0dXJuIHsidGVzdF9wb3J0MSI6IE1vY2tUZXN0UG9ydDEoKSwgInRlc3RfcG9y dDIiOiBNb2NrVGVzdFBvcnQyKCl9CiAKIAotY2xhc3MgTW9ja1Rvb2woKToKK2NsYXNzIE1vY2tU b29sKG9iamVjdCk6CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgbG9nX2V4ZWN1dGl2ZT1GYWxz ZSk6CiAgICAgICAgIHNlbGYud2FrZXVwX2V2ZW50ID0gdGhyZWFkaW5nLkV2ZW50KCkK