33394 2010-01-08 12:00:43 -0800 Optimize the number of CPUs used for building Qt and Gtk 2010-01-08 15:31:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned commit-queue eric webkit.review.bot oldest_to_newest 178733 0 abarth 2010-01-08 12:00:43 -0800 Optimize the number of CPUs used for building Qt and Gtk 178734 1 46149 abarth 2010-01-08 12:01:35 -0800 Created attachment 46149 Patch 178737 2 webkit.review.bot 2010-01-08 12:05:14 -0800 style-queue ran check-webkit-style on attachment 46149 without any errors. 178751 3 46149 eric 2010-01-08 12:36:39 -0800 Comment on attachment 46149 Patch LGTM! 178757 4 46149 abarth 2010-01-08 13:11:59 -0800 Comment on attachment 46149 Patch I'm excited that that commit-queue runs test-webkitpy for me! 178804 5 46149 commit-queue 2010-01-08 14:14:30 -0800 Comment on attachment 46149 Patch Rejecting patch 46149 from commit-queue. Failed to run "['WebKitTools/Scripts/test-webkitpy']" exit_code: 1 Last 500 characters of output: webkitpy/webkitport_unittest.py", line 57, in test_qt_port self.assertEquals(QtPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--qt", '--makeargs="-j8"']) AssertionError: ['WebKitTools/Scripts/build-webkit', '--debug', '--qt', '--makeargs="-j2"'] != ['WebKitTools/Scripts/build-webkit', '--debug', '--qt', '--makeargs="-j8"'] ---------------------------------------------------------------------- Ran 226 tests in 0.908s FAILED (failures=1) Full output: http://webkit-commit-queue.appspot.com/results/171078 178806 6 46162 abarth 2010-01-08 14:18:13 -0800 Created attachment 46162 Patch 178819 7 46162 commit-queue 2010-01-08 14:46:03 -0800 Comment on attachment 46162 Patch Clearing flags on attachment: 46162 Committed r53011: <http://trac.webkit.org/changeset/53011> 178821 8 commit-queue 2010-01-08 14:46:08 -0800 All reviewed patches have been landed. Closing bug. 178835 9 eric 2010-01-08 15:27:57 -0800 Why did it fail on the commit-bot? 178839 10 abarth 2010-01-08 15:31:34 -0800 (In reply to comment #9) > Why did it fail on the commit-bot? One of the expected results in test-webkitpy was set to 8, which happens to be the number of cores on my machine. 46149 2010-01-08 12:01:35 -0800 2010-01-08 14:18:09 -0800 Patch bug-33394-20100108120133.patch text/plain 4947 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjMjQxN2UxLi41NTVmNWJlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEt MDggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPcHRpbWl6ZSB0aGUgbnVtYmVyIG9mIENQVXMg dXNlZCBmb3IgYnVpbGRpbmcgUXQgYW5kIEd0aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMzOTQKKworICAgICAgICBJbnN0ZWFkIG9mIGhhcmRjb2Rp bmcgdGhlIG51bWJlciA4LCB3ZSBzaG91bGQgcmVhZCB0aGUgbnVtYmVyIG9mIENQVXMKKyAgICAg ICAgZnJvbSB0aGUgZW52aXJvbm1lbnQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2V4 ZWN1dGl2ZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBvcnQucHk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS93ZWJraXRwb3J0X3VuaXR0ZXN0LnB5OgorCiAyMDEw LTAxLTA4ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2V4ZWN1dGl2ZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvZXhl Y3V0aXZlLnB5CmluZGV4IGRkMjE0ODkuLjc0YTM5YTMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvZXhlY3V0aXZlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvZXhlY3V0aXZlLnB5CkBAIC05OCw2ICs5OCwxNSBAQCBjbGFzcyBFeGVjdXRpdmUo b2JqZWN0KToKICAgICAgICAgaWYgZXhpdF9jb2RlOgogICAgICAgICAgICAgcmFpc2UgU2NyaXB0 RXJyb3Ioc2NyaXB0X2FyZ3M9YXJncywgZXhpdF9jb2RlPWV4aXRfY29kZSwgb3V0cHV0PWNoaWxk X291dHB1dCkKIAorICAgIEBzdGF0aWNtZXRob2QKKyAgICBkZWYgY3B1X2NvdW50KCk6CisgICAg ICAgICMgVGhpcyBBUEkgZXhpc3RzIG9ubHkgaW4gUHl0aG9uIDIuNiBhbmQgaGlnaGVyLiAgOigK KyAgICAgICAgdHJ5OgorICAgICAgICAgICAgaW1wb3J0IG11bHRpcHJvY2Vzc2luZworICAgICAg ICAgICAgcmV0dXJuIG11bHRpcHJvY2Vzc2luZy5jcHVfY291bnQoKQorICAgICAgICBleGNlcHQg KEltcG9ydEVycm9yLE5vdEltcGxlbWVudGVkRXJyb3IpOgorICAgICAgICAgICAgcmV0dXJuIDIg IyBUaGlzIHF1YW50aXR5IGlzIGEgbGllIGJ1dCBwcm9iYWJseSBhIHJlYXNvbmFibGUgZ3Vlc3Mg Zm9yIG1vZGVybiBtYWNoaW5lcy4KKwogICAgICMgRXJyb3IgaGFuZGxlcnMgZG8gbm90IG5lZWQg dG8gYmUgc3RhdGljIG1ldGhvZHMgb25jZSBhbGwgY2FsbGVycyBhcmUgdXBkYXRlZCB0byB1c2Ug YW4gRXhlY3V0aXZlIG9iamVjdC4KICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGRlZmF1bHRf ZXJyb3JfaGFuZGxlcihlcnJvcik6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3dlYmtpdHBvcnQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmtp dHBvcnQucHkKaW5kZXggYjQ2OGM5ZC4uZmNkZTQ2MCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS93ZWJraXRwb3J0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvd2Via2l0cG9ydC5weQpAQCAtMzEsNiArMzEsOCBAQAogaW1wb3J0IG9zCiAKIGZy b20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCitmcm9tIHdlYmtpdHB5LmV4ZWN1dGl2ZSBp bXBvcnQgRXhlY3V0aXZlCisKIAogY2xhc3MgV2ViS2l0UG9ydChvYmplY3QpOgogICAgICMgV2Ug bWlnaHQgbmVlZCB0byBwYXNzIHNjbSBpbnRvIHRoaXMgZnVuY3Rpb24gZm9yIHNjbS5jaGVja291 dF9yb290CkBAIC0xMTAsNiArMTEyLDcgQEAgY2xhc3MgR3RrUG9ydChXZWJLaXRQb3J0KToKICAg ICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoY2xzLCBidWlsZF9zdHlsZT1Ob25lKToKICAgICAg ICAgY29tbWFuZCA9IFdlYktpdFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9 YnVpbGRfc3R5bGUpCiAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWd0ayIpCisgICAgICAgIGNv bW1hbmQuYXBwZW5kKCctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50KCkp CiAgICAgICAgIHJldHVybiBjb21tYW5kCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTEzMiw4ICsx MzUsNyBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIGJ1aWxkX3dlYmtpdF9j b21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6CiAgICAgICAgIGNvbW1hbmQgPSBXZWJLaXRQ b3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxlKQogICAgICAg ICBjb21tYW5kLmFwcGVuZCgiLS1xdCIpCi0gICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBwcm9i YWJseSBkZXRlY3QgdGhlIG51bWJlciBvZiBjb3Jlcy4KLSAgICAgICAgY29tbWFuZC5hcHBlbmQo Jy0tbWFrZWFyZ3M9Ii1qOCInKQorICAgICAgICBjb21tYW5kLmFwcGVuZCgnLS1tYWtlYXJncz0i LWolcyInICUgRXhlY3V0aXZlLmNwdV9jb3VudCgpKQogICAgICAgICByZXR1cm4gY29tbWFuZAog CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2Via2l0cG9ydF91 bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2Via2l0cG9ydF91bml0 dGVzdC5weQppbmRleCBiNjk5MDM4Li5jYWI1ZDVkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBvcnRfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS93ZWJraXRwb3J0X3VuaXR0ZXN0LnB5CkBAIC0yOSw4ICsyOSwxMCBA QAogCiBpbXBvcnQgdW5pdHRlc3QKIAorZnJvbSB3ZWJraXRweS5leGVjdXRpdmUgaW1wb3J0IEV4 ZWN1dGl2ZQogZnJvbSB3ZWJraXRweS53ZWJraXRwb3J0IGltcG9ydCBXZWJLaXRQb3J0LCBNYWNQ b3J0LCBHdGtQb3J0LCBRdFBvcnQsIENocm9taXVtUG9ydAogCisKIGNsYXNzIFdlYktpdFBvcnRU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9tYWNfcG9ydChzZWxmKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5uYW1lKCksICJNYWMiKQpAQCAtNDQsMTQg KzQ2LDE0IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5uYW1lKCksICJHdGsiKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhHdGtQb3J0LmZsYWcoKSwgIi0tcG9ydD1ndGsiKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhHdGtQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0 UG9ydC5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpLCAiLS1ndGsiXSkKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0 UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWd0ayJdKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJk ZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVn IiwgIi0tZ3RrIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQuYnVpbGRfd2Vi a2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAi LS1ndGsiLCAnLS1tYWtlYXJncz0iLWolcyInICUgRXhlY3V0aXZlLmNwdV9jb3VudCgpXSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWls ZF9zdHlsZT0iZGVidWciKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIp LCAiLS1kZWJ1ZyIsICItLWd0ayIsICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1 X2NvdW50KCldKQogCiAgICAgZGVmIHRlc3RfcXRfcG9ydChzZWxmKToKICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHMoUXRQb3J0Lm5hbWUoKSwgIlF0IikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoUXRQb3J0LmZsYWcoKSwgIi0tcG9ydD1xdCIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KFF0UG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3Bh dGgoInJ1bi13ZWJraXQtdGVzdHMiKV0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9y dC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQt d2Via2l0IiksICItLXF0IiwgJy0tbWFrZWFyZ3M9Ii1qOCInXSkKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMoUXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlw dF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tcXQiLCAnLS1tYWtlYXJncz0iLWolcyInICUgRXhl Y3V0aXZlLmNwdV9jb3VudCgpXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0LmJ1 aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3Jp cHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVnIiwgIi0tcXQiLCAnLS1tYWtlYXJncz0i LWo4IiddKQogCiAgICAgZGVmIHRlc3RfY2hyb21pdW1fcG9ydChzZWxmKToK 46162 2010-01-08 14:18:13 -0800 2010-01-08 14:46:03 -0800 Patch bug-33394-20100108141811.patch text/plain 5187 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjMjQxN2UxLi5mNjhmNGE2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEt MDggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBFcmljIFNlaWRlbC4KKworICAgICAgICBPcHRpbWl6ZSB0aGUgbnVtYmVyIG9mIENQVXMgdXNl ZCBmb3IgYnVpbGRpbmcgUXQgYW5kIEd0aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzMzOTQKKworICAgICAgICBJbnN0ZWFkIG9mIGhhcmRjb2Rpbmcg dGhlIG51bWJlciA4LCB3ZSBzaG91bGQgcmVhZCB0aGUgbnVtYmVyIG9mIENQVXMKKyAgICAgICAg ZnJvbSB0aGUgZW52aXJvbm1lbnQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2V4ZWN1 dGl2ZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBvcnQucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS93ZWJraXRwb3J0X3VuaXR0ZXN0LnB5OgorCiAyMDEwLTAx LTA4ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2V4ZWN1dGl2ZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvZXhlY3V0 aXZlLnB5CmluZGV4IGRkMjE0ODkuLjc0YTM5YTMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvZXhlY3V0aXZlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvZXhlY3V0aXZlLnB5CkBAIC05OCw2ICs5OCwxNSBAQCBjbGFzcyBFeGVjdXRpdmUob2Jq ZWN0KToKICAgICAgICAgaWYgZXhpdF9jb2RlOgogICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJy b3Ioc2NyaXB0X2FyZ3M9YXJncywgZXhpdF9jb2RlPWV4aXRfY29kZSwgb3V0cHV0PWNoaWxkX291 dHB1dCkKIAorICAgIEBzdGF0aWNtZXRob2QKKyAgICBkZWYgY3B1X2NvdW50KCk6CisgICAgICAg ICMgVGhpcyBBUEkgZXhpc3RzIG9ubHkgaW4gUHl0aG9uIDIuNiBhbmQgaGlnaGVyLiAgOigKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgaW1wb3J0IG11bHRpcHJvY2Vzc2luZworICAgICAgICAg ICAgcmV0dXJuIG11bHRpcHJvY2Vzc2luZy5jcHVfY291bnQoKQorICAgICAgICBleGNlcHQgKElt cG9ydEVycm9yLE5vdEltcGxlbWVudGVkRXJyb3IpOgorICAgICAgICAgICAgcmV0dXJuIDIgIyBU aGlzIHF1YW50aXR5IGlzIGEgbGllIGJ1dCBwcm9iYWJseSBhIHJlYXNvbmFibGUgZ3Vlc3MgZm9y IG1vZGVybiBtYWNoaW5lcy4KKwogICAgICMgRXJyb3IgaGFuZGxlcnMgZG8gbm90IG5lZWQgdG8g YmUgc3RhdGljIG1ldGhvZHMgb25jZSBhbGwgY2FsbGVycyBhcmUgdXBkYXRlZCB0byB1c2UgYW4g RXhlY3V0aXZlIG9iamVjdC4KICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGRlZmF1bHRfZXJy b3JfaGFuZGxlcihlcnJvcik6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3dlYmtpdHBvcnQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmtpdHBv cnQucHkKaW5kZXggYjQ2OGM5ZC4uZmNkZTQ2MCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS93ZWJraXRwb3J0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvd2Via2l0cG9ydC5weQpAQCAtMzEsNiArMzEsOCBAQAogaW1wb3J0IG9zCiAKIGZyb20g b3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCitmcm9tIHdlYmtpdHB5LmV4ZWN1dGl2ZSBpbXBv cnQgRXhlY3V0aXZlCisKIAogY2xhc3MgV2ViS2l0UG9ydChvYmplY3QpOgogICAgICMgV2UgbWln aHQgbmVlZCB0byBwYXNzIHNjbSBpbnRvIHRoaXMgZnVuY3Rpb24gZm9yIHNjbS5jaGVja291dF9y b290CkBAIC0xMTAsNiArMTEyLDcgQEAgY2xhc3MgR3RrUG9ydChXZWJLaXRQb3J0KToKICAgICBk ZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoY2xzLCBidWlsZF9zdHlsZT1Ob25lKToKICAgICAgICAg Y29tbWFuZCA9IFdlYktpdFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVp bGRfc3R5bGUpCiAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWd0ayIpCisgICAgICAgIGNvbW1h bmQuYXBwZW5kKCctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50KCkpCiAg ICAgICAgIHJldHVybiBjb21tYW5kCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTEzMiw4ICsxMzUs NyBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21t YW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6CiAgICAgICAgIGNvbW1hbmQgPSBXZWJLaXRQb3J0 LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxlKQogICAgICAgICBj b21tYW5kLmFwcGVuZCgiLS1xdCIpCi0gICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBwcm9iYWJs eSBkZXRlY3QgdGhlIG51bWJlciBvZiBjb3Jlcy4KLSAgICAgICAgY29tbWFuZC5hcHBlbmQoJy0t bWFrZWFyZ3M9Ii1qOCInKQorICAgICAgICBjb21tYW5kLmFwcGVuZCgnLS1tYWtlYXJncz0iLWol cyInICUgRXhlY3V0aXZlLmNwdV9jb3VudCgpKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCiAK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2Via2l0cG9ydF91bml0 dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2Via2l0cG9ydF91bml0dGVz dC5weQppbmRleCBiNjk5MDM4Li4yMDIyMzRmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3dlYmtpdHBvcnRfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS93ZWJraXRwb3J0X3VuaXR0ZXN0LnB5CkBAIC0yOSw4ICsyOSwxMCBAQAog CiBpbXBvcnQgdW5pdHRlc3QKIAorZnJvbSB3ZWJraXRweS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1 dGl2ZQogZnJvbSB3ZWJraXRweS53ZWJraXRwb3J0IGltcG9ydCBXZWJLaXRQb3J0LCBNYWNQb3J0 LCBHdGtQb3J0LCBRdFBvcnQsIENocm9taXVtUG9ydAogCisKIGNsYXNzIFdlYktpdFBvcnRUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9tYWNfcG9ydChzZWxmKToKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5uYW1lKCksICJNYWMiKQpAQCAtNDQsMTUgKzQ2 LDE1IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5uYW1lKCksICJHdGsiKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhHdGtQb3J0LmZsYWcoKSwgIi0tcG9ydD1ndGsiKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhHdGtQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9y dC5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpLCAiLS1ndGsiXSkKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9y dC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWd0ayJdKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1 ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVnIiwg Ii0tZ3RrIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQuYnVpbGRfd2Via2l0 X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1n dGsiLCAnLS1tYWtlYXJncz0iLWolcyInICUgRXhlY3V0aXZlLmNwdV9jb3VudCgpXSkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9z dHlsZT0iZGVidWciKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAi LS1kZWJ1ZyIsICItLWd0ayIsICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2Nv dW50KCldKQogCiAgICAgZGVmIHRlc3RfcXRfcG9ydChzZWxmKToKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMoUXRQb3J0Lm5hbWUoKSwgIlF0IikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo UXRQb3J0LmZsYWcoKSwgIi0tcG9ydD1xdCIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0 UG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgo InJ1bi13ZWJraXQtdGVzdHMiKV0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5i dWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Vi a2l0IiksICItLXF0IiwgJy0tbWFrZWFyZ3M9Ii1qOCInXSkKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoUXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBb V2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVnIiwgIi0tcXQi LCAnLS1tYWtlYXJncz0iLWo4IiddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQu YnVpbGRfd2Via2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdl YmtpdCIpLCAiLS1xdCIsICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50 KCldKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuYnVpbGRfd2Via2l0X2NvbW1h bmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13 ZWJraXQiKSwgIi0tZGVidWciLCAiLS1xdCIsICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRp dmUuY3B1X2NvdW50KCldKQogCiAgICAgZGVmIHRlc3RfY2hyb21pdW1fcG9ydChzZWxmKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0Lm5hbWUoKSwgIkNocm9taXVtIikK