63793 2011-07-01 01:10:56 -0700 new-run-webkit-tests output gets confused when logging 2012-06-18 13:00:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64491 1 abarth dpranke abarth ap dpranke eric ojan webkit.review.bot oldest_to_newest 431046 0 abarth 2011-07-01 01:10:56 -0700 new-run-webkit-tests output gets confused when logging 431047 1 99443 abarth 2011-07-01 01:13:09 -0700 Created attachment 99443 Patch 431049 2 99443 eric 2011-07-01 01:17:31 -0700 Comment on attachment 99443 Patch OK. How do we test this? 431056 3 abarth 2011-07-01 01:31:00 -0700 > OK. How do we test this? Dunno. It actually fails in a different way. :( 431500 4 dpranke 2011-07-01 15:59:59 -0700 There are actually unit tests for this module (metered_stream_unittest.py). You can at least update them with what the expected behavior would be. I'm not surprised if it is failing in a different way, because I remember having to play with the ordering once or twice to get it to even mostly work. One solution would be to route all logging from the workers to the master so that it could coordinate the cursor state. I looked into doing that once (when we were getting duplicate messages in the log from the workers) but only got about halfway through before I realized the problem was actually that there were two loggers running in that case. Another (presumably much less portable) option would be to push the MeteredStream's state into some form of shared memory. 431523 5 99443 abarth 2011-07-01 16:30:24 -0700 Comment on attachment 99443 Patch Logging in NRWT is way too complicated. I'd prefer to just do something simpler. 645202 6 dpranke 2012-06-08 18:59:18 -0700 *** Bug 67164 has been marked as a duplicate of this bug. *** 649886 7 147733 dpranke 2012-06-14 22:31:48 -0700 Created attachment 147733 Patch 650533 8 147902 dpranke 2012-06-15 14:48:51 -0700 Created attachment 147902 Patch 651602 9 147902 abarth 2012-06-18 11:52:21 -0700 Comment on attachment 147902 Patch I don't really understand python logging enough to really understanding this patch. Are you looking for a real review or just a rubber stamp? 651611 10 147902 abarth 2012-06-18 12:10:43 -0700 Comment on attachment 147902 Patch dpranke told me in #webkit that he's just look for an rs here, which I'm happy to provide. 651637 11 dpranke 2012-06-18 13:00:07 -0700 Committed r120619: <http://trac.webkit.org/changeset/120619> 99443 2011-07-01 01:13:09 -0700 2012-06-14 22:31:44 -0700 Patch bug-63793-20110701011308.patch text/plain 2145 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDkwMjE3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjIgQEAKKzIwMTEtMDctMDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBuZXctcnVuLXdl YmtpdC10ZXN0cyBvdXRwdXQgZ2V0cyBjb25mdXNlZCB3aGVuIGxvZ2dpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYzNzkzCisKKyAgICAgICAgUHJl dmlvdXNseSwgdGhlIG1ldGVyZWQgc3RyZWFtIHdvdWxkIGxlYXZlIHRoZSBpbnNlcnRpb24gcG9p bnQgYXQgdGhlCisgICAgICAgIGVuZCBvZiB0aGUgbWV0ZXIsIHdoaWNoIGNhdXNlZCBwcm9ibGVt cyB3aGVuIG90aGVyIGNvZGUgcHJpbnRlZCAoZS5nLiwKKyAgICAgICAgdXNpbmcgUHl0aG9uIGxv Z2dpbmcgb3IgZnJvbSBhIHN1YnByb2Nlc3MpLiAgTm93IHdlIGtlZXAgdGhlIGluc2VydGlvbgor ICAgICAgICBwb2ludCBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBtZXRlciBzbyB0aGF0IHRoaXMg dGV4dCBpcyBpbnNlcnRlZAorICAgICAgICBiZWZvcmUgdGhlIG1ldGVyIGFuZCB0aGUgbWV0ZXIg Y2FuIGNvbnRpbnVlIHRvIHVwZGF0ZSBwcm9wZXJseS4KKworICAgICAgICBWaXN1YWxseSB0aGVy ZSBpcyBhIHNsaWdodCBkaWZmZXJlbmNlIGJlY2F1c2UgdGhlIE1hYyB0ZXJtaW5hbCBjdXJzb3IK KyAgICAgICAgaXMgcG9zaXRpb25lZCBhdCB0aGUgZnJvbnQgb2YgdGhlIG1ldGVyIChpbnN0ZWFk IG9mIHRoZSBlbmQpLCBidXQKKyAgICAgICAgdGhhdCdzIG5vcm1hbCBmb3IgdGhpcyBzb3J0IG9m IGNvbnNvbGUgVUkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9s YXlvdXRfcGFja2FnZS9tZXRlcmVkX3N0cmVhbS5weToKKwogMjAxMS0wNy0wMSAgU2hlcmlmZiBC b3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjkwMjEzLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvbWV0ZXJlZF9zdHJlYW0ucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWV0ZXJlZF9z dHJlYW0ucHkJKHJldmlzaW9uIDkwMjEyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWV0ZXJlZF9zdHJlYW0ucHkJKHdvcmtpbmcgY29weSkK QEAgLTcwLDEyICs3MCwxMiBAQCBjbGFzcyBNZXRlcmVkU3RyZWFtOgogICAgICAgICAjIFByaW50 IHRoZSBuZWNlc3NhcnkgbnVtYmVyIG9mIGJhY2tzcGFjZXMgdG8gZXJhc2UgdGhlIHByZXZpb3Vz CiAgICAgICAgICMgbWVzc2FnZS4KICAgICAgICAgaWYgbGVuKHNlbGYuX2xhc3RfdXBkYXRlKToK LSAgICAgICAgICAgIHNlbGYuX3N0cmVhbS53cml0ZSgiXGIiICogbGVuKHNlbGYuX2xhc3RfdXBk YXRlKSArCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAiICogbGVuKHNlbGYuX2xh c3RfdXBkYXRlKSArCisgICAgICAgICAgICBzZWxmLl9zdHJlYW0ud3JpdGUoIiAiICogbGVuKHNl bGYuX2xhc3RfdXBkYXRlKSArCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlxiIiAq IGxlbihzZWxmLl9sYXN0X3VwZGF0ZSkpCiAgICAgICAgIHNlbGYuX3N0cmVhbS53cml0ZSh0eHQp CiAgICAgICAgIGxhc3RfbmV3bGluZSA9IHR4dC5yZmluZCgiXG4iKQogICAgICAgICBzZWxmLl9s YXN0X3VwZGF0ZSA9IHR4dFsobGFzdF9uZXdsaW5lICsgMSk6XQorICAgICAgICBzZWxmLl9zdHJl YW0ud3JpdGUoIlxiIiAqIGxlbihzZWxmLl9sYXN0X3VwZGF0ZSkpCiAgICAgICAgIHNlbGYuX2Rp cnR5ID0gVHJ1ZQogCiAgICAgZGVmIF9yZXNldChzZWxmKToK 147733 2012-06-14 22:31:48 -0700 2012-06-15 14:48:47 -0700 Patch bug-63793-20120614223151.patch text/plain 9650 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGNiNTJmYWQ4MDMwMjM1ZWUyNTI0NzNjMzdiMTI0ZDMx MmY2NWVkNS4uZmFlZGFkZWU0N2Q1Mzc3MDVkYTllOWIxMmIzNzNiYThjNDhmN2MwMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1 IEBACisyMDEyLTA2LTE0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIG91dHB1dCBnZXRzIGNvbmZ1c2VkIHdoZW4gbG9n Z2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM3 OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGlw IGFsbCBvZiB0aGUgbG9nIG1lc3NhZ2VzIGdlbmVyYXRlZCBpbiB0aGUgd29ya2VyIGJhY2sKKyAg ICAgICAgdG8gdGhlIG1hbmFnZXI7IHRoaXMgYWxsb3dzIHRoZSBtZXNzYWdlcyB0byBiZSBwcm9w ZXJseQorICAgICAgICBzZXJpYWxpemVkIHRvIHN0ZGVyciBhbmQgZm9yIHRoZSBtZXRlciB0byBm bHVzaCBpdHMgb3V0cHV0CisgICAgICAgIGNvcnJlY3RseS4KKworICAgICAgICBXb3JrIGluIHBy b2dyZXNzOyBub3QgcmVhZHkgZm9yIHJldmlldy4gTmVlZHMgbW9yZSB0ZXN0aW5nLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w eToKKyAgICAgICAgKE1hbmFnZXIuaGFuZGxlX2RvbmUpOgorICAgICAgICAoTWFuYWdlci5oYW5k bGVfZmluaXNoZWRfdGVzdCk6CisgICAgICAgIChNYW5hZ2VyLl9sb2dfbWVzc2FnZXMpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5w eToKKyAgICAgICAgKFdvcmtlci5fX2luaXRfXyk6CisgICAgICAgIChXb3JrZXIuX3NldF91cF9s b2dnaW5nKToKKyAgICAgICAgKFdvcmtlci5ydW4pOgorICAgICAgICAoV29ya2VyLl9ydW5fdGVz dCk6CisgICAgICAgIChXb3JrZXIuY2xlYW51cCk6CisgICAgICAgIChXb3JrZXIucnVuX3Npbmds ZV90ZXN0KToKKyAgICAgICAgKF9Xb3JrZXJMb2dIYW5kbGVyKToKKyAgICAgICAgKF9Xb3JrZXJM b2dIYW5kbGVyLl9faW5pdF9fKToKKyAgICAgICAgKF9Xb3JrZXJMb2dIYW5kbGVyLmVtaXQpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL21ldGVyZWRfc3Ry ZWFtLnB5OgorICAgICAgICAoTWV0ZXJlZFN0cmVhbS53cml0ZSk6CisgICAgICAgIChNZXRlcmVk U3RyZWFtLndyaXRlbG4pOgorCiAyMDEyLTA2LTE0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpo dUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIEluaXRpYWxpemUg Zm9udCByZW5kZXJpbmcgaW4gRHVtcFJlbmRlclRyZWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4 IDBiMzM1ZGIxMGQ0NTM3YzRjZmU0OWQyMzdlZDI2YjE4NjE5NDA2MzkuLjU3ODhkNGQ4NTA5YjVl Y2ZjMGRkOTljZjA3OWU2YjlkZTMyZjYzNGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtMTQ2 Miw5ICsxNDYyLDEwIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgd29ya2VyX3N0 YXRlLmN1cnJlbnRfdGVzdF9uYW1lID0gdGVzdF9pbmZvLnRlc3RfbmFtZQogICAgICAgICB3b3Jr ZXJfc3RhdGUubmV4dF90aW1lb3V0ID0gdGltZS50aW1lKCkgKyBoYW5nX3RpbWVvdXQKIAotICAg IGRlZiBoYW5kbGVfZG9uZShzZWxmLCBzb3VyY2UpOgorICAgIGRlZiBoYW5kbGVfZG9uZShzZWxm LCBzb3VyY2UsIGxvZ19tZXNzYWdlcz1Ob25lKToKICAgICAgICAgd29ya2VyX3N0YXRlID0gc2Vs Zi5fd29ya2VyX3N0YXRlc1tzb3VyY2VdCiAgICAgICAgIHdvcmtlcl9zdGF0ZS5kb25lID0gVHJ1 ZQorICAgICAgICBzZWxmLl9sb2dfbWVzc2FnZXMobG9nX21lc3NhZ2VzKQogCiAgICAgZGVmIGhh bmRsZV9leGNlcHRpb24oc2VsZiwgc291cmNlLCBleGNlcHRpb25fdHlwZSwgZXhjZXB0aW9uX3Zh bHVlLCBzdGFjayk6CiAgICAgICAgIGlmIGV4Y2VwdGlvbl90eXBlIGluIChLZXlib2FyZEludGVy cnVwdCwgVGVzdFJ1bkludGVycnVwdGVkRXhjZXB0aW9uKToKQEAgLTE0OTEsMTYgKzE0OTIsMjEg QEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgaWYgbm90IHNlbGYuX3JlbWFp bmluZ19sb2NrZWRfc2hhcmRzOgogICAgICAgICAgICAgICAgIHNlbGYuc3RvcF9zZXJ2ZXJzX3dp dGhfbG9jaygpCiAKLSAgICBkZWYgaGFuZGxlX2ZpbmlzaGVkX3Rlc3Qoc2VsZiwgc291cmNlLCBy ZXN1bHQsIGVsYXBzZWRfdGltZSk6CisgICAgZGVmIGhhbmRsZV9maW5pc2hlZF90ZXN0KHNlbGYs IHNvdXJjZSwgcmVzdWx0LCBlbGFwc2VkX3RpbWUsIGxvZ19tZXNzYWdlcz1Ob25lKToKICAgICAg ICAgd29ya2VyX3N0YXRlID0gc2VsZi5fd29ya2VyX3N0YXRlc1tzb3VyY2VdCiAgICAgICAgIHdv cmtlcl9zdGF0ZS5uZXh0X3RpbWVvdXQgPSBOb25lCiAgICAgICAgIHdvcmtlcl9zdGF0ZS5jdXJy ZW50X3Rlc3RfbmFtZSA9IE5vbmUKICAgICAgICAgd29ya2VyX3N0YXRlLnN0YXRzWyd0b3RhbF90 aW1lJ10gKz0gZWxhcHNlZF90aW1lCiAgICAgICAgIHdvcmtlcl9zdGF0ZS5zdGF0c1snbnVtX3Rl c3RzJ10gKz0gMQogCisgICAgICAgIHNlbGYuX2xvZ19tZXNzYWdlcyhsb2dfbWVzc2FnZXMpCiAg ICAgICAgIHNlbGYuX2FsbF9yZXN1bHRzLmFwcGVuZChyZXN1bHQpCiAgICAgICAgIHNlbGYuX3Vw ZGF0ZV9zdW1tYXJ5X3dpdGhfcmVzdWx0KHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnksIHJl c3VsdCkKIAorICAgIGRlZiBfbG9nX21lc3NhZ2VzKHNlbGYsIG1lc3NhZ2VzKToKKyAgICAgICAg Zm9yIG1lc3NhZ2UgaW4gbWVzc2FnZXM6CisgICAgICAgICAgICBzZWxmLl9wcmludGVyLl9tZXRl ci53cml0ZWxuKCptZXNzYWdlKQorCiAgICAgZGVmIF9sb2dfd29ya2VyX3N0YWNrKHNlbGYsIHN0 YWNrKToKICAgICAgICAgd2Via2l0cHlkaXIgPSBzZWxmLl9wb3J0LnBhdGhfZnJvbV93ZWJraXRf YmFzZSgnVG9vbHMnLCAnU2NyaXB0cycsICd3ZWJraXRweScpICsgc2VsZi5fZmlsZXN5c3RlbS5z ZXAKICAgICAgICAgZm9yIGZpbGVuYW1lLCBsaW5lX251bWJlciwgZnVuY3Rpb25fbmFtZSwgdGV4 dCBpbiBzdGFjazoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQppbmRleCBhMWUzYmVlNzBlYjI5MmYyN2Q1MGMz MWY4MjYxNWM4YzdjZGI3OTBjLi41NzM2MDk0M2RmY2ExNTYxY2IxMDkyNGJlMGQ5M2NhYmRhNDUw NjY4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy93b3JrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvd29ya2VyLnB5CkBAIC0yOSw2ICsyOSw3IEBACiAiIiJIYW5kbGUgbWVz c2FnZXMgZnJvbSB0aGUgTWFuYWdlciBhbmQgZXhlY3V0ZXMgYWN0dWFsIHRlc3RzLiIiIgogCiBp bXBvcnQgbG9nZ2luZworaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiBpbXBvcnQgdGhyZWFkaW5nCiBp bXBvcnQgdGltZQpAQCAtNjUsNyArNjYsOSBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJf YnJva2VyLkFic3RyYWN0V29ya2VyKToKICAgICAgICAgc2VsZi5fZHJpdmVyID0gTm9uZQogICAg ICAgICBzZWxmLl90ZXN0c19ydW5fZmlsZSA9IE5vbmUKICAgICAgICAgc2VsZi5fdGVzdHNfcnVu X2ZpbGVuYW1lID0gTm9uZQotICAgICAgICBzZWxmLl9tZXRlciA9IE5vbmUKKyAgICAgICAgc2Vs Zi5fbG9nX21lc3NhZ2VzID0gW10KKyAgICAgICAgc2VsZi5fbG9nZ2VyID0gTm9uZQorICAgICAg ICBzZWxmLl9sb2dfaGFuZGxlciA9IE5vbmUKIAogICAgIGRlZiBfX2RlbF9fKHNlbGYpOgogICAg ICAgICBzZWxmLmNsZWFudXAoKQpAQCAtODYsMjYgKzg5LDE3IEBAIGNsYXNzIFdvcmtlcihtYW5h Z2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICAjIFRoZSB1bml4IG11 bHRpcHJvY2Vzc2luZyBpbXBsZW1lbnRhdGlvbiBjbG9uZXMgdGhlIE1ldGVyZWRTdHJlYW0gbG9n IGhhbmRsZXIKICAgICAgICAgIyBpbnRvIHRoZSBjaGlsZCBwcm9jZXNzLCBzbyB3ZSBuZWVkIHRv IHJlbW92ZSBpdCBiZWZvcmUgd2UgY2FuCiAgICAgICAgICMgYWRkIGEgbmV3IG9uZSB0byBnZXQg dGhlIGNvcnJlY3QgcGlkIGxvZ2dlZC4KLSAgICAgICAgcm9vdF9sb2dnZXIgPSBsb2dnaW5nLmdl dExvZ2dlcigpCi0gICAgICAgIGhhbmRsZXJfdG9fcmVtb3ZlID0gTm9uZQotICAgICAgICBmb3Ig aCBpbiByb290X2xvZ2dlci5oYW5kbGVyczoKKyAgICAgICAgc2VsZi5fbG9nZ2VyID0gbG9nZ2lu Zy5nZXRMb2dnZXIoKQorICAgICAgICBmb3IgaCBpbiBzZWxmLl9sb2dnZXIuaGFuZGxlcnM6CiAg ICAgICAgICAgICAjIGxvZyBoYW5kbGVycyBkb24ndCBoYXZlIG5hbWVzIHVudGlsIHB5dGhvbiAy LjcuCiAgICAgICAgICAgICBpZiBnZXRhdHRyKGgsICduYW1lJywgJycpID09IG1ldGVyZWRfc3Ry ZWFtLkxPR19IQU5ETEVSX05BTUU6Ci0gICAgICAgICAgICAgICAgaGFuZGxlcl90b19yZW1vdmUg PSBoCisgICAgICAgICAgICAgICAgc2VsZi5fbG9nZ2VyLnJlbW92ZUhhbmRsZXIoaCkKICAgICAg ICAgICAgICAgICBicmVhawotICAgICAgICBpZiBoYW5kbGVyX3RvX3JlbW92ZToKLSAgICAgICAg ICAgIHJvb3RfbG9nZ2VyLnJlbW92ZUhhbmRsZXIoaGFuZGxlcl90b19yZW1vdmUpCi0KLSAgICAg ICAgIyBGSVhNRTogVGhpcyB3b24ndCB3b3JrIGlmIHRoZSBjYWxsaW5nIHByb2Nlc3MgaXMgbG9n Z2luZwotICAgICAgICAjIHNvbWV3aGVyZSBvdGhlciB0aGFuIHN5cy5zdGRlcnIsIGJ1dCBJJ20g bm90IHN1cmUKLSAgICAgICAgIyBpZiB0aGlzIHdpbGwgYmUgYW4gaXNzdWUgaW4gcHJhY3RpY2Uu IEFsc28sIGl0IHdvdWxkIGJlCi0gICAgICAgICMgbmljZSBpZiB3ZSB0cmFwcGVkIGFsbCBvZiB0 aGUgbWVzc2FnZXMgZm9yIGEgZ2l2ZW4gdGVzdAotICAgICAgICAjIGFuZCBzZW50IHRoZW0gYmFj ayBpbiBmaW5pc2hlZF90ZXN0KCkgcmF0aGVyIHRoYW4gbG9nZ2luZwotICAgICAgICAjIHRoZW0g dG8gc3RkZXJyLgotICAgICAgICBpZiBub3Qgcm9vdF9sb2dnZXIuaGFuZGxlcnM6Ci0gICAgICAg ICAgICBvcHRpb25zID0gc2VsZi5fb3B0aW9ucwotICAgICAgICAgICAgcm9vdF9sb2dnZXIuc2V0 TGV2ZWwobG9nZ2luZy5ERUJVRyBpZiBvcHRpb25zLnZlcmJvc2UgZWxzZSBsb2dnaW5nLklORk8p Ci0gICAgICAgICAgICBzZWxmLl9tZXRlciA9IG1ldGVyZWRfc3RyZWFtLk1ldGVyZWRTdHJlYW0o c3lzLnN0ZGVyciwgb3B0aW9ucy52ZXJib3NlLCBsb2dnZXI9cm9vdF9sb2dnZXIpCisKKyAgICAg ICAgb3B0aW9ucyA9IHNlbGYuX29wdGlvbnMKKyAgICAgICAgc2VsZi5fbG9nZ2VyLnNldExldmVs KGxvZ2dpbmcuREVCVUcgaWYgb3B0aW9ucy52ZXJib3NlIGVsc2UgbG9nZ2luZy5JTkZPKQorICAg ICAgICBzZWxmLl9sb2dfaGFuZGxlciA9IF9Xb3JrZXJMb2dIYW5kbGVyKHNlbGYpCisgICAgICAg IHNlbGYuX2xvZ2dlci5hZGRIYW5kbGVyKHNlbGYuX2xvZ19oYW5kbGVyKQogCiAgICAgZGVmIF9z ZXRfdXBfaG9zdF9hbmRfcG9ydChzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IHNlbGYuX29wdGlv bnMKQEAgLTEzMiw5ICsxMjYsOSBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2Vy LkFic3RyYWN0V29ya2VyKToKICAgICAgICAgICAgIHN1cGVyKFdvcmtlciwgc2VsZikucnVuKCkK ICAgICAgICAgZmluYWxseToKICAgICAgICAgICAgIHNlbGYua2lsbF9kcml2ZXIoKQotICAgICAg ICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdkb25lJykKICAgICAg ICAgICAgIF9sb2cuZGVidWcoIiVzIGV4aXRpbmciICUgc2VsZi5fbmFtZSkKICAgICAgICAgICAg IHNlbGYuY2xlYW51cCgpCisgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0 X21lc3NhZ2UoJ2RvbmUnLCBzZWxmLl9sb2dfbWVzc2FnZXMpCiAKICAgICBkZWYgaGFuZGxlX3Rl c3RfbGlzdChzZWxmLCBzcmMsIGxpc3RfbmFtZSwgdGVzdF9saXN0KToKICAgICAgICAgc3RhcnRf dGltZSA9IHRpbWUudGltZSgpCkBAIC0xNzEsNyArMTY1LDkgQEAgY2xhc3MgV29ya2VyKG1hbmFn ZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgIHJlc3VsdCA9IHNlbGYu cnVuX3Rlc3Rfd2l0aF90aW1lb3V0KHRlc3RfaW5wdXQsIHRlc3RfdGltZW91dF9zZWMpCiAKICAg ICAgICAgZWxhcHNlZF90aW1lID0gdGltZS50aW1lKCkgLSBzdGFydAotICAgICAgICBzZWxmLl93 b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2ZpbmlzaGVkX3Rlc3QnLCByZXN1bHQsIGVs YXBzZWRfdGltZSkKKyAgICAgICAgbG9nX21lc3NhZ2VzID0gc2VsZi5fbG9nX21lc3NhZ2VzCisg ICAgICAgIHNlbGYuX2xvZ19tZXNzYWdlcyA9IFtdCisgICAgICAgIHNlbGYuX3dvcmtlcl9jb25u ZWN0aW9uLnBvc3RfbWVzc2FnZSgnZmluaXNoZWRfdGVzdCcsIHJlc3VsdCwgZWxhcHNlZF90aW1l LCBsb2dfbWVzc2FnZXMpCiAKICAgICAgICAgc2VsZi5jbGVhbl91cF9hZnRlcl90ZXN0KHRlc3Rf aW5wdXQsIHJlc3VsdCkKIApAQCAtMTgxLDkgKzE3Nyw2IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2Vy X3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICBpZiBzZWxmLl90ZXN0c19y dW5fZmlsZToKICAgICAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxlLmNsb3NlKCkKICAgICAg ICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxlID0gTm9uZQotICAgICAgICBpZiBzZWxmLl9tZXRl cjoKLSAgICAgICAgICAgIHNlbGYuX21ldGVyLmNsZWFudXAoKQotICAgICAgICAgICAgc2VsZi5f bWV0ZXIgPSBOb25lCiAKICAgICBkZWYgdGltZW91dChzZWxmLCB0ZXN0X2lucHV0KToKICAgICAg ICAgIiIiQ29tcHV0ZSB0aGUgYXBwcm9wcmlhdGUgdGltZW91dCB2YWx1ZSBmb3IgYSB0ZXN0LiIi IgpAQCAtMzAwLDMgKzI5MywxMyBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2Vy LkFic3RyYWN0V29ya2VyKToKICAgICBkZWYgcnVuX3NpbmdsZV90ZXN0KHNlbGYsIGRyaXZlciwg dGVzdF9pbnB1dCk6CiAgICAgICAgIHJldHVybiBzaW5nbGVfdGVzdF9ydW5uZXIucnVuX3Npbmds ZV90ZXN0KHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMsCiAgICAgICAgICAgICB0ZXN0X2lucHV0 LCBkcml2ZXIsIHNlbGYuX25hbWUpCisKKworY2xhc3MgX1dvcmtlckxvZ0hhbmRsZXIobG9nZ2lu Zy5IYW5kbGVyKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgd29ya2VyKToKKyAgICAgICAgbG9n Z2luZy5IYW5kbGVyLl9faW5pdF9fKHNlbGYpCisgICAgICAgIHNlbGYuX3dvcmtlciA9IHdvcmtl cgorICAgICAgICBzZWxmLl9waWQgPSBvcy5nZXRwaWQoKQorCisgICAgZGVmIGVtaXQoc2VsZiwg cmVjb3JkKToKKyAgICAgICAgc2VsZi5fd29ya2VyLl9sb2dfbWVzc2FnZXMuYXBwZW5kKChyZWNv cmQuZ2V0TWVzc2FnZSgpLCByZWNvcmQuY3JlYXRlZCwgc2VsZi5fcGlkKSkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL21ldGVyZWRfc3RyZWFt LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9z dHJlYW0ucHkKaW5kZXggNDlhNTA3ZWQ2M2RlMTRhNzZlNTJkYjY0Y2NmZjc0OGNhZDg2MDZlNS4u NDlhOWE4ZDhhNmUzYTQ5ODAxNDRiM2FhZWJjMTMzYzNjZTc1YmJkZSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9zdHJlYW0ucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9z dHJlYW0ucHkKQEAgLTkxLDE0ICs5MSwxNSBAQCBjbGFzcyBNZXRlcmVkU3RyZWFtKG9iamVjdCk6 CiAgICAgICAgIGlmIHNlbGYuX2VyYXNpbmc6CiAgICAgICAgICAgICBzZWxmLl9sYXN0X3BhcnRp YWxfbGluZSA9IHR4dFt0eHQucmZpbmQoJ1xuJykgKyAxOl0KIAotICAgIGRlZiB3cml0ZShzZWxm LCB0eHQsIG5vdz1Ob25lKToKKyAgICBkZWYgd3JpdGUoc2VsZiwgdHh0LCBub3c9Tm9uZSwgcGlk PU5vbmUpOgogICAgICAgICBub3cgPSBub3cgb3Igc2VsZi5fdGltZV9mbigpCisgICAgICAgIHBp ZCA9IHBpZCBvciBzZWxmLl9waWQKICAgICAgICAgc2VsZi5fbGFzdF93cml0ZV90aW1lID0gbm93 CiAgICAgICAgIGlmIHNlbGYuX2xhc3RfcGFydGlhbF9saW5lOgogICAgICAgICAgICAgc2VsZi5f ZXJhc2VfbGFzdF9wYXJ0aWFsX2xpbmUoKQogICAgICAgICBpZiBzZWxmLl92ZXJib3NlOgogICAg ICAgICAgICAgbm93X3R1cGxlID0gdGltZS5sb2NhbHRpbWUobm93KQotICAgICAgICAgICAgbXNn ID0gJyUwMmQ6JTAyZDolMDJkLiUwM2QgJWQgJXMnICUgKG5vd190dXBsZS50bV9ob3VyLCBub3df dHVwbGUudG1fbWluLCBub3dfdHVwbGUudG1fc2VjLCBpbnQoKG5vdyAqIDEwMDApICUgMTAwMCks IHNlbGYuX3BpZCwgc2VsZi5fZW5zdXJlX25ld2xpbmUodHh0KSkKKyAgICAgICAgICAgIG1zZyA9 ICclMDJkOiUwMmQ6JTAyZC4lMDNkICVkICVzJyAlIChub3dfdHVwbGUudG1faG91ciwgbm93X3R1 cGxlLnRtX21pbiwgbm93X3R1cGxlLnRtX3NlYywgaW50KChub3cgKiAxMDAwKSAlIDEwMDApLCBw aWQsIHNlbGYuX2Vuc3VyZV9uZXdsaW5lKHR4dCkpCiAgICAgICAgIGVsaWYgc2VsZi5faXNhdHR5 OgogICAgICAgICAgICAgbXNnID0gdHh0CiAgICAgICAgIGVsc2U6CkBAIC0xMDYsOCArMTA3LDgg QEAgY2xhc3MgTWV0ZXJlZFN0cmVhbShvYmplY3QpOgogCiAgICAgICAgIHNlbGYuX3N0cmVhbS53 cml0ZShtc2cpCiAKLSAgICBkZWYgd3JpdGVsbihzZWxmLCB0eHQsIG5vdz1Ob25lKToKLSAgICAg ICAgc2VsZi53cml0ZShzZWxmLl9lbnN1cmVfbmV3bGluZSh0eHQpLCBub3cpCisgICAgZGVmIHdy aXRlbG4oc2VsZiwgdHh0LCBub3c9Tm9uZSwgcGlkPU5vbmUpOgorICAgICAgICBzZWxmLndyaXRl KHNlbGYuX2Vuc3VyZV9uZXdsaW5lKHR4dCksIG5vdywgcGlkKQogCiAgICAgZGVmIF9lcmFzZV9s YXN0X3BhcnRpYWxfbGluZShzZWxmKToKICAgICAgICAgbnVtX2NoYXJzID0gbGVuKHNlbGYuX2xh c3RfcGFydGlhbF9saW5lKQo= 147902 2012-06-15 14:48:51 -0700 2012-06-18 12:10:43 -0700 Patch bug-63793-20120615144850.patch text/plain 11140 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNDg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2E0OGEwM2Q2MDI2OWNmNzc4OTgxZjEwNjE3NDY3MTll ODIzM2FhNS4uYmNlNjY3OWQ1MzU5YWYyZjcxMDQ3ZjI4OWUxNjQ5MjRkM2Q0MmZjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0 IEBACiAyMDEyLTA2LTE1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIG91dHB1dCBnZXRzIGNvbmZ1c2VkIHdoZW4gbG9n Z2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM3 OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGlw IGFsbCBvZiB0aGUgbG9nIG1lc3NhZ2VzIGdlbmVyYXRlZCBpbiB0aGUgd29ya2VyIGJhY2sKKyAg ICAgICAgdG8gdGhlIG1hbmFnZXI7IHRoaXMgYWxsb3dzIHRoZSBtZXNzYWdlcyB0byBiZSBwcm9w ZXJseQorICAgICAgICBzZXJpYWxpemVkIHRvIHN0ZGVyciBhbmQgZm9yIHRoZSBtZXRlciB0byBm bHVzaCBpdHMgb3V0cHV0IGNvcnJlY3RseS4KKworICAgICAgICBOb3RlIGhvd2V2ZXIgdGhhdCB0 aGlzIHdpbGwgbGlrZWx5IHJlc3VsdCBpbiBtZXNzYWdlcyB0byBiZQorICAgICAgICBsb2dnZWQg b3V0IG9mIG9yZGVyIGJldHdlZW4gd29ya2VyczsgSSdtIG5vdCBzdXJlIHRoYXQgdGhlcmUncwor ICAgICAgICBhbiBlYXN5IHdheSB0byBmaXggdGhpcyBzaG9ydCBvZiBidWZmZXJpbmcgYSBwb3Rl bnRpYWxseQorICAgICAgICB1bmJvdW5kZWQgYW1vdW50IG9mIGRhdGEuIEl0IG1pZ2h0IGJlIGJl dHRlciB0byBqdXN0IGxvZyB0aHJvdWdoCisgICAgICAgIHN0ZGVyciB1bmxlc3Mgd2UncmUgaW4g J21ldGVyaW5nJyBtb2RlLCBidXQgaXQncyBhbHNvIHdvcnRoCisgICAgICAgIG5vdGluZyB0aGF0 IHdlIGFscmVhZHkgZ2V0IG1lc3NhZ2VzIG91dCBvZiBvcmRlciB0aHJvdWdoIHN0ZGVycgorICAg ICAgICBvbiBXaW5kb3dzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuaGFuZGxlX2RvbmUp OgorICAgICAgICAoTWFuYWdlci5oYW5kbGVfZmluaXNoZWRfdGVzdCk6CisgICAgICAgIChNYW5h Z2VyLl9sb2dfbWVzc2FnZXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weToKKyAgICAgICAgKFdvcmtlci5fX2luaXRfXyk6Cisg ICAgICAgIChXb3JrZXIuX3NldF91cF9sb2dnaW5nKToKKyAgICAgICAgKFdvcmtlci5ydW4pOgor ICAgICAgICAoV29ya2VyLl9ydW5fdGVzdCk6CisgICAgICAgIChXb3JrZXIuY2xlYW51cCk6Cisg ICAgICAgIChXb3JrZXIucnVuX3NpbmdsZV90ZXN0KToKKyAgICAgICAgKF9Xb3JrZXJMb2dIYW5k bGVyKToKKyAgICAgICAgKF9Xb3JrZXJMb2dIYW5kbGVyLl9faW5pdF9fKToKKyAgICAgICAgKF9X b3JrZXJMb2dIYW5kbGVyLmVtaXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3ZpZXdzL21ldGVyZWRfc3RyZWFtLnB5OgorICAgICAgICAoTWV0ZXJlZFN0cmVhbS53 cml0ZSk6CisgICAgICAgIChNZXRlcmVkU3RyZWFtLndyaXRlbG4pOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5OgorICAgICAgICAoUHJp bnRlci53cml0ZWxuKToKKworMjAxMi0wNi0xNSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9t aXVtLm9yZz4KKwogICAgICAgICB3ZWJraXRweTogcmVtb3ZlIER1bW15T3B0aW9ucyBhbmQgY2xl YW4gdXAgdGhlIGNvZGUgaW4gUG9ydC5nZXRfb3B0aW9uKCkgYW5kIFBvcnQuc2V0X29wdGlvbl9k ZWZhdWx0KCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg5MTM1CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IDBiMzM1ZGIxMGQ0NTM3YzRjZmU0OWQy MzdlZDI2YjE4NjE5NDA2MzkuLjI2NWZmNDM0N2FkY2MwM2YzM2JmZWFkMmUyMTU3ZGY4MTU4OWM5 ODAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtMTQ2Miw5ICsxNDYyLDEwIEBAIGNsYXNzIE1h bmFnZXIob2JqZWN0KToKICAgICAgICAgd29ya2VyX3N0YXRlLmN1cnJlbnRfdGVzdF9uYW1lID0g dGVzdF9pbmZvLnRlc3RfbmFtZQogICAgICAgICB3b3JrZXJfc3RhdGUubmV4dF90aW1lb3V0ID0g dGltZS50aW1lKCkgKyBoYW5nX3RpbWVvdXQKIAotICAgIGRlZiBoYW5kbGVfZG9uZShzZWxmLCBz b3VyY2UpOgorICAgIGRlZiBoYW5kbGVfZG9uZShzZWxmLCBzb3VyY2UsIGxvZ19tZXNzYWdlcz1O b25lKToKICAgICAgICAgd29ya2VyX3N0YXRlID0gc2VsZi5fd29ya2VyX3N0YXRlc1tzb3VyY2Vd CiAgICAgICAgIHdvcmtlcl9zdGF0ZS5kb25lID0gVHJ1ZQorICAgICAgICBzZWxmLl9sb2dfbWVz c2FnZXMobG9nX21lc3NhZ2VzKQogCiAgICAgZGVmIGhhbmRsZV9leGNlcHRpb24oc2VsZiwgc291 cmNlLCBleGNlcHRpb25fdHlwZSwgZXhjZXB0aW9uX3ZhbHVlLCBzdGFjayk6CiAgICAgICAgIGlm IGV4Y2VwdGlvbl90eXBlIGluIChLZXlib2FyZEludGVycnVwdCwgVGVzdFJ1bkludGVycnVwdGVk RXhjZXB0aW9uKToKQEAgLTE0OTEsMTYgKzE0OTIsMjEgQEAgY2xhc3MgTWFuYWdlcihvYmplY3Qp OgogICAgICAgICAgICAgaWYgbm90IHNlbGYuX3JlbWFpbmluZ19sb2NrZWRfc2hhcmRzOgogICAg ICAgICAgICAgICAgIHNlbGYuc3RvcF9zZXJ2ZXJzX3dpdGhfbG9jaygpCiAKLSAgICBkZWYgaGFu ZGxlX2ZpbmlzaGVkX3Rlc3Qoc2VsZiwgc291cmNlLCByZXN1bHQsIGVsYXBzZWRfdGltZSk6Cisg ICAgZGVmIGhhbmRsZV9maW5pc2hlZF90ZXN0KHNlbGYsIHNvdXJjZSwgcmVzdWx0LCBlbGFwc2Vk X3RpbWUsIGxvZ19tZXNzYWdlcz1Ob25lKToKICAgICAgICAgd29ya2VyX3N0YXRlID0gc2VsZi5f d29ya2VyX3N0YXRlc1tzb3VyY2VdCiAgICAgICAgIHdvcmtlcl9zdGF0ZS5uZXh0X3RpbWVvdXQg PSBOb25lCiAgICAgICAgIHdvcmtlcl9zdGF0ZS5jdXJyZW50X3Rlc3RfbmFtZSA9IE5vbmUKICAg ICAgICAgd29ya2VyX3N0YXRlLnN0YXRzWyd0b3RhbF90aW1lJ10gKz0gZWxhcHNlZF90aW1lCiAg ICAgICAgIHdvcmtlcl9zdGF0ZS5zdGF0c1snbnVtX3Rlc3RzJ10gKz0gMQogCisgICAgICAgIHNl bGYuX2xvZ19tZXNzYWdlcyhsb2dfbWVzc2FnZXMpCiAgICAgICAgIHNlbGYuX2FsbF9yZXN1bHRz LmFwcGVuZChyZXN1bHQpCiAgICAgICAgIHNlbGYuX3VwZGF0ZV9zdW1tYXJ5X3dpdGhfcmVzdWx0 KHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnksIHJlc3VsdCkKIAorICAgIGRlZiBfbG9nX21l c3NhZ2VzKHNlbGYsIG1lc3NhZ2VzKToKKyAgICAgICAgZm9yIG1lc3NhZ2UgaW4gbWVzc2FnZXM6 CisgICAgICAgICAgICBzZWxmLl9wcmludGVyLndyaXRlbG4oKm1lc3NhZ2UpCisKICAgICBkZWYg X2xvZ193b3JrZXJfc3RhY2soc2VsZiwgc3RhY2spOgogICAgICAgICB3ZWJraXRweWRpciA9IHNl bGYuX3BvcnQucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdUb29scycsICdTY3JpcHRzJywgJ3dlYmtp dHB5JykgKyBzZWxmLl9maWxlc3lzdGVtLnNlcAogICAgICAgICBmb3IgZmlsZW5hbWUsIGxpbmVf bnVtYmVyLCBmdW5jdGlvbl9uYW1lLCB0ZXh0IGluIHN0YWNrOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29ya2VyLnB5Cmlu ZGV4IGExZTNiZWU3MGViMjkyZjI3ZDUwYzMxZjgyNjE1YzhjN2NkYjc5MGMuLmQzMjFiNWE0MTVl Y2NiNGU4NWQ0MTg5MzI2MTlhOWUwZDI3NjBhNmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkKQEAgLTI5 LDYgKzI5LDcgQEAKICIiIkhhbmRsZSBtZXNzYWdlcyBmcm9tIHRoZSBNYW5hZ2VyIGFuZCBleGVj dXRlcyBhY3R1YWwgdGVzdHMuIiIiCiAKIGltcG9ydCBsb2dnaW5nCitpbXBvcnQgb3MKIGltcG9y dCBzeXMKIGltcG9ydCB0aHJlYWRpbmcKIGltcG9ydCB0aW1lCkBAIC02NSw3ICs2Niw5IEBAIGNs YXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAg ICBzZWxmLl9kcml2ZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxlID0gTm9u ZQogICAgICAgICBzZWxmLl90ZXN0c19ydW5fZmlsZW5hbWUgPSBOb25lCi0gICAgICAgIHNlbGYu X21ldGVyID0gTm9uZQorICAgICAgICBzZWxmLl9sb2dfbWVzc2FnZXMgPSBbXQorICAgICAgICBz ZWxmLl9sb2dnZXIgPSBOb25lCisgICAgICAgIHNlbGYuX2xvZ19oYW5kbGVyID0gTm9uZQogCiAg ICAgZGVmIF9fZGVsX18oc2VsZik6CiAgICAgICAgIHNlbGYuY2xlYW51cCgpCkBAIC04MywyOSAr ODYsMTkgQEAgY2xhc3MgV29ya2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtl cik6CiAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxlID0gc2VsZi5fZmlsZXN5c3RlbS5vcGVu X3RleHRfZmlsZV9mb3Jfd3JpdGluZyh0ZXN0c19ydW5fZmlsZW5hbWUpCiAKICAgICBkZWYgX3Nl dF91cF9sb2dnaW5nKHNlbGYpOgorICAgICAgICBzZWxmLl9sb2dnZXIgPSBsb2dnaW5nLmdldExv Z2dlcigpCisKICAgICAgICAgIyBUaGUgdW5peCBtdWx0aXByb2Nlc3NpbmcgaW1wbGVtZW50YXRp b24gY2xvbmVzIHRoZSBNZXRlcmVkU3RyZWFtIGxvZyBoYW5kbGVyCi0gICAgICAgICMgaW50byB0 aGUgY2hpbGQgcHJvY2Vzcywgc28gd2UgbmVlZCB0byByZW1vdmUgaXQgYmVmb3JlIHdlIGNhbgot ICAgICAgICAjIGFkZCBhIG5ldyBvbmUgdG8gZ2V0IHRoZSBjb3JyZWN0IHBpZCBsb2dnZWQuCi0g ICAgICAgIHJvb3RfbG9nZ2VyID0gbG9nZ2luZy5nZXRMb2dnZXIoKQotICAgICAgICBoYW5kbGVy X3RvX3JlbW92ZSA9IE5vbmUKLSAgICAgICAgZm9yIGggaW4gcm9vdF9sb2dnZXIuaGFuZGxlcnM6 CisgICAgICAgICMgaW50byB0aGUgY2hpbGQgcHJvY2Vzcywgc28gd2UgbmVlZCB0byByZW1vdmUg aXQgdG8gYXZvaWQgZHVwbGljYXRlIGxvZ2dpbmcuCisgICAgICAgIGZvciBoIGluIHNlbGYuX2xv Z2dlci5oYW5kbGVyczoKICAgICAgICAgICAgICMgbG9nIGhhbmRsZXJzIGRvbid0IGhhdmUgbmFt ZXMgdW50aWwgcHl0aG9uIDIuNy4KICAgICAgICAgICAgIGlmIGdldGF0dHIoaCwgJ25hbWUnLCAn JykgPT0gbWV0ZXJlZF9zdHJlYW0uTE9HX0hBTkRMRVJfTkFNRToKLSAgICAgICAgICAgICAgICBo YW5kbGVyX3RvX3JlbW92ZSA9IGgKKyAgICAgICAgICAgICAgICBzZWxmLl9sb2dnZXIucmVtb3Zl SGFuZGxlcihoKQogICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgIGlmIGhhbmRsZXJfdG9f cmVtb3ZlOgotICAgICAgICAgICAgcm9vdF9sb2dnZXIucmVtb3ZlSGFuZGxlcihoYW5kbGVyX3Rv X3JlbW92ZSkKLQotICAgICAgICAjIEZJWE1FOiBUaGlzIHdvbid0IHdvcmsgaWYgdGhlIGNhbGxp bmcgcHJvY2VzcyBpcyBsb2dnaW5nCi0gICAgICAgICMgc29tZXdoZXJlIG90aGVyIHRoYW4gc3lz LnN0ZGVyciwgYnV0IEknbSBub3Qgc3VyZQotICAgICAgICAjIGlmIHRoaXMgd2lsbCBiZSBhbiBp c3N1ZSBpbiBwcmFjdGljZS4gQWxzbywgaXQgd291bGQgYmUKLSAgICAgICAgIyBuaWNlIGlmIHdl IHRyYXBwZWQgYWxsIG9mIHRoZSBtZXNzYWdlcyBmb3IgYSBnaXZlbiB0ZXN0Ci0gICAgICAgICMg YW5kIHNlbnQgdGhlbSBiYWNrIGluIGZpbmlzaGVkX3Rlc3QoKSByYXRoZXIgdGhhbiBsb2dnaW5n Ci0gICAgICAgICMgdGhlbSB0byBzdGRlcnIuCi0gICAgICAgIGlmIG5vdCByb290X2xvZ2dlci5o YW5kbGVyczoKLSAgICAgICAgICAgIG9wdGlvbnMgPSBzZWxmLl9vcHRpb25zCi0gICAgICAgICAg ICByb290X2xvZ2dlci5zZXRMZXZlbChsb2dnaW5nLkRFQlVHIGlmIG9wdGlvbnMudmVyYm9zZSBl bHNlIGxvZ2dpbmcuSU5GTykKLSAgICAgICAgICAgIHNlbGYuX21ldGVyID0gbWV0ZXJlZF9zdHJl YW0uTWV0ZXJlZFN0cmVhbShzeXMuc3RkZXJyLCBvcHRpb25zLnZlcmJvc2UsIGxvZ2dlcj1yb290 X2xvZ2dlcikKKworICAgICAgICBzZWxmLl9sb2dnZXIuc2V0TGV2ZWwobG9nZ2luZy5ERUJVRyBp ZiBzZWxmLl9vcHRpb25zLnZlcmJvc2UgZWxzZSBsb2dnaW5nLklORk8pCisgICAgICAgIHNlbGYu X2xvZ19oYW5kbGVyID0gX1dvcmtlckxvZ0hhbmRsZXIoc2VsZikKKyAgICAgICAgc2VsZi5fbG9n Z2VyLmFkZEhhbmRsZXIoc2VsZi5fbG9nX2hhbmRsZXIpCiAKICAgICBkZWYgX3NldF91cF9ob3N0 X2FuZF9wb3J0KHNlbGYpOgogICAgICAgICBvcHRpb25zID0gc2VsZi5fb3B0aW9ucwpAQCAtMTMy LDkgKzEyNSw5IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RX b3JrZXIpOgogICAgICAgICAgICAgc3VwZXIoV29ya2VyLCBzZWxmKS5ydW4oKQogICAgICAgICBm aW5hbGx5OgogICAgICAgICAgICAgc2VsZi5raWxsX2RyaXZlcigpCi0gICAgICAgICAgICBzZWxm Ll93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2RvbmUnKQogICAgICAgICAgICAgX2xv Zy5kZWJ1ZygiJXMgZXhpdGluZyIgJSBzZWxmLl9uYW1lKQogICAgICAgICAgICAgc2VsZi5jbGVh bnVwKCkKKyAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgn ZG9uZScsIHNlbGYuX2xvZ19tZXNzYWdlcykKIAogICAgIGRlZiBoYW5kbGVfdGVzdF9saXN0KHNl bGYsIHNyYywgbGlzdF9uYW1lLCB0ZXN0X2xpc3QpOgogICAgICAgICBzdGFydF90aW1lID0gdGlt ZS50aW1lKCkKQEAgLTE3MSw3ICsxNjQsOSBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJf YnJva2VyLkFic3RyYWN0V29ya2VyKToKICAgICAgICAgcmVzdWx0ID0gc2VsZi5ydW5fdGVzdF93 aXRoX3RpbWVvdXQodGVzdF9pbnB1dCwgdGVzdF90aW1lb3V0X3NlYykKIAogICAgICAgICBlbGFw c2VkX3RpbWUgPSB0aW1lLnRpbWUoKSAtIHN0YXJ0Ci0gICAgICAgIHNlbGYuX3dvcmtlcl9jb25u ZWN0aW9uLnBvc3RfbWVzc2FnZSgnZmluaXNoZWRfdGVzdCcsIHJlc3VsdCwgZWxhcHNlZF90aW1l KQorICAgICAgICBsb2dfbWVzc2FnZXMgPSBzZWxmLl9sb2dfbWVzc2FnZXMKKyAgICAgICAgc2Vs Zi5fbG9nX21lc3NhZ2VzID0gW10KKyAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9z dF9tZXNzYWdlKCdmaW5pc2hlZF90ZXN0JywgcmVzdWx0LCBlbGFwc2VkX3RpbWUsIGxvZ19tZXNz YWdlcykKIAogICAgICAgICBzZWxmLmNsZWFuX3VwX2FmdGVyX3Rlc3QodGVzdF9pbnB1dCwgcmVz dWx0KQogCkBAIC0xODEsOSArMTc2LDEwIEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9i cm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICBpZiBzZWxmLl90ZXN0c19ydW5fZmlsZToK ICAgICAgICAgICAgIHNlbGYuX3Rlc3RzX3J1bl9maWxlLmNsb3NlKCkKICAgICAgICAgICAgIHNl bGYuX3Rlc3RzX3J1bl9maWxlID0gTm9uZQotICAgICAgICBpZiBzZWxmLl9tZXRlcjoKLSAgICAg ICAgICAgIHNlbGYuX21ldGVyLmNsZWFudXAoKQotICAgICAgICAgICAgc2VsZi5fbWV0ZXIgPSBO b25lCisgICAgICAgIGlmIHNlbGYuX2xvZ19oYW5kbGVyIGFuZCBzZWxmLl9sb2dnZXI6CisgICAg ICAgICAgICBzZWxmLl9sb2dnZXIucmVtb3ZlSGFuZGxlcihzZWxmLl9sb2dfaGFuZGxlcikKKyAg ICAgICAgc2VsZi5fbG9nX2hhbmRsZXIgPSBOb25lCisgICAgICAgIHNlbGYuX2xvZ2dlciA9IE5v bmUKIAogICAgIGRlZiB0aW1lb3V0KHNlbGYsIHRlc3RfaW5wdXQpOgogICAgICAgICAiIiJDb21w dXRlIHRoZSBhcHByb3ByaWF0ZSB0aW1lb3V0IHZhbHVlIGZvciBhIHRlc3QuIiIiCkBAIC0zMDAs MyArMjk2LDEzIEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RX b3JrZXIpOgogICAgIGRlZiBydW5fc2luZ2xlX3Rlc3Qoc2VsZiwgZHJpdmVyLCB0ZXN0X2lucHV0 KToKICAgICAgICAgcmV0dXJuIHNpbmdsZV90ZXN0X3J1bm5lci5ydW5fc2luZ2xlX3Rlc3Qoc2Vs Zi5fcG9ydCwgc2VsZi5fb3B0aW9ucywKICAgICAgICAgICAgIHRlc3RfaW5wdXQsIGRyaXZlciwg c2VsZi5fbmFtZSkKKworCitjbGFzcyBfV29ya2VyTG9nSGFuZGxlcihsb2dnaW5nLkhhbmRsZXIp OgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB3b3JrZXIpOgorICAgICAgICBsb2dnaW5nLkhhbmRs ZXIuX19pbml0X18oc2VsZikKKyAgICAgICAgc2VsZi5fd29ya2VyID0gd29ya2VyCisgICAgICAg IHNlbGYuX3BpZCA9IG9zLmdldHBpZCgpCisKKyAgICBkZWYgZW1pdChzZWxmLCByZWNvcmQpOgor ICAgICAgICBzZWxmLl93b3JrZXIuX2xvZ19tZXNzYWdlcy5hcHBlbmQodHVwbGUoW3JlY29yZC5n ZXRNZXNzYWdlKCksIHJlY29yZC5jcmVhdGVkLCBzZWxmLl9waWRdKSkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL21ldGVyZWRfc3RyZWFtLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9zdHJl YW0ucHkKaW5kZXggNDlhNTA3ZWQ2M2RlMTRhNzZlNTJkYjY0Y2NmZjc0OGNhZDg2MDZlNS4uNDlh OWE4ZDhhNmUzYTQ5ODAxNDRiM2FhZWJjMTMzYzNjZTc1YmJkZSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9zdHJlYW0ucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvbWV0ZXJlZF9zdHJl YW0ucHkKQEAgLTkxLDE0ICs5MSwxNSBAQCBjbGFzcyBNZXRlcmVkU3RyZWFtKG9iamVjdCk6CiAg ICAgICAgIGlmIHNlbGYuX2VyYXNpbmc6CiAgICAgICAgICAgICBzZWxmLl9sYXN0X3BhcnRpYWxf bGluZSA9IHR4dFt0eHQucmZpbmQoJ1xuJykgKyAxOl0KIAotICAgIGRlZiB3cml0ZShzZWxmLCB0 eHQsIG5vdz1Ob25lKToKKyAgICBkZWYgd3JpdGUoc2VsZiwgdHh0LCBub3c9Tm9uZSwgcGlkPU5v bmUpOgogICAgICAgICBub3cgPSBub3cgb3Igc2VsZi5fdGltZV9mbigpCisgICAgICAgIHBpZCA9 IHBpZCBvciBzZWxmLl9waWQKICAgICAgICAgc2VsZi5fbGFzdF93cml0ZV90aW1lID0gbm93CiAg ICAgICAgIGlmIHNlbGYuX2xhc3RfcGFydGlhbF9saW5lOgogICAgICAgICAgICAgc2VsZi5fZXJh c2VfbGFzdF9wYXJ0aWFsX2xpbmUoKQogICAgICAgICBpZiBzZWxmLl92ZXJib3NlOgogICAgICAg ICAgICAgbm93X3R1cGxlID0gdGltZS5sb2NhbHRpbWUobm93KQotICAgICAgICAgICAgbXNnID0g JyUwMmQ6JTAyZDolMDJkLiUwM2QgJWQgJXMnICUgKG5vd190dXBsZS50bV9ob3VyLCBub3dfdHVw bGUudG1fbWluLCBub3dfdHVwbGUudG1fc2VjLCBpbnQoKG5vdyAqIDEwMDApICUgMTAwMCksIHNl bGYuX3BpZCwgc2VsZi5fZW5zdXJlX25ld2xpbmUodHh0KSkKKyAgICAgICAgICAgIG1zZyA9ICcl MDJkOiUwMmQ6JTAyZC4lMDNkICVkICVzJyAlIChub3dfdHVwbGUudG1faG91ciwgbm93X3R1cGxl LnRtX21pbiwgbm93X3R1cGxlLnRtX3NlYywgaW50KChub3cgKiAxMDAwKSAlIDEwMDApLCBwaWQs IHNlbGYuX2Vuc3VyZV9uZXdsaW5lKHR4dCkpCiAgICAgICAgIGVsaWYgc2VsZi5faXNhdHR5Ogog ICAgICAgICAgICAgbXNnID0gdHh0CiAgICAgICAgIGVsc2U6CkBAIC0xMDYsOCArMTA3LDggQEAg Y2xhc3MgTWV0ZXJlZFN0cmVhbShvYmplY3QpOgogCiAgICAgICAgIHNlbGYuX3N0cmVhbS53cml0 ZShtc2cpCiAKLSAgICBkZWYgd3JpdGVsbihzZWxmLCB0eHQsIG5vdz1Ob25lKToKLSAgICAgICAg c2VsZi53cml0ZShzZWxmLl9lbnN1cmVfbmV3bGluZSh0eHQpLCBub3cpCisgICAgZGVmIHdyaXRl bG4oc2VsZiwgdHh0LCBub3c9Tm9uZSwgcGlkPU5vbmUpOgorICAgICAgICBzZWxmLndyaXRlKHNl bGYuX2Vuc3VyZV9uZXdsaW5lKHR4dCksIG5vdywgcGlkKQogCiAgICAgZGVmIF9lcmFzZV9sYXN0 X3BhcnRpYWxfbGluZShzZWxmKToKICAgICAgICAgbnVtX2NoYXJzID0gbGVuKHNlbGYuX2xhc3Rf cGFydGlhbF9saW5lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvdmlld3MvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy92aWV3cy9wcmludGluZy5weQppbmRleCAzZGYyOTU2YzE4MjYxOGVkMGRjZjEzZWQ2ZjE4 NWU1MTBlNDg3ZmJhLi43NGU3Yjc5MDI1YzZiZTIwMmVlYjBjMjNkYTA4ODMwODc3ZmU5NGE5IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9w cmludGluZy5weQpAQCAtNDA3LDUgKzQwNyw4IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAg ICAgICAgICAgIHJldHVybgogICAgICAgICBzZWxmLl93cml0ZShtc2cpCiAKKyAgICBkZWYgd3Jp dGVsbihzZWxmLCAqYXJncywgKiprd2FyZ3MpOgorICAgICAgICBzZWxmLl9tZXRlci53cml0ZWxu KCphcmdzLCAqKmt3YXJncykKKwogICAgIGRlZiBfd3JpdGUoc2VsZiwgbXNnKToKICAgICAgICAg c2VsZi5fbWV0ZXIud3JpdGVsbihtc2cpCg==