103661 2012-11-29 12:36:58 -0800 webkitpy's run_webkit_tests should initialize the printer earlier on 2012-12-04 04:12:14 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peter dpranke abarth dpranke eric ojan rniwa tony oldest_to_newest 779333 0 peter 2012-11-29 12:36:58 -0800 Before creating the Printer, which creates the MeteredStream that handles the log messages run_webkit_tests.py's run() sets up derived options. _set_up_derived_options() calls various methods on the Port objects. As this is done without a printer, they aren't able to use normal loggers and have to resort to writing to stderr directly. There are FIXMEs in at least the Mac and Chromium-Android Ports, and the Chromium-Android Port imports "sys" for this reason alone. 781889 1 177332 dpranke 2012-12-03 14:28:58 -0800 Created attachment 177332 Patch 781912 2 177332 eric 2012-12-03 15:03:18 -0800 Comment on attachment 177332 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177332&action=review FANTASTIC. > Tools/Scripts/webkitpy/layout_tests/port/mac.py:241 > - except ScriptError, e: > + except ScriptError: > _log.warning('Unable to sample process.') We could log the actual error. :) 781916 3 dpranke 2012-12-03 15:05:26 -0800 (In reply to comment #2) > (From update of attachment 177332 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177332&action=review > > FANTASTIC. > > > Tools/Scripts/webkitpy/layout_tests/port/mac.py:241 > > - except ScriptError, e: > > + except ScriptError: > > _log.warning('Unable to sample process.') > > We could log the actual error. :) Sure :). 781923 4 dpranke 2012-12-03 15:08:57 -0800 Committed r136443: <http://trac.webkit.org/changeset/136443> 782459 5 peter 2012-12-04 04:12:14 -0800 Awesome, thanks for following up!! 177332 2012-12-03 14:28:58 -0800 2012-12-03 15:03:18 -0800 Patch bug-103661-20121203142624.patch text/plain 12413 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWQ1NmQwMDExNjFhZDcyMjcyNDkwN2UxNTIwYjdmM2Y5 NGM1ZjY1My4uYWY4ZGZjOTgxM2FjYjQyNWE5NTNlZjhmNTk5NjNlNmI5ZGNkODkyZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMy IEBACiAyMDEyLTEyLTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5J3MgcnVuX3dlYmtpdF90ZXN0cyBzaG91bGQgaW5pdGlhbGl6ZSB0aGUg cHJpbnRlciBlYXJsaWVyIG9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMDM2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbml0aWFsaXplIHRoZSBwcmludGVyIGJlZm9yZSBjb21wdXRpbmcgdGhlIGRl cml2ZWQgb3B0aW9ucworICAgICAgICBmcm9tIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzLCBz byB0aGF0IHdlIGNhbiBzYWZlbHkgbG9nIGZyb20KKyAgICAgICAgcG9ydCBtZXRob2RzLgorCisg ICAgICAgIEFsc28gY2xlYW4gdXAgYSBmZXcgbWlzY2VsbGFuZW91cyBsaW50IHdhcm5pbmdzLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9h bmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkUG9ydC5wYXRoX3RvX2FkYik6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHk6CisgICAg ICAgIChNYWNQb3J0LmRlZmF1bHRfY2hpbGRfcHJvY2Vzc2VzKToKKyAgICAgICAgKE1hY1BvcnQu c2FtcGxlX3Byb2Nlc3MpOgorICAgICAgICAoTWFjUG9ydC5zdGFydF9oZWxwZXIpOgorICAgICAg ICAoTWFjUG9ydC5zdG9wX2hlbHBlcik6CisgICAgICAgIChNYWNQb3J0Lm5tX2NvbW1hbmQpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0 LnB5OgorICAgICAgICAodGVzdF9kZWZhdWx0X2NoaWxkX3Byb2Nlc3Nlcyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAg ICAgKHJ1bik6CisgICAgICAgIChfc2V0X3VwX2Rlcml2ZWRfb3B0aW9ucyk6CisKKzIwMTItMTIt MDMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgbnJ3dDog Y2xlYW4gdXAgZXhjZXB0aW9uIHByb3BhZ2F0aW9uIC8gaGFuZGxpbmcgZm9yIGludGVycnVwdHMg YW5kIGVhcmx5IGV4aXRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDM4MzAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CmluZGV4IDkxY2QzMTAwYzA4 YWUwNzYwMzEyNGM2NjRkYTJiZmE4MGZiNDdhNmMuLmQ4MDc1ZTQ2YzlmZGU0MDU5NDM0YjI5YmM0 OWFlMWE5OTg5NGYyYTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKQEAgLTMyLDcgKzMyLDYg QEAgaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJlCiBpbXBvcnQgc3VicHJvY2Vz cwotaW1wb3J0IHN5cwogaW1wb3J0IHRocmVhZGluZwogaW1wb3J0IHRpbWUKIApAQCAtMjc2LDgg KzI3NSw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0 KToKICAgICAgICAgaWYgbm90IHBhdGhfdmVyc2lvbjoKICAgICAgICAgICAgIENocm9taXVtQW5k cm9pZFBvcnQuX2FkYl9wYXRoID0gcHJvdmlkZWRfYWRiX3BhdGgKICAgICAgICAgZWxpZiBwcm92 aWRlZF92ZXJzaW9uID4gcGF0aF92ZXJzaW9uOgotICAgICAgICAgICAgIyBGSVhNRTogVGhlIFBy aW50ZXIgaXNuJ3QgaW5pdGlhbGl6ZWQgd2hlbiB0aGlzIGlzIGNhbGxlZCwgc28gdXNpbmcgX2xv ZyB3b3VsZCBqdXN0IHNob3cgYW4gdW5pdGlhbGl6ZWQgbG9nZ2VyIGVycm9yLgotICAgICAgICAg ICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgJ1RoZSAiYWRiIiB2ZXJzaW9uIGluIHlvdXIgcGF0aCBp cyBvbGRlciB0aGFuIHRoZSBvbmUgY2hlY2tlZCBpbiwgY29uc2lkZXIgdXBkYXRpbmcgeW91ciBs b2NhbCBBbmRyb2lkIFNESy4gVXNpbmcgdGhlIGNoZWNrZWQgaW4gb25lLicKKyAgICAgICAgICAg IF9sb2cud2FybmluZygnVGhlICJhZGIiIHZlcnNpb24gaW4geW91ciBwYXRoIGlzIG9sZGVyIHRo YW4gdGhlIG9uZSBjaGVja2VkIGluLCBjb25zaWRlciB1cGRhdGluZyB5b3VyIGxvY2FsIEFuZHJv aWQgU0RLLiBVc2luZyB0aGUgY2hlY2tlZCBpbiBvbmUuJykKICAgICAgICAgICAgIENocm9taXVt QW5kcm9pZFBvcnQuX2FkYl9wYXRoID0gcHJvdmlkZWRfYWRiX3BhdGgKICAgICAgICAgZWxzZToK ICAgICAgICAgICAgIENocm9taXVtQW5kcm9pZFBvcnQuX2FkYl9wYXRoID0gJ2FkYicKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKaW5kZXggNDQx NWI4YTYyMDljMzgxYzkwOWZmODViODM4NWFlMjcxMjAzOTE0Mi4uOWQ1NWVkOGY5MzVkM2NhNDE5 M2VjOWI3MWE3MjE4ZWY4NTRiODczYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKQEAgLTI5LDkgKzI5LDYgQEAKIAogaW1wb3J0IGxvZ2dp bmcKIGltcG9ydCBvcwotaW1wb3J0IHJlCi1pbXBvcnQgc3VicHJvY2VzcwotaW1wb3J0IHN5cwog aW1wb3J0IHRpbWUKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmNyYXNobG9ncyBpbXBv cnQgQ3Jhc2hMb2dzCkBAIC0xMDcsMTAgKzEwNCw4IEBAIGNsYXNzIE1hY1BvcnQoQXBwbGVQb3J0 KToKICAgICAgICAgcmV0dXJuIHNlbGYuX3ZlcnNpb24gPT0gImxpb24iCiAKICAgICBkZWYgZGVm YXVsdF9jaGlsZF9wcm9jZXNzZXMoc2VsZik6Ci0gICAgICAgICMgRklYTUU6IFRoZSBQcmludGVy IGlzbid0IGluaXRpYWxpemVkIHdoZW4gdGhpcyBpcyBjYWxsZWQsIHNvIHVzaW5nIF9sb2cgd291 bGQganVzdCBzaG93IGFuIHVuaXRpYWxpemVkIGxvZ2dlciBlcnJvci4KLQogICAgICAgICBpZiBz ZWxmLl92ZXJzaW9uID09ICJzbm93bGVvcGFyZCI6Ci0gICAgICAgICAgICBwcmludCA+PiBzeXMu c3RkZXJyLCAiQ2Fubm90IHJ1biB0ZXN0cyBpbiBwYXJhbGxlbCBvbiBTbm93IExlb3BhcmQgZHVl IHRvIHJkYXI6Ly9wcm9ibGVtLzEwNjIxNTI1LiIKKyAgICAgICAgICAgIF9sb2cud2FybmluZygi Q2Fubm90IHJ1biB0ZXN0cyBpbiBwYXJhbGxlbCBvbiBTbm93IExlb3BhcmQgZHVlIHRvIHJkYXI6 Ly9wcm9ibGVtLzEwNjIxNTI1LiIpCiAgICAgICAgICAgICByZXR1cm4gMQogCiAgICAgICAgIGRl ZmF1bHRfY291bnQgPSBzdXBlcihNYWNQb3J0LCBzZWxmKS5kZWZhdWx0X2NoaWxkX3Byb2Nlc3Nl cygpCkBAIC0xMjcsNyArMTIyLDcgQEAgY2xhc3MgTWFjUG9ydChBcHBsZVBvcnQpOgogICAgICAg ICBvdmVyaGVhZCA9IDIwNDggKiAxMDI0ICogMTAyNCAgIyBBc3N1bWUgd2UgbmVlZCAyR0IgZnJl ZSBmb3IgdGhlIE8vUwogICAgICAgICBzdXBwb3J0YWJsZV9pbnN0YW5jZXMgPSBtYXgoKHRvdGFs X21lbW9yeSAtIG92ZXJoZWFkKSAvIGJ5dGVzX3Blcl9kcnQsIDEpICAjIEFsd2F5cyB1c2Ugb25l IHByb2Nlc3MsIGV2ZW4gaWYgd2UgZG9uJ3QgaGF2ZSBzcGFjZSBmb3IgaXQuCiAgICAgICAgIGlm IHN1cHBvcnRhYmxlX2luc3RhbmNlcyA8IGRlZmF1bHRfY291bnQ6Ci0gICAgICAgICAgICBwcmlu dCA+PiBzeXMuc3RkZXJyLCAiVGhpcyBtYWNoaW5lIGNvdWxkIHN1cHBvcnQgJXMgY2hpbGQgcHJv Y2Vzc2VzLCBidXQgb25seSBoYXMgZW5vdWdoIG1lbW9yeSBmb3IgJXMuIiAlIChkZWZhdWx0X2Nv dW50LCBzdXBwb3J0YWJsZV9pbnN0YW5jZXMpCisgICAgICAgICAgICBfbG9nLndhcm5pbmcoIlRo aXMgbWFjaGluZSBjb3VsZCBzdXBwb3J0ICVzIGNoaWxkIHByb2Nlc3NlcywgYnV0IG9ubHkgaGFz IGVub3VnaCBtZW1vcnkgZm9yICVzLiIgJSAoZGVmYXVsdF9jb3VudCwgc3VwcG9ydGFibGVfaW5z dGFuY2VzKSkKICAgICAgICAgcmV0dXJuIG1pbihzdXBwb3J0YWJsZV9pbnN0YW5jZXMsIGRlZmF1 bHRfY291bnQpCiAKICAgICBkZWYgX2J1aWxkX2phdmFfdGVzdF9zdXBwb3J0KHNlbGYpOgpAQCAt MjQyLDcgKzIzNyw3IEBAIGNsYXNzIE1hY1BvcnQoQXBwbGVQb3J0KToKICAgICAgICAgICAgICAg ICAiLWZpbGUiLAogICAgICAgICAgICAgICAgIGhhbmdfcmVwb3J0LAogICAgICAgICAgICAgXSkK LSAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgorICAgICAgICBleGNlcHQgU2NyaXB0RXJy b3I6CiAgICAgICAgICAgICBfbG9nLndhcm5pbmcoJ1VuYWJsZSB0byBzYW1wbGUgcHJvY2Vzcy4n KQogCiAgICAgZGVmIF9wYXRoX3RvX2hlbHBlcihzZWxmKToKQEAgLTI1Myw5ICsyNDgsOCBAQCBj bGFzcyBNYWNQb3J0KEFwcGxlUG9ydCk6CiAgICAgICAgIGhlbHBlcl9wYXRoID0gc2VsZi5fcGF0 aF90b19oZWxwZXIoKQogICAgICAgICBpZiBoZWxwZXJfcGF0aDoKICAgICAgICAgICAgIF9sb2cu ZGVidWcoIlN0YXJ0aW5nIGxheW91dCBoZWxwZXIgJXMiICUgaGVscGVyX3BhdGgpCi0gICAgICAg ICAgICAjIE5vdGU6IE5vdCB0aHJlYWQgc2FmZTogaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1 ZTIzMjAKICAgICAgICAgICAgIHNlbGYuX2hlbHBlciA9IHNlbGYuX2V4ZWN1dGl2ZS5wb3Blbihb aGVscGVyX3BhdGhdLAotICAgICAgICAgICAgICAgIHN0ZGluPXN1YnByb2Nlc3MuUElQRSwgc3Rk b3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPU5vbmUpCisgICAgICAgICAgICAgICAgc3RkaW49 c2VsZi5fZXhlY3V0aXZlLlBJUEUsIHN0ZG91dD1zZWxmLl9leGVjdXRpdmUuUElQRSwgc3RkZXJy PU5vbmUpCiAgICAgICAgICAgICBpc19yZWFkeSA9IHNlbGYuX2hlbHBlci5zdGRvdXQucmVhZGxp bmUoKQogICAgICAgICAgICAgaWYgbm90IGlzX3JlYWR5LnN0YXJ0c3dpdGgoJ3JlYWR5Jyk6CiAg ICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiTGF5b3V0VGVzdEhlbHBlciBmYWlsZWQgdG8gYmUg cmVhZHkiKQpAQCAtMjY5LDEyICsyNjMsMTEgQEAgY2xhc3MgTWFjUG9ydChBcHBsZVBvcnQpOgog ICAgICAgICAgICAgICAgIHNlbGYuX2hlbHBlci53YWl0KCkKICAgICAgICAgICAgIGV4Y2VwdCBJ T0Vycm9yLCBlOgogICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIklPRXJyb3IgcmFpc2VkIHdo aWxlIHN0b3BwaW5nIGhlbHBlcjogJXMiICUgc3RyKGUpKQotICAgICAgICAgICAgICAgIHBhc3MK ICAgICAgICAgICAgIHNlbGYuX2hlbHBlciA9IE5vbmUKIAogICAgIGRlZiBubV9jb21tYW5kKHNl bGYpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5fZXhlY3V0aXZlLnJ1 bl9jb21tYW5kKFsneGNydW4nLCAnLWZpbmQnLCAnbm0nXSkucnN0cmlwKCkKLSAgICAgICAgZXhj ZXB0IFNjcmlwdEVycm9yLCBlOgorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3I6CiAgICAgICAg ICAgICBfbG9nLndhcm4oInhjcnVuIGZhaWxlZDsgZmFsbGluZyBiYWNrIHRvICdubScuIikKICAg ICAgICAgICAgIHJldHVybiAnbm0nCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CmluZGV4IDgzMWZiZjdjOWMwMjhk NjJiMWY0NjViMjI1ZTAzYzkyMjk0MzM0YzYuLjQxOTUyODEzYTVmNjYxYzk2MDBlNTMzOGE5MTkw ZTNiMzY1NWU3ZGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CkBAIC0xNTIsMjAgKzE1MiwyMCBAQCBqYXZh LwogCiAgICAgICAgIGJ5dGVzX2Zvcl9kcnQgPSAyMDAgKiAxMDI0ICogMTAyNAogICAgICAgICBw b3J0Lmhvc3QucGxhdGZvcm0udG90YWxfYnl0ZXNfbWVtb3J5ID0gbGFtYmRhOiBieXRlc19mb3Jf ZHJ0Ci0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJUaGlzIG1hY2hpbmUgY291bGQgc3VwcG9y dCAyIGNoaWxkIHByb2Nlc3NlcywgYnV0IG9ubHkgaGFzIGVub3VnaCBtZW1vcnkgZm9yIDEuXG4i Ci0gICAgICAgIGNoaWxkX3Byb2Nlc3NlcyA9IE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0 cyhzZWxmLCBwb3J0LmRlZmF1bHRfY2hpbGRfcHJvY2Vzc2VzLCAoKSwgZXhwZWN0ZWRfc3RkZXJy PWV4cGVjdGVkX3N0ZGVycikKKyAgICAgICAgZXhwZWN0ZWRfbG9ncyA9ICJUaGlzIG1hY2hpbmUg Y291bGQgc3VwcG9ydCAyIGNoaWxkIHByb2Nlc3NlcywgYnV0IG9ubHkgaGFzIGVub3VnaCBtZW1v cnkgZm9yIDEuXG4iCisgICAgICAgIGNoaWxkX3Byb2Nlc3NlcyA9IE91dHB1dENhcHR1cmUoKS5h c3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LmRlZmF1bHRfY2hpbGRfcHJvY2Vzc2VzLCAoKSwgZXhw ZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNoaWxk X3Byb2Nlc3NlcywgMSkKIAogICAgICAgICAjIE1ha2Ugc3VyZSB0aGF0IHdlIGFsd2F5cyB1c2Ug b25lIHByb2Nlc3MsIGV2ZW4gaWYgd2UgZG9uJ3QgaGF2ZSB0aGUgbWVtb3J5IGZvciBpdC4KICAg ICAgICAgcG9ydC5ob3N0LnBsYXRmb3JtLnRvdGFsX2J5dGVzX21lbW9yeSA9IGxhbWJkYTogYnl0 ZXNfZm9yX2RydCAtIDEKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIlRoaXMgbWFjaGluZSBj b3VsZCBzdXBwb3J0IDIgY2hpbGQgcHJvY2Vzc2VzLCBidXQgb25seSBoYXMgZW5vdWdoIG1lbW9y eSBmb3IgMS5cbiIKLSAgICAgICAgY2hpbGRfcHJvY2Vzc2VzID0gT3V0cHV0Q2FwdHVyZSgpLmFz c2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuZGVmYXVsdF9jaGlsZF9wcm9jZXNzZXMsICgpLCBleHBl Y3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorICAgICAgICBleHBlY3RlZF9sb2dzID0gIlRo aXMgbWFjaGluZSBjb3VsZCBzdXBwb3J0IDIgY2hpbGQgcHJvY2Vzc2VzLCBidXQgb25seSBoYXMg ZW5vdWdoIG1lbW9yeSBmb3IgMS5cbiIKKyAgICAgICAgY2hpbGRfcHJvY2Vzc2VzID0gT3V0cHV0 Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuZGVmYXVsdF9jaGlsZF9wcm9jZXNz ZXMsICgpLCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoY2hpbGRfcHJvY2Vzc2VzLCAxKQogCiAgICAgICAgICMgU25vd0xlb3BhcmQgaGFzIGEg Q0ZOZXR3b3JrIGJ1ZyB3aGljaCBjYXVzZXMgY3Jhc2hlcyBpZiB3ZSBleGVjdXRlIG1vcmUgdGhh biBvbmUgY29weSBvZiBEUlQgYXQgb25jZS4KICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0 KHBvcnRfbmFtZT0nbWFjLXNub3dsZW9wYXJkJykKLSAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0g IkNhbm5vdCBydW4gdGVzdHMgaW4gcGFyYWxsZWwgb24gU25vdyBMZW9wYXJkIGR1ZSB0byByZGFy Oi8vcHJvYmxlbS8xMDYyMTUyNS5cbiIKLSAgICAgICAgY2hpbGRfcHJvY2Vzc2VzID0gT3V0cHV0 Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuZGVmYXVsdF9jaGlsZF9wcm9jZXNz ZXMsICgpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorICAgICAgICBleHBlY3Rl ZF9sb2dzID0gIkNhbm5vdCBydW4gdGVzdHMgaW4gcGFyYWxsZWwgb24gU25vdyBMZW9wYXJkIGR1 ZSB0byByZGFyOi8vcHJvYmxlbS8xMDYyMTUyNS5cbiIKKyAgICAgICAgY2hpbGRfcHJvY2Vzc2Vz ID0gT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuZGVmYXVsdF9jaGls ZF9wcm9jZXNzZXMsICgpLCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoY2hpbGRfcHJvY2Vzc2VzLCAxKQogCiAgICAgZGVmIHRlc3RfZ2V0X2Ny YXNoX2xvZyhzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDhmMmQ4MjhmNWUwMTI3MzdiZWZhZTc1 YzQyNThjMmY3Mjk4YmE4ZDUuLjA4ZmIxMWM4Mjc4NDkyNWRlNmNkMjJlMjYzNTk1Y2RlOWVlNWM3 YjUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjksNyArMjksNiBAQAogIyAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMg T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KIAotaW1wb3J0IGVycm5vCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9wdHBh cnNlCiBpbXBvcnQgb3MKQEAgLTM4LDcgKzM3LDYgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHRyYWNl YmFjawogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0Ci1mcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IHN0YWNrX3V0aWxzCiBmcm9tIHdlYmtpdHB5LmxheW91 dF90ZXN0cy5jb250cm9sbGVycy5tYW5hZ2VyIGltcG9ydCBNYW5hZ2VyCiBmcm9tIHdlYmtpdHB5 LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfZXhwZWN0YXRpb25zCiBmcm9tIHdlYmtp dHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBjb25maWd1cmF0aW9uX29wdGlvbnMsIHBsYXRm b3JtX29wdGlvbnMKQEAgLTkxLDE4ICs4OSwxMyBAQCBkZWYgbGludChwb3J0LCBvcHRpb25zKToK IAogZGVmIHJ1bihwb3J0LCBvcHRpb25zLCBhcmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJy LCBidWlsZGJvdF9vdXRwdXQ9c3lzLnN0ZG91dCk6CiAgICAgdHJ5OgotICAgICAgICB3YXJuaW5n cyA9IF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnQsIG9wdGlvbnMpCi0KICAgICAgICAgcHJp bnRlciA9IHByaW50aW5nLlByaW50ZXIocG9ydCwgb3B0aW9ucywgcmVndWxhcl9vdXRwdXQsIGJ1 aWxkYm90X291dHB1dCwgbG9nZ2VyPWxvZ2dpbmcuZ2V0TG9nZ2VyKCkpCiAKLSAgICAgICAgZm9y IHdhcm5pbmcgaW4gd2FybmluZ3M6Ci0gICAgICAgICAgICBfbG9nLndhcm5pbmcod2FybmluZykK KyAgICAgICAgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucykKIAogICAgICAg ICBpZiBvcHRpb25zLmxpbnRfdGVzdF9maWxlczoKICAgICAgICAgICAgIHJldHVybiBsaW50KHBv cnQsIG9wdGlvbnMpCiAKLSAgICAgICAgIyBXZSB3cmFwIGFueSBwYXJ0cyBvZiB0aGUgcnVuIHRo YXQgYXJlIHNsb3cgb3IgbGlrZWx5IHRvIHJhaXNlIGV4Y2VwdGlvbnMKLSAgICAgICAgIyBpbiBh IHRyeS9maW5hbGx5IHRvIGVuc3VyZSB0aGF0IHdlIGNsZWFuIHVwIHRoZSBsb2dnaW5nIGNvbmZp Z3VyYXRpb24uCiAgICAgICAgIG1hbmFnZXIgPSBNYW5hZ2VyKHBvcnQsIG9wdGlvbnMsIHByaW50 ZXIpCiAgICAgICAgIHByaW50ZXIucHJpbnRfY29uZmlnKHBvcnQucmVzdWx0c19kaXJlY3Rvcnko KSkKIApAQCAtMTE0LDkgKzEwNyw2IEBAIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgcmVn dWxhcl9vdXRwdXQ9c3lzLnN0ZGVyciwgYnVpbGRib3Rfb3V0cHV0PXN5cy5zdGRvCiAKIGRlZiBf c2V0X3VwX2Rlcml2ZWRfb3B0aW9ucyhwb3J0LCBvcHRpb25zKToKICAgICAiIiJTZXRzIHRoZSBv cHRpb25zIHZhbHVlcyB0aGF0IGRlcGVuZCBvbiBvdGhlciBvcHRpb25zIHZhbHVlcy4iIiIKLSAg ICAjIFdlIHJldHVybiBhIGxpc3Qgb2Ygd2FybmluZ3MgdG8gcHJpbnQgYWZ0ZXIgdGhlIHByaW50 ZXIgaXMgaW5pdGlhbGl6ZWQuCi0gICAgd2FybmluZ3MgPSBbXQotCiAgICAgaWYgbm90IG9wdGlv bnMuY2hpbGRfcHJvY2Vzc2VzOgogICAgICAgICBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyA9IG9z LmVudmlyb24uZ2V0KCJXRUJLSVRfVEVTVF9DSElMRF9QUk9DRVNTRVMiLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cihwb3J0LmRlZmF1bHRfY2hp bGRfcHJvY2Vzc2VzKCkpKQpAQCAtMTQyLDExICsxMzIsMTEgQEAgZGVmIF9zZXRfdXBfZGVyaXZl ZF9vcHRpb25zKHBvcnQsIG9wdGlvbnMpOgogICAgICAgICBvcHRpb25zLmFkZGl0aW9uYWxfcGxh dGZvcm1fZGlyZWN0b3J5ID0gYWRkaXRpb25hbF9wbGF0Zm9ybV9kaXJlY3RvcmllcwogCiAgICAg aWYgbm90IG9wdGlvbnMuaHR0cCBhbmQgb3B0aW9ucy5za2lwcGVkIGluICgnaWdub3JlJywgJ29u bHknKToKLSAgICAgICAgd2FybmluZ3MuYXBwZW5kKCItLWZvcmNlLy0tc2tpcHBlZD0lcyBvdmVy cmlkZXMgLS1uby1odHRwLiIgJSAob3B0aW9ucy5za2lwcGVkKSkKKyAgICAgICAgX2xvZy53YXJu aW5nKCItLWZvcmNlLy0tc2tpcHBlZD0lcyBvdmVycmlkZXMgLS1uby1odHRwLiIgJSAob3B0aW9u cy5za2lwcGVkKSkKICAgICAgICAgb3B0aW9ucy5odHRwID0gVHJ1ZQogCiAgICAgaWYgb3B0aW9u cy5pZ25vcmVfbWV0cmljcyBhbmQgKG9wdGlvbnMubmV3X2Jhc2VsaW5lIG9yIG9wdGlvbnMucmVz ZXRfcmVzdWx0cyk6Ci0gICAgICAgIHdhcm5pbmdzLmFwcGVuZCgiLS1pZ25vcmUtbWV0cmljcyBo YXMgbm8gZWZmZWN0IHdpdGggLS1uZXctYmFzZWxpbmVzIG9yIHdpdGggLS1yZXNldC1yZXN1bHRz IikKKyAgICAgICAgX2xvZy53YXJuaW5nKCItLWlnbm9yZS1tZXRyaWNzIGhhcyBubyBlZmZlY3Qg d2l0aCAtLW5ldy1iYXNlbGluZXMgb3Igd2l0aCAtLXJlc2V0LXJlc3VsdHMiKQogCiAgICAgaWYg b3B0aW9ucy5uZXdfYmFzZWxpbmU6CiAgICAgICAgIG9wdGlvbnMucmVzZXRfcmVzdWx0cyA9IFRy dWUKQEAgLTE2Miw3ICsxNTIsNyBAQCBkZWYgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwg b3B0aW9ucyk6CiAgICAgICAgICAgICAjIHRvIFBvcnQuCiAgICAgICAgICAgICBmaWxlc3lzdGVt ID0gcG9ydC5ob3N0LmZpbGVzeXN0ZW0KICAgICAgICAgICAgIGlmIG5vdCBmaWxlc3lzdGVtLmlz ZGlyKGZpbGVzeXN0ZW0uam9pbihwb3J0LmxheW91dF90ZXN0c19kaXIoKSwgZGlyZWN0b3J5KSk6 Ci0gICAgICAgICAgICAgICAgd2FybmluZ3MuYXBwZW5kKCInJXMnIHdhcyBwYXNzZWQgdG8gLS1w aXhlbC10ZXN0LWRpcmVjdG9yaWVzLCB3aGljaCBkb2Vzbid0IHNlZW0gdG8gYmUgYSBkaXJlY3Rv cnkiICUgc3RyKGRpcmVjdG9yeSkpCisgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCInJXMn IHdhcyBwYXNzZWQgdG8gLS1waXhlbC10ZXN0LWRpcmVjdG9yaWVzLCB3aGljaCBkb2Vzbid0IHNl ZW0gdG8gYmUgYSBkaXJlY3RvcnkiICUgc3RyKGRpcmVjdG9yeSkpCiAgICAgICAgICAgICBlbHNl OgogICAgICAgICAgICAgICAgIHZhcmlmaWVkX2RpcnMuYWRkKGRpcmVjdG9yeSkKIApAQCAtMTcx LDEwICsxNjEsOCBAQCBkZWYgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucyk6 CiAgICAgaWYgb3B0aW9ucy5ydW5fc2luZ2x5OgogICAgICAgICBvcHRpb25zLnZlcmJvc2UgPSBU cnVlCiAKLSAgICByZXR1cm4gd2FybmluZ3MKLQogCi1kZWYgX2NvbXBhdF9zaGltX2NhbGxiYWNr KG9wdGlvbiwgb3B0X3N0ciwgdmFsdWUsIHBhcnNlcik6CitkZWYgX2NvbXBhdF9zaGltX2NhbGxi YWNrKG9wdGlvbiwgb3B0X3N0ciwgdmFsdWUsIHBhcnNlcik6ICAjIGlnbm9yZSB1bnVzZWQgdmFy aWFibGUgd2FybmluZyAtIHB5bGludDogZGlzYWJsZS1tc2c9VzA2MTMKICAgICBwcmludCAiSWdu b3JpbmcgdW5zdXBwb3J0ZWQgb3B0aW9uOiAlcyIgJSBvcHRfc3RyCiAKIAo=