37406 2010-04-11 00:10:29 -0700 Add PrettyPatch links to new-run-webkit-tests output 2010-04-12 01:10:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth commit-queue dpranke ojan oldest_to_newest 211324 0 eric 2010-04-11 00:10:29 -0700 Add PrettyPatch links to new-run-webkit-tests output 211325 1 53079 eric 2010-04-11 00:15:23 -0700 Created attachment 53079 Patch 211327 2 53079 abarth 2010-04-11 00:23:54 -0700 Comment on attachment 53079 Patch Ok. I miss the pretty diffs. Glad it's coming back. 211333 3 53079 commit-queue 2010-04-11 00:42:03 -0700 Comment on attachment 53079 Patch Clearing flags on attachment: 53079 Committed r57446: <http://trac.webkit.org/changeset/57446> 211334 4 commit-queue 2010-04-11 00:42:09 -0700 All reviewed patches have been landed. Closing bug. 211385 5 53079 dpranke 2010-04-11 11:35:35 -0700 Comment on attachment 53079 Patch > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > index b1e0733..33893f6 100644 > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -1,3 +1,27 @@ > +2010-04-11 Eric Seidel <eric@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Add PrettyPatch links to new-run-webkit-tests output > + https://bugs.webkit.org/show_bug.cgi?id=37406 > + Does this patch introduce a dependency on Ruby into the test system? I don't think we have Ruby on Chromium windows (and am not sure about Linux, although it's probably there). Also, do we really need three different kinds of diffs? > @@ -519,6 +519,7 @@ class Port(object): > '--end-insert=##WDIFF_END##', > actual_filename, > expected_filename] > + # FIXME: Why not just check os.exists(executable) once? > global _wdiff_available See the comments in base.py's Port.wdiff_text() 211386 6 eric 2010-04-11 11:37:46 -0700 I need to add a check for Ruby, as it looks like the Linux canary doesn't have ruby. Personally I find PrettyPatch diffs prettier than wdiff. :) wdiff doesn't exist on Mac systems, and more importantly is the same prettydiff that we use on bugs.webkti.org (the "Formatted Diff" link next to any patch is a PrettyPatch diff). 211390 7 dpranke 2010-04-11 11:43:14 -0700 (In reply to comment #6) > I need to add a check for Ruby, as it looks like the Linux canary doesn't have > ruby. > > Personally I find PrettyPatch diffs prettier than wdiff. :) wdiff doesn't > exist on Mac systems, and more importantly is the same prettydiff that we use > on bugs.webkti.org (the "Formatted Diff" link next to any patch is a > PrettyPatch diff). Sorry, I should have been clearer; I'm not wedded to wdiff either, except that it shows you intraline diffs, and I don't know that anyone else is, either. Perhaps we should replace wdiff with PrettyPatch, instead of having three diffs? 211397 8 abarth 2010-04-11 11:53:59 -0700 > Perhaps we should replace wdiff with PrettyPatch, instead of having three > diffs? That sounds like a good plan to me. That's consistent with how the tool has worked historically and with how bugs.webkit.org works. 211483 9 eric 2010-04-11 18:47:48 -0700 I wont be able to fix the script for pllatforms missing Ruby until tomorrow morning. If that's blocking the Gardner from getting work done, feel free to roll this out. 211568 10 eric 2010-04-12 01:10:09 -0700 Fixed systems missing ruby in bug 37441. 53079 2010-04-11 00:15:23 -0700 2010-04-11 11:35:35 -0700 Patch bug-37406-20100411001520.patch text/plain 14356 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiMWUwNzMzLi4zMzg5M2Y2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDQt MTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBQcmV0dHlQYXRjaCBsaW5rcyB0byBuZXct cnVuLXdlYmtpdC10ZXN0cyBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM3NDA2CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weToKKyAgICAg ICAgIC0gV2UncmUgbGVha2luZyBhIGZpbGUgaGFuZGxlIGhlcmUsIGFkZCBhIEZJWE1FLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3Rf ZmFpbHVyZXMucHk6CisgICAgICAgICAtIEFkZCBwcmV0dHkgZGlmZiBsaW5rcy4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgICAt IEFkZCBzdXBwb3J0IGZvciBnZW5lcmF0aW5nIHByZXR0eSBkaWZmcyB1c2luZyBQcmV0dHlQYXRj aC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5w eToKKyAgICAgICAgIC0gV2UncmUgbGVha2luZyBhbm90aGVyIGZpbGUgaGFuZGxlIGhlcmUsIGFu b3RoZXIgRklYTUUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVz dF90eXBlcy9pbWFnZV9kaWZmLnB5OgorICAgICAgICAgLSBVcGRhdGUgd3JpdGVfb3V0cHV0X2Zp bGVzIHNpZ25hdHVyZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90 ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlLnB5OgorICAgICAgICAgLSBSZW1vdmUgdW51c2VkIGFy Z3VtZW50cyBmcm9tIHdyaXRlX291dHB1dF9maWxlcy4KKyAgICAgICAgIC0gQWRkIHN1cHBvcnQg Zm9yIGR1bXBpbmcgcHJldHR5IGRpZmZzIHRvIHdyaXRlX291dHB1dF9maWxlcy4KKyAgICAgICAg IC0gRml4IGEgYnVuY2ggb2YgZmlsZSBkZXNjcmlwdG9yIGxlYWtzIGluIHRoaXMgZmlsZS4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3RleHRfZGlm Zi5weToKKyAgICAgICAgIC0gVXBkYXRlIHdyaXRlX291dHB1dF9maWxlcyBzaWduYXR1cmUuCisK IDIwMTAtMDQtMTAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhy ZWFkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKaW5kZXggM2ZkMzhmZS4uOTNiNGM3 OSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKKysrIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5k ZXJfdHJlZV90aHJlYWQucHkKQEAgLTg5LDcgKzg5LDcgQEAgZGVmIHByb2Nlc3Nfb3V0cHV0KHBv cnQsIHRlc3RfaW5mbywgdGVzdF90eXBlcywgdGVzdF9hcmdzLCBjb25maWd1cmF0aW9uLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2luZm8uZmlsZW5hbWUpKQogICAgICAg ICBmaWxlbmFtZSA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWzBdICsgIi1zdGFjay50eHQi CiAgICAgICAgIHBvcnQubWF5YmVfbWFrZV9kaXJlY3Rvcnkob3MucGF0aC5zcGxpdChmaWxlbmFt ZSlbMF0pCi0gICAgICAgIG9wZW4oZmlsZW5hbWUsICJ3YiIpLndyaXRlKGVycm9yKQorICAgICAg ICBvcGVuKGZpbGVuYW1lLCAid2IiKS53cml0ZShlcnJvcikgICMgRklYTUU6IFRoaXMgbGVha3Mg YSBmaWxlIGhhbmRsZS4KICAgICBlbGlmIGVycm9yOgogICAgICAgICBfbG9nLmRlYnVnKCJQcmV2 aW91cyB0ZXN0IG91dHB1dCBleHRyYSBsaW5lcyBhZnRlciBkdW1wOlxuJXMiICUKICAgICAgICAg ICAgICAgICAgICBlcnJvcikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZmFpbHVyZXMucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2Zh aWx1cmVzLnB5CmluZGV4IDAyMjk3M2EuLjYwYmRiY2EgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZmFpbHVy ZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2UvdGVzdF9mYWlsdXJlcy5weQpAQCAtMTEwLDcgKzExMCw3IEBAIGNsYXNzIEZh aWx1cmVXaXRoVHlwZShUZXN0RmFpbHVyZSk6CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgdGVz dF90eXBlKToKICAgICAgICAgVGVzdEZhaWx1cmUuX19pbml0X18oc2VsZikKLSAgICAgICAgIyBU T0RPKG9qYW4pOiBUaGlzIGNsYXNzIG5vIGxvbmdlciBuZWVkcyB0byBrbm93IHRoZSB0ZXN0X3R5 cGUuCisgICAgICAgICMgRklYTUU6IFRoaXMgY2xhc3Mgbm8gbG9uZ2VyIG5lZWRzIHRvIGtub3cg dGhlIHRlc3RfdHlwZS4KICAgICAgICAgc2VsZi5fdGVzdF90eXBlID0gdGVzdF90eXBlCiAKICAg ICAjIEZpbGVuYW1lIHN1ZmZpeGVzIHVzZWQgYnkgUmVzdWx0SHRtbE91dHB1dC4KQEAgLTEyNyw2 ICsxMjcsOSBAQCBjbGFzcyBGYWlsdXJlV2l0aFR5cGUoVGVzdEZhaWx1cmUpOgogICAgICAgICAg ICAgICBzaW5nbGUgaXRlbSBpcyB0aGUgW2FjdHVhbF0gZmlsZW5hbWUgc3VmZml4LgogICAgICAg ICAgICAgICBJZiBvdXRfbmFtZXMgaXMgZW1wdHksIHJldHVybnMgdGhlIGVtcHR5IHN0cmluZy4K ICAgICAgICAgIiIiCisgICAgICAgICMgRklYTUU6IFNlZW1zIGxpa2UgYSBiYWQgaWRlYSB0byBz ZXBhcmF0ZSB0aGUgZGlzcGxheSBuYW1lIGRhdGEKKyAgICAgICAgIyBmcm9tIHRoZSBwYXRoIGRh dGEgYnkgaGFyZC1jb2RpbmcgdGhlIGRpc3BsYXkgbmFtZSBoZXJlCisgICAgICAgICMgYW5kIHBh c3NpbmcgaW4gdGhlIHBhdGggaW5mb3JtYXRpb24gdmlhIG91dF9uYW1lcy4KICAgICAgICAgbGlu a3MgPSBbJyddCiAgICAgICAgIHVyaXMgPSBbc2VsZi5yZWxhdGl2ZV9vdXRwdXRfZmlsZW5hbWUo ZmlsZW5hbWUsIGZuKSBmb3IKICAgICAgICAgICAgICAgICBmbiBpbiBvdXRfbmFtZXNdCkBAIC0x MzgsNiArMTQxLDggQEAgY2xhc3MgRmFpbHVyZVdpdGhUeXBlKFRlc3RGYWlsdXJlKToKICAgICAg ICAgICAgIGxpbmtzLmFwcGVuZCgiPGEgaHJlZj0nJXMnPmRpZmY8L2E+IiAlIHVyaXNbMl0pCiAg ICAgICAgIGlmIGxlbih1cmlzKSA+IDM6CiAgICAgICAgICAgICBsaW5rcy5hcHBlbmQoIjxhIGhy ZWY9JyVzJz53ZGlmZjwvYT4iICUgdXJpc1szXSkKKyAgICAgICAgaWYgbGVuKHVyaXMpID4gNDoK KyAgICAgICAgICAgIGxpbmtzLmFwcGVuZCgiPGEgaHJlZj0nJXMnPnByZXR0eSBkaWZmPC9hPiIg JSB1cmlzWzRdKQogICAgICAgICByZXR1cm4gJyAnLmpvaW4obGlua3MpCiAKICAgICBkZWYgcmVz dWx0X2h0bWxfb3V0cHV0KHNlbGYsIGZpbGVuYW1lKToKQEAgLTE5Miw5ICsxOTcsMTAgQEAgY2xh c3MgRmFpbHVyZU1pc3NpbmdSZXN1bHQoRmFpbHVyZVdpdGhUeXBlKToKIGNsYXNzIEZhaWx1cmVU ZXh0TWlzbWF0Y2goRmFpbHVyZVdpdGhUeXBlKToKICAgICAiIiJUZXh0IGRpZmYgb3V0cHV0IGZh aWxlZC4iIiIKICAgICAjIEZpbGVuYW1lIHN1ZmZpeGVzIHVzZWQgYnkgUmVzdWx0SHRtbE91dHB1 dC4KKyAgICAjIEZJWE1FOiBXaHkgZG9uJ3Qgd2UgdXNlIHRoZSBjb25zdGFudHMgZnJvbSBUZXN0 VHlwZUJhc2UgaGVyZT8KICAgICBPVVRfRklMRU5BTUVTID0gWyItYWN0dWFsLnR4dCIsICItZXhw ZWN0ZWQudHh0IiwgIi1kaWZmLnR4dCJdCiAgICAgT1VUX0ZJTEVOQU1FU19XRElGRiA9IFsiLWFj dHVhbC50eHQiLCAiLWV4cGVjdGVkLnR4dCIsICItZGlmZi50eHQiLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIi13ZGlmZi5odG1sIl0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICIt d2RpZmYuaHRtbCIsICItcHJldHR5LWRpZmYuaHRtbCJdCiAKICAgICBkZWYgX19pbml0X18oc2Vs ZiwgdGVzdF90eXBlLCBoYXNfd2RpZmYpOgogICAgICAgICBGYWlsdXJlV2l0aFR5cGUuX19pbml0 X18oc2VsZiwgdGVzdF90eXBlKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDJmMjE2M2IuLjk4OGU1MjkgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Jhc2UucHkKQEAgLTUxOSw2ICs1MTksNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ICAgICAgICAgICAnLS1lbmQtaW5zZXJ0PSMjV0RJRkZfRU5EIyMnLAogICAgICAgICAgICAgICAg YWN0dWFsX2ZpbGVuYW1lLAogICAgICAgICAgICAgICAgZXhwZWN0ZWRfZmlsZW5hbWVdCisgICAg ICAgICMgRklYTUU6IFdoeSBub3QganVzdCBjaGVjayBvcy5leGlzdHMoZXhlY3V0YWJsZSkgb25j ZT8KICAgICAgICAgZ2xvYmFsIF93ZGlmZl9hdmFpbGFibGUKICAgICAgICAgcmVzdWx0ID0gJycK ICAgICAgICAgdHJ5OgpAQCAtNTQxLDYgKzU0Miw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAg ICAgICAgICAgICMgaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1ZTEyMzYKICAgICAgICAgICAg IGlmIF93ZGlmZl9hdmFpbGFibGU6CiAgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAg ICAgICAgICAjIEZJWE1FOiBVc2UgRXhlY3V0aXZlKCkgaGVyZS4KICAgICAgICAgICAgICAgICAg ICAgd2RpZmYgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwKICAgICAgICAgICAgICAgICAgICAgICAg IHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpLmNvbW11bmljYXRlKClbMF0KICAgICAgICAgICAgICAg ICBleGNlcHQgVmFsdWVFcnJvciwgZToKQEAgLTU2Miw2ICs1NjQsMTIgQEAgY2xhc3MgUG9ydChv YmplY3QpOgogICAgICAgICAgICAgICAgIHJhaXNlIGUKICAgICAgICAgcmV0dXJuIHJlc3VsdAog CisgICAgZGVmIHByZXR0eV9wYXRjaF90ZXh0KHNlbGYsIGRpZmZfcGF0aCk6CisgICAgICAgIHBy ZXR0eV9wYXRjaF9wYXRoID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkJ1Z3NTaXRlIiwg IlByZXR0eVBhdGNoIikKKyAgICAgICAgcHJldHRpZnlfcGF0aCA9IG9zLnBhdGguam9pbihwcmV0 dHlfcGF0Y2hfcGF0aCwgInByZXR0aWZ5LnJiIikKKyAgICAgICAgY29tbWFuZCA9IFsicnVieSIs ICItSSIsIHByZXR0eV9wYXRjaF9wYXRoLCBwcmV0dGlmeV9wYXRoLCBkaWZmX3BhdGhdCisgICAg ICAgIHJldHVybiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoY29tbWFuZCkKKwogICAgIGRl ZiBkZWZhdWx0X2NvbmZpZ3VyYXRpb24oc2VsZik6CiAgICAgICAgIHJldHVybiAiUmVsZWFzZSIK IApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC93ZWJraXQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYmtpdC5weQppbmRleCAyZjRiYWRjLi5kZDhkMTgwIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5w eQpAQCAtMTYzLDcgKzE2Myw3IEBAIGNsYXNzIFdlYktpdFBvcnQoYmFzZS5Qb3J0KToKICAgICAg ICAgICAgIGlmIG0uZ3JvdXAoMikgPT0gJ3Bhc3NlZCc6CiAgICAgICAgICAgICAgICAgcmVzdWx0 ID0gRmFsc2UKICAgICAgICAgZWxpZiBvdXRwdXQgYW5kIGRpZmZfZmlsZW5hbWU6Ci0gICAgICAg ICAgICBvcGVuKGRpZmZfZmlsZW5hbWUsICd3Jykud3JpdGUob3V0cHV0KQorICAgICAgICAgICAg b3BlbihkaWZmX2ZpbGVuYW1lLCAndycpLndyaXRlKG91dHB1dCkgICMgRklYTUU6IFRoaXMgbGVh a3MgYSBmaWxlIGhhbmRsZS4KICAgICAgICAgZWxpZiBzcC50aW1lZF9vdXQ6CiAgICAgICAgICAg ICBfbG9nLmVycm9yKCJJbWFnZURpZmYgdGltZWQgb3V0IG9uICVzIiAlIGV4cGVjdGVkX2ZpbGVu YW1lKQogICAgICAgICBlbGlmIHNwLmNyYXNoZWQ6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdl X2RpZmYucHkKaW5kZXggZGNhMmZiYy4uYjQxNDM1OCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMv aW1hZ2VfZGlmZi5weQpAQCAtMTUwLDkgKzE1MCw5IEBAIGNsYXNzIEltYWdlRGlmZih0ZXN0X3R5 cGVfYmFzZS5UZXN0VHlwZUJhc2UpOgogCiAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmlzZmlsZShl eHBlY3RlZF9wbmdfZmlsZSk6CiAgICAgICAgICAgICAjIFJlcG9ydCBhIG1pc3NpbmcgZXhwZWN0 ZWQgUE5HIGZpbGUuCi0gICAgICAgICAgICBzZWxmLndyaXRlX291dHB1dF9maWxlcyhwb3J0LCBm aWxlbmFtZSwgJycsICcuY2hlY2tzdW0nLAorICAgICAgICAgICAgc2VsZi53cml0ZV9vdXRwdXRf ZmlsZXMocG9ydCwgZmlsZW5hbWUsICcuY2hlY2tzdW0nLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGVzdF9hcmdzLmhhc2gsIGV4cGVjdGVkX2hhc2gsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkaWZmPUZhbHNlLCB3ZGlmZj1GYWxzZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50X3RleHRfZGlmZnM9RmFsc2UpCiAg ICAgICAgICAgICBzZWxmLl9jb3B5X291dHB1dF9wbmcoZmlsZW5hbWUsIHRlc3RfYXJncy5wbmdf cGF0aCwgJy1hY3R1YWwucG5nJykKICAgICAgICAgICAgIGZhaWx1cmVzLmFwcGVuZCh0ZXN0X2Zh aWx1cmVzLkZhaWx1cmVNaXNzaW5nSW1hZ2Uoc2VsZikpCiAgICAgICAgICAgICByZXR1cm4gZmFp bHVyZXMKQEAgLTE2MCwxMCArMTYwLDkgQEAgY2xhc3MgSW1hZ2VEaWZmKHRlc3RfdHlwZV9iYXNl LlRlc3RUeXBlQmFzZSk6CiAgICAgICAgICAgICAjIEhhc2ggbWF0Y2hlZCAobm8gZGlmZiBuZWVk ZWQsIG9rYXkgdG8gcmV0dXJuKS4KICAgICAgICAgICAgIHJldHVybiBmYWlsdXJlcwogCi0KLSAg ICAgICAgc2VsZi53cml0ZV9vdXRwdXRfZmlsZXMocG9ydCwgZmlsZW5hbWUsICcnLCAnLmNoZWNr c3VtJywKKyAgICAgICAgc2VsZi53cml0ZV9vdXRwdXRfZmlsZXMocG9ydCwgZmlsZW5hbWUsICcu Y2hlY2tzdW0nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2FyZ3MuaGFz aCwgZXhwZWN0ZWRfaGFzaCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlmZj1G YWxzZSwgd2RpZmY9RmFsc2UpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW50 X3RleHRfZGlmZnM9RmFsc2UpCiAgICAgICAgIHNlbGYuX2NvcHlfb3V0cHV0X3BuZyhmaWxlbmFt ZSwgdGVzdF9hcmdzLnBuZ19wYXRoLCAnLWFjdHVhbC5wbmcnKQogICAgICAgICBzZWxmLl9jb3B5 X291dHB1dF9wbmcoZmlsZW5hbWUsIGV4cGVjdGVkX3BuZ19maWxlLCAnLWV4cGVjdGVkLnBuZycp CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3Rlc3RfdHlwZXMvdGVzdF90eXBlX2Jhc2UucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlLnB5CmluZGV4IGU0Yjk3 NjYuLjRjOTliZTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGVzdF90eXBlX2Jhc2UucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXN0X3R5cGVfYmFzZS5w eQpAQCAtNzAsNiArNzAsNyBAQCBjbGFzcyBUZXN0VHlwZUJhc2Uob2JqZWN0KToKICAgICBGSUxF TkFNRV9TVUZGSVhfRVhQRUNURUQgPSAiLWV4cGVjdGVkIgogICAgIEZJTEVOQU1FX1NVRkZJWF9E SUZGID0gIi1kaWZmIgogICAgIEZJTEVOQU1FX1NVRkZJWF9XRElGRiA9ICItd2RpZmYuaHRtbCIK KyAgICBGSUxFTkFNRV9TVUZGSVhfUFJFVFRZX1BBVENIID0gIi1wcmV0dHktZGlmZi5odG1sIgog ICAgIEZJTEVOQU1FX1NVRkZJWF9DT01QQVJFID0gIi1kaWZmLnBuZyIKIAogICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBwb3J0LCByb290X291dHB1dF9kaXIpOgpAQCAtMTExLDcgKzExMiw3IEBAIGNs YXNzIFRlc3RUeXBlQmFzZShvYmplY3QpOgogICAgICAgICBzZWxmLl9wb3J0Lm1heWJlX21ha2Vf ZGlyZWN0b3J5KG91dHB1dF9kaXIpCiAgICAgICAgIG91dHB1dF9wYXRoID0gb3MucGF0aC5qb2lu KG91dHB1dF9kaXIsIG91dHB1dF9maWxlKQogICAgICAgICBfbG9nLmRlYnVnKCd3cml0aW5nIG5l dyBiYXNlbGluZSB0byAiJXMiJyAlIChvdXRwdXRfcGF0aCkpCi0gICAgICAgIG9wZW4ob3V0cHV0 X3BhdGgsICJ3YiIpLndyaXRlKGRhdGEpCisgICAgICAgIHNlbGYuX3dyaXRlX2ludG9fZmlsZV9h dF9wYXRoKG91dHB1dF9wYXRoLCBkYXRhKQogCiAgICAgZGVmIG91dHB1dF9maWxlbmFtZShzZWxm LCBmaWxlbmFtZSwgbW9kaWZpZXIpOgogICAgICAgICAiIiJSZXR1cm5zIGEgZmlsZW5hbWUgaW5z aWRlIHRoZSBvdXRwdXQgZGlyIHRoYXQgY29udGFpbnMgbW9kaWZpZXIuCkBAIC0xNDksNDkgKzE1 MCw1MiBAQCBjbGFzcyBUZXN0VHlwZUJhc2Uob2JqZWN0KToKICAgICAgICAgIiIiCiAgICAgICAg IHJhaXNlIE5vdEltcGxlbWVudGVkCiAKLSAgICBkZWYgd3JpdGVfb3V0cHV0X2ZpbGVzKHNlbGYs IHBvcnQsIGZpbGVuYW1lLCB0ZXN0X3R5cGUsIGZpbGVfdHlwZSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgIG91dHB1dCwgZXhwZWN0ZWQsIGRpZmY9VHJ1ZSwgd2RpZmY9RmFsc2UpOgorICAg IGRlZiBfd3JpdGVfaW50b19maWxlX2F0X3BhdGgoc2VsZiwgZmlsZV9wYXRoLCBjb250ZW50cyk6 CisgICAgICAgIGZpbGUgPSBvcGVuKGZpbGVfcGF0aCwgIndiIikKKyAgICAgICAgZmlsZS53cml0 ZShjb250ZW50cykKKyAgICAgICAgZmlsZS5jbG9zZSgpCisKKyAgICBkZWYgd3JpdGVfb3V0cHV0 X2ZpbGVzKHNlbGYsIHBvcnQsIGZpbGVuYW1lLCBmaWxlX3R5cGUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICBvdXRwdXQsIGV4cGVjdGVkLCBwcmludF90ZXh0X2RpZmZzPUZhbHNlKToKICAg ICAgICAgIiIiV3JpdGVzIHRoZSB0ZXN0IG91dHB1dCwgdGhlIGV4cGVjdGVkIG91dHB1dCBhbmQg b3B0aW9uYWxseSB0aGUgZGlmZgogICAgICAgICBiZXR3ZWVuIHRoZSB0d28gdG8gZmlsZXMgaW4g dGhlIHJlc3VsdHMgZGlyZWN0b3J5LgogCiAgICAgICAgIFRoZSBmdWxsIG91dHB1dCBmaWxlbmFt ZSBvZiB0aGUgYWN0dWFsLCBmb3IgZXhhbXBsZSwgd2lsbCBiZQotICAgICAgICAgIDxmaWxlbmFt ZT48dGVzdF90eXBlPi1hY3R1YWw8ZmlsZV90eXBlPgorICAgICAgICAgIDxmaWxlbmFtZT4tYWN0 dWFsPGZpbGVfdHlwZT4KICAgICAgICAgRm9yIGluc3RhbmNlLAotICAgICAgICAgIG15X3Rlc3Qt c2ltcC1hY3R1YWwudHh0CisgICAgICAgICAgbXlfdGVzdC1hY3R1YWwudHh0CiAKICAgICAgICAg QXJnczoKICAgICAgICAgICBmaWxlbmFtZTogVGhlIHRlc3QgZmlsZW5hbWUKLSAgICAgICAgICB0 ZXN0X3R5cGU6IEEgc3RyaW5nIGRlc2NyaWJpbmcgdGhlIHRlc3QgdHlwZSwgZS5nLiAic2ltcCIK ICAgICAgICAgICBmaWxlX3R5cGU6IEEgc3RyaW5nIGRlc2NyaWJpbmcgdGhlIHRlc3Qgb3V0cHV0 IGZpbGUgdHlwZSwgZS5nLiAiLnR4dCIKICAgICAgICAgICBvdXRwdXQ6IEEgc3RyaW5nIGNvbnRh aW5pbmcgdGhlIHRlc3Qgb3V0cHV0CiAgICAgICAgICAgZXhwZWN0ZWQ6IEEgc3RyaW5nIGNvbnRh aW5pbmcgdGhlIGV4cGVjdGVkIHRlc3Qgb3V0cHV0Ci0gICAgICAgICAgZGlmZjogaWYgVHJ1ZSwg d3JpdGUgYSBmaWxlIGNvbnRhaW5pbmcgdGhlIGRpZmZzIHRvby4gVGhpcyBzaG91bGQgYmUKLSAg ICAgICAgICAgICAgRmFsc2UgZm9yIHJlc3VsdHMgdGhhdCBhcmUgbm90IHRleHQKLSAgICAgICAg ICB3ZGlmZjogaWYgVHJ1ZSwgd3JpdGUgYW4gSFRNTCBmaWxlIGNvbnRhaW5pbmcgd29yZC1ieS13 b3JkIGRpZmZzCisgICAgICAgICAgcHJpbnRfdGV4dF9kaWZmczogVHJ1ZSBmb3IgdGV4dCBkaWZm cy4gKEZJWE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBnZXQgdGhpcyBmcm9tIHRoZSBmaWxlIHR5 cGU/KQogICAgICAgICAiIiIKICAgICAgICAgc2VsZi5fbWFrZV9vdXRwdXRfZGlyZWN0b3J5KGZp bGVuYW1lKQotICAgICAgICBhY3R1YWxfZmlsZW5hbWUgPSBzZWxmLm91dHB1dF9maWxlbmFtZShm aWxlbmFtZSwKLSAgICAgICAgICAgIHRlc3RfdHlwZSArIHNlbGYuRklMRU5BTUVfU1VGRklYX0FD VFVBTCArIGZpbGVfdHlwZSkKLSAgICAgICAgZXhwZWN0ZWRfZmlsZW5hbWUgPSBzZWxmLm91dHB1 dF9maWxlbmFtZShmaWxlbmFtZSwKLSAgICAgICAgICAgIHRlc3RfdHlwZSArIHNlbGYuRklMRU5B TUVfU1VGRklYX0VYUEVDVEVEICsgZmlsZV90eXBlKQorICAgICAgICBhY3R1YWxfZmlsZW5hbWUg PSBzZWxmLm91dHB1dF9maWxlbmFtZShmaWxlbmFtZSwgc2VsZi5GSUxFTkFNRV9TVUZGSVhfQUNU VUFMICsgZmlsZV90eXBlKQorICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9IHNlbGYub3V0cHV0 X2ZpbGVuYW1lKGZpbGVuYW1lLCBzZWxmLkZJTEVOQU1FX1NVRkZJWF9FWFBFQ1RFRCArIGZpbGVf dHlwZSkKICAgICAgICAgaWYgb3V0cHV0OgotICAgICAgICAgICAgb3BlbihhY3R1YWxfZmlsZW5h bWUsICJ3YiIpLndyaXRlKG91dHB1dCkKKyAgICAgICAgICAgIHNlbGYuX3dyaXRlX2ludG9fZmls ZV9hdF9wYXRoKGFjdHVhbF9maWxlbmFtZSwgb3V0cHV0KQogICAgICAgICBpZiBleHBlY3RlZDoK LSAgICAgICAgICAgIG9wZW4oZXhwZWN0ZWRfZmlsZW5hbWUsICJ3YiIpLndyaXRlKGV4cGVjdGVk KQorICAgICAgICAgICAgc2VsZi5fd3JpdGVfaW50b19maWxlX2F0X3BhdGgoZXhwZWN0ZWRfZmls ZW5hbWUsIGV4cGVjdGVkKQogCiAgICAgICAgIGlmIG5vdCBvdXRwdXQgb3Igbm90IGV4cGVjdGVk OgogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgaWYgZGlmZjoKLSAgICAgICAgICAgIGRp ZmYgPSBwb3J0LmRpZmZfdGV4dChleHBlY3RlZCwgb3V0cHV0LCBleHBlY3RlZF9maWxlbmFtZSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY3R1YWxfZmlsZW5hbWUpCi0gICAg ICAgICAgICBkaWZmX2ZpbGVuYW1lID0gc2VsZi5vdXRwdXRfZmlsZW5hbWUoZmlsZW5hbWUsCi0g ICAgICAgICAgICAgICAgdGVzdF90eXBlICsgc2VsZi5GSUxFTkFNRV9TVUZGSVhfRElGRiArIGZp bGVfdHlwZSkKLSAgICAgICAgICAgIG9wZW4oZGlmZl9maWxlbmFtZSwgIndiIikud3JpdGUoZGlm ZikKLQotICAgICAgICBpZiB3ZGlmZjoKLSAgICAgICAgICAgICMgU2hlbGwgb3V0IHRvIHdkaWZm IHRvIGdldCBjb2xvcmVkIGlubGluZSBkaWZmcy4KLSAgICAgICAgICAgIHdkaWZmID0gcG9ydC53 ZGlmZl90ZXh0KGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmlsZW5hbWUpCi0gICAgICAgICAg ICBmaWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKGZpbGVuYW1lLCB0ZXN0X3R5cGUgKwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLkZJTEVOQU1F X1NVRkZJWF9XRElGRikKLSAgICAgICAgICAgIG91dCA9IG9wZW4oZmlsZW5hbWUsICd3YicpLndy aXRlKHdkaWZmKQorICAgICAgICBpZiBub3QgcHJpbnRfdGV4dF9kaWZmczoKKyAgICAgICAgICAg IHJldHVybgorCisgICAgICAgIGRpZmYgPSBwb3J0LmRpZmZfdGV4dChleHBlY3RlZCwgb3V0cHV0 LCBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lKQorICAgICAgICBkaWZmX2ZpbGVu YW1lID0gc2VsZi5vdXRwdXRfZmlsZW5hbWUoZmlsZW5hbWUsIHNlbGYuRklMRU5BTUVfU1VGRklY X0RJRkYgKyBmaWxlX3R5cGUpCisgICAgICAgIHNlbGYuX3dyaXRlX2ludG9fZmlsZV9hdF9wYXRo KGRpZmZfZmlsZW5hbWUsIGRpZmYpCisKKyAgICAgICAgIyBTaGVsbCBvdXQgdG8gd2RpZmYgdG8g Z2V0IGNvbG9yZWQgaW5saW5lIGRpZmZzLgorICAgICAgICB3ZGlmZiA9IHBvcnQud2RpZmZfdGV4 dChleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lKQorICAgICAgICB3ZGlmZl9maWxl bmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKGZpbGVuYW1lLCBzZWxmLkZJTEVOQU1FX1NVRkZJ WF9XRElGRikKKyAgICAgICAgc2VsZi5fd3JpdGVfaW50b19maWxlX2F0X3BhdGgod2RpZmZfZmls ZW5hbWUsIHdkaWZmKQorCisgICAgICAgICMgVXNlIFdlYktpdCdzIFByZXR0eVBhdGNoLnJiIHRv IGdldCBhbiBIVE1MIGRpZmYuCisgICAgICAgIHByZXR0eV9wYXRjaCA9IHBvcnQucHJldHR5X3Bh dGNoX3RleHQoZGlmZl9maWxlbmFtZSkKKyAgICAgICAgcHJldHR5X3BhdGNoX2ZpbGVuYW1lID0g c2VsZi5vdXRwdXRfZmlsZW5hbWUoZmlsZW5hbWUsIHNlbGYuRklMRU5BTUVfU1VGRklYX1BSRVRU WV9QQVRDSCkKKyAgICAgICAgc2VsZi5fd3JpdGVfaW50b19maWxlX2F0X3BhdGgocHJldHR5X3Bh dGNoX2ZpbGVuYW1lLCBwcmV0dHlfcGF0Y2gpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3RleHRfZGlmZi5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZm LnB5CmluZGV4IDFhZjc4NmMuLjhmNzkwN2MgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9k aWZmLnB5CkBAIC05OCw4ICs5OCw4IEBAIGNsYXNzIFRlc3RUZXh0RGlmZih0ZXN0X3R5cGVfYmFz ZS5UZXN0VHlwZUJhc2UpOgogICAgICAgICAjIFdyaXRlIG91dHB1dCBmaWxlcyBmb3IgbmV3IHRl c3RzLCB0b28uCiAgICAgICAgIGlmIHBvcnQuY29tcGFyZV90ZXh0KG91dHB1dCwgZXhwZWN0ZWQp OgogICAgICAgICAgICAgIyBUZXh0IGRvZXNuJ3QgbWF0Y2gsIHdyaXRlIG91dHB1dCBmaWxlcy4K LSAgICAgICAgICAgIHNlbGYud3JpdGVfb3V0cHV0X2ZpbGVzKHBvcnQsIGZpbGVuYW1lLCAiIiwg Ii50eHQiLCBvdXRwdXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBl Y3RlZCwgZGlmZj1UcnVlLCB3ZGlmZj1UcnVlKQorICAgICAgICAgICAgc2VsZi53cml0ZV9vdXRw dXRfZmlsZXMocG9ydCwgZmlsZW5hbWUsICIudHh0Iiwgb3V0cHV0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWQsIHByaW50X3RleHRfZGlmZnM9VHJ1ZSkKIAog ICAgICAgICAgICAgaWYgZXhwZWN0ZWQgPT0gJyc6CiAgICAgICAgICAgICAgICAgZmFpbHVyZXMu YXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZU1pc3NpbmdSZXN1bHQoc2VsZikpCg==