37015 2010-04-02 00:23:43 -0700 webkit-patch attached my patch to the wrong bug 2010-04-09 14:01:51 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sfalken webkit-unassigned abarth commit-queue ericu eric oldest_to_newest 207763 0 sfalken 2010-04-02 00:23:43 -0700 I filed <https://bugs.webkit.org/show_bug.cgi?id=37014> using webkit-patch. I used: - webkit-prepare - webkit-upload When I uploaded the patch, I edited the changelog a bit (you can see it in the patch). The webkit-patch tool attached the patch to this bug instead: https://bugs.webkit.org/show_bug.cgi?id=36971 208069 1 eric 2010-04-02 14:30:31 -0700 I'm not sure I know what webkit-prepare or webkit-upload are? Are those internal Apple scripts? 208070 2 eric 2010-04-02 14:31:13 -0700 I expect he means: webkit-patch prepare webkit-patch upload 208202 3 sfalken 2010-04-02 20:35:01 -0700 Correct. I used: webkit-patch prepare webkit-patch upload No Apple scripts. 210556 4 eric 2010-04-08 21:56:14 -0700 *** Bug 37107 has been marked as a duplicate of this bug. *** 210557 5 eric 2010-04-08 21:56:35 -0700 We've had several reports of this recently. We have a theory. Investigating now. 210563 6 eric 2010-04-08 22:49:02 -0700 I've found a cause of this for SVN users. We have had a report from a Git user which I've not been able to reproduce yet. Fix coming shortly. 210593 7 52940 eric 2010-04-09 00:09:12 -0700 Created attachment 52940 Patch 210715 8 52940 abarth 2010-04-09 07:22:28 -0700 Comment on attachment 52940 Patch Yay! Thanks for fixing this bug. + # FIXME: This should probably use cwd=self.checkout_root. We should use checkout_root in all these cases to make SCM more predictable and aligned between SVN and GIT. 210819 9 52940 eric 2010-04-09 11:31:15 -0700 Comment on attachment 52940 Patch I agree. I'll file a bug about that. 210823 10 eric 2010-04-09 11:33:23 -0700 Filed bug 37346 for followup. 210908 11 52940 commit-queue 2010-04-09 14:01:45 -0700 Comment on attachment 52940 Patch Clearing flags on attachment: 52940 Committed r57361: <http://trac.webkit.org/changeset/57361> 210909 12 commit-queue 2010-04-09 14:01:51 -0700 All reviewed patches have been landed. Closing bug. 52940 2010-04-09 00:09:12 -0700 2010-04-09 14:01:45 -0700 Patch bug-37015-20100409000911.patch text/plain 14692 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2ZDBiMWRhLi4xMmZjNDU0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTAtMDQt MDggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHdlYmtpdC1wYXRjaCBhdHRhY2hlZCBteSBwYXRj aCB0byB0aGUgd3JvbmcgYnVnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zNzAxNQorCisgICAgICAgIFRoZSBwcm9ibGVtIGhlcmUgaXMgdGhhdCBTVk4g d2FzIHZpb2xhdGluZyBTQ00ncyBpbXBsaWNpdAorICAgICAgICBjb250cmFjdCBvZiBhbHdheXMg cmV0dXJuaW5nIHBhdGhzIHJlbGF0aXZlIHRvIHRoZSByZXBvc2l0b3J5IHJvb3QuCisgICAgICAg IFRoYXQgY2FuIGVhc2lseSBiZSBmaXhlZCBieSB0ZWxsaW5nIFNWTiB0aGF0IHRoZSBDV0QgaXMg dGhlIHJlcG9zaXRvcnkgcm9vdC4KKworICAgICAgICBXaGVuIGZpeGluZyB0aGlzIEkgcmVhbGl6 ZWQgdGhlcmUgYXJlIGEgbGFyZ2UgbnVtYmVyIG9mIHBsYWNlcyBpbiBTQ00ucHkgd2hlcmUKKyAg ICAgICAgd2Ugd2FudCB0byBjb25zaWRlciBleHBsaWNpdGx5IHBhc3Npbmcgc2VsZi5jaGVja291 dF9yb290IGFzIHRoZSBDV0QuCisgICAgICAgIFRoYXQgd291bGQgYWxsb3cgc2NtIG1ldGhvZHMg dG8gYmUgZXhlY3V0ZWQgZXZlbiB3aGVuIHRoZSBDV0QgaXMgbm90IGluc2lkZQorICAgICAgICB0 aGUgc2NtIHRyZWUgYXQgYWxsLCBhbmQgd291bGQgYWxzbyBtYWtlIHN1cmUgKGluIHRoZSBjYXNl IG9mIFNWTikgdGhhdCBwYXRocworICAgICAgICByZXR1cm5lZCBhcmUgcmVsYXRpdmUgdG8gdGhl IHJvb3QuICBHaXQgKGFsbW9zdCBhbHdheXMpIHJldHVybnMgcGF0aHMgcmVsYXRpdmUKKyAgICAg ICAgdG8gdGhlIHJlcG9zaXRvcnkgcm9vdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L3NjbS5weToKKyAgICAgICAgIC0gRXhwbGljaXRseSBwYXNzIHNlbGYu Y2hlY2tvdXRfcm9vdCBhcyBjd2QgaW4gcnVuX3N0YXR1c19hbmRfZXh0cmFjdF9maWxlbmFtZXMK KyAgICAgICAgIC0gQWRkIGEgdG9uIG9mIEZJWE1FcyBhYm91dCB0aGUgbmVlZCB0byBnbyBiYWNr IGFuZCBkZWNpZGUgd2hpY2ggbWV0aG9kcyByZXF1aXJlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QK KyAgICAgICAgICAgYW5kIHdoaWNoIGRvIG5vdC4gIFdlJ2xsIHByb2JhYmx5IGFkZCBhIGhlbHBl ciBmdW5jdGlvbiB0byBzY20gKGxpa2VseSBTQ00uX3J1bikgd2hpY2gKKyAgICAgICAgICAgYWx3 YXlzIHBhc3NlcyBjd2Q9c2VsZi5jaGVja291dF9yb290IHRvIEV4ZWN1dGl2ZS5ydW5fY29tbWFu ZAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVz dC5weToKKyAgICAgICAgIC0gQWRkIGEgdGVzdCBmb3IgdGhpcyBjaGFuZ2UuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weToKKyAgICAgICAgIC0gUmVt b3ZlZCB0aGUgZXhwbGljaXQgb3MuY2hkaXIgdG8gdGhlIHJlcG9zaXRvcnkgcm9vdCwgc2luY2Ug c2NtLnB5IG1ldGhvZHMKKyAgICAgICAgICAgc2hvdWxkIGJlIHJvYnVzdCBhZ2FpbnN0IHRoZSBj d2Qgbm90IGJlaW5nIGVxdWFsIHRvIHRoZSByb290LgorCiAyMDEwLTA0LTA4ICBTYW0gV2Vpbmln ICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20u cHkKaW5kZXggNjU1YTk5ZC4uN2NhZjViNiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQpAQCAtMzIsNiArMzIsOSBAQAogaW1w b3J0IG9zCiBpbXBvcnQgcmUKIAorIyBGSVhNRTogSW5zdGVhZCBvZiB1c2luZyBydW5fY29tbWFu ZCBkaXJlY3RseSwgbW9zdCBwbGFjZXMgaW4gdGhpcworIyBjbGFzcyB3b3VsZCByYXRoZXIgdXNl IGFuIFNDTS5ydW4gbWV0aG9kIHdoaWNoIGF1dG9tYXRpY2FsbHkgc2V0CisjIGN3ZD1zZWxmLmNo ZWNrb3V0X3Jvb3QuCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9y dCBFeGVjdXRpdmUsIHJ1bl9jb21tYW5kLCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5jb21t b24uc3lzdGVtLnVzZXIgaW1wb3J0IFVzZXIKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5k ZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGVycm9yLCBsb2cKQEAgLTkwLDYgKzkzLDcgQEAgZGVm IGNvbW1pdF9lcnJvcl9oYW5kbGVyKGVycm9yKToKICAgICBFeGVjdXRpdmUuZGVmYXVsdF9lcnJv cl9oYW5kbGVyKGVycm9yKQogCiAKKyMgU0NNIG1ldGhvZHMgYXJlIGV4cGVjdGVkIHRvIHJldHVy biBwYXRocyByZWxhdGl2ZSB0byBzZWxmLmNoZWNrb3V0X3Jvb3QuCiBjbGFzcyBTQ006CiAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIGN3ZCk6CiAgICAgICAgIHNlbGYuY3dkID0gY3dkCkBAIC0xMDQs NiArMTA4LDcgQEAgY2xhc3MgU0NNOgogCiAgICAgZGVmIGVuc3VyZV9jbGVhbl93b3JraW5nX2Rp cmVjdG9yeShzZWxmLCBmb3JjZV9jbGVhbik6CiAgICAgICAgIGlmIG5vdCBmb3JjZV9jbGVhbiBh bmQgbm90IHNlbGYud29ya2luZ19kaXJlY3RvcnlfaXNfY2xlYW4oKToKKyAgICAgICAgICAgICMg RklYTUU6IFNob3VsZG4ndCB0aGlzIHVzZSBjd2Q9c2VsZi5jaGVja291dF9yb290PwogICAgICAg ICAgICAgcHJpbnQgcnVuX2NvbW1hbmQoc2VsZi5zdGF0dXNfY29tbWFuZCgpLCBlcnJvcl9oYW5k bGVyPUV4ZWN1dGl2ZS5pZ25vcmVfZXJyb3IpCiAgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJv cihtZXNzYWdlPSJXb3JraW5nIGRpcmVjdG9yeSBoYXMgbW9kaWZpY2F0aW9ucywgcGFzcyAtLWZv cmNlLWNsZWFuIG9yIC0tbm8tY2xlYW4gdG8gY29udGludWUuIikKICAgICAgICAgCkBAIC0xMjIs NyArMTI3LDggQEAgY2xhc3MgU0NNOgogCiAgICAgZGVmIHJ1bl9zdGF0dXNfYW5kX2V4dHJhY3Rf ZmlsZW5hbWVzKHNlbGYsIHN0YXR1c19jb21tYW5kLCBzdGF0dXNfcmVnZXhwKToKICAgICAgICAg ZmlsZW5hbWVzID0gW10KLSAgICAgICAgZm9yIGxpbmUgaW4gcnVuX2NvbW1hbmQoc3RhdHVzX2Nv bW1hbmQpLnNwbGl0bGluZXMoKToKKyAgICAgICAgIyBXZSBydW4gd2l0aCBjd2Q9c2VsZi5jaGVj a291dF9yb290IHNvIHRoYXQgcmV0dXJuZWQtcGF0aHMgYXJlIHJvb3QtcmVsYXRpdmUuCisgICAg ICAgIGZvciBsaW5lIGluIHJ1bl9jb21tYW5kKHN0YXR1c19jb21tYW5kLCBjd2Q9c2VsZi5jaGVj a291dF9yb290KS5zcGxpdGxpbmVzKCk6CiAgICAgICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaChz dGF0dXNfcmVnZXhwLCBsaW5lKQogICAgICAgICAgICAgaWYgbm90IG1hdGNoOgogICAgICAgICAg ICAgICAgIGNvbnRpbnVlCkBAIC0yODksOSArMjk1LDExIEBAIGNsYXNzIFNWTihTQ00pOgogICAg ICAgICByZXR1cm4gc2VsZi5jYWNoZWRfdmVyc2lvbgogCiAgICAgZGVmIHdvcmtpbmdfZGlyZWN0 b3J5X2lzX2NsZWFuKHNlbGYpOgorICAgICAgICAjIEZJWE1FOiBTaG91bGQgdGhpcyB1c2UgY3dk PXNlbGYuY2hlY2tvdXRfcm9vdD8KICAgICAgICAgcmV0dXJuIHJ1bl9jb21tYW5kKFsnc3ZuJywg J2RpZmYnXSkgPT0gIiIKIAogICAgIGRlZiBjbGVhbl93b3JraW5nX2RpcmVjdG9yeShzZWxmKToK KyAgICAgICAgIyBGSVhNRTogU2hvdWxkbid0IHRoaXMgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jv b3Q/CiAgICAgICAgIHJ1bl9jb21tYW5kKFsnc3ZuJywgJ3JldmVydCcsICctUicsICcuJ10pCiAK ICAgICBkZWYgc3RhdHVzX2NvbW1hbmQoc2VsZik6CkBAIC0zMzAsNiArMzM4LDcgQEAgY2xhc3Mg U1ZOKFNDTSk6CiAgICAgICAgIHJldHVybiBydW5fY29tbWFuZChbInN2biIsICJjYXQiLCAiLXIi LCBzdHIocmV2aXNpb24pLCByZW1vdGVfcGF0aF0pCiAKICAgICBkZWYgZGlmZl9mb3JfcmV2aXNp b24oc2VsZiwgcmV2aXNpb24pOgorICAgICAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJs eSB1c2UgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdAogICAgICAgICByZXR1cm4gcnVuX2NvbW1hbmQo Wydzdm4nLCAnZGlmZicsICctYycsIHN0cihyZXZpc2lvbildKQogCiAgICAgZGVmIF9yZXBvc2l0 b3J5X3VybChzZWxmKToKQEAgLTM0MCw5ICszNDksMTEgQEAgY2xhc3MgU1ZOKFNDTSk6CiAgICAg ICAgIHN2bl9tZXJnZV9hcmdzID0gWydzdm4nLCAnbWVyZ2UnLCAnLS1ub24taW50ZXJhY3RpdmUn LCAnLWMnLCAnLSVzJyAlIHJldmlzaW9uLCBzZWxmLl9yZXBvc2l0b3J5X3VybCgpXQogICAgICAg ICBsb2coIldBUk5JTkc6IHN2biBtZXJnZSBoYXMgYmVlbiBrbm93biB0byB0YWtlIG1vcmUgdGhh biAxMCBtaW51dGVzIHRvIGNvbXBsZXRlLiAgSXQgaXMgcmVjb21tZW5kZWQgeW91IHVzZSBnaXQg Zm9yIHJvbGxvdXRzLiIpCiAgICAgICAgIGxvZygiUnVubmluZyAnJXMnIiAlICIgIi5qb2luKHN2 bl9tZXJnZV9hcmdzKSkKKyAgICAgICAgIyBGSVhNRTogU2hvdWxkIHRoaXMgdXNlIGN3ZD1zZWxm LmNoZWNrb3V0X3Jvb3Q/CiAgICAgICAgIHJ1bl9jb21tYW5kKHN2bl9tZXJnZV9hcmdzKQogCiAg ICAgZGVmIHJldmVydF9maWxlcyhzZWxmLCBmaWxlX3BhdGhzKToKKyAgICAgICAgIyBGSVhNRTog VGhpcyBzaG91bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QuCiAgICAgICAg IHJ1bl9jb21tYW5kKFsnc3ZuJywgJ3JldmVydCddICsgZmlsZV9wYXRocykKIAogICAgIGRlZiBj b21taXRfd2l0aF9tZXNzYWdlKHNlbGYsIG1lc3NhZ2UsIHVzZXJuYW1lPU5vbmUpOgpAQCAtMzU3 LDYgKzM2OCw3IEBAIGNsYXNzIFNWTihTQ00pOgogICAgICAgICBpZiB1c2VybmFtZToKICAgICAg ICAgICAgIHN2bl9jb21taXRfYXJncy5leHRlbmQoWyItLXVzZXJuYW1lIiwgdXNlcm5hbWVdKQog ICAgICAgICBzdm5fY29tbWl0X2FyZ3MuZXh0ZW5kKFsiLW0iLCBtZXNzYWdlXSkKKyAgICAgICAg IyBGSVhNRTogU2hvdWxkIHRoaXMgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3Q/CiAgICAgICAg IHJldHVybiBydW5fY29tbWFuZChzdm5fY29tbWl0X2FyZ3MsIGVycm9yX2hhbmRsZXI9Y29tbWl0 X2Vycm9yX2hhbmRsZXIpCiAKICAgICBkZWYgc3ZuX2NvbW1pdF9sb2coc2VsZiwgc3ZuX3Jldmlz aW9uKToKQEAgLTM4OCw2ICs0MDAsNyBAQCBjbGFzcyBHaXQoU0NNKToKIAogICAgIEBjbGFzc21l dGhvZAogICAgIGRlZiByZWFkX2dpdF9jb25maWcoY2xzLCBrZXkpOgorICAgICAgICAjIEZJWE1F OiBUaGlzIHNob3VsZCBwcm9iYWJseSB1c2UgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdC4KICAgICAg ICAgcmV0dXJuIHJ1bl9jb21tYW5kKFsiZ2l0IiwgImNvbmZpZyIsIGtleV0sCiAgICAgICAgICAg ICBlcnJvcl9oYW5kbGVyPUV4ZWN1dGl2ZS5pZ25vcmVfZXJyb3IpLnJzdHJpcCgnXG4nKQogCkBA IC0zOTYsMTggKzQwOSwyMiBAQCBjbGFzcyBHaXQoU0NNKToKICAgICAgICAgcmV0dXJuICJeQ29t bWl0dGVkIHIoP1A8c3ZuX3JldmlzaW9uPlxkKykkIgogCiAgICAgZGVmIGRpc2NhcmRfbG9jYWxf Y29tbWl0cyhzZWxmKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgdXNl IGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QKICAgICAgICAgcnVuX2NvbW1hbmQoWydnaXQnLCAncmVz ZXQnLCAnLS1oYXJkJywgc2VsZi5zdm5fYnJhbmNoX25hbWUoKV0pCiAgICAgCiAgICAgZGVmIGxv Y2FsX2NvbW1pdHMoc2VsZik6CisgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5 IHVzZSBjd2Q9c2VsZi5jaGVja291dF9yb290CiAgICAgICAgIHJldHVybiBydW5fY29tbWFuZChb J2dpdCcsICdsb2cnLCAnLS1wcmV0dHk9b25lbGluZScsICdIRUFELi4uJyArIHNlbGYuc3ZuX2Jy YW5jaF9uYW1lKCldKS5zcGxpdGxpbmVzKCkKIAogICAgIGRlZiByZWJhc2VfaW5fcHJvZ3Jlc3Mo c2VsZik6CiAgICAgICAgIHJldHVybiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oc2VsZi5j aGVja291dF9yb290LCAnLmdpdC9yZWJhc2UtYXBwbHknKSkKIAogICAgIGRlZiB3b3JraW5nX2Rp cmVjdG9yeV9pc19jbGVhbihzZWxmKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgcHJv YmFibHkgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QKICAgICAgICAgcmV0dXJuIHJ1bl9jb21t YW5kKFsnZ2l0JywgJ2RpZmYnLCAnSEVBRCcsICctLW5hbWUtb25seSddKSA9PSAiIgogCiAgICAg ZGVmIGNsZWFuX3dvcmtpbmdfZGlyZWN0b3J5KHNlbGYpOgorICAgICAgICAjIEZJWE1FOiBUaGVz ZSBzaG91bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QuCiAgICAgICAgICMg Q291bGQgcnVuIGdpdCBjbGVhbiBoZXJlIHRvbywgYnV0IHRoYXQgd291bGRuJ3QgbWF0Y2ggd29y a2luZ19kaXJlY3RvcnlfaXNfY2xlYW4KICAgICAgICAgcnVuX2NvbW1hbmQoWydnaXQnLCAncmVz ZXQnLCAnLS1oYXJkJywgJ0hFQUQnXSkKICAgICAgICAgIyBBYm9ydGluZyByZWJhc2UgZXZlbiB0 aG91Z2ggdGhpcyBkb2VzIG5vdCBtYXRjaCB3b3JraW5nX2RpcmVjdG9yeV9pc19jbGVhbgpAQCAt NDQ2LDEwICs0NjMsMTIgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgICAgIHJldHVybiAiZ2l0Igog CiAgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91 bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QKICAgICAgICAgcmV0dXJuIHJ1 bl9jb21tYW5kKFsnZ2l0JywgJ2RpZmYnLCAnLS1iaW5hcnknLCAnSEVBRCddKQogCiAgICAgQGNs YXNzbWV0aG9kCiAgICAgZGVmIGdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24oY2xzLCByZXZp c2lvbik6CisgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IHVzZSBjd2Q9c2Vs Zi5jaGVja291dF9yb290CiAgICAgICAgIGdpdF9jb21taXQgPSBydW5fY29tbWFuZChbJ2dpdCcs ICdzdm4nLCAnZmluZC1yZXYnLCAnciVzJyAlIHJldmlzaW9uXSkucnN0cmlwKCkKICAgICAgICAg IyBnaXQgc3ZuIGZpbmQtcmV2IGFsd2F5cyBleGl0cyAwLCBldmVuIHdoZW4gdGhlIHJldmlzaW9u IGlzIG5vdCBmb3VuZC4KICAgICAgICAgaWYgbm90IGdpdF9jb21taXQ6CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5pdHRlc3Qu cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY21fdW5p dHRlc3QucHkKaW5kZXggZDQ4NzU5OC4uNGIwODkwMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbV91bml0dGVzdC5w eQpAQCAtNjksMzMgKzY5LDQyIEBAIGRlZiByZWFkX2Zyb21fcGF0aChmaWxlX3BhdGgpOgogCiAj IEV4aXN0cyB0byBzaGFyZSBzdm4gcmVwb3NpdG9yeSBjcmVhdGlvbiBjb2RlIGJldHdlZW4gdGhl IGdpdCBhbmQgc3ZuIHRlc3RzCiBjbGFzcyBTVk5UZXN0UmVwb3NpdG9yeToKLSAgICBAc3RhdGlj bWV0aG9kCi0gICAgZGVmIF9zZXR1cF90ZXN0X2NvbW1pdHModGVzdF9vYmplY3QpOgorICAgIEBj bGFzc21ldGhvZAorICAgIGRlZiBfc3ZuX2FkZChjbHMsIHBhdGgpOgorICAgICAgICBydW5fY29t bWFuZChbInN2biIsICJhZGQiLCBwYXRoXSkKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBf c3ZuX2NvbW1pdChjbHMsIG1lc3NhZ2UpOgorICAgICAgICBydW5fY29tbWFuZChbInN2biIsICJj b21taXQiLCAiLS1xdWlldCIsICItLW1lc3NhZ2UiLCBtZXNzYWdlXSkKKworICAgIEBjbGFzc21l dGhvZAorICAgIGRlZiBfc2V0dXBfdGVzdF9jb21taXRzKGNscywgdGVzdF9vYmplY3QpOgogICAg ICAgICAjIEFkZCBzb21lIHRlc3QgY29tbWl0cwogICAgICAgICBvcy5jaGRpcih0ZXN0X29iamVj dC5zdm5fY2hlY2tvdXRfcGF0aCkKLSAgICAgICAgdGVzdF9maWxlID0gb3BlbigndGVzdF9maWxl JywgJ3cnKQotICAgICAgICB0ZXN0X2ZpbGUud3JpdGUoInRlc3QxIikKLSAgICAgICAgdGVzdF9m aWxlLmZsdXNoKCkKLQotICAgICAgICBydW5fY29tbWFuZChbJ3N2bicsICdhZGQnLCAndGVzdF9m aWxlJ10pCi0gICAgICAgIHJ1bl9jb21tYW5kKFsnc3ZuJywgJ2NvbW1pdCcsICctLXF1aWV0Jywg Jy0tbWVzc2FnZScsICdpbml0aWFsIGNvbW1pdCddKQotICAgICAgICAKLSAgICAgICAgdGVzdF9m aWxlLndyaXRlKCJ0ZXN0MiIpCi0gICAgICAgIHRlc3RfZmlsZS5mbHVzaCgpCi0gICAgICAgIAot ICAgICAgICBydW5fY29tbWFuZChbJ3N2bicsICdjb21taXQnLCAnLS1xdWlldCcsICctLW1lc3Nh Z2UnLCAnc2Vjb25kIGNvbW1pdCddKQotICAgICAgICAKLSAgICAgICAgdGVzdF9maWxlLndyaXRl KCJ0ZXN0M1xuIikKLSAgICAgICAgdGVzdF9maWxlLmZsdXNoKCkKLSAgICAgICAgd3JpdGVfaW50 b19maWxlX2F0X3BhdGgoInRlc3RfZmlsZTIiLCAic2Vjb25kIGZpbGUiKQotICAgICAgICBydW5f Y29tbWFuZChbJ3N2bicsICdhZGQnLCAndGVzdF9maWxlMiddKQotCi0gICAgICAgIHJ1bl9jb21t YW5kKFsnc3ZuJywgJ2NvbW1pdCcsICctLXF1aWV0JywgJy0tbWVzc2FnZScsICd0aGlyZCBjb21t aXQnXSkKIAotICAgICAgICB0ZXN0X2ZpbGUud3JpdGUoInRlc3Q0XG4iKQotICAgICAgICB0ZXN0 X2ZpbGUuY2xvc2UoKQorICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgidGVzdF9maWxl IiwgInRlc3QxIikKKyAgICAgICAgY2xzLl9zdm5fYWRkKCJ0ZXN0X2ZpbGUiKQorICAgICAgICBj bHMuX3N2bl9jb21taXQoImluaXRpYWwgY29tbWl0IikKKworICAgICAgICB3cml0ZV9pbnRvX2Zp bGVfYXRfcGF0aCgidGVzdF9maWxlIiwgInRlc3QxdGVzdDIiKQorICAgICAgICAjIFRoaXMgdXNl ZCB0byBiZSB0aGUgbGFzdCBjb21taXQsIGJ1dCBkb2luZyBzbyBicm9rZQorICAgICAgICAjIEdp dFRlc3QudGVzdF9hcHBseV9naXRfcGF0Y2ggd2hpY2ggdXNlIHRoZSBpbnZlcnNlIGRpZmYgb2Yg dGhlIGxhc3QgY29tbWl0LgorICAgICAgICAjIHN2bi1hcHBseSBmYWlscyB0byByZW1vdmUgZGly ZWN0b3JpZXMgaW4gR2l0LCBzZWU6CisgICAgICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM0ODcxCisgICAgICAgIG9zLm1rZGlyKCJ0ZXN0X2RpciIpCisgICAg ICAgICMgU2xhc2ggc2hvdWxkIGFsd2F5cyBiZSB0aGUgcmlnaHQgcGF0aCBzZXBhcmF0b3Igc2lu Y2Ugd2UgdXNlIGN5Z3dpbiBvbiBXaW5kb3dzLgorICAgICAgICB0ZXN0X2ZpbGUzX3BhdGggPSAi dGVzdF9kaXIvdGVzdF9maWxlMyIKKyAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgodGVz dF9maWxlM19wYXRoLCAidGhpcmQgZmlsZSIpCisgICAgICAgIGNscy5fc3ZuX2FkZCgidGVzdF9k aXIiKQorICAgICAgICBjbHMuX3N2bl9jb21taXQoInNlY29uZCBjb21taXQiKQorCisgICAgICAg IHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKCJ0ZXN0X2ZpbGUiLCAidGVzdDF0ZXN0MnRlc3QzXG4i KQorICAgICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgidGVzdF9maWxlMiIsICJzZWNvbmQg ZmlsZSIpCisgICAgICAgIGNscy5fc3ZuX2FkZCgidGVzdF9maWxlMiIpCisgICAgICAgIGNscy5f c3ZuX2NvbW1pdCgidGhpcmQgY29tbWl0IikKIAotICAgICAgICBydW5fY29tbWFuZChbJ3N2bics ICdjb21taXQnLCAnLS1xdWlldCcsICctLW1lc3NhZ2UnLCAnZm91cnRoIGNvbW1pdCddKQorICAg ICAgICB3cml0ZV9pbnRvX2ZpbGVfYXRfcGF0aCgidGVzdF9maWxlIiwgInRlc3QxdGVzdDJ0ZXN0 M1xudGVzdDRcbiIpCisgICAgICAgIGNscy5fc3ZuX2NvbW1pdCgiZm91cnRoIGNvbW1pdCIpCiAK ICAgICAgICAgIyBzdm4gZG9lcyBub3Qgc2VlbSB0byB1cGRhdGUgYWZ0ZXIgY29tbWl0IGFzIEkg d291bGQgZXhwZWN0LgogICAgICAgICBydW5fY29tbWFuZChbJ3N2bicsICd1cGRhdGUnXSkKQEAg LTIwMyw4ICsyMTIsMjMgQEAgY2xhc3MgU0NNVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIGNvbW1pdF90ZXh0ID0gc2VsZi5zY20uY29tbWl0X3dpdGhfbWVzc2FnZSgieWV0IGFub3Ro ZXIgdGVzdCBjb21taXQiLCB1c2VybmFtZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxm LnNjbS5zdm5fcmV2aXNpb25fZnJvbV9jb21taXRfdGV4dChjb21taXRfdGV4dCksICcwJykKIAor ICAgIGRlZiBfc2hhcmVkX3Rlc3RfY2hhbmdlZF9maWxlcyhzZWxmKToKKyAgICAgICAgd3JpdGVf aW50b19maWxlX2F0X3BhdGgoInRlc3RfZmlsZSIsICJjaGFuZ2VkIGNvbnRlbnQiKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuc2NtLmNoYW5nZWRfZmlsZXMoKSwgWyJ0ZXN0X2ZpbGUi XSkKKyAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoInRlc3RfZGlyL3Rlc3RfZmlsZTMi LCAibmV3IHN0dWZmIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnNjbS5jaGFuZ2Vk X2ZpbGVzKCksIFsidGVzdF9kaXIvdGVzdF9maWxlMyIsICJ0ZXN0X2ZpbGUiXSkKKyAgICAgICAg b2xkX2N3ZCA9IG9zLmdldGN3ZCgpCisgICAgICAgIG9zLmNoZGlyKCJ0ZXN0X2RpciIpCisgICAg ICAgICMgVmFsaWRhdGUgdGhhdCBjaGFuZ2VkX2ZpbGVzIGRvZXMgbm90IGNoYW5nZSB3aXRoIG91 ciBjd2QsIHNlZSBidWcgMzcwMTUuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5zY20u Y2hhbmdlZF9maWxlcygpLCBbInRlc3RfZGlyL3Rlc3RfZmlsZTMiLCAidGVzdF9maWxlIl0pCisg ICAgICAgIG9zLmNoZGlyKG9sZF9jd2QpCisKICAgICBkZWYgX3NoYXJlZF90ZXN0X2NoYW5nZWRf ZmlsZXNfZm9yX3JldmlzaW9uKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYu c2NtLmNoYW5nZWRfZmlsZXNfZm9yX3JldmlzaW9uKDIpLCBbInRlc3RfZmlsZSJdKQorICAgICAg ICAjIFNWTiByZXBvcnRzIGRpcmVjdG9yeSBjaGFuZ2VzLCBHaXQgZG9lcyBub3QuCisgICAgICAg IGNoYW5nZWRfZmlsZXMgPSBzZWxmLnNjbS5jaGFuZ2VkX2ZpbGVzX2Zvcl9yZXZpc2lvbigyKQor ICAgICAgICBpZiAidGVzdF9kaXIiIGluIGNoYW5nZWRfZmlsZXM6CisgICAgICAgICAgICBjaGFu Z2VkX2ZpbGVzLnJlbW92ZSgidGVzdF9kaXIiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNo YW5nZWRfZmlsZXMsIFsidGVzdF9kaXIvdGVzdF9maWxlMyIsICJ0ZXN0X2ZpbGUiXSkKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChzb3J0ZWQoc2VsZi5zY20uY2hhbmdlZF9maWxlc19mb3JfcmV2 aXNpb24oMykpLCBzb3J0ZWQoWyJ0ZXN0X2ZpbGUiLCAidGVzdF9maWxlMiJdKSkgIyBHaXQgYW5k IFNWTiByZXR1cm4gZGlmZmVyZW50IG9yZGVycy4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChz ZWxmLnNjbS5jaGFuZ2VkX2ZpbGVzX2Zvcl9yZXZpc2lvbig0KSwgWyJ0ZXN0X2ZpbGUiXSkKIApA QCAtNDI3LDExICs0NTEsMTEgQEAgY2xhc3MgU1ZOVGVzdChTQ01UZXN0KToKICAgICAgICAgU1ZO VGVzdFJlcG9zaXRvcnkudGVhcl9kb3duKHNlbGYpCiAKICAgICBkZWYgdGVzdF9jcmVhdGVfcGF0 Y2hfaXNfZnVsbF9wYXRjaChzZWxmKToKLSAgICAgICAgdGVzdF9kaXJfcGF0aCA9IG9zLnBhdGgu am9pbihzZWxmLnN2bl9jaGVja291dF9wYXRoLCAndGVzdF9kaXInKQorICAgICAgICB0ZXN0X2Rp cl9wYXRoID0gb3MucGF0aC5qb2luKHNlbGYuc3ZuX2NoZWNrb3V0X3BhdGgsICJ0ZXN0X2RpcjIi KQogICAgICAgICBvcy5ta2Rpcih0ZXN0X2Rpcl9wYXRoKQogICAgICAgICB0ZXN0X2ZpbGVfcGF0 aCA9IG9zLnBhdGguam9pbih0ZXN0X2Rpcl9wYXRoLCAndGVzdF9maWxlMicpCiAgICAgICAgIHdy aXRlX2ludG9fZmlsZV9hdF9wYXRoKHRlc3RfZmlsZV9wYXRoLCAndGVzdCBjb250ZW50JykKLSAg ICAgICAgcnVuX2NvbW1hbmQoWydzdm4nLCAnYWRkJywgJ3Rlc3RfZGlyJ10pCisgICAgICAgIHJ1 bl9jb21tYW5kKFsnc3ZuJywgJ2FkZCcsICd0ZXN0X2RpcjInXSkKIAogICAgICAgICAjIGNyZWF0 ZV9wYXRjaCBkZXBlbmRzIG9uICdzdm4tY3JlYXRlLXBhdGNoJywgc28gbWFrZSBhIGR1bW15IHZl cnNpb24uCiAgICAgICAgIHNjcmlwdHNfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLnN2bl9jaGVj a291dF9wYXRoLCAnV2ViS2l0VG9vbHMnLCAnU2NyaXB0cycpCkBAIC01MjcsNiArNTUxLDkgQEAg UTFkVEJ4MEFBQUI0Mml0ZzRHbGdZSmpHd01ERHlPRE14TUR3MzRHQmdRRUFKUFFESkE9PQogICAg IGRlZiB0ZXN0X3N2bl9hcHBseV9naXRfcGF0Y2goc2VsZik6CiAgICAgICAgIHNlbGYuX3NoYXJl ZF90ZXN0X3N2bl9hcHBseV9naXRfcGF0Y2goKQogCisgICAgZGVmIHRlc3RfY2hhbmdlZF9maWxl cyhzZWxmKToKKyAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfY2hhbmdlZF9maWxlcygpCisKICAg ICBkZWYgdGVzdF9jaGFuZ2VkX2ZpbGVzX2Zvcl9yZXZpc2lvbihzZWxmKToKICAgICAgICAgc2Vs Zi5fc2hhcmVkX3Rlc3RfY2hhbmdlZF9maWxlc19mb3JfcmV2aXNpb24oKQogCkBAIC02NTUsNiAr NjgyLDkgQEAgY2xhc3MgR2l0VGVzdChTQ01UZXN0KToKIAogICAgIGRlZiB0ZXN0X2FwcGx5X2dp dF9wYXRjaChzZWxmKToKICAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi5naXRf Y2hlY2tvdXRfcGF0aCkKKyAgICAgICAgIyBXZSBjYXJlZnVsbGx5IHBpY2sgYSBkaWZmIHdoaWNo IGRvZXMgbm90IGhhdmUgYSBkaXJlY3RvcnkgYWRkaXRpb24KKyAgICAgICAgIyBhcyBjdXJyZW50 bHkgc3ZuLWFwcGx5IHdpbGwgZXJyb3Igb3V0IHdoZW4gdHJ5aW5nIHRvIHJlbW92ZSBkaXJlY3Rv cmllcworICAgICAgICAjIGluIEdpdDogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM0ODcxCiAgICAgICAgIHBhdGNoID0gc2VsZi5fY3JlYXRlX3BhdGNoKHJ1bl9jb21t YW5kKFsnZ2l0JywgJ2RpZmYnLCAnSEVBRC4uSEVBRF4nXSkpCiAgICAgICAgIHNlbGYuX3NldHVw X3dlYmtpdHRvb2xzX3NjcmlwdHNfc3ltbGluayhzY20pCiAgICAgICAgIENoZWNrb3V0KHNjbSku YXBwbHlfcGF0Y2gocGF0Y2gpCkBAIC03MDcsNiArNzM3LDkgQEAgY2xhc3MgR2l0VGVzdChTQ01U ZXN0KToKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlLnNlYXJjaChyJ1xubGl0ZXJhbCAyNTZc bicsIHBhdGNoX3NpbmNlX2xvY2FsX2NvbW1pdCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo cGF0Y2hfZnJvbV9sb2NhbF9jb21taXQsIHBhdGNoX3NpbmNlX2xvY2FsX2NvbW1pdCkKIAorICAg IGRlZiB0ZXN0X2NoYW5nZWRfZmlsZXMoc2VsZik6CisgICAgICAgIHNlbGYuX3NoYXJlZF90ZXN0 X2NoYW5nZWRfZmlsZXMoKQorCiAgICAgZGVmIHRlc3RfY2hhbmdlZF9maWxlc19mb3JfcmV2aXNp b24oc2VsZik6CiAgICAgICAgIHNlbGYuX3NoYXJlZF90ZXN0X2NoYW5nZWRfZmlsZXNfZm9yX3Jl dmlzaW9uKCkKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3VwbG9hZC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy91cGxvYWQucHkKaW5kZXggN2Q4OWJjYS4uNmU2OGZiZSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkLnB5CkBAIC01 Miw3ICs1Miw4IEBAIGNsYXNzIENvbW1pdE1lc3NhZ2VGb3JDdXJyZW50RGlmZihBYnN0cmFjdERl Y2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgaGVscF90ZXh0ID0gIlByaW50IGEgY29tbWl0IG1lc3Nh Z2Ugc3VpdGFibGUgZm9yIHRoZSB1bmNvbW1pdHRlZCBjaGFuZ2VzIgogCiAgICAgZGVmIGV4ZWN1 dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6Ci0gICAgICAgIG9zLmNoZGlyKHRvb2wuc2Nt KCkuY2hlY2tvdXRfcm9vdCkKKyAgICAgICAgIyBUaGlzIGNvbW1hbmQgaXMgYSB1c2VmdWwgdGVz dCB0byBtYWtlIHN1cmUgY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0CisgICAgICAgICMg YWx3YXlzIHJldHVybnMgdGhlIHJpZ2h0IHZhbHVlIHJlZ2FyZGxlc3Mgb2YgdGhlIGN1cnJlbnQg d29ya2luZyBkaXJlY3RvcnkuCiAgICAgICAgIHByaW50ICIlcyIgJSB0b29sLmNoZWNrb3V0KCku Y29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KCkubWVzc2FnZSgpCiAKIGNsYXNzIENsZWFu UGVuZGluZ0NvbW1pdChBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6Cg==