104975 2012-12-13 16:32:31 -0800 Callers should not have to stringify args before calling Executive run_command/popen 2012-12-13 17:59:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104891 1 eric eric abarth dpranke webkit.review.bot oldest_to_newest 791094 0 eric 2012-12-13 16:32:31 -0800 Callers should not have to stringify args before calling Executive run_command/popen 791101 1 179373 eric 2012-12-13 16:35:29 -0800 Created attachment 179373 Patch 791102 2 eric 2012-12-13 16:36:13 -0800 %test-webkitpy Suppressing most webkitpy logging while running unit tests. Skipping tests in the following modules or packages because they are really, really, slow: webkitpy.common.checkout.scm.scm_unittest (https://bugs.webkit.org/show_bug.cgi?id=31818; use --all to include) [99/1610] webkitpy.common.checkout.baselineoptimizer_unittest.BaselineOptimizerTest.test_chromium_covers_mac_win_linux (+10)Failure: No such entity Failure: No such entity Failure: No such entity Ran 1610 tests in 3.019s OK 791111 3 179373 dpranke 2012-12-13 16:43:58 -0800 Comment on attachment 179373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179373&action=review Can you verify that NRWT actually runs w/ this patch, since it broke last time trying to start the http server? > Tools/Scripts/webkitpy/common/system/executive.py:390 > + args = self._stringify_args(args) You can probably now simplify _command_for_printing(), yes? 791114 4 179373 eric 2012-12-13 16:47:48 -0800 Comment on attachment 179373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179373&action=review >> Tools/Scripts/webkitpy/common/system/executive.py:390 >> + args = self._stringify_args(args) > > You can probably now simplify _command_for_printing(), yes? You mean because I can now always assume unicode? (It turns out we always could before too.) 791119 5 dpranke 2012-12-13 16:50:25 -0800 (In reply to comment #4) > (From update of attachment 179373 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=179373&action=review > > >> Tools/Scripts/webkitpy/common/system/executive.py:390 > >> + args = self._stringify_args(args) > > > > You can probably now simplify _command_for_printing(), yes? > > You mean because I can now always assume unicode? (It turns out we always could before too.) yes. 791134 6 179380 eric 2012-12-13 17:08:24 -0800 Created attachment 179380 Patch 791138 7 179380 dpranke 2012-12-13 17:11:23 -0800 Comment on attachment 179380 Patch ok. 791177 8 179380 webkit.review.bot 2012-12-13 17:59:07 -0800 Comment on attachment 179380 Patch Clearing flags on attachment: 179380 Committed r137692: <http://trac.webkit.org/changeset/137692> 791178 9 webkit.review.bot 2012-12-13 17:59:11 -0800 All reviewed patches have been landed. Closing bug. 179373 2012-12-13 16:35:29 -0800 2012-12-13 17:08:23 -0800 Patch bug-104975-20121213163249.patch text/plain 5510 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3Njc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QwMzAwN2VlZGQzODVlY2YxNzczOGEwNDA3MmNlOGNm ZTg1MTA4Mi4uM2ZmZDI0MzgxYjJhOWI3M2ViMWFiNDFiMWNjNjMwYzA4YmNiNDhmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDEyLTEyLTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBDYWxsZXJzIHNob3VsZCBub3QgaGF2ZSB0byBzdHJpbmdpZnkgYXJncyBiZWZvcmUgY2FsbGlu ZyBFeGVjdXRpdmUgcnVuX2NvbW1hbmQvcG9wZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDk3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE9uZSBjb3VsZCBhcmd1ZSB0aGF0IHdlIHNob3VsZCBtYXRj aCB0aGUgcHl0aG9uIGNhbGwgc3ludGF4IGhlcmUsCisgICAgICAgIGJ1dCBJIHRoaW5rIGl0J3Mg YSBtb3JlIGZyaWVuZGx5IEFQSSBpZiB3ZSBhdXRvbWFnaWNhbGx5IGhhbmRsZQorICAgICAgICBz dHJpbmdpZmljYXRpb24gb2YgYXJncyBpbiBydW5fY29tbWFuZCwgZXRjLgorICAgICAgICBUaGlz IHJlbW92ZXMgbWFwKHVuaWNvZGUsIGFyZ3MpIGZyb20gc2V2ZXJhbCBjYWxsc2l0ZXMuCisKKyAg ICAgICAgV2hlbiBJIGZpcnN0IHRyaWVkIHRvIGxhbmQgdGhpcyBjaGFuZ2UsIEkgZGlkbid0IHJl YWxpemUgdGhhdAorICAgICAgICBFeGVjdXRpdmUuX2NvbW1hbmRfZm9yX3ByaW50aW5nIGRlcGVu ZGVkIG9uIHRoaXMgYmVoYXZpb3IKKyAgICAgICAgaGF2aW5nIGJlZW4gYXBwbGllZCB0byBhcmdz IGluIHJ1bl9jb21tYW5kLiAgVGhlIGZpeCBpcyB0bworICAgICAgICBjYWxsIF9zdHJpbmdpZnlf YXJncyBpbiBib3RoIHJ1bl9jb21tYW5kIGFuZCBwb3Blbi4KKyAgICAgICAgVGhpcyBpcyBzbGln aHRseSByZWR1bmRhbnQsIGJ1dCBnaXZlbiBob3cgc2hvcnQgYXJncyBoYXZlIHRvIGJlCisgICAg ICAgIChkdWUgdG8gc2hlbGwgbGltaXRzKSwgSSBkb24ndCB0aGluayB0aGUgZG91YmxlLWVuY29k ZSBjaGVjaworICAgICAgICBtYXR0ZXJzIGluIHByYWN0aWNlLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weToKKyAgICAgICAgKEV4ZWN1dGl2 ZS5ydW5fY29tbWFuZCk6CisgICAgICAgIChFeGVjdXRpdmUuX3N0cmluZ2lmeV9hcmdzKToKKyAg ICAgICAgKEV4ZWN1dGl2ZS5wb3Blbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2V4ZWN1dGl2ZV91bml0dGVzdC5weToKKyAgICAgICAgKEV4ZWN1dGl2ZVRlc3Qu dGVzdF9hdXRvX3N0cmluZ2lmeV9hcmdzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChhdHRhY2hfdG9f cGlkKToKKwogMjAxMi0xMi0xMyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTM3NjYxLgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKaW5kZXggNDJhODEy MmQzNmUwZWU0ODA0NjQxOGE5YWNkYTExOTI0ODA1MzAxNy4uMzBkNTQ1YmRjZGFmZTI4NGQwODU0 YmRkY2ZhOGNmZjI5OTNhNDMzOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CkBAIC0xMDEsOSArMTAxLDYgQEAgY2xhc3MgRXhlY3V0 aXZlKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzeXMucGxhdGZvcm0gbm90IGluICgnd2luMzIn LCAnY3lnd2luJykKIAogICAgIGRlZiBfcnVuX2NvbW1hbmRfd2l0aF90ZWVkX291dHB1dChzZWxm LCBhcmdzLCB0ZWVkX291dHB1dCwgKiprd2FyZ3MpOgotICAgICAgICBhcmdzID0gbWFwKHVuaWNv ZGUsIGFyZ3MpICAjIFBvcGVuIHdpbGwgdGhyb3cgYW4gZXhjZXB0aW9uIGlmIGFyZ3MgYXJlIG5v bi1zdHJpbmdzIChsaWtlIGludCgpKQotICAgICAgICBhcmdzID0gbWFwKHNlbGYuX2VuY29kZV9h cmd1bWVudF9pZl9uZWVkZWQsIGFyZ3MpCi0KICAgICAgICAgY2hpbGRfcHJvY2VzcyA9IHNlbGYu cG9wZW4oYXJncywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXNl bGYuUElQRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXNlbGYu U1RET1VULApAQCAtMzkwLDggKzM4Nyw3IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAg ICAgICAiIiJQb3BlbiB3cmFwcGVyIGZvciBjb252ZW5pZW5jZSBhbmQgdG8gd29yayBhcm91bmQg cHl0aG9uIGJ1Z3MuIiIiCiAgICAgICAgIGFzc2VydChpc2luc3RhbmNlKGFyZ3MsIGxpc3QpIG9y IGlzaW5zdGFuY2UoYXJncywgdHVwbGUpKQogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1l KCkKLSAgICAgICAgYXJncyA9IG1hcCh1bmljb2RlLCBhcmdzKSAgIyBQb3BlbiB3aWxsIHRocm93 IGFuIGV4Y2VwdGlvbiBpZiBhcmdzIGFyZSBub24tc3RyaW5ncyAobGlrZSBpbnQoKSkKLSAgICAg ICAgYXJncyA9IG1hcChzZWxmLl9lbmNvZGVfYXJndW1lbnRfaWZfbmVlZGVkLCBhcmdzKQorICAg ICAgICBhcmdzID0gc2VsZi5fc3RyaW5naWZ5X2FyZ3MoYXJncykKIAogICAgICAgICBzdGRpbiwg c3RyaW5nX3RvX2NvbW11bmljYXRlID0gc2VsZi5fY29tcHV0ZV9zdGRpbihpbnB1dCkKICAgICAg ICAgc3RkZXJyID0gc2VsZi5TVERPVVQgaWYgcmV0dXJuX3N0ZGVyciBlbHNlIE5vbmUKQEAgLTQ1 Nyw4ICs0NTMsMTQgQEAgY2xhc3MgRXhlY3V0aXZlKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1 cm4gYXJndW1lbnQKICAgICAgICAgcmV0dXJuIGFyZ3VtZW50LmVuY29kZShzZWxmLl9jaGlsZF9w cm9jZXNzX2VuY29kaW5nKCkpCiAKKyAgICBkZWYgX3N0cmluZ2lmeV9hcmdzKHNlbGYsICphcmdz KToKKyAgICAgICAgIyBQb3BlbiB3aWxsIHRocm93IGFuIGV4Y2VwdGlvbiBpZiBhcmdzIGFyZSBu b24tc3RyaW5ncyAobGlrZSBpbnQoKSkKKyAgICAgICAgc3RyaW5nX2FyZ3MgPSBtYXAodW5pY29k ZSwgKmFyZ3MpCisgICAgICAgICMgVGhlIFdpbmRvd3MgaW1wbGVtZW50YXRpb24gb2YgUG9wZW4g Y2Fubm90IGhhbmRsZSB1bmljb2RlIHN0cmluZ3MuIDooCisgICAgICAgIHJldHVybiBtYXAoc2Vs Zi5fZW5jb2RlX2FyZ3VtZW50X2lmX25lZWRlZCwgc3RyaW5nX2FyZ3MpCisKICAgICBkZWYgcG9w ZW4oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKToKLSAgICAgICAgcmV0dXJuIHN1YnByb2Nlc3MuUG9w ZW4oKmFyZ3MsICoqa3dhcmdzKQorICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5Qb3BlbihzZWxm Ll9zdHJpbmdpZnlfYXJncygqYXJncyksICoqa3dhcmdzKQogCiAgICAgZGVmIHJ1bl9pbl9wYXJh bGxlbChzZWxmLCBjb21tYW5kX2xpbmVzX2FuZF9jd2RzLCBwcm9jZXNzZXM9Tm9uZSk6CiAgICAg ICAgICIiIlJ1bnMgYSBsaXN0IG9mIChjbWRfbGluZSBsaXN0LCBjd2Qgc3RyaW5nKSB0dXBsZXMg aW4gcGFyYWxsZWwgYW5kIHJldHVybnMgYSBsaXN0IG9mIChyZXRjb2RlLCBzdGRvdXQsIHN0ZGVy cikgdHVwbGVzLiIiIgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL2V4ZWN1dGl2ZV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9leGVjdXRpdmVfdW5pdHRlc3QucHkKaW5kZXggNzU1OTU1ZDM0MGY5YzAxYWI4 ZmI0NDQ0ZTlkNWI2YzMzMGM4Y2FmYS4uZjQyNTE3ZGM0OWE5ZDcxNWZkZjNmM2U5ZTg4MjZmODYy NDIxMzA5ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVt L2V4ZWN1dGl2ZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vZXhlY3V0aXZlX3VuaXR0ZXN0LnB5CkBAIC0xMTMsNiArMTEzLDExIEBAIGNsYXNz IEV4ZWN1dGl2ZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBleGVjdXRpdmUucnVu X2NvbW1hbmQoY29tbWFuZF9saW5lKCdlY2hvJywgJ2ZvbycpKQogICAgICAgICBleGVjdXRpdmUu cnVuX2NvbW1hbmQodHVwbGUoY29tbWFuZF9saW5lKCdlY2hvJywgJ2ZvbycpKSkKIAorICAgIGRl ZiB0ZXN0X2F1dG9fc3RyaW5naWZ5X2FyZ3Moc2VsZik6CisgICAgICAgIGV4ZWN1dGl2ZSA9IEV4 ZWN1dGl2ZSgpCisgICAgICAgIGV4ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21tYW5kX2xpbmUoJ2Vj aG8nLCAxKSkKKyAgICAgICAgZXhlY3V0aXZlLnBvcGVuKGNvbW1hbmRfbGluZSgnZWNobycsIDEp KS53YWl0KCkKKwogICAgIGRlZiB0ZXN0X3J1bl9jb21tYW5kX3dpdGhfdW5pY29kZShzZWxmKToK ICAgICAgICAgIiIiVmFsaWRhdGUgdGhhdCBpdCBpcyBzYWZlIHRvIHBhc3MgdW5pY29kZSgpIG9i amVjdHMKICAgICAgICAgdG8gRXhlY3V0aXZlLnJ1biogbWV0aG9kcywgYW5kIHRoZXkgd2lsbCBy ZXR1cm4gdW5pY29kZSgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKaW5kZXggZGJmYzQ2MWQyMzBk MmRkOWQ1NDZlYjk1YTI1ZTIyZDZkNWFmNTQ2OC4uNjNmNGUyNTE0NDEyODg4ZThmOTcwMjZlNmM5 NWMyODNiNDhiMDk2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpAQCAtNDE1LDcgKzQxNSw2 IEBAIGh0dHA6Ly9nb3RvLmdvb2dsZS5jb20vY3ItYW5kcm9pZC1wZXJmLWhvd3RvCiAgICAgICAg IGFzc2VydChzZWxmLl9wZXJmX3Byb2Nlc3MgPT0gTm9uZSkKICAgICAgICAgIyBGSVhNRTogVGhp cyBjYW4ndCBiZSBhIGZpeGVkIHRpbWVvdXQhCiAgICAgICAgIGNtZCA9IHNlbGYuX2FkYl9jb21t YW5kICsgWydzaGVsbCcsICdwZXJmJywgJ3JlY29yZCcsICctZycsICctcCcsIHBpZCwgJ3NsZWVw JywgMzBdCi0gICAgICAgIGNtZCA9IG1hcCh1bmljb2RlLCBjbWQpCiAgICAgICAgIHNlbGYuX3Bl cmZfcHJvY2VzcyA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnBvcGVuKGNtZCkKIAogICAgIGRlZiBf cGVyZl92ZXJzaW9uX3N0cmluZyhzZWxmLCBwZXJmX3BhdGgpOgo= 179380 2012-12-13 17:08:24 -0800 2012-12-13 17:59:07 -0800 Patch bug-104975-20121213170545.patch text/plain 6460 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3Njc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QwMzAwN2VlZGQzODVlY2YxNzczOGEwNDA3MmNlOGNm ZTg1MTA4Mi4uNDI1YzMwYWY3NjNlNjk4Y2IxOTNmODY1N2E2M2I0NzI3YzBjYTM0ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDEyLTEyLTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBDYWxsZXJzIHNob3VsZCBub3QgaGF2ZSB0byBzdHJpbmdpZnkgYXJncyBiZWZvcmUgY2FsbGlu ZyBFeGVjdXRpdmUgcnVuX2NvbW1hbmQvcG9wZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDk3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE9uZSBjb3VsZCBhcmd1ZSB0aGF0IHdlIHNob3VsZCBtYXRj aCB0aGUgcHl0aG9uIGNhbGwgc3ludGF4IGhlcmUsCisgICAgICAgIGJ1dCBJIHRoaW5rIGl0J3Mg YSBtb3JlIGZyaWVuZGx5IEFQSSBpZiB3ZSBhdXRvbWFnaWNhbGx5IGhhbmRsZQorICAgICAgICBz dHJpbmdpZmljYXRpb24gb2YgYXJncyBpbiBydW5fY29tbWFuZCwgZXRjLgorICAgICAgICBUaGlz IHJlbW92ZXMgbWFwKHVuaWNvZGUsIGFyZ3MpIGZyb20gc2V2ZXJhbCBjYWxsc2l0ZXMuCisKKyAg ICAgICAgV2hlbiBJIGZpcnN0IHRyaWVkIHRvIGxhbmQgdGhpcyBjaGFuZ2UsIEkgZGlkbid0IHJl YWxpemUgdGhhdAorICAgICAgICBFeGVjdXRpdmUuX2NvbW1hbmRfZm9yX3ByaW50aW5nIGRlcGVu ZGVkIG9uIHRoaXMgYmVoYXZpb3IKKyAgICAgICAgaGF2aW5nIGJlZW4gYXBwbGllZCB0byBhcmdz IGluIHJ1bl9jb21tYW5kLiAgVGhlIGZpeCBpcyB0bworICAgICAgICBjYWxsIF9zdHJpbmdpZnlf YXJncyBpbiBib3RoIHJ1bl9jb21tYW5kIGFuZCBwb3Blbi4KKyAgICAgICAgVGhpcyBpcyBzbGln aHRseSByZWR1bmRhbnQsIGJ1dCBnaXZlbiBob3cgc2hvcnQgYXJncyBoYXZlIHRvIGJlCisgICAg ICAgIChkdWUgdG8gc2hlbGwgbGltaXRzKSwgSSBkb24ndCB0aGluayB0aGUgZG91YmxlLWVuY29k ZSBjaGVjaworICAgICAgICBtYXR0ZXJzIGluIHByYWN0aWNlLgorCisgICAgICAgIFRoaXMgaXMg c2xpZ2h0bHkgY29tcGxpY2F0ZWQgYnkgdGhlIGZhY3QgdGhhdCBhcGFjaGVfaHR0cF9zZXJ2ZXIu cHkKKyAgICAgICAgaXMgdGhlIG9uZSBjYWxsZXIgaW4gb3VyIGNvZGViYXNlIHdoaWNoIHVzZXMg c2hlbGw9VHJ1ZS4KKyAgICAgICAgc2hlbGw9VHJ1ZSBpcyBhIHdlbGwtZG9jdW1lbnRlZCB0cmFp bC1vZi10ZWFyczoKKyAgICAgICAgaHR0cDovL3N0YWNrb3ZlcmZsb3cuY29tL3F1ZXN0aW9ucy8z MTcyNDcwL2FjdHVhbC1tZWFuaW5nLW9mLXNoZWxsLXRydWUtaW4tc3VicHJvY2VzcworICAgICAg ICBidXQgdG8gc3VwcG9ydCB0aGlzIGxlZ2FjeSAod2luZG93cy1vbmx5KSBjb2RlICh3aGljaCBJ IGNhbid0IGVhc2lseSB0ZXN0KQorICAgICAgICBJJ3ZlIGFkZGVkIGFuIGlmLWhhY2sgdG8gYXZv aWQgc3RyaW5naWZ5aW5nIHRoZSB0aGUgcG9wZW4oc2hlbGw9VHJ1ZSkgY2FzZS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHk6CisgICAgICAg IChFeGVjdXRpdmUucnVuX2NvbW1hbmQpOgorICAgICAgICAoRXhlY3V0aXZlLl9zdHJpbmdpZnlf YXJncyk6CisgICAgICAgIChFeGVjdXRpdmUucG9wZW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmVfdW5pdHRlc3QucHk6CisgICAgICAgIChFeGVj dXRpdmVUZXN0LnRlc3RfYXV0b19zdHJpbmdpZnlfYXJncyk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAo YXR0YWNoX3RvX3BpZCk6CisKIDIwMTItMTItMTMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzNzY2MS4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5Cmlu ZGV4IDQyYTgxMjJkMzZlMGVlNDgwNDY0MThhOWFjZGExMTkyNDgwNTMwMTcuLmNjZWFjYmU0YWJm ODAzODlhZTEyZGI4N2YyMTVkYTJhMzI0YTY2MDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQpAQCAtMTAxLDkgKzEwMSw2IEBAIGNs YXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICByZXR1cm4gc3lzLnBsYXRmb3JtIG5vdCBp biAoJ3dpbjMyJywgJ2N5Z3dpbicpCiAKICAgICBkZWYgX3J1bl9jb21tYW5kX3dpdGhfdGVlZF9v dXRwdXQoc2VsZiwgYXJncywgdGVlZF9vdXRwdXQsICoqa3dhcmdzKToKLSAgICAgICAgYXJncyA9 IG1hcCh1bmljb2RlLCBhcmdzKSAgIyBQb3BlbiB3aWxsIHRocm93IGFuIGV4Y2VwdGlvbiBpZiBh cmdzIGFyZSBub24tc3RyaW5ncyAobGlrZSBpbnQoKSkKLSAgICAgICAgYXJncyA9IG1hcChzZWxm Ll9lbmNvZGVfYXJndW1lbnRfaWZfbmVlZGVkLCBhcmdzKQotCiAgICAgICAgIGNoaWxkX3Byb2Nl c3MgPSBzZWxmLnBvcGVuKGFyZ3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0ZG91dD1zZWxmLlBJUEUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0 ZGVycj1zZWxmLlNURE9VVCwKQEAgLTM5MCw4ICszODcsNyBAQCBjbGFzcyBFeGVjdXRpdmUob2Jq ZWN0KToKICAgICAgICAgIiIiUG9wZW4gd3JhcHBlciBmb3IgY29udmVuaWVuY2UgYW5kIHRvIHdv cmsgYXJvdW5kIHB5dGhvbiBidWdzLiIiIgogICAgICAgICBhc3NlcnQoaXNpbnN0YW5jZShhcmdz LCBsaXN0KSBvciBpc2luc3RhbmNlKGFyZ3MsIHR1cGxlKSkKICAgICAgICAgc3RhcnRfdGltZSA9 IHRpbWUudGltZSgpCi0gICAgICAgIGFyZ3MgPSBtYXAodW5pY29kZSwgYXJncykgICMgUG9wZW4g d2lsbCB0aHJvdyBhbiBleGNlcHRpb24gaWYgYXJncyBhcmUgbm9uLXN0cmluZ3MgKGxpa2UgaW50 KCkpCi0gICAgICAgIGFyZ3MgPSBtYXAoc2VsZi5fZW5jb2RlX2FyZ3VtZW50X2lmX25lZWRlZCwg YXJncykKKyAgICAgICAgYXJncyA9IHNlbGYuX3N0cmluZ2lmeV9hcmdzKGFyZ3MpCiAKICAgICAg ICAgc3RkaW4sIHN0cmluZ190b19jb21tdW5pY2F0ZSA9IHNlbGYuX2NvbXB1dGVfc3RkaW4oaW5w dXQpCiAgICAgICAgIHN0ZGVyciA9IHNlbGYuU1RET1VUIGlmIHJldHVybl9zdGRlcnIgZWxzZSBO b25lCkBAIC00NTcsOCArNDUzLDIyIEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAg ICAgICAgcmV0dXJuIGFyZ3VtZW50CiAgICAgICAgIHJldHVybiBhcmd1bWVudC5lbmNvZGUoc2Vs Zi5fY2hpbGRfcHJvY2Vzc19lbmNvZGluZygpKQogCisgICAgZGVmIF9zdHJpbmdpZnlfYXJncyhz ZWxmLCAqYXJncyk6CisgICAgICAgICMgUG9wZW4gd2lsbCB0aHJvdyBhbiBleGNlcHRpb24gaWYg YXJncyBhcmUgbm9uLXN0cmluZ3MgKGxpa2UgaW50KCkpCisgICAgICAgIHN0cmluZ19hcmdzID0g bWFwKHVuaWNvZGUsICphcmdzKQorICAgICAgICAjIFRoZSBXaW5kb3dzIGltcGxlbWVudGF0aW9u IG9mIFBvcGVuIGNhbm5vdCBoYW5kbGUgdW5pY29kZSBzdHJpbmdzLiA6KAorICAgICAgICByZXR1 cm4gbWFwKHNlbGYuX2VuY29kZV9hcmd1bWVudF9pZl9uZWVkZWQsIHN0cmluZ19hcmdzKQorCiAg ICAgZGVmIHBvcGVuKHNlbGYsICphcmdzLCAqKmt3YXJncyk6Ci0gICAgICAgIHJldHVybiBzdWJw cm9jZXNzLlBvcGVuKCphcmdzLCAqKmt3YXJncykKKyAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxk IGFsd2F5cyBiZSBzdHJpbmdpZnlpbmcgdGhlIGFyZ3MsIGJ1dCBjYWxsZXJzIHdobyBwYXNzIHNo ZWxsPVRydWUKKyAgICAgICAgIyBleHBlY3QgdGhhdCB0aGUgZXhhY3QgYnl0ZXMgcGFzc2VkIHdp bGwgZ2V0IHBhc3NlZCB0byB0aGUgc2hlbGwgKGV2ZW4gaWYgdGhleSdyZSB3cm9uZ2x5IGVuY29k ZWQpLgorICAgICAgICAjIHNoZWxsPVRydWUgaXMgd3JvbmcgZm9yIG1hbnkgb3RoZXIgcmVhc29u cywgYW5kIHdlIHNob3VsZCByZW1vdmUgdGhpcworICAgICAgICAjIGhhY2sgYXMgc29vbiBhcyB3 ZSBjYW4gZml4IGFsbCBjYWxsZXJzIHRvIG5vdCB1c2Ugc2hlbGw9VHJ1ZS4KKyAgICAgICAgaWYg a3dhcmdzLmdldCgnc2hlbGwnKSA9PSBUcnVlOgorICAgICAgICAgICAgc3RyaW5nX2FyZ3MgPSBh cmdzCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzdHJpbmdfYXJncyA9IHNlbGYuX3N0cmlu Z2lmeV9hcmdzKCphcmdzKQorICAgICAgICByZXR1cm4gc3VicHJvY2Vzcy5Qb3BlbihzdHJpbmdf YXJncywgKiprd2FyZ3MpCiAKICAgICBkZWYgcnVuX2luX3BhcmFsbGVsKHNlbGYsIGNvbW1hbmRf bGluZXNfYW5kX2N3ZHMsIHByb2Nlc3Nlcz1Ob25lKToKICAgICAgICAgIiIiUnVucyBhIGxpc3Qg b2YgKGNtZF9saW5lIGxpc3QsIGN3ZCBzdHJpbmcpIHR1cGxlcyBpbiBwYXJhbGxlbCBhbmQgcmV0 dXJucyBhIGxpc3Qgb2YgKHJldGNvZGUsIHN0ZG91dCwgc3RkZXJyKSB0dXBsZXMuIiIiCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2 ZV91bml0dGVzdC5weQppbmRleCA3NTU5NTVkMzQwZjljMDFhYjhmYjQ0NDRlOWQ1YjZjMzMwYzhj YWZhLi5mNDI1MTdkYzQ5YTlkNzE1ZmRmM2YzZTllODgyNmY4NjI0MjEzMDlkIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmVf dW5pdHRlc3QucHkKQEAgLTExMyw2ICsxMTMsMTEgQEAgY2xhc3MgRXhlY3V0aXZlVGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGV4ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21tYW5kX2xp bmUoJ2VjaG8nLCAnZm9vJykpCiAgICAgICAgIGV4ZWN1dGl2ZS5ydW5fY29tbWFuZCh0dXBsZShj b21tYW5kX2xpbmUoJ2VjaG8nLCAnZm9vJykpKQogCisgICAgZGVmIHRlc3RfYXV0b19zdHJpbmdp ZnlfYXJncyhzZWxmKToKKyAgICAgICAgZXhlY3V0aXZlID0gRXhlY3V0aXZlKCkKKyAgICAgICAg ZXhlY3V0aXZlLnJ1bl9jb21tYW5kKGNvbW1hbmRfbGluZSgnZWNobycsIDEpKQorICAgICAgICBl eGVjdXRpdmUucG9wZW4oY29tbWFuZF9saW5lKCdlY2hvJywgMSkpLndhaXQoKQorCiAgICAgZGVm IHRlc3RfcnVuX2NvbW1hbmRfd2l0aF91bmljb2RlKHNlbGYpOgogICAgICAgICAiIiJWYWxpZGF0 ZSB0aGF0IGl0IGlzIHNhZmUgdG8gcGFzcyB1bmljb2RlKCkgb2JqZWN0cwogICAgICAgICB0byBF eGVjdXRpdmUucnVuKiBtZXRob2RzLCBhbmQgdGhleSB3aWxsIHJldHVybiB1bmljb2RlKCkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fYW5kcm9pZC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fYW5kcm9pZC5weQppbmRleCBkYmZjNDYxZDIzMGQyZGQ5ZDU0NmViOTVhMjVlMjJk NmQ1YWY1NDY4Li42M2Y0ZTI1MTQ0MTI4ODhlOGY5NzAyNmU2Yzk1YzI4M2I0OGIwOTZmIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X2FuZHJvaWQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9hbmRyb2lkLnB5CkBAIC00MTUsNyArNDE1LDYgQEAgaHR0cDovL2dvdG8uZ29v Z2xlLmNvbS9jci1hbmRyb2lkLXBlcmYtaG93dG8KICAgICAgICAgYXNzZXJ0KHNlbGYuX3BlcmZf cHJvY2VzcyA9PSBOb25lKQogICAgICAgICAjIEZJWE1FOiBUaGlzIGNhbid0IGJlIGEgZml4ZWQg dGltZW91dCEKICAgICAgICAgY21kID0gc2VsZi5fYWRiX2NvbW1hbmQgKyBbJ3NoZWxsJywgJ3Bl cmYnLCAncmVjb3JkJywgJy1nJywgJy1wJywgcGlkLCAnc2xlZXAnLCAzMF0KLSAgICAgICAgY21k ID0gbWFwKHVuaWNvZGUsIGNtZCkKICAgICAgICAgc2VsZi5fcGVyZl9wcm9jZXNzID0gc2VsZi5f aG9zdC5leGVjdXRpdmUucG9wZW4oY21kKQogCiAgICAgZGVmIF9wZXJmX3ZlcnNpb25fc3RyaW5n KHNlbGYsIHBlcmZfcGF0aCk6Cg==