66078 2011-08-11 11:07:16 -0700 Clarify how the symbol and runtime-feature based test exclusion works and cleanup the code a bit 2011-11-06 13:05:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth aroben dpranke ossy rniwa webkit.review.bot oldest_to_newest 449886 0 eric 2011-08-11 11:07:16 -0700 Clarify how the symbol and runtime-feature based test exclusion works and cleanup the code a bit 449892 1 103647 eric 2011-08-11 11:14:25 -0700 Created attachment 103647 Patch 496828 2 103647 webkit.review.bot 2011-11-06 11:36:20 -0800 Comment on attachment 103647 Patch Rejecting attachment 103647 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: 6 with fuzz 1 (offset 14 lines). patching file Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py Hunk #1 succeeded at 43 (offset 3 lines). Hunk #2 succeeded at 60 (offset 3 lines). Hunk #3 FAILED at 96. Hunk #4 succeeded at 118 (offset 3 lines). 1 out of 4 hunks FAILED -- saving rejects to file Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Adam Barth', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/10337533 496830 3 113794 eric 2011-11-06 11:48:00 -0800 Created attachment 113794 Patch for landing 496831 4 eric 2011-11-06 11:48:29 -0800 Committed r99377: <http://trac.webkit.org/changeset/99377> 496851 5 rniwa 2011-11-06 12:50:10 -0800 It appears that this patch broke nrwt on SL: http://build.webkit.org/builders/SnowLeopard%20Intel%20Debug%20%28Tests%29/builds/2871 496852 6 eric 2011-11-06 12:53:08 -0800 OK. Looking. 496855 7 ossy 2011-11-06 13:00:01 -0800 (In reply to comment #5) > It appears that this patch broke nrwt on SL: > http://build.webkit.org/builders/SnowLeopard%20Intel%20Debug%20%28Tests%29/builds/2871 Not only SL, but NRWT on all bots. 496858 8 eric 2011-11-06 13:01:57 -0800 Committed r99381: <http://trac.webkit.org/changeset/99381> 496859 9 eric 2011-11-06 13:05:45 -0800 I believe I fixed the bots. Please let me know if that's not the case. 103647 2011-08-11 11:14:25 -0700 2011-11-06 11:47:56 -0800 Patch bug-66078-20110811111424.patch text/plain 14147 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4NjkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4YzM5ZGY4YzQ0YjZlODhmZWMxNmZiMTQ3NzdhOTc1YTc0 Yjc4YzBhLi43Mzg4Y2VhYTVmMzYxODU5YWQxNjk4NTEwZjk5ZTcxMTViNTIzNjVlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTEtMDgtMTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IENsYXJpZnkgaG93IHRoZSBzeW1ib2wgYW5kIHJ1bnRpbWUtZmVhdHVyZSBiYXNlZCB0ZXN0IGV4 Y2x1c2lvbiB3b3JrcyBhbmQgY2xlYW51cCB0aGUgY29kZSBhIGJpdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwNzgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcnVudGltZSBmZWF0dXJlIGRldGVj dGlvbiB3YXMgZml4ZWQgdG8gd29yayBpbiBidWcgNjQ0NzIuCisgICAgICAgIEluIHRoaXMgYnVn IEkgbW92ZWQgdGhlIHN5bWJvbC1iYXNlZCBmZWF0dXJlIGRldGVjdGlvbiBmcm9tCisgICAgICAg IHBvcGVuKCkgdG8gRXhlY3V0aXZlLnJ1bl9jb21tYW5kIGFuZCBjbGVhbmVkIHVwIHRoZSBjYWxs ZXJzCisgICAgICAgIGFuZCB1bml0dGVzdHMgdG8gbWFrZSBzdXJlIHRoYXQgd2UncmUgY29ycmVj dGx5IHBhcnNpbmcgdGhlCisgICAgICAgIG5tIG91dHB1dCBjb3JyZWN0bHkuICBUaGUgb2xkIGNv ZGUgaGFwcGVuZWQgdG8gd29yayBldmVuIHRob3VnaAorICAgICAgICB0aGUgcnVudGltZS1mZWF0 dXJlcyBwYXRoIHdhcyB1c2luZyAic3RyIGluIGxpc3QiIGFuZCB0aGUKKyAgICAgICAgc3ltYm9s IGZlYXR1cmVzIHBhdGggd2FzIHVzaW5nICJzdHIgaW4gc3RyIiBhbmQgaXQganVzdCBoYXBwZW5l ZAorICAgICAgICB0byBkbyB3aGF0IHdlIHdhbnRlZCB0by4gIE5vdyBydW50aW1lIGZlYXR1cmVz IGFuZCBzeW1ib2wgZmVhdHVyZQorICAgICAgICBibGFja2xpc3RzIGFyZSBjb21wdXRlZCBzZXBh cmF0ZWx5IChhbmQgd2l0aCBiZXR0ZXIgZG9jdW1lbnRhdGlvbikuCisKKyAgICAgICAgVGhpcyBz eXN0ZW0gcmVtYWlucyBjb25mdXNpbmcsIHBhcnRpYWxseSBiZWNhdXNlIHRoZXNlIGFyZSBibGFj ay1saXN0cworICAgICAgICB3aGljaCBhcmUgYW1lbmRlZCB0byB3aGF0ZXZlciBzdGF0aWMgYmxh Y2tsaXN0IG1heSBleGlzdCBmb3IgdGhlCisgICAgICAgIHBvcnQgYXMgcGFydCBvZiBhIFNraXBw ZWQgbGlzdCBmaWxlLgorCisgICAgICAgIEZvciBleGFtcGxlLCBub3RpY2UgaG93IHRoZSBydW50 aW1lIGZlYXR1cmUgbGlzdCBvbmx5IGhhcyBkaXJlY3RvcnkKKyAgICAgICAgYmxhY2tsaXN0cyBm b3IgYSBjb3VwbGUgZmVhdHVyZXMuICBJZiBhbGwgZmVhdHVyZXMgYXJlIG9mZiwKKyAgICAgICAg aG93IGRvIHdlIHNraXAgZW5vdWdoIHRlc3RzIHdpdGggb25seSAyIGVudHJpZXMgaW4gdGhlIGJs YWNrbGlzdCBtYXA/CisgICAgICAgIFRoZSBhbnN3ZXIgaXMgdGhhdCBXaW5kb3dzIGlzIHRoZSBv bmx5IHBvcnQgdG8gdXNlIHJ1bnRpbWUgZmVhdHVyZQorICAgICAgICBkZXRlY3Rpb24sIGFuZCB0 aGUgd2luL1NraXBwZWQgZmlsZSB0dXJucyBvZmYgYWxsIHRoZSBvdGhlciBmZWF0dXJlcworICAg ICAgICBzdGF0aWNhbGx5IChsaWtlIG1hdGhtbCwgbWh0bWwsIHdzcywgZXRjLikgd2hlcmUgYXMg c29tZSBvdGhlciBwb3J0cyAobGlrZSBBcHBsZU1hYykKKyAgICAgICAgd2hpY2ggdXNlIHN5bWJv bC1iYXNlZCBmZWF0dXJlIGRldGVjdGlvbiB0dXJuIG9mIG1hdGhtbCwgd2NzcywgZXRjCisgICAg ICAgIHVzaW5nIHRoZSBibGFja2xpc3RzIGZvdW5kIGluIF9taXNzaW5nX3N5bWJvbF90b19za2lw cGVkX3Rlc3RzLgorCisgICAgICAgIFRoaXMgc2hvdWxkIHJlc3VsdCBpbiBubyBmdW5jdGlvbmFs IGNoYW5nZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Z3RrLnB5OgorICAgICAgICAgLSBVc2Ugc2VsZi5fZmlsZXN5c3RlbSBpbnN0ZWFkIG9mIG9zLnBh dGgKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91 bml0dGVzdC5weToKKwogMjAxMS0wOC0xMSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIE5ldyBleHBlY3RhdGlvbiBlbnRyaWVzIHNob3VsZCBiZSBw bGFjZWQgbmV4dCB0byBleGlzdGluZyBvbmVzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQppbmRleCA4N2RkOTUyOTdlNTY0MmJkZGJlMDNhOGRk ODU0NmM4OGYzNjU5YWFiLi42OTNlNjI5NjRmZjI4OTNmOTMyOWU1MDBhZThjYTc1Y2NiMDZiYmRm IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0 ay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5w eQpAQCAtMTE1LDcgKzExNSw3IEBAIGNsYXNzIEd0a1BvcnQod2Via2l0LldlYktpdFBvcnQpOgog CiAgICAgICAgIGZvciBsaWJyYXJ5IGluIGd0a19saWJyYXJ5X25hbWVzOgogICAgICAgICAgICAg ZnVsbF9saWJyYXJ5ID0gc2VsZi5fYnVpbGRfcGF0aCgiLmxpYnMiLCBsaWJyYXJ5KQotICAgICAg ICAgICAgaWYgb3MucGF0aC5pc2ZpbGUoZnVsbF9saWJyYXJ5KToKKyAgICAgICAgICAgIGlmIHNl bGYuX2ZpbGVzeXN0ZW0uaXNmaWxlKGZ1bGxfbGlicmFyeSk6CiAgICAgICAgICAgICAgICAgcmV0 dXJuIGZ1bGxfbGlicmFyeQogICAgICAgICByZXR1cm4gTm9uZQogCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IGYxODhkZDg3 OWExMTk5NTViY2M4M2M1N2ZlMjllZmUxNjBlNGI2ZmIuLjRhZTc5NzMzYWE3NmVlMWRlNDI1YmI3 ZTk4ODcxMmE2MjFiZDMwZDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC0yMzIsMzYgKzIzMiw0OCBAQCBjbGFzcyBXZWJL aXRQb3J0KFBvcnQpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBvdXRwdXQgPSBzZWxmLl9l eGVjdXRpdmUucnVuX2NvbW1hbmQoc3VwcG9ydGVkX2ZlYXR1cmVzX2NvbW1hbmQsIGVycm9yX2hh bmRsZXI9RXhlY3V0aXZlLmlnbm9yZV9lcnJvcikKICAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6 Ci0gICAgICAgICAgICBfbG9nLndhcm4oIkV4Y2VwdGlvbiBydW5uaWcgZHJpdmVyOiAlcywgJXMu ICBEcml2ZXIgbXVzdCBiZSBidWlsdCBiZWZvcmUgY2FsbGluZyBXZWJLaXRQb3J0LnRlc3RfZXhw ZWN0YXRpb25zKCkuIiAlIChzdXBwb3J0ZWRfZmVhdHVyZXNfY29tbWFuZCwgZSkpCi0gICAgICAg ICAgICByZXR1cm4gW10KKyAgICAgICAgICAgIF9sb2cud2FybigiRXhjZXB0aW9uIHJ1bm5pbmcg ZHJpdmVyOiAlcywgJXMuICBEcml2ZXIgbXVzdCBiZSBidWlsdCBiZWZvcmUgY2FsbGluZyBXZWJL aXRQb3J0LnRlc3RfZXhwZWN0YXRpb25zKCkuIiAlIChzdXBwb3J0ZWRfZmVhdHVyZXNfY29tbWFu ZCwgZSkpCisgICAgICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgICAgICMgTm90ZTogd2luL0R1 bXBSZW5kZXJUcmVlLmNwcCBkb2VzIG5vdCBwcmludCBhIGxlYWRpbmcgc3BhY2UgYmVmb3JlIHRo ZSBmZWF0dXJlc19zdHJpbmcuCiAgICAgICAgIG1hdGNoX29iamVjdCA9IHJlLm1hdGNoKCJTdXBw b3J0ZWRGZWF0dXJlczpccyooP1A8ZmVhdHVyZXNfc3RyaW5nPi4qKVxzKiIsIG91dHB1dCkKICAg ICAgICAgaWYgbm90IG1hdGNoX29iamVjdDoKLSAgICAgICAgICAgIHJldHVybiBbXQorICAgICAg ICAgICAgcmV0dXJuIE5vbmUKICAgICAgICAgcmV0dXJuIG1hdGNoX29iamVjdC5ncm91cCgnZmVh dHVyZXNfc3RyaW5nJykuc3BsaXQoJyAnKQogCi0gICAgZGVmIF9zdXBwb3J0ZWRfc3ltYm9sX2xp c3Qoc2VsZik6Ci0gICAgICAgICIiIlJldHVybiB0aGUgc3VwcG9ydGVkIHN5bWJvbHMgb2YgV2Vi Q29yZS4iIiIKKyAgICBkZWYgX3dlYmNvcmVfc3ltYm9sc19zdHJpbmcoc2VsZik6CiAgICAgICAg IHdlYmNvcmVfbGlicmFyeV9wYXRoID0gc2VsZi5fcGF0aF90b193ZWJjb3JlX2xpYnJhcnkoKQog ICAgICAgICBpZiBub3Qgd2ViY29yZV9saWJyYXJ5X3BhdGg6Ci0gICAgICAgICAgICByZXR1cm4g W10KLSAgICAgICAgc3ltYm9sX2xpc3QgPSAnICcuam9pbihvcy5wb3Blbigibm0gIiArIHdlYmNv cmVfbGlicmFyeV9wYXRoKS5yZWFkbGluZXMoKSkKLSAgICAgICAgcmV0dXJuIHN5bWJvbF9saXN0 Ci0KLSAgICBkZWYgX2RpcmVjdG9yaWVzX2Zvcl9mZWF0dXJlcyhzZWxmKToKLSAgICAgICAgIiIi UmV0dXJuIHRoZSBzdXBwb3J0ZWQgZmVhdHVyZSBkaWN0aW9uYXJ5LiBUaGUga2V5cyBhcmUgdGhl Ci0gICAgICAgIGZlYXR1cmVzIGFuZCB0aGUgdmFsdWVzIGFyZSB0aGUgZGlyZWN0b3JpZXMgaW4g bGlzdHMuIiIiCi0gICAgICAgIGRpcmVjdG9yaWVzX2Zvcl9mZWF0dXJlcyA9IHsKKyAgICAgICAg ICAgIHJldHVybiBOb25lCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9l eGVjdXRpdmUucnVuX2NvbW1hbmQoJ25tJywgd2ViY29yZV9saWJyYXJ5X3BhdGgsIGVycm9yX2hh bmRsZXI9RXhlY3V0aXZlLmlnbm9yZV9lcnJvcikKKyAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6 CisgICAgICAgICAgICBfbG9nLndhcm4oIkZhaWxlZCB0byBydW4gbm06ICVzLiAgQ2FuJ3QgZGV0 ZXJtaW5lIFdlYkNvcmUgc3VwcG9ydGVkIGZlYXR1cmVzLiIgJSBlKQorICAgICAgICByZXR1cm4g Tm9uZQorCisgICAgIyBQb3J0cyB3aGljaCB1c2UgcnVuLXRpbWUgZmVhdHVyZSBkZXRlY3Rpb24g c2hvdWxkIGRlZmluZSB0aGlzIG1ldGhvZCBhbmQgcmV0dXJuCisgICAgIyBhIGRpY3Rpb25hcnkg bWFwcGluZyBmcm9tIEZlYXR1cmUgTmFtZXMgdG8gc2tpcHBlZCBkaXJlY3RvaXJlcy4gIE5SV1Qg d2lsbAorICAgICMgcnVuIER1bXBSZW5kZXJUcmVlIC0tcHJpbnQtc3VwcG9ydGVkLWZlYXR1cmVz IGFuZCBwYXJzZSB0aGUgb3V0cHV0LgorICAgICMgSWYgdGhlIEZlYXR1cmUgTmFtZXMgYXJlIG5v dCBmb3VuZCBpbiB0aGUgb3V0cHV0LCB0aGUgY29ycmVzcG9uZGluZyBkaXJlY3RvcmllcworICAg ICMgd2lsbCBiZSBza2lwcGVkLgorICAgIGRlZiBfbWlzc2luZ19mZWF0dXJlX3RvX3NraXBwZWRf dGVzdHMoc2VsZik6CisgICAgICAgICIiIlJldHVybiB0aGUgc3VwcG9ydGVkIGZlYXR1cmUgZGlj dGlvbmFyeS4gS2V5cyBhcmUgZmVhdHVyZSBuYW1lcyBhbmQgdmFsdWVzCisgICAgICAgIGFyZSB0 aGUgbGlzdHMgb2YgZGlyZWN0b3JpZXMgdG8gc2tpcCBpZiB0aGUgZmVhdHVyZSBuYW1lIGlzIG5v dCBtYXRjaGVkLiIiIgorICAgICAgICAjIEZJWE1FOiBUaGlzIGxpc3QgbWF0Y2hlcyBXZWJLaXRX aW4gYW5kIHNob3VsZCBiZSBtb3ZlZCBvbnRvIHRoZSBXaW4gcG9ydC4KKyAgICAgICAgcmV0dXJu IHsKICAgICAgICAgICAgICJBY2NlbGVyYXRlZCBDb21wb3NpdGluZyI6IFsiY29tcG9zaXRpbmci XSwKICAgICAgICAgICAgICIzRCBSZW5kZXJpbmciOiBbImFuaW1hdGlvbnMvM2QiLCAidHJhbnNm b3Jtcy8zZCJdLAogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBkaXJlY3Rvcmllc19mb3JfZmVh dHVyZXMKIAotICAgIGRlZiBfZGlyZWN0b3JpZXNfZm9yX3N5bWJvbHMoc2VsZik6Ci0gICAgICAg ICIiIlJldHVybiB0aGUgc3VwcG9ydGVkIGZlYXR1cmUgZGljdGlvbmFyeS4gVGhlIGtleXMgYXJl IHRoZQotICAgICAgICBzeW1ib2xzIGFuZCB0aGUgdmFsdWVzIGFyZSB0aGUgZGlyZWN0b3JpZXMg aW4gbGlzdHMuIiIiCi0gICAgICAgIGRpcmVjdG9yaWVzX2Zvcl9zeW1ib2wgPSB7CisgICAgIyBQ b3J0cyB3aGljaCB1c2UgY29tcGlsZS10aW1lIGZlYXR1cmUgZGV0ZWN0aW9uIHNob3VsZCBkZWZp bmUgdGhpcyBtZXRob2QgYW5kIHJldHVybgorICAgICMgYSBkaWN0aW9uYXJ5IG1hcHBpbmcgZnJv bSBzeW1ib2wgc3Vic3RyaW5ncyB0byBwb3NzaWJseSBkaXNhYmxlZCB0ZXN0IGRpcmVjdG9yaWVz LgorICAgICMgV2hlbiB0aGUgc3ltYm9sIHN1YnN0cmluZ3MgYXJlIG5vdCBtYXRjaGVkLCB0aGUg ZGlyZWN0b3JpZXMgd2lsbCBiZSBza2lwcGVkLgorICAgICMgSWYgcG9ydHMgZG9uJ3QgZXZlciBl bmFibGUgY2VydGFpbiBmZWF0dXJlcywgdGhlbiB0aG9zZSBkaXJlY3RvcmllcyBjYW4ganVzdCBi ZQorICAgICMgaW4gdGhlIFNraXBwZWQgbGlzdCBpbnN0ZWFkIG9mIGNvbXBpbGUtdGltZS1jaGVj a2VkIGhlcmUuCisgICAgZGVmIF9taXNzaW5nX3N5bWJvbF90b19za2lwcGVkX3Rlc3RzKHNlbGYp OgorICAgICAgICAiIiJSZXR1cm4gdGhlIHN1cHBvcnRlZCBmZWF0dXJlIGRpY3Rpb25hcnkuIFRo ZSBrZXlzIGFyZSBzeW1ib2wtc3Vic3RyaW5ncworICAgICAgICBhbmQgdGhlIHZhbHVlcyBhcmUg dGhlIGxpc3RzIG9mIGRpcmVjdG9yaWVzIHRvIHNraXAgaWYgdGhhdCBzeW1ib2wgaXMgbWlzc2lu Zy4iIiIKKyAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgICJNYXRoTUxFbGVtZW50IjogWyJt YXRobWwiXSwKICAgICAgICAgICAgICJHcmFwaGljc0xheWVyIjogWyJjb21wb3NpdGluZyJdLAog ICAgICAgICAgICAgIldlYkNvcmVIYXMzRFJlbmRlcmluZyI6IFsiYW5pbWF0aW9ucy8zZCIsICJ0 cmFuc2Zvcm1zLzNkIl0sCkBAIC0yNzAsMjcgKzI4MiwyMyBAQCBjbGFzcyBXZWJLaXRQb3J0KFBv cnQpOgogICAgICAgICAgICAgImlzWEhUTUxNUERvY3VtZW50IjogWyJmYXN0L3hodG1sbXAiXSwK ICAgICAgICAgICAgICJNSFRNTEFyY2hpdmUiOiBbIm1odG1sIl0sCiAgICAgICAgIH0KLSAgICAg ICAgcmV0dXJuIGRpcmVjdG9yaWVzX2Zvcl9zeW1ib2wKIAogICAgIGRlZiBfc2tpcHBlZF90ZXN0 c19mb3JfdW5zdXBwb3J0ZWRfZmVhdHVyZXMoc2VsZik6Ci0gICAgICAgICIiIlJldHVybiB0aGUg ZGlyZWN0b3JpZXMgb2YgdW5zdXBwb3J0ZWQgdGVzdHMuIFNlYXJjaCBmb3IgdGhlCi0gICAgICAg IHN5bWJvbHMgaW4gdGhlIHN5bWJvbF9saXN0LCBpZiBmb3VuZCBhZGQgdGhlIGNvcnJlc3BvbmRp bmcKLSAgICAgICAgZGlyZWN0b3JpZXMgdG8gdGhlIHNraXBwZWQgZGlyZWN0b3J5IGxpc3QuIiIi Ci0gICAgICAgIGZlYXR1cmVfbGlzdCA9IHNlbGYuX3J1bnRpbWVfZmVhdHVyZV9saXN0KCkKLSAg ICAgICAgZGlyZWN0b3JpZXMgPSBzZWxmLl9kaXJlY3Rvcmllc19mb3JfZmVhdHVyZXMoKQotCi0g ICAgICAgICMgaWYgRFJUIGZlYXR1cmUgZGV0ZWN0aW9uIG5vdCBzdXBwb3J0ZWQKLSAgICAgICAg aWYgbm90IGZlYXR1cmVfbGlzdDoKLSAgICAgICAgICAgIGZlYXR1cmVfbGlzdCA9IHNlbGYuX3N1 cHBvcnRlZF9zeW1ib2xfbGlzdCgpCi0gICAgICAgICAgICBkaXJlY3RvcmllcyA9IHNlbGYuX2Rp cmVjdG9yaWVzX2Zvcl9zeW1ib2xzKCkKLQotICAgICAgICBpZiBub3QgZmVhdHVyZV9saXN0Ogot ICAgICAgICAgICAgcmV0dXJuIFtdCi0KLSAgICAgICAgc2tpcHBlZF9kaXJlY3RvcmllcyA9IFtk aXJlY3Rvcmllc1tmZWF0dXJlXQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9yIGZl YXR1cmUgaW4gZGlyZWN0b3JpZXMua2V5cygpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiBmZWF0dXJlIG5vdCBpbiBmZWF0dXJlX2xpc3RdCi0gICAgICAgIHJldHVybiByZWR1Y2Uo b3BlcmF0b3IuYWRkLCBza2lwcGVkX2RpcmVjdG9yaWVzKQorICAgICAgICAjIElmIHRoZSBwb3J0 IHN1cHBvcnRzIHJ1bnRpbWUgZmVhdHVyZSBkZXRlY3Rpb24sIGRpc2FibGUgYW55IHRlc3RzCisg ICAgICAgICMgZm9yIGZlYXR1cmVzIG1pc3NpbmcgZnJvbSB0aGUgcnVudGltZSBmZWF0dXJlIGxp c3QuCisgICAgICAgIHN1cHBvcnRlZF9mZWF0dXJlX2xpc3QgPSBzZWxmLl9ydW50aW1lX2ZlYXR1 cmVfbGlzdCgpCisgICAgICAgICMgSWYgX3J1bnRpbWVfZmVhdHVyZV9saXN0IHJldHVybnMgYSBu b24tTm9uZSB2YWx1ZSwgdGhlbiBwcmVmZXIKKyAgICAgICAgIyBydW50aW1lIGZlYXR1cmUgZGV0 ZWN0aW9uIG92ZXIgc3RhdGljIGZlYXR1cmUgZGV0ZWN0aW9uLgorICAgICAgICBpZiBzdXBwb3J0 ZWRfZmVhdHVyZV9saXN0IGlzIG5vdCBOb25lOgorICAgICAgICAgICAgcmV0dXJuIHJlZHVjZShv cGVyYXRvci5hZGQsIFtkaXJlY3RvcmllcyBmb3IgZmVhdHVyZSwgZGlyZWN0b3JpZXMgaW4gc2Vs Zi5fbWlzc2luZ19mZWF0dXJlX3RvX3NraXBwZWRfdGVzdHMoKS5pdGVtcygpIGlmIGZlYXR1cmUg bm90IGluIHN1cHBvcnRlZF9mZWF0dXJlX2xpc3RdKQorCisgICAgICAgICMgUnVudGltZSBmZWF0 dXJlIGRldGVjdGlvbiBub3Qgc3VwcG9ydGVkLCBmYWxsYmFjayB0byBzdGF0aWMgZGVjdGVjdGlv bjoKKyAgICAgICAgIyBEaXNhYmxlIGFueSB0ZXN0cyBmb3Igc3ltYm9scyBtaXNzaW5nIGZyb20g dGhlIHdlYmNvcmUgc3ltYm9sIHN0cmluZy4KKyAgICAgICAgd2ViY29yZV9zeW1ib2xzX3N0cmlu ZyA9IHNlbGYuX3dlYmNvcmVfc3ltYm9sc19zdHJpbmcoKQorICAgICAgICBpZiB3ZWJjb3JlX3N5 bWJvbHNfc3RyaW5nIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgcmV0dXJuIHJlZHVjZShvcGVy YXRvci5hZGQsIFtkaXJlY3RvcmllcyBmb3Igc3ltYm9sX3N1YnN0cmluZywgZGlyZWN0b3JpZXMg aW4gc2VsZi5fbWlzc2luZ19zeW1ib2xfdG9fc2tpcHBlZF90ZXN0cygpLml0ZW1zKCkgaWYgc3lt Ym9sX3N1YnN0cmluZyBub3QgaW4gd2ViY29yZV9zeW1ib2xzX3N0cmluZ10sIFtdKQorICAgICAg ICAjIEZhaWxlZCB0byBnZXQgYW55IHJ1bnRpbWUgb3Igc3ltYm9sIGluZm9ybWF0aW9uLCBkb24n dCBza2lwIGFueSB0ZXN0cy4KKyAgICAgICAgcmV0dXJuIFtdCiAKICAgICBkZWYgX3Rlc3RzX2Zy b21fc2tpcHBlZF9maWxlX2NvbnRlbnRzKHNlbGYsIHNraXBwZWRfZmlsZV9jb250ZW50cyk6CiAg ICAgICAgIHRlc3RzX3RvX3NraXAgPSBbXQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weQppbmRleCAzOTU3 ODM4MTAxOTQxNjQ3YjRjMDQyNzQ5NDk0NjZkOWQ1NmUxZGQ4Li42ZTdjNmI1MzQzZTQ3MTQ3ZDI5 OTEyOWNkYzE3NGIwMTJhZDM3N2U4IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weQpAQCAtNDAsMTIg KzQwLDEyIEBAIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja0V4ZWN1dGl2 ZSwgTW9ja09wdGlvbnMsIE1vY2tVc2VyCiBjbGFzcyBUZXN0V2ViS2l0UG9ydChXZWJLaXRQb3J0 KToKICAgICBwb3J0X25hbWUgPSAidGVzdHdlYmtpdHBvcnQiCiAKLSAgICBkZWYgX19pbml0X18o c2VsZiwgc3ltYm9sX2xpc3Q9Tm9uZSwgZmVhdHVyZV9saXN0PU5vbmUsCisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHN5bWJvbHNfc3RyaW5nPU5vbmUsIGZlYXR1cmVfbGlzdD1Ob25lLAogICAgICAg ICAgICAgICAgICBleHBlY3RhdGlvbnNfZmlsZT1Ob25lLCBza2lwc19maWxlPU5vbmUsCiAgICAg ICAgICAgICAgICAgIGV4ZWN1dGl2ZT1Ob25lLCBmaWxlc3lzdGVtPU5vbmUsIHVzZXI9Tm9uZSwK ICAgICAgICAgICAgICAgICAgKiprd2FyZ3MpOgotICAgICAgICBzZWxmLnN5bWJvbF9saXN0ID0g c3ltYm9sX2xpc3QKLSAgICAgICAgc2VsZi5mZWF0dXJlX2xpc3QgPSBmZWF0dXJlX2xpc3QKKyAg ICAgICAgc2VsZi5zeW1ib2xzX3N0cmluZyA9IHN5bWJvbHNfc3RyaW5nICAjIFBhc3NpbmcgIiIg ZGlzYWJsZXMgYWxsIHN0YXRpY2x5LWRldGVjdGFibGUgZmVhdHVyZXMuCisgICAgICAgIHNlbGYu ZmVhdHVyZV9saXN0ID0gZmVhdHVyZV9saXN0ICAjIFBhc3NpbmcgW10gZGlzYWJsZXMgYWxsIHJ1 bnRpbWUtZGV0ZWN0YWJsZSBmZWF0dXJlcy4KICAgICAgICAgZXhlY3V0aXZlID0gZXhlY3V0aXZl IG9yIE1vY2tFeGVjdXRpdmUoc2hvdWxkX2xvZz1GYWxzZSkKICAgICAgICAgZmlsZXN5c3RlbSA9 IGZpbGVzeXN0ZW0gb3IgTW9ja0ZpbGVTeXN0ZW0oKQogICAgICAgICB1c2VyID0gdXNlciBvciBN b2NrVXNlcigpCkBAIC01Nyw4ICs1Nyw4IEBAIGNsYXNzIFRlc3RXZWJLaXRQb3J0KFdlYktpdFBv cnQpOgogICAgIGRlZiBfcnVudGltZV9mZWF0dXJlX2xpc3Qoc2VsZik6CiAgICAgICAgIHJldHVy biBzZWxmLmZlYXR1cmVfbGlzdAogCi0gICAgZGVmIF9zdXBwb3J0ZWRfc3ltYm9sX2xpc3Qoc2Vs Zik6Ci0gICAgICAgIHJldHVybiBzZWxmLnN5bWJvbF9saXN0CisgICAgZGVmIF93ZWJjb3JlX3N5 bWJvbHNfc3RyaW5nKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5zeW1ib2xzX3N0cmluZwog CiAgICAgZGVmIF90ZXN0c19mb3Jfb3RoZXJfcGxhdGZvcm1zKHNlbGYpOgogICAgICAgICByZXR1 cm4gWyJtZWRpYSIsIF0KQEAgLTk2LDE1ICs5NiwzNiBAQCBjbGFzcyBXZWJLaXRQb3J0VGVzdChw b3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6CiAgICAgICAgIHBhc3MKIAogICAgIGRlZiB0ZXN0 X3NraXBwZWRfZGlyZWN0b3JpZXNfZm9yX3N5bWJvbHMoc2VsZik6Ci0gICAgICAgIHN1cHBvcnRl ZF9zeW1ib2xzID0gWyJHcmFwaGljc0xheWVyIiwgIldlYkNvcmVIYXMzRFJlbmRlcmluZyIsICJp c1hIVE1MTVBEb2N1bWVudCIsICJmb29TeW1ib2wiXQotICAgICAgICBleHBlY3RlZF9kaXJlY3Rv cmllcyA9IHNldChbIm1hdGhtbCIsICJmYXN0L2NhbnZhcy93ZWJnbCIsICJjb21wb3NpdGluZy93 ZWJnbCIsICJodHRwL3Rlc3RzL2NhbnZhcy93ZWJnbCIsICJmYXN0L3djc3MiLCAibWh0bWwiXSkK LSAgICAgICAgcmVzdWx0X2RpcmVjdG9yaWVzID0gc2V0KFRlc3RXZWJLaXRQb3J0KHN1cHBvcnRl ZF9zeW1ib2xzLCBOb25lKS5fc2tpcHBlZF90ZXN0c19mb3JfdW5zdXBwb3J0ZWRfZmVhdHVyZXMo KSkKKyAgICAgICAgIyBUaGlzIGZpcnN0IHRlc3QgY29uZmlybXMgdGhhdCB0aGUgY29tbW9ubHkg Zm91bmQgc3ltYm9scyByZXN1bHQgaW4gdGhlIGV4cGVjdGVkIHNraXBwZWQgZGlyZWN0b3JpZXMu CisgICAgICAgIHN5bWJvbHNfc3RyaW5nID0gIiAiLmpvaW4oWyJHcmFwaGljc0xheWVyIiwgIldl YkNvcmVIYXMzRFJlbmRlcmluZyIsICJpc1hIVE1MTVBEb2N1bWVudCIsICJmb29TeW1ib2wiXSkK KyAgICAgICAgZXhwZWN0ZWRfZGlyZWN0b3JpZXMgPSBzZXQoWworICAgICAgICAgICAgIm1hdGht bCIsICAjIFJlcXVpcmVzIE1hdGhNTEVsZW1lbnQKKyAgICAgICAgICAgICJmYXN0L2NhbnZhcy93 ZWJnbCIsICAjIFJlcXVpcmVzIFdlYkdMU2hhZGVyCisgICAgICAgICAgICAiY29tcG9zaXRpbmcv d2ViZ2wiLCAgIyBSZXF1aXJlcyBXZWJHTFNoYWRlcgorICAgICAgICAgICAgImh0dHAvdGVzdHMv Y2FudmFzL3dlYmdsIiwgICMgUmVxdWlyZXMgV2ViR0xTaGFkZXIKKyAgICAgICAgICAgICJmYXN0 L3djc3MiLCAgIyBSZXF1aXJlcyBwYXJzZVdDU1NJbnB1dFByb3BlcnR5CisgICAgICAgICAgICAi bWh0bWwiLCAgIyBSZXF1aXJlcyBNSFRNTEFyY2hpdmUKKyAgICAgICAgXSkKKworICAgICAgICBy ZXN1bHRfZGlyZWN0b3JpZXMgPSBzZXQoVGVzdFdlYktpdFBvcnQoc3ltYm9sc19zdHJpbmcsIE5v bmUpLl9za2lwcGVkX3Rlc3RzX2Zvcl91bnN1cHBvcnRlZF9mZWF0dXJlcygpKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHJlc3VsdF9kaXJlY3RvcmllcywgZXhwZWN0ZWRfZGlyZWN0b3JpZXMp CisKKyAgICAgICAgIyBUZXN0IHRoYXQgdGhlIG5tIHN0cmluZyBwYXJzaW5nIGFjdHVhbGx5IHdv cmtzOgorICAgICAgICBzeW1ib2xzX3N0cmluZyA9ICIiIgorMDAwMDAwMDAwMTI0ZjQ5OCBzIF9f WlpON1dlYkNvcmUxM0dyYXBoaWNzTGF5ZXIxMnJlcGxhY2VDaGlsZEVQUzBfUzFfRTE5X19QUkVU VFlfRlVOQ1RJT05fXworMDAwMDAwMDAwMTI0ZjUwMCBzIF9fWlpON1dlYkNvcmUxM0dyYXBoaWNz TGF5ZXIxM2FkZENoaWxkQWJvdmVFUFMwX1MxX0UxOV9fUFJFVFRZX0ZVTkNUSU9OX18KKzAwMDAw MDAwMDEyNGY2NzAgcyBfX1paTjdXZWJDb3JlMTNHcmFwaGljc0xheWVyMTNhZGRDaGlsZEJlbG93 RVBTMF9TMV9FMTlfX1BSRVRUWV9GVU5DVElPTl9fCisiIiIKKyAgICAgICAgIyBOb3RlICdjb21w b3NpdGluZycgaXMgbm90IGluIHRoZSBsaXN0IG9mIHNraXBwZWQgZGlyZWN0b3JpZXMgKGhlbmNl IHRoZSBwYXJzaW5nIG9mIEdyYXBoaWNzTGF5ZXIgd29ya2VkKToKKyAgICAgICAgZXhwZWN0ZWRf ZGlyZWN0b3JpZXMgPSBzZXQoWydmYXN0L3djc3MnLCAnbWF0aG1sJywgJ3RyYW5zZm9ybXMvM2Qn LCAnZmFzdC94aHRtbG1wJywgJ2NvbXBvc2l0aW5nL3dlYmdsJywgJ2Zhc3QvY2FudmFzL3dlYmds JywgJ2FuaW1hdGlvbnMvM2QnLCAnbWh0bWwnLCAnaHR0cC90ZXN0cy9jYW52YXMvd2ViZ2wnXSkK KyAgICAgICAgcmVzdWx0X2RpcmVjdG9yaWVzID0gc2V0KFRlc3RXZWJLaXRQb3J0KHN5bWJvbHNf c3RyaW5nLCBOb25lKS5fc2tpcHBlZF90ZXN0c19mb3JfdW5zdXBwb3J0ZWRfZmVhdHVyZXMoKSkK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXN1bHRfZGlyZWN0b3JpZXMsIGV4cGVjdGVkX2Rp cmVjdG9yaWVzKQogCiAgICAgZGVmIHRlc3RfcnVudGltZV9mZWF0dXJlX2xpc3Qoc2VsZik6CiAg ICAgICAgIHBvcnQgPSBXZWJLaXRQb3J0KGV4ZWN1dGl2ZT1Nb2NrRXhlY3V0aXZlKCkpCiAgICAg ICAgIHBvcnQuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZCA9IGxhbWJkYSBjb21tYW5kLCBjd2Q9Tm9u ZSwgZXJyb3JfaGFuZGxlcj1Ob25lOiAiTm9uc2Vuc2UiCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBvcnQuX3J1bnRpbWVfZmVhdHVyZV9saXN0KCksIFtdKQorICAgICAgICAjIHJ1bnRpbWVf ZmVhdHVyZXNfbGlzdCByZXR1cm5zIE5vbmUgd2hlbiBpdHMgcmVzdWx0cyBhcmUgbWVhbmluZ2xl c3MgKGl0IGNvdWxkbid0IHJ1biBEUlQgb3IgcGFyc2UgdGhlIG91dHB1dCwgZXRjLikKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fcnVudGltZV9mZWF0dXJlX2xpc3QoKSwgTm9uZSkK ICAgICAgICAgcG9ydC5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kID0gbGFtYmRhIGNvbW1hbmQsIGN3 ZD1Ob25lLCBlcnJvcl9oYW5kbGVyPU5vbmU6ICJTdXBwb3J0ZWRGZWF0dXJlczpmb28gYmFyIgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9ydW50aW1lX2ZlYXR1cmVfbGlzdCgpLCBb J2ZvbycsICdiYXInXSkKIApAQCAtMTE1LDcgKzEzNiw3IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0 KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChy ZXN1bHRfZGlyZWN0b3JpZXMsIGV4cGVjdGVkX2RpcmVjdG9yaWVzKQogCiAgICAgZGVmIHRlc3Rf c2tpcHBlZF9sYXlvdXRfdGVzdHMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVz dFdlYktpdFBvcnQoTm9uZSwgTm9uZSkuc2tpcHBlZF9sYXlvdXRfdGVzdHMoKSwgc2V0KFsibWVk aWEiXSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdFdlYktpdFBvcnQoTm9uZSwgTm9u ZSkuc2tpcHBlZF9sYXlvdXRfdGVzdHMoKSwgc2V0KFsnbWVkaWEnXSkpCiAKICAgICBkZWYgdGVz dF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKHNlbGYpOgogICAgICAgICBwb3J0ID0gVGVzdFdl YktpdFBvcnQoKQo= 113794 2011-11-06 11:48:00 -0800 2011-11-06 11:48:00 -0800 Patch for landing bug-66078-20111106114759.patch text/plain 15730 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTkzNzYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmNjZkYTA3ZTViNzY0NDEyOTQ5MTg3OTNjY2Y2OWM3Zjg2 MDE3YWE2Li4zYzMwMTFkYTU0MGMxOGM3Mzg4NmY0ZGZkYzk0MWQyNjgyODgxYTQ1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMg QEAKKzIwMTEtMTEtMDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IENsYXJpZnkgaG93IHRoZSBzeW1ib2wgYW5kIHJ1bnRpbWUtZmVhdHVyZSBiYXNlZCB0ZXN0IGV4 Y2x1c2lvbiB3b3JrcyBhbmQgY2xlYW51cCB0aGUgY29kZSBhIGJpdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwNzgKKworICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFRoZSBydW50aW1lIGZlYXR1cmUgZGV0ZWN0aW9u IHdhcyBmaXhlZCB0byB3b3JrIGluIGJ1ZyA2NDQ3Mi4KKyAgICAgICAgSW4gdGhpcyBidWcgSSBt b3ZlZCB0aGUgc3ltYm9sLWJhc2VkIGZlYXR1cmUgZGV0ZWN0aW9uIGZyb20KKyAgICAgICAgcG9w ZW4oKSB0byBFeGVjdXRpdmUucnVuX2NvbW1hbmQgYW5kIGNsZWFuZWQgdXAgdGhlIGNhbGxlcnMK KyAgICAgICAgYW5kIHVuaXR0ZXN0cyB0byBtYWtlIHN1cmUgdGhhdCB3ZSdyZSBjb3JyZWN0bHkg cGFyc2luZyB0aGUKKyAgICAgICAgbm0gb3V0cHV0IGNvcnJlY3RseS4gIFRoZSBvbGQgY29kZSBo YXBwZW5lZCB0byB3b3JrIGV2ZW4gdGhvdWdoCisgICAgICAgIHRoZSBydW50aW1lLWZlYXR1cmVz IHBhdGggd2FzIHVzaW5nICJzdHIgaW4gbGlzdCIgYW5kIHRoZQorICAgICAgICBzeW1ib2wgZmVh dHVyZXMgcGF0aCB3YXMgdXNpbmcgInN0ciBpbiBzdHIiIGFuZCBpdCBqdXN0IGhhcHBlbmVkCisg ICAgICAgIHRvIGRvIHdoYXQgd2Ugd2FudGVkIHRvLiAgTm93IHJ1bnRpbWUgZmVhdHVyZXMgYW5k IHN5bWJvbCBmZWF0dXJlCisgICAgICAgIGJsYWNrbGlzdHMgYXJlIGNvbXB1dGVkIHNlcGFyYXRl bHkgKGFuZCB3aXRoIGJldHRlciBkb2N1bWVudGF0aW9uKS4KKworICAgICAgICBUaGlzIHN5c3Rl bSByZW1haW5zIGNvbmZ1c2luZywgcGFydGlhbGx5IGJlY2F1c2UgdGhlc2UgYXJlIGJsYWNrLWxp c3RzCisgICAgICAgIHdoaWNoIGFyZSBhbWVuZGVkIHRvIHdoYXRldmVyIHN0YXRpYyBibGFja2xp c3QgbWF5IGV4aXN0IGZvciB0aGUKKyAgICAgICAgcG9ydCBhcyBwYXJ0IG9mIGEgU2tpcHBlZCBs aXN0IGZpbGUuCisKKyAgICAgICAgRm9yIGV4YW1wbGUsIG5vdGljZSBob3cgdGhlIHJ1bnRpbWUg ZmVhdHVyZSBsaXN0IG9ubHkgaGFzIGRpcmVjdG9yeQorICAgICAgICBibGFja2xpc3RzIGZvciBh IGNvdXBsZSBmZWF0dXJlcy4gIElmIGFsbCBmZWF0dXJlcyBhcmUgb2ZmLAorICAgICAgICBob3cg ZG8gd2Ugc2tpcCBlbm91Z2ggdGVzdHMgd2l0aCBvbmx5IDIgZW50cmllcyBpbiB0aGUgYmxhY2ts aXN0IG1hcD8KKyAgICAgICAgVGhlIGFuc3dlciBpcyB0aGF0IFdpbmRvd3MgaXMgdGhlIG9ubHkg cG9ydCB0byB1c2UgcnVudGltZSBmZWF0dXJlCisgICAgICAgIGRldGVjdGlvbiwgYW5kIHRoZSB3 aW4vU2tpcHBlZCBmaWxlIHR1cm5zIG9mZiBhbGwgdGhlIG90aGVyIGZlYXR1cmVzCisgICAgICAg IHN0YXRpY2FsbHkgKGxpa2UgbWF0aG1sLCBtaHRtbCwgd3NzLCBldGMuKSB3aGVyZSBhcyBzb21l IG90aGVyIHBvcnRzIChsaWtlIEFwcGxlTWFjKQorICAgICAgICB3aGljaCB1c2Ugc3ltYm9sLWJh c2VkIGZlYXR1cmUgZGV0ZWN0aW9uIHR1cm4gb2YgbWF0aG1sLCB3Y3NzLCBldGMKKyAgICAgICAg dXNpbmcgdGhlIGJsYWNrbGlzdHMgZm91bmQgaW4gX21pc3Npbmdfc3ltYm9sX3RvX3NraXBwZWRf dGVzdHMuCisKKyAgICAgICAgSSBhbHNvIG5vdGljZWQgYSBjb3VwbGUgcGxhY2VzIHdoZXJlIHdl IHN0aWxsIHJlZmVyZW5jZWQgeGh0bWxtcAorICAgICAgICBldmVuIHRob3VnaCBzdXBwb3J0IGZv ciBzdWNoIGhhcyBiZWVuIHJlbW92ZWQgZnJvbSBXZWJLaXQuICBSZW1vdmVkIHRob3NlLgorCisg ICAgICAgIFRoaXMgc2hvdWxkIHJlc3VsdCBpbiBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5OgorICAgICAg ICAgLSBVc2Ugc2VsZi5fZmlsZXN5c3RlbSBpbnN0ZWFkIG9mIG9zLnBhdGgKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weToKKwog MjAxMS0xMS0wNiAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIE1h ZGUgc2hvdy1wcmV0dHktZGlmZiB3b3JrIHdoZW4gdGhlIGlucHV0IHBhdGggY29udGFpbnMgc3Bh Y2VzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5w eQppbmRleCBmMmE1YTEyYjMyMzA2MGJkNzNjMDk2MDYwNDY4MjI2YjlhYjE0MzFhLi5lYTc3MzVl ZTk0ODZlNjM1NzU5Njk3NWU4YWQ2Y2NmMGJmY2UzMzdjIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQpAQCAtMTE3LDcgKzExNyw3IEBAIGNs YXNzIEd0a1BvcnQod2Via2l0LldlYktpdFBvcnQpOgogCiAgICAgICAgIGZvciBsaWJyYXJ5IGlu IGd0a19saWJyYXJ5X25hbWVzOgogICAgICAgICAgICAgZnVsbF9saWJyYXJ5ID0gc2VsZi5fYnVp bGRfcGF0aCgiLmxpYnMiLCBsaWJyYXJ5KQotICAgICAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUo ZnVsbF9saWJyYXJ5KToKKyAgICAgICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uaXNmaWxlKGZ1 bGxfbGlicmFyeSk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZ1bGxfbGlicmFyeQogICAgICAg ICByZXR1cm4gTm9uZQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3RfZmlsZXMucHkKaW5kZXggZDk2YTIzNjkwYTM4ZmVlZjU3NjkxYjhj NzZhYzhiYWEzOTkzMDNmZC4uYjhiODQxMzhiYzg0MmJiNDVlMjAyNjA2ZTkzNGE3NWZkMWI0Nzgz NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90 ZXN0X2ZpbGVzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvdGVzdF9maWxlcy5weQpAQCAtNDMsNyArNDMsNyBAQCBfbG9nID0gbG9ndXRpbHMuZ2V0X2xv Z2dlcihfX2ZpbGVfXykKIAogCiAjIFdoZW4gY29sbGVjdGluZyB0ZXN0IGNhc2VzLCB3ZSBpbmNs dWRlIGFueSBmaWxlIHdpdGggdGhlc2UgZXh0ZW5zaW9ucy4KLV9zdXBwb3J0ZWRfZmlsZV9leHRl bnNpb25zID0gc2V0KFsnLmh0bWwnLCAnLnNodG1sJywgJy54bWwnLCAnLnhodG1sJywgJy54aHRt bG1wJywgJy5wbCcsCitfc3VwcG9ydGVkX2ZpbGVfZXh0ZW5zaW9ucyA9IHNldChbJy5odG1sJywg Jy5zaHRtbCcsICcueG1sJywgJy54aHRtbCcsICcucGwnLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICcuaHRtJywgJy5waHAnLCAnLnN2ZycsICcubWh0J10pCiAjIFdoZW4gY29s bGVjdGluZyB0ZXN0IGNhc2VzLCBza2lwIHRoZXNlIGRpcmVjdG9yaWVzCiBfc2tpcHBlZF9kaXJl Y3RvcmllcyA9IHNldChbJy5zdm4nLCAnX3N2bicsICdyZXNvdXJjZXMnLCAnc2NyaXB0LXRlc3Rz J10pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3dlYmtpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Vi a2l0LnB5CmluZGV4IDI0OGI0MzBlMmUyNWY3MWUyOGI5Y2QzZDc4NjlmNTExMWU2MDlmNTUuLmM1 YTZlM2IwMTFmMjY1YjQ0NjUwNzViMzdmNDZkNmYxZTQ2Mjk3NWUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC0yNDgsNjMg KzI0OCw3MSBAQCBjbGFzcyBXZWJLaXRQb3J0KFBvcnQpOgogICAgICAgICB0cnk6CiAgICAgICAg ICAgICBvdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoc3VwcG9ydGVkX2ZlYXR1 cmVzX2NvbW1hbmQsIGVycm9yX2hhbmRsZXI9RXhlY3V0aXZlLmlnbm9yZV9lcnJvcikKICAgICAg ICAgZXhjZXB0IE9TRXJyb3IsIGU6Ci0gICAgICAgICAgICBfbG9nLndhcm4oIkV4Y2VwdGlvbiBy dW5uaWcgZHJpdmVyOiAlcywgJXMuICBEcml2ZXIgbXVzdCBiZSBidWlsdCBiZWZvcmUgY2FsbGlu ZyBXZWJLaXRQb3J0LnRlc3RfZXhwZWN0YXRpb25zKCkuIiAlIChzdXBwb3J0ZWRfZmVhdHVyZXNf Y29tbWFuZCwgZSkpCi0gICAgICAgICAgICByZXR1cm4gW10KKyAgICAgICAgICAgIF9sb2cud2Fy bigiRXhjZXB0aW9uIHJ1bm5pbmcgZHJpdmVyOiAlcywgJXMuICBEcml2ZXIgbXVzdCBiZSBidWls dCBiZWZvcmUgY2FsbGluZyBXZWJLaXRQb3J0LnRlc3RfZXhwZWN0YXRpb25zKCkuIiAlIChzdXBw b3J0ZWRfZmVhdHVyZXNfY29tbWFuZCwgZSkpCisgICAgICAgICAgICByZXR1cm4gTm9uZQogCiAg ICAgICAgICMgTm90ZTogd2luL0R1bXBSZW5kZXJUcmVlLmNwcCBkb2VzIG5vdCBwcmludCBhIGxl YWRpbmcgc3BhY2UgYmVmb3JlIHRoZSBmZWF0dXJlc19zdHJpbmcuCiAgICAgICAgIG1hdGNoX29i amVjdCA9IHJlLm1hdGNoKCJTdXBwb3J0ZWRGZWF0dXJlczpccyooP1A8ZmVhdHVyZXNfc3RyaW5n Pi4qKVxzKiIsIG91dHB1dCkKICAgICAgICAgaWYgbm90IG1hdGNoX29iamVjdDoKLSAgICAgICAg ICAgIHJldHVybiBbXQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAgICAgcmV0dXJuIG1h dGNoX29iamVjdC5ncm91cCgnZmVhdHVyZXNfc3RyaW5nJykuc3BsaXQoJyAnKQogCi0gICAgZGVm IF9zdXBwb3J0ZWRfc3ltYm9sX2xpc3Qoc2VsZik6Ci0gICAgICAgICIiIlJldHVybiB0aGUgc3Vw cG9ydGVkIHN5bWJvbHMgb2YgV2ViQ29yZS4iIiIKKyAgICBkZWYgX3dlYmNvcmVfc3ltYm9sc19z dHJpbmcoc2VsZik6CiAgICAgICAgIHdlYmNvcmVfbGlicmFyeV9wYXRoID0gc2VsZi5fcGF0aF90 b193ZWJjb3JlX2xpYnJhcnkoKQogICAgICAgICBpZiBub3Qgd2ViY29yZV9saWJyYXJ5X3BhdGg6 Ci0gICAgICAgICAgICByZXR1cm4gW10KLSAgICAgICAgc3ltYm9sX2xpc3QgPSAnICcuam9pbihv cy5wb3Blbigibm0gIiArIHdlYmNvcmVfbGlicmFyeV9wYXRoKS5yZWFkbGluZXMoKSkKLSAgICAg ICAgcmV0dXJuIHN5bWJvbF9saXN0Ci0KLSAgICBkZWYgX2RpcmVjdG9yaWVzX2Zvcl9mZWF0dXJl cyhzZWxmKToKLSAgICAgICAgIiIiUmV0dXJuIHRoZSBzdXBwb3J0ZWQgZmVhdHVyZSBkaWN0aW9u YXJ5LiBUaGUga2V5cyBhcmUgdGhlCi0gICAgICAgIGZlYXR1cmVzIGFuZCB0aGUgdmFsdWVzIGFy ZSB0aGUgZGlyZWN0b3JpZXMgaW4gbGlzdHMuIiIiCi0gICAgICAgIGRpcmVjdG9yaWVzX2Zvcl9m ZWF0dXJlcyA9IHsKKyAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIHRyeToKKyAgICAg ICAgICAgIHJldHVybiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoJ25tJywgd2ViY29yZV9s aWJyYXJ5X3BhdGgsIGVycm9yX2hhbmRsZXI9RXhlY3V0aXZlLmlnbm9yZV9lcnJvcikKKyAgICAg ICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAgICAgICBfbG9nLndhcm4oIkZhaWxlZCB0byBy dW4gbm06ICVzLiAgQ2FuJ3QgZGV0ZXJtaW5lIFdlYkNvcmUgc3VwcG9ydGVkIGZlYXR1cmVzLiIg JSBlKQorICAgICAgICByZXR1cm4gTm9uZQorCisgICAgIyBQb3J0cyB3aGljaCB1c2UgcnVuLXRp bWUgZmVhdHVyZSBkZXRlY3Rpb24gc2hvdWxkIGRlZmluZSB0aGlzIG1ldGhvZCBhbmQgcmV0dXJu CisgICAgIyBhIGRpY3Rpb25hcnkgbWFwcGluZyBmcm9tIEZlYXR1cmUgTmFtZXMgdG8gc2tpcHBl ZCBkaXJlY3RvaXJlcy4gIE5SV1Qgd2lsbAorICAgICMgcnVuIER1bXBSZW5kZXJUcmVlIC0tcHJp bnQtc3VwcG9ydGVkLWZlYXR1cmVzIGFuZCBwYXJzZSB0aGUgb3V0cHV0LgorICAgICMgSWYgdGhl IEZlYXR1cmUgTmFtZXMgYXJlIG5vdCBmb3VuZCBpbiB0aGUgb3V0cHV0LCB0aGUgY29ycmVzcG9u ZGluZyBkaXJlY3RvcmllcworICAgICMgd2lsbCBiZSBza2lwcGVkLgorICAgIGRlZiBfbWlzc2lu Z19mZWF0dXJlX3RvX3NraXBwZWRfdGVzdHMoc2VsZik6CisgICAgICAgICIiIlJldHVybiB0aGUg c3VwcG9ydGVkIGZlYXR1cmUgZGljdGlvbmFyeS4gS2V5cyBhcmUgZmVhdHVyZSBuYW1lcyBhbmQg dmFsdWVzCisgICAgICAgIGFyZSB0aGUgbGlzdHMgb2YgZGlyZWN0b3JpZXMgdG8gc2tpcCBpZiB0 aGUgZmVhdHVyZSBuYW1lIGlzIG5vdCBtYXRjaGVkLiIiIgorICAgICAgICAjIEZJWE1FOiBUaGlz IGxpc3QgbWF0Y2hlcyBXZWJLaXRXaW4gYW5kIHNob3VsZCBiZSBtb3ZlZCBvbnRvIHRoZSBXaW4g cG9ydC4KKyAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgICJBY2NlbGVyYXRlZCBDb21wb3Np dGluZyI6IFsiY29tcG9zaXRpbmciXSwKICAgICAgICAgICAgICIzRCBSZW5kZXJpbmciOiBbImFu aW1hdGlvbnMvM2QiLCAidHJhbnNmb3Jtcy8zZCJdLAogICAgICAgICB9Ci0gICAgICAgIHJldHVy biBkaXJlY3Rvcmllc19mb3JfZmVhdHVyZXMKIAotICAgIGRlZiBfZGlyZWN0b3JpZXNfZm9yX3N5 bWJvbHMoc2VsZik6Ci0gICAgICAgICIiIlJldHVybiB0aGUgc3VwcG9ydGVkIGZlYXR1cmUgZGlj dGlvbmFyeS4gVGhlIGtleXMgYXJlIHRoZQotICAgICAgICBzeW1ib2xzIGFuZCB0aGUgdmFsdWVz IGFyZSB0aGUgZGlyZWN0b3JpZXMgaW4gbGlzdHMuIiIiCi0gICAgICAgIGRpcmVjdG9yaWVzX2Zv cl9zeW1ib2wgPSB7CisgICAgIyBQb3J0cyB3aGljaCB1c2UgY29tcGlsZS10aW1lIGZlYXR1cmUg ZGV0ZWN0aW9uIHNob3VsZCBkZWZpbmUgdGhpcyBtZXRob2QgYW5kIHJldHVybgorICAgICMgYSBk aWN0aW9uYXJ5IG1hcHBpbmcgZnJvbSBzeW1ib2wgc3Vic3RyaW5ncyB0byBwb3NzaWJseSBkaXNh YmxlZCB0ZXN0IGRpcmVjdG9yaWVzLgorICAgICMgV2hlbiB0aGUgc3ltYm9sIHN1YnN0cmluZ3Mg YXJlIG5vdCBtYXRjaGVkLCB0aGUgZGlyZWN0b3JpZXMgd2lsbCBiZSBza2lwcGVkLgorICAgICMg SWYgcG9ydHMgZG9uJ3QgZXZlciBlbmFibGUgY2VydGFpbiBmZWF0dXJlcywgdGhlbiB0aG9zZSBk aXJlY3RvcmllcyBjYW4ganVzdCBiZQorICAgICMgaW4gdGhlIFNraXBwZWQgbGlzdCBpbnN0ZWFk IG9mIGNvbXBpbGUtdGltZS1jaGVja2VkIGhlcmUuCisgICAgZGVmIF9taXNzaW5nX3N5bWJvbF90 b19za2lwcGVkX3Rlc3RzKHNlbGYpOgorICAgICAgICAiIiJSZXR1cm4gdGhlIHN1cHBvcnRlZCBm ZWF0dXJlIGRpY3Rpb25hcnkuIFRoZSBrZXlzIGFyZSBzeW1ib2wtc3Vic3RyaW5ncworICAgICAg ICBhbmQgdGhlIHZhbHVlcyBhcmUgdGhlIGxpc3RzIG9mIGRpcmVjdG9yaWVzIHRvIHNraXAgaWYg dGhhdCBzeW1ib2wgaXMgbWlzc2luZy4iIiIKKyAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAg ICJNYXRoTUxFbGVtZW50IjogWyJtYXRobWwiXSwKICAgICAgICAgICAgICJHcmFwaGljc0xheWVy IjogWyJjb21wb3NpdGluZyJdLAogICAgICAgICAgICAgIldlYkNvcmVIYXMzRFJlbmRlcmluZyI6 IFsiYW5pbWF0aW9ucy8zZCIsICJ0cmFuc2Zvcm1zLzNkIl0sCiAgICAgICAgICAgICAiV2ViR0xT aGFkZXIiOiBbImZhc3QvY2FudmFzL3dlYmdsIiwgImNvbXBvc2l0aW5nL3dlYmdsIiwgImh0dHAv dGVzdHMvY2FudmFzL3dlYmdsIl0sCiAgICAgICAgICAgICAiTUhUTUxBcmNoaXZlIjogWyJtaHRt bCJdLAogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBkaXJlY3Rvcmllc19mb3Jfc3ltYm9sCiAK ICAgICBkZWYgX3NraXBwZWRfdGVzdHNfZm9yX3Vuc3VwcG9ydGVkX2ZlYXR1cmVzKHNlbGYpOgot ICAgICAgICAiIiJSZXR1cm4gdGhlIGRpcmVjdG9yaWVzIG9mIHVuc3VwcG9ydGVkIHRlc3RzLiBT ZWFyY2ggZm9yIHRoZQotICAgICAgICBzeW1ib2xzIGluIHRoZSBzeW1ib2xfbGlzdCwgaWYgZm91 bmQgYWRkIHRoZSBjb3JyZXNwb25kaW5nCi0gICAgICAgIGRpcmVjdG9yaWVzIHRvIHRoZSBza2lw cGVkIGRpcmVjdG9yeSBsaXN0LiIiIgotICAgICAgICBmZWF0dXJlX2xpc3QgPSBzZWxmLl9ydW50 aW1lX2ZlYXR1cmVfbGlzdCgpCi0gICAgICAgIGRpcmVjdG9yaWVzID0gc2VsZi5fZGlyZWN0b3Jp ZXNfZm9yX2ZlYXR1cmVzKCkKLQotICAgICAgICAjIGlmIERSVCBmZWF0dXJlIGRldGVjdGlvbiBu b3Qgc3VwcG9ydGVkCi0gICAgICAgIGlmIG5vdCBmZWF0dXJlX2xpc3Q6Ci0gICAgICAgICAgICBm ZWF0dXJlX2xpc3QgPSBzZWxmLl9zdXBwb3J0ZWRfc3ltYm9sX2xpc3QoKQotICAgICAgICAgICAg ZGlyZWN0b3JpZXMgPSBzZWxmLl9kaXJlY3Rvcmllc19mb3Jfc3ltYm9scygpCi0KLSAgICAgICAg aWYgbm90IGZlYXR1cmVfbGlzdDoKLSAgICAgICAgICAgIHJldHVybiBbXQotCi0gICAgICAgIHNr aXBwZWRfZGlyZWN0b3JpZXMgPSBbZGlyZWN0b3JpZXNbZmVhdHVyZV0KLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGZvciBmZWF0dXJlIGluIGRpcmVjdG9yaWVzLmtleXMoKQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaWYgZmVhdHVyZSBub3QgaW4gZmVhdHVyZV9saXN0XQot ICAgICAgICByZXR1cm4gcmVkdWNlKG9wZXJhdG9yLmFkZCwgc2tpcHBlZF9kaXJlY3RvcmllcykK KyAgICAgICAgIyBJZiB0aGUgcG9ydCBzdXBwb3J0cyBydW50aW1lIGZlYXR1cmUgZGV0ZWN0aW9u LCBkaXNhYmxlIGFueSB0ZXN0cworICAgICAgICAjIGZvciBmZWF0dXJlcyBtaXNzaW5nIGZyb20g dGhlIHJ1bnRpbWUgZmVhdHVyZSBsaXN0LgorICAgICAgICBzdXBwb3J0ZWRfZmVhdHVyZV9saXN0 ID0gc2VsZi5fcnVudGltZV9mZWF0dXJlX2xpc3QoKQorICAgICAgICAjIElmIF9ydW50aW1lX2Zl YXR1cmVfbGlzdCByZXR1cm5zIGEgbm9uLU5vbmUgdmFsdWUsIHRoZW4gcHJlZmVyCisgICAgICAg ICMgcnVudGltZSBmZWF0dXJlIGRldGVjdGlvbiBvdmVyIHN0YXRpYyBmZWF0dXJlIGRldGVjdGlv bi4KKyAgICAgICAgaWYgc3VwcG9ydGVkX2ZlYXR1cmVfbGlzdCBpcyBub3QgTm9uZToKKyAgICAg ICAgICAgIHJldHVybiByZWR1Y2Uob3BlcmF0b3IuYWRkLCBbZGlyZWN0b3JpZXMgZm9yIGZlYXR1 cmUsIGRpcmVjdG9yaWVzIGluIHNlbGYuX21pc3NpbmdfZmVhdHVyZV90b19za2lwcGVkX3Rlc3Rz KCkuaXRlbXMoKSBpZiBmZWF0dXJlIG5vdCBpbiBzdXBwb3J0ZWRfZmVhdHVyZV9saXN0XSkKKwor ICAgICAgICAjIFJ1bnRpbWUgZmVhdHVyZSBkZXRlY3Rpb24gbm90IHN1cHBvcnRlZCwgZmFsbGJh Y2sgdG8gc3RhdGljIGRlY3RlY3Rpb246CisgICAgICAgICMgRGlzYWJsZSBhbnkgdGVzdHMgZm9y IHN5bWJvbHMgbWlzc2luZyBmcm9tIHRoZSB3ZWJjb3JlIHN5bWJvbCBzdHJpbmcuCisgICAgICAg IHdlYmNvcmVfc3ltYm9sc19zdHJpbmcgPSBzZWxmLl93ZWJjb3JlX3N5bWJvbHNfc3RyaW5nKCkK KyAgICAgICAgaWYgd2ViY29yZV9zeW1ib2xzX3N0cmluZyBpcyBub3QgTm9uZToKKyAgICAgICAg ICAgIHJldHVybiByZWR1Y2Uob3BlcmF0b3IuYWRkLCBbZGlyZWN0b3JpZXMgZm9yIHN5bWJvbF9z dWJzdHJpbmcsIGRpcmVjdG9yaWVzIGluIHNlbGYuX21pc3Npbmdfc3ltYm9sX3RvX3NraXBwZWRf dGVzdHMoKS5pdGVtcygpIGlmIHN5bWJvbF9zdWJzdHJpbmcgbm90IGluIHdlYmNvcmVfc3ltYm9s c19zdHJpbmddLCBbXSkKKyAgICAgICAgIyBGYWlsZWQgdG8gZ2V0IGFueSBydW50aW1lIG9yIHN5 bWJvbCBpbmZvcm1hdGlvbiwgZG9uJ3Qgc2tpcCBhbnkgdGVzdHMuCisgICAgICAgIHJldHVybiBb XQogCiAgICAgZGVmIF90ZXN0c19mcm9tX3NraXBwZWRfZmlsZV9jb250ZW50cyhzZWxmLCBza2lw cGVkX2ZpbGVfY29udGVudHMpOgogICAgICAgICB0ZXN0c190b19za2lwID0gW10KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0X3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRf dW5pdHRlc3QucHkKaW5kZXggYWUwNWM1ZTBkZjZhMGEyZTc0NDk4NTQ0Mzk1YjQ3OTM1N2I0ODQ1 NS4uZDY2Nzg3YjQzNDJmY2ZhZTE4ZDAyN2Y2OTAwODQyMzIyYzM0YTM5YiAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRf dW5pdHRlc3QucHkKQEAgLTQzLDEyICs0MywxMiBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0udXNlcl9tb2NrIGltcG9ydCBNb2NrVXNlcgogY2xhc3MgVGVzdFdlYktpdFBvcnQoV2ViS2l0 UG9ydCk6CiAgICAgcG9ydF9uYW1lID0gInRlc3R3ZWJraXRwb3J0IgogCi0gICAgZGVmIF9faW5p dF9fKHNlbGYsIHN5bWJvbF9saXN0PU5vbmUsIGZlYXR1cmVfbGlzdD1Ob25lLAorICAgIGRlZiBf X2luaXRfXyhzZWxmLCBzeW1ib2xzX3N0cmluZz1Ob25lLCBmZWF0dXJlX2xpc3Q9Tm9uZSwKICAg ICAgICAgICAgICAgICAgZXhwZWN0YXRpb25zX2ZpbGU9Tm9uZSwgc2tpcHNfZmlsZT1Ob25lLAog ICAgICAgICAgICAgICAgICBleGVjdXRpdmU9Tm9uZSwgZmlsZXN5c3RlbT1Ob25lLCB1c2VyPU5v bmUsCiAgICAgICAgICAgICAgICAgICoqa3dhcmdzKToKLSAgICAgICAgc2VsZi5zeW1ib2xfbGlz dCA9IHN5bWJvbF9saXN0Ci0gICAgICAgIHNlbGYuZmVhdHVyZV9saXN0ID0gZmVhdHVyZV9saXN0 CisgICAgICAgIHNlbGYuc3ltYm9sc19zdHJpbmcgPSBzeW1ib2xzX3N0cmluZyAgIyBQYXNzaW5n ICIiIGRpc2FibGVzIGFsbCBzdGF0aWNseS1kZXRlY3RhYmxlIGZlYXR1cmVzLgorICAgICAgICBz ZWxmLmZlYXR1cmVfbGlzdCA9IGZlYXR1cmVfbGlzdCAgIyBQYXNzaW5nIFtdIGRpc2FibGVzIGFs bCBydW50aW1lLWRldGVjdGFibGUgZmVhdHVyZXMuCiAgICAgICAgIGV4ZWN1dGl2ZSA9IGV4ZWN1 dGl2ZSBvciBNb2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9RmFsc2UpCiAgICAgICAgIGZpbGVzeXN0 ZW0gPSBmaWxlc3lzdGVtIG9yIE1vY2tGaWxlU3lzdGVtKCkKICAgICAgICAgdXNlciA9IHVzZXIg b3IgTW9ja1VzZXIoKQpAQCAtNjAsOCArNjAsOCBAQCBjbGFzcyBUZXN0V2ViS2l0UG9ydChXZWJL aXRQb3J0KToKICAgICBkZWYgX3J1bnRpbWVfZmVhdHVyZV9saXN0KHNlbGYpOgogICAgICAgICBy ZXR1cm4gc2VsZi5mZWF0dXJlX2xpc3QKIAotICAgIGRlZiBfc3VwcG9ydGVkX3N5bWJvbF9saXN0 KHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5zeW1ib2xfbGlzdAorICAgIGRlZiBfd2ViY29y ZV9zeW1ib2xzX3N0cmluZyhzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuc3ltYm9sc19zdHJp bmcKIAogICAgIGRlZiBfdGVzdHNfZm9yX290aGVyX3BsYXRmb3JtcyhzZWxmKToKICAgICAgICAg cmV0dXJuIFsibWVkaWEiLCBdCkBAIC05OSwxNSArOTksMzUgQEAgY2xhc3MgV2ViS2l0UG9ydFRl c3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBwYXNzCiAKICAgICBkZWYg dGVzdF9za2lwcGVkX2RpcmVjdG9yaWVzX2Zvcl9zeW1ib2xzKHNlbGYpOgotICAgICAgICBzdXBw b3J0ZWRfc3ltYm9scyA9IFsiR3JhcGhpY3NMYXllciIsICJXZWJDb3JlSGFzM0RSZW5kZXJpbmci LCAiZm9vU3ltYm9sIl0KLSAgICAgICAgZXhwZWN0ZWRfZGlyZWN0b3JpZXMgPSBzZXQoWyJtYXRo bWwiLCAiZmFzdC9jYW52YXMvd2ViZ2wiLCAiY29tcG9zaXRpbmcvd2ViZ2wiLCAiaHR0cC90ZXN0 cy9jYW52YXMvd2ViZ2wiLCAibWh0bWwiXSkKLSAgICAgICAgcmVzdWx0X2RpcmVjdG9yaWVzID0g c2V0KFRlc3RXZWJLaXRQb3J0KHN1cHBvcnRlZF9zeW1ib2xzLCBOb25lKS5fc2tpcHBlZF90ZXN0 c19mb3JfdW5zdXBwb3J0ZWRfZmVhdHVyZXMoKSkKKyAgICAgICAgIyBUaGlzIGZpcnN0IHRlc3Qg Y29uZmlybXMgdGhhdCB0aGUgY29tbW9ubHkgZm91bmQgc3ltYm9scyByZXN1bHQgaW4gdGhlIGV4 cGVjdGVkIHNraXBwZWQgZGlyZWN0b3JpZXMuCisgICAgICAgIHN5bWJvbHNfc3RyaW5nID0gIiAi LmpvaW4oWyJHcmFwaGljc0xheWVyIiwgIldlYkNvcmVIYXMzRFJlbmRlcmluZyIsICJpc1hIVE1M TVBEb2N1bWVudCIsICJmb29TeW1ib2wiXSkKKyAgICAgICAgZXhwZWN0ZWRfZGlyZWN0b3JpZXMg PSBzZXQoWworICAgICAgICAgICAgIm1hdGhtbCIsICAjIFJlcXVpcmVzIE1hdGhNTEVsZW1lbnQK KyAgICAgICAgICAgICJmYXN0L2NhbnZhcy93ZWJnbCIsICAjIFJlcXVpcmVzIFdlYkdMU2hhZGVy CisgICAgICAgICAgICAiY29tcG9zaXRpbmcvd2ViZ2wiLCAgIyBSZXF1aXJlcyBXZWJHTFNoYWRl cgorICAgICAgICAgICAgImh0dHAvdGVzdHMvY2FudmFzL3dlYmdsIiwgICMgUmVxdWlyZXMgV2Vi R0xTaGFkZXIKKyAgICAgICAgICAgICJtaHRtbCIsICAjIFJlcXVpcmVzIE1IVE1MQXJjaGl2ZQor ICAgICAgICBdKQorCisgICAgICAgIHJlc3VsdF9kaXJlY3RvcmllcyA9IHNldChUZXN0V2ViS2l0 UG9ydChzeW1ib2xzX3N0cmluZywgTm9uZSkuX3NraXBwZWRfdGVzdHNfZm9yX3Vuc3VwcG9ydGVk X2ZlYXR1cmVzKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVzdWx0X2RpcmVjdG9yaWVz LCBleHBlY3RlZF9kaXJlY3RvcmllcykKKworICAgICAgICAjIFRlc3QgdGhhdCB0aGUgbm0gc3Ry aW5nIHBhcnNpbmcgYWN0dWFsbHkgd29ya3M6CisgICAgICAgIHN5bWJvbHNfc3RyaW5nID0gIiIi CiswMDAwMDAwMDAxMjRmNDk4IHMgX19aWk43V2ViQ29yZTEzR3JhcGhpY3NMYXllcjEycmVwbGFj ZUNoaWxkRVBTMF9TMV9FMTlfX1BSRVRUWV9GVU5DVElPTl9fCiswMDAwMDAwMDAxMjRmNTAwIHMg X19aWk43V2ViQ29yZTEzR3JhcGhpY3NMYXllcjEzYWRkQ2hpbGRBYm92ZUVQUzBfUzFfRTE5X19Q UkVUVFlfRlVOQ1RJT05fXworMDAwMDAwMDAwMTI0ZjY3MCBzIF9fWlpON1dlYkNvcmUxM0dyYXBo aWNzTGF5ZXIxM2FkZENoaWxkQmVsb3dFUFMwX1MxX0UxOV9fUFJFVFRZX0ZVTkNUSU9OX18KKyIi IgorICAgICAgICAjIE5vdGUgJ2NvbXBvc2l0aW5nJyBpcyBub3QgaW4gdGhlIGxpc3Qgb2Ygc2tp cHBlZCBkaXJlY3RvcmllcyAoaGVuY2UgdGhlIHBhcnNpbmcgb2YgR3JhcGhpY3NMYXllciB3b3Jr ZWQpOgorICAgICAgICBleHBlY3RlZF9kaXJlY3RvcmllcyA9IHNldChbJ21hdGhtbCcsICd0cmFu c2Zvcm1zLzNkJywgJ2NvbXBvc2l0aW5nL3dlYmdsJywgJ2Zhc3QvY2FudmFzL3dlYmdsJywgJ2Fu aW1hdGlvbnMvM2QnLCAnbWh0bWwnLCAnaHR0cC90ZXN0cy9jYW52YXMvd2ViZ2wnXSkKKyAgICAg ICAgcmVzdWx0X2RpcmVjdG9yaWVzID0gc2V0KFRlc3RXZWJLaXRQb3J0KHN5bWJvbHNfc3RyaW5n LCBOb25lKS5fc2tpcHBlZF90ZXN0c19mb3JfdW5zdXBwb3J0ZWRfZmVhdHVyZXMoKSkKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChyZXN1bHRfZGlyZWN0b3JpZXMsIGV4cGVjdGVkX2RpcmVjdG9y aWVzKQogCiAgICAgZGVmIHRlc3RfcnVudGltZV9mZWF0dXJlX2xpc3Qoc2VsZik6CiAgICAgICAg IHBvcnQgPSBXZWJLaXRQb3J0KGV4ZWN1dGl2ZT1Nb2NrRXhlY3V0aXZlKCkpCiAgICAgICAgIHBv cnQuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZCA9IGxhbWJkYSBjb21tYW5kLCBjd2Q9Tm9uZSwgZXJy b3JfaGFuZGxlcj1Ob25lOiAiTm9uc2Vuc2UiCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBv cnQuX3J1bnRpbWVfZmVhdHVyZV9saXN0KCksIFtdKQorICAgICAgICAjIHJ1bnRpbWVfZmVhdHVy ZXNfbGlzdCByZXR1cm5zIE5vbmUgd2hlbiBpdHMgcmVzdWx0cyBhcmUgbWVhbmluZ2xlc3MgKGl0 IGNvdWxkbid0IHJ1biBEUlQgb3IgcGFyc2UgdGhlIG91dHB1dCwgZXRjLikKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMocG9ydC5fcnVudGltZV9mZWF0dXJlX2xpc3QoKSwgTm9uZSkKICAgICAg ICAgcG9ydC5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kID0gbGFtYmRhIGNvbW1hbmQsIGN3ZD1Ob25l LCBlcnJvcl9oYW5kbGVyPU5vbmU6ICJTdXBwb3J0ZWRGZWF0dXJlczpmb28gYmFyIgogICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9ydW50aW1lX2ZlYXR1cmVfbGlzdCgpLCBbJ2Zvbycs ICdiYXInXSkKIApAQCAtMTE4LDcgKzEzOCw3IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0KHBvcnRf dGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXN1bHRf ZGlyZWN0b3JpZXMsIGV4cGVjdGVkX2RpcmVjdG9yaWVzKQogCiAgICAgZGVmIHRlc3Rfc2tpcHBl ZF9sYXlvdXRfdGVzdHMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdFdlYktp dFBvcnQoTm9uZSwgTm9uZSkuc2tpcHBlZF9sYXlvdXRfdGVzdHMoKSwgc2V0KFsibWVkaWEiXSkp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdFdlYktpdFBvcnQoTm9uZSwgTm9uZSkuc2tp cHBlZF9sYXlvdXRfdGVzdHMoKSwgc2V0KFsnbWVkaWEnXSkpCiAKICAgICBkZWYgdGVzdF9za2lw cGVkX2ZpbGVfc2VhcmNoX3BhdGhzKHNlbGYpOgogICAgICAgICBwb3J0ID0gVGVzdFdlYktpdFBv cnQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2Vy dmVycy9saWdodHRwZC5jb25mIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv c2VydmVycy9saWdodHRwZC5jb25mCmluZGV4IDI2Y2EyMmYyZDdlZmRhMTEzMWVmMDgwNjY4ZWU0 NjQxM2I3N2ZkOTMuLjQzNjBjMzdkOWQ4MTIyN2E2MWEzMGUzNmYzZWM4NzBjZGFmNzJhZmQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvbGln aHR0cGQuY29uZgorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2 ZXJzL2xpZ2h0dHBkLmNvbmYKQEAgLTIxLDcgKzIxLDYgQEAgbWltZXR5cGUuYXNzaWduICAgICAg ICAgICAgID0gKAogICAiLmh0bWwiICAgICAgICAgPT4gICAgICAidGV4dC9odG1sIiwKICAgIi5o dG0iICAgICAgICAgID0+ICAgICAgInRleHQvaHRtbCIsCiAgICIueGh0bWwiICAgICAgICA9PiAg ICAgICJhcHBsaWNhdGlvbi94aHRtbCt4bWwiLAotICAiLnhodG1sbXAiICAgICAgPT4gICAgICAi YXBwbGljYXRpb24vdm5kLndhcC54aHRtbCt4bWwiLAogICAiLmpzIiAgICAgICAgICAgPT4gICAg ICAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IiwKICAgIi5sb2ciICAgICAgICAgID0+ICAgICAg InRleHQvcGxhaW4iLAogICAiLmNvbmYiICAgICAgICAgPT4gICAgICAidGV4dC9wbGFpbiIsCg==