81054 2012-03-13 16:22:15 -0700 Have webkit-patch rebaseline-test update test_expectations.txt 2012-03-16 12:03:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth adamk dglazkov dpranke oldest_to_newest 577964 0 ojan 2012-03-13 16:22:15 -0700 Have webkit-patch rebaseline-test update test_expectations.txt 577967 1 131746 ojan 2012-03-13 16:24:51 -0700 Created attachment 131746 Patch 577968 2 ojan 2012-03-13 16:27:03 -0700 I could also imagine making this a separate webkit-patch command instead that garden-o-matic calls. I'm not sure that's better though. It seems if someone uses "webkit-patch rebaseline-test" manually, they'd still want test_expectations.txt to be updated. 577973 3 abarth 2012-03-13 16:31:24 -0700 @dglazkov: Would you be willing to take a look at this patch since it involves editing test_expectation.txt files? 577984 4 dpranke 2012-03-13 16:37:38 -0700 the patch looks pretty good to me; but I haven't stared at it in detail. If dglazkov is otherwise occupied, I can review it. 578815 5 131746 dglazkov 2012-03-14 15:01:39 -0700 Comment on attachment 131746 Patch Oops, sorry. I don't know how I missed this. The test_expectations changes look great. I am not super-familiar with other parts. Dirk -- you wanna take a look? 578834 6 131746 dpranke 2012-03-14 15:14:49 -0700 Comment on attachment 131746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131746&action=review looks fine w/ the one change to use port.all_test_configuration(). > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:113 > + # FIXME: Support non-Chromium ports. Nit: do you actually need this? what happens if you run a non-chromium port? I would expect it to be mostly fine. > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:124 > + # FIXME: Do something more general here. You should use port.all_test_configurations() and then just filter on the version. 578837 7 131746 dpranke 2012-03-14 15:15:08 -0700 Comment on attachment 131746 Patch cq-'ing to address the comments one way or another. 578914 8 131746 ojan 2012-03-14 16:33:59 -0700 Comment on attachment 131746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131746&action=review >> Tools/Scripts/webkitpy/tool/commands/rebaseline.py:113 >> + # FIXME: Support non-Chromium ports. > > Nit: do you actually need this? what happens if you run a non-chromium port? I would expect it to be mostly fine. I suppose not. I'll remove it. >> Tools/Scripts/webkitpy/tool/commands/rebaseline.py:124 >> + # FIXME: Do something more general here. > > You should use port.all_test_configurations() and then just filter on the version. Oh, good idea! 578924 9 ojan 2012-03-14 16:38:51 -0700 http://trac.webkit.org/changeset/110783 578950 10 ojan 2012-03-14 17:02:11 -0700 Reverted r110783 for reason: Caused existing test expectation lines to expand to one for each test configuration. Committed r110789: <http://trac.webkit.org/changeset/110789> 580763 11 ojan 2012-03-16 12:03:06 -0700 Committed r111039: <http://trac.webkit.org/changeset/111039> 131746 2012-03-13 16:24:51 -0700 2012-03-14 16:33:59 -0700 Patch bug-81054-20120313162443.patch text/plain 11813 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNjExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjJkNzc4OGY0Zjg4ZWMwMGNmMTdkYTQzNTEzZDVkZDNk ZjY1NWU1ZC4uYmNkODQxMTNiNGI0ZjU4MmY4ZTgwYjdhNTk3ODA1ZWFjYzViMjJlYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDEyLTAzLTEzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgSGF2ZSB3ZWJraXQtcGF0Y2ggcmViYXNlbGluZS10ZXN0IHVwZGF0ZSB0ZXN0X2V4cGVjdGF0 aW9ucy50eHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgxMDU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyB3aWxsIGFsbG93IHVzIHRvIHVzZSB0aGUgQWxsIEZhaWx1cmVzIHRhYiBpbiBnYXJkZW4t by1tYXRpYworICAgICAgICB0byByZWJhc2VsaW5lIHRlc3RzIHdpdGhvdXQgbWFraW5nIHRlc3Rf ZXhwZWN0YXRpb25zLnR4dCBzdGFsZS4KKworICAgICAgICBJdCdzIGNvbnNlcnZhdGl2ZSBhbmQg b25seSByZW1vdmVzIGxpbmVzIGlmIHRoZSB0ZXN0IGlzCisgICAgICAgIG5vdCBmbGFreSBhbmQg ZmFpbHMgaW4gYSB3YXkgdGhlIHJlYmFzZWxpbmUgd291bGQgZml4IChlLmcuCisgICAgICAgIENS QVNIL1RJTUVPVVQgd2lsbCBub3QgYmUgdG91Y2hlZCkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6CisgICAgICAg IChUZXN0RXhwZWN0YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVzdCk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRp b25zX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUmVtb3ZlQ29uZmlndXJhdGlvbnNUZXN0KToKKyAg ICAgICAgKFJlbW92ZUNvbmZpZ3VyYXRpb25zVGVzdC50ZXN0X3JlbW92ZSk6CisgICAgICAgICh0 ZXN0X3JlbW92ZV9saW5lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZS5weToKKyAgICAgICAgKFJlYmFzZWxpbmVUZXN0Ll9pc19zdXBwb3J0ZWRf cG9ydCk6CisgICAgICAgIChSZWJhc2VsaW5lVGVzdCk6CisgICAgICAgIChSZWJhc2VsaW5lVGVz dC5fdXBkYXRlX2V4cGVjdGF0aW9uc19maWxlKToKKyAgICAgICAgKFJlYmFzZWxpbmVUZXN0Ll9y ZWJhc2VsaW5lX3Rlc3RfYW5kX3VwZGF0ZV9leHBlY3RhdGlvbnMpOgorICAgICAgICAoUmViYXNl bGluZVRlc3QuZXhlY3V0ZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0UmViYXNlbGluZS50ZXN0 X3JlYmFzZWxpbmVfdXBkYXRlc19leHBlY3RhdGlvbnNfZmlsZSk6CisKIDIwMTItMDMtMTMgIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4gJiYgQmVuamFtaW4gUG91bGFpbiAgPGJwb3Vs YWluQGFwcGxlLmNvbT4KIAogICAgICAgICBBbHdheXMgZW5hYmxlIEVOQUJMRShDTElFTlRfQkFT RURfR0VPTE9DQVRJT04pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggZWE0ODM3 ZDkzMjY4ODc3MjlmZjkzOTQ4ZGI4M2MwNzg2M2RmNTZiZC4uY2E2MjlmOTVhODczMTZlMjJjOTY4 NTBlZTFlMDg0MTM0YjE2NzZkMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAt ODE0LDYgKzgxNCwyNSBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6CiAgICAgZGVm IGhhc193YXJuaW5ncyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2hhc193YXJuaW5ncwog CisgICAgZGVmIHJlbW92ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVzdChzZWxmLCB0ZXN0LCB0ZXN0 X2NvbmZpZ3VyYXRpb24pOgorICAgICAgICBleHBlY3RhdGlvbnNfdG9fcmVtb3ZlID0gW10KKyAg ICAgICAgZm9yIGV4cGVjdGF0aW9uIGluIHNlbGYuX2V4cGVjdGF0aW9uczoKKyAgICAgICAgICAg IGlmIGV4cGVjdGF0aW9uLm5hbWUgIT0gdGVzdCBvciBleHBlY3RhdGlvbi5pc19mbGFreSgpIG9y IG5vdCBleHBlY3RhdGlvbi5wYXJzZWRfZXhwZWN0YXRpb25zOgorICAgICAgICAgICAgICAgIGNv bnRpbnVlCisgICAgICAgICAgICBpZiBpdGVyKGV4cGVjdGF0aW9uLnBhcnNlZF9leHBlY3RhdGlv bnMpLm5leHQoKSBub3QgaW4gKEZBSUwsIFRFWFQsIElNQUdFLCBJTUFHRV9QTFVTX1RFWFQsIEFV RElPKToKKyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgaWYgdGVzdF9jb25m aWd1cmF0aW9uIG5vdCBpbiBleHBlY3RhdGlvbi5tYXRjaGluZ19jb25maWd1cmF0aW9uczoKKyAg ICAgICAgICAgICAgICBjb250aW51ZQorCisgICAgICAgICAgICBleHBlY3RhdGlvbi5tYXRjaGlu Z19jb25maWd1cmF0aW9ucy5yZW1vdmUodGVzdF9jb25maWd1cmF0aW9uKQorICAgICAgICAgICAg aWYgbm90IGV4cGVjdGF0aW9uLm1hdGNoaW5nX2NvbmZpZ3VyYXRpb25zOgorICAgICAgICAgICAg ICAgIGV4cGVjdGF0aW9uc190b19yZW1vdmUuYXBwZW5kKGV4cGVjdGF0aW9uKQorCisgICAgICAg IGZvciBleHBlY3RhdGlvbiBpbiBleHBlY3RhdGlvbnNfdG9fcmVtb3ZlOgorICAgICAgICAgICAg c2VsZi5fZXhwZWN0YXRpb25zLnJlbW92ZShleHBlY3RhdGlvbikKKworICAgICAgICByZXR1cm4g VGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0cmluZyhzZWxmLl9leHBlY3RhdGlv bnMsIHNlbGYuX3BhcnNlci5fdGVzdF9jb25maWd1cmF0aW9uX2NvbnZlcnRlcikKKwogICAgIGRl ZiByZW1vdmVfcmViYXNlbGluZWRfdGVzdHMoc2VsZiwgZXhjZXB0X3RoZXNlX3Rlc3RzKToKICAg ICAgICAgIiIiUmV0dXJucyBhIGNvcHkgb2YgdGhlIGV4cGVjdGF0aW9ucyB3aXRoIHRoZSB0ZXN0 cyByZW1vdmVkLiIiIgogICAgICAgICBkZWYgd2l0aG91dF9yZWJhc2VsaW5lX21vZGlmaWVyKGV4 cGVjdGF0aW9uKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eQppbmRleCBjNWI1MzNmZGQwYjAwNTRhNmMxN2QyNmExM2Y1OWYzNDkwMWY4YmMyLi45YmNmMmM4 ZGE5N2ZmYzYyYzI2YjVhZDk5ZjU0MjNlYzllMjYwOTE0IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CkBAIC0zODAsNiArMzgwLDUzIEBAIEJVR1ggOiBm YWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgPSBURVhUCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIkJVR19URVNUIFhQIDogcGFzc2VzL3RleHQuaHRtbCA9IFRFWFRcbiIp CiAKIAorY2xhc3MgUmVtb3ZlQ29uZmlndXJhdGlvbnNUZXN0KEJhc2UpOgorICAgIGRlZiB0ZXN0 X3JlbW92ZShzZWxmKToKKyAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKKyAgICAgICAgdGVzdF9w b3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0LXdpbi14cCcsIE5vbmUpCisgICAgICAg IHRlc3RfcG9ydC50ZXN0X2V4aXN0cyA9IGxhbWJkYSB0ZXN0OiBUcnVlCisgICAgICAgIHRlc3Rf cG9ydC50ZXN0X2lzZmlsZSA9IGxhbWJkYSB0ZXN0OiBUcnVlCisKKyAgICAgICAgdGVzdF9jb25m aWcgPSB0ZXN0X3BvcnQudGVzdF9jb25maWd1cmF0aW9uKCkKKyAgICAgICAgZXhwZWN0YXRpb25z ID0gVGVzdEV4cGVjdGF0aW9ucyh0ZXN0X3BvcnQsCisgICAgICAgICAgICAgdGVzdHM9c2VsZi5n ZXRfYmFzaWNfdGVzdHMoKSwKKyAgICAgICAgICAgICBleHBlY3RhdGlvbnM9IiIiQlVHWCBMSU5V WCBXSU4gUkVMRUFTRSA6IGZhaWx1cmVzL2V4cGVjdGVkL2Zvby5odG1sID0gVEVYVAorQlVHWSBX SU4gREVCVUcgOiBmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCA9IENSQVNICisiIiIsCisgICAg ICAgICAgICAgdGVzdF9jb25maWc9dGVzdF9jb25maWcsCisgICAgICAgICAgICAgaXNfbGludF9t b2RlPUZhbHNlLAorICAgICAgICAgICAgIG92ZXJyaWRlcz1Ob25lKQorCisgICAgICAgIGFjdHVh bF9leHBlY3RhdGlvbnMgPSBleHBlY3RhdGlvbnMucmVtb3ZlX2NvbmZpZ3VyYXRpb25fZnJvbV90 ZXN0KCdmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCcsIHRlc3RfY29uZmlnKQorCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoIiIiQlVHWCBMSU5VWCBWSVNUQSBXSU43IFJFTEVBU0UgOiBmYWls dXJlcy9leHBlY3RlZC9mb28uaHRtbCA9IFRFWFQKK0JVR1kgV0lOIERFQlVHIDogZmFpbHVyZXMv ZXhwZWN0ZWQvZm9vLmh0bWwgPSBDUkFTSAorIiIiLCBhY3R1YWxfZXhwZWN0YXRpb25zKQorCisg ICAgZGVmIHRlc3RfcmVtb3ZlX2xpbmUoc2VsZik6CisgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgp CisgICAgICAgIHRlc3RfcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVzdC13aW4teHAn LCBOb25lKQorICAgICAgICB0ZXN0X3BvcnQudGVzdF9leGlzdHMgPSBsYW1iZGEgdGVzdDogVHJ1 ZQorICAgICAgICB0ZXN0X3BvcnQudGVzdF9pc2ZpbGUgPSBsYW1iZGEgdGVzdDogVHJ1ZQorCisg ICAgICAgIHRlc3RfY29uZmlnID0gdGVzdF9wb3J0LnRlc3RfY29uZmlndXJhdGlvbigpCisgICAg ICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvbnModGVzdF9wb3J0LAorICAgICAgICAg ICAgIHRlc3RzPU5vbmUsCisgICAgICAgICAgICAgZXhwZWN0YXRpb25zPSIiIkJVR1ggV0lOIFJF TEVBU0UgOiBmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCA9IFRFWFQKK0JVR1kgV0lOIERFQlVH IDogZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwgPSBDUkFTSAorIiIiLAorICAgICAgICAgICAg IHRlc3RfY29uZmlnPXRlc3RfY29uZmlnLAorICAgICAgICAgICAgIGlzX2xpbnRfbW9kZT1GYWxz ZSwKKyAgICAgICAgICAgICBvdmVycmlkZXM9Tm9uZSkKKworICAgICAgICBhY3R1YWxfZXhwZWN0 YXRpb25zID0gZXhwZWN0YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVzdCgnZmFp bHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwnLCB0ZXN0X2NvbmZpZykKKyAgICAgICAgYWN0dWFsX2V4 cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucy5yZW1vdmVfY29uZmlndXJhdGlvbl9mcm9tX3Rlc3Qo J2ZhaWx1cmVzL2V4cGVjdGVkL2Zvby5odG1sJywgaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0 LXdpbi12aXN0YScsIE5vbmUpLnRlc3RfY29uZmlndXJhdGlvbigpKQorICAgICAgICBhY3R1YWxf ZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVz dCgnZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwnLCBob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rl c3Qtd2luLXdpbjcnLCBOb25lKS50ZXN0X2NvbmZpZ3VyYXRpb24oKSkKKworICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCIiIkJVR1kgV0lOIERFQlVHIDogZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0 bWwgPSBDUkFTSAorIiIiLCBhY3R1YWxfZXhwZWN0YXRpb25zKQorCisKIGNsYXNzIFJlYmFzZWxp bmluZ1Rlc3QoQmFzZSk6CiAgICAgIiIiVGVzdCByZWJhc2VsaW5pbmctc3BlY2lmaWMgZnVuY3Rp b25hbGl0eS4iIiIKICAgICBkZWYgYXNzZXJ0UmVtb3ZlKHNlbGYsIGlucHV0X2V4cGVjdGF0aW9u cywgdGVzdHMsIGV4cGVjdGVkX2V4cGVjdGF0aW9ucyk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CmluZGV4IGM0YTIwNmRiM2VmYWQ5 ZmI5N2I5OTg4OWY1YTZhNjkwMGUzNTExZGMuLmI1YjM1N2NmYzFjYmFiOTU4ODY2ZjViYTkxN2M4 NjFiMWFjMjJkMDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9yZWJhc2VsaW5lLnB5CkBAIC00MCw2ICs0MCw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0udXNlciBpbXBvcnQgVXNlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuY29u dHJvbGxlcnMudGVzdF9yZXN1bHRfd3JpdGVyIGltcG9ydCBUZXN0UmVzdWx0V3JpdGVyCiBmcm9t IHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfZmFpbHVyZXMKK2Zyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRl c3RDb25maWd1cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9l eHBlY3RhdGlvbnMgaW1wb3J0IFRlc3RFeHBlY3RhdGlvbnMKIGZyb20gd2Via2l0cHkubGF5b3V0 X3Rlc3RzLnBvcnQgaW1wb3J0IGJ1aWxkZXJzCiBmcm9tIHdlYmtpdHB5LnRvb2wuZ3JhbW1hciBp bXBvcnQgcGx1cmFsaXplCkBAIC0xMDgsNiArMTA5LDMwIEBAIGNsYXNzIFJlYmFzZWxpbmVUZXN0 KEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKICAgICAgICAgaWYgbm90IHNlbGYuX3Rvb2wu c2NtKCkuZXhpc3RzKHRhcmdldF9iYXNlbGluZSk6CiAgICAgICAgICAgICBzZWxmLl90b29sLnNj bSgpLmFkZCh0YXJnZXRfYmFzZWxpbmUpCiAKKyAgICBkZWYgX2lzX3N1cHBvcnRlZF9wb3J0KHNl bGYsIHBvcnRfbmFtZSk6CisgICAgICAgICMgRklYTUU6IFN1cHBvcnQgbm9uLUNocm9taXVtIHBv cnRzLgorICAgICAgICByZXR1cm4gcG9ydF9uYW1lLnN0YXJ0c3dpdGgoJ2Nocm9taXVtLScpCisK KyAgICBkZWYgX3VwZGF0ZV9leHBlY3RhdGlvbnNfZmlsZShzZWxmLCBidWlsZGVyX25hbWUsIHRl c3RfbmFtZSk6CisgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5nZXRfZnJv bV9idWlsZGVyX25hbWUoYnVpbGRlcl9uYW1lKQorICAgICAgICBpZiBub3Qgc2VsZi5faXNfc3Vw cG9ydGVkX3BvcnQocG9ydC5uYW1lKCkpOgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGV4 cGVjdGF0aW9uc1N0cmluZyA9IHBvcnQudGVzdF9leHBlY3RhdGlvbnMoKQorICAgICAgICBleHBl Y3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zKHBvcnQsIE5vbmUsIGV4cGVjdGF0aW9uc1N0cmlu ZywgcG9ydC50ZXN0X2NvbmZpZ3VyYXRpb24oKSkKKyAgICAgICAgcGF0aCA9IHBvcnQucGF0aF90 b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCkKKworICAgICAgICAjIEZJWE1FOiBEbyBzb21ldGhp bmcgbW9yZSBnZW5lcmFsIGhlcmUuCisgICAgICAgICMgUGVyaGFwcyBnaXZlIHRoZSBwb3J0IG9i amVjdCBhIGFsbF9wb3NzaWJsZV9jb25maWd1cmF0aW9uc19mb3JfcGxhdGZvcm0gbWV0aG9kPwor ICAgICAgICBhcmNoaXRlY3R1cmVzX3RvX3VwZGF0ZSA9IFsneDg2JywgJ3g4Nl82NCddCisgICAg ICAgIGJ1aWxkX3R5cGVzX3RvX3VwZGF0ZSA9IFsncmVsZWFzZScsICdkZWJ1ZyddCisgICAgICAg IHZlcnNpb24gPSBwb3J0LnRlc3RfY29uZmlndXJhdGlvbigpLnZlcnNpb24KKyAgICAgICAgZm9y IGFyY2hpdGVjdHVyZSBpbiBhcmNoaXRlY3R1cmVzX3RvX3VwZGF0ZToKKyAgICAgICAgICAgIGZv ciBidWlsZF90eXBlIGluIGJ1aWxkX3R5cGVzX3RvX3VwZGF0ZToKKyAgICAgICAgICAgICAgICBj b25maWcgPSBUZXN0Q29uZmlndXJhdGlvbih2ZXJzaW9uLCBhcmNoaXRlY3R1cmUsIGJ1aWxkX3R5 cGUpCisgICAgICAgICAgICAgICAgZXhwZWN0YXRpb25zU3RyaW5nID0gZXhwZWN0YXRpb25zLnJl bW92ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVzdCh0ZXN0X25hbWUsIGNvbmZpZykKKworICAgICAg ICBzZWxmLl90b29sLmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHBhdGgsIGV4cGVjdGF0aW9u c1N0cmluZykKKwogICAgIGRlZiBfdGVzdF9yb290KHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAg IHJldHVybiBvcy5wYXRoLnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0KIApAQCAtMTMwLDEzICsxNTUs MTcgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgog ICAgICAgICBwcmludCAiUmV0cmlldmluZyAlcy4iICUgc291cmNlX2Jhc2VsaW5lCiAgICAgICAg IHNlbGYuX3NhdmVfYmFzZWxpbmUoc2VsZi5fdG9vbC53ZWIuZ2V0X2JpbmFyeShzb3VyY2VfYmFz ZWxpbmUsIGNvbnZlcnRfNDA0X3RvX05vbmU9VHJ1ZSksIHRhcmdldF9iYXNlbGluZSkKIAotICAg IGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgIGRlZiBfcmViYXNl bGluZV90ZXN0X2FuZF91cGRhdGVfZXhwZWN0YXRpb25zKHNlbGYsIGJ1aWxkZXJfbmFtZSwgdGVz dF9uYW1lLCBwbGF0Zm9ybXNfdG9fbW92ZV9leGlzdGluZ19iYXNlbGluZXNfdG8pOgogICAgICAg ICBmb3Igc3VmZml4IGluIF9iYXNlbGluZV9zdWZmaXhfbGlzdDoKLSAgICAgICAgICAgIGlmIGxl bihhcmdzKSA+IDI6Ci0gICAgICAgICAgICAgICAgcGxhdGZvcm1zX3RvX21vdmVfZXhpc3Rpbmdf YmFzZWxpbmVzX3RvID0gYXJnc1syOl0KLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAg ICAgcGxhdGZvcm1zX3RvX21vdmVfZXhpc3RpbmdfYmFzZWxpbmVzX3RvID0gTm9uZQotICAgICAg ICAgICAgc2VsZi5fcmViYXNlbGluZV90ZXN0KGFyZ3NbMF0sIGFyZ3NbMV0sIHBsYXRmb3Jtc190 b19tb3ZlX2V4aXN0aW5nX2Jhc2VsaW5lc190bywgc3VmZml4KQorICAgICAgICAgICAgc2VsZi5f cmViYXNlbGluZV90ZXN0KGJ1aWxkZXJfbmFtZSwgdGVzdF9uYW1lLCBwbGF0Zm9ybXNfdG9fbW92 ZV9leGlzdGluZ19iYXNlbGluZXNfdG8sIHN1ZmZpeCkKKyAgICAgICAgc2VsZi5fdXBkYXRlX2V4 cGVjdGF0aW9uc19maWxlKGJ1aWxkZXJfbmFtZSwgdGVzdF9uYW1lKQorCisgICAgZGVmIGV4ZWN1 dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIGlmIGxlbihhcmdzKSA+IDI6 CisgICAgICAgICAgICBwbGF0Zm9ybXNfdG9fbW92ZV9leGlzdGluZ19iYXNlbGluZXNfdG8gPSBh cmdzWzI6XQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcGxhdGZvcm1zX3RvX21vdmVfZXhp c3RpbmdfYmFzZWxpbmVzX3RvID0gTm9uZQorICAgICAgICBzZWxmLl9yZWJhc2VsaW5lX3Rlc3Rf YW5kX3VwZGF0ZV9leHBlY3RhdGlvbnMoYXJnc1swXSwgYXJnc1sxXSwgcGxhdGZvcm1zX3RvX21v dmVfZXhpc3RpbmdfYmFzZWxpbmVzX3RvKQogCiAKIGNsYXNzIE9wdGltaXplQmFzZWxpbmVzKEFi c3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkKaW5kZXggYTgx N2ZhMDZkZjVhY2Q2ZmZiY2RhZWNiOWQ0ZWJlNmNlMjljMzc3MC4uNDdkMDk2MTI1Y2E2MjU4NmY5 MWQxNDZlNTU2NGQzN2JkZmU1NjhlZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkKQEAgLTQyLDYg KzQyLDIxIEBAIGNsYXNzIFRlc3RSZWJhc2VsaW5lKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgYnVpbGQgPSBNb2NrKCkKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRz KHNlbGYsIGNvbW1hbmQuX3Rlc3RzX3RvX3VwZGF0ZSwgW2J1aWxkXSkKIAorICAgIGRlZiB0ZXN0 X3JlYmFzZWxpbmVfdXBkYXRlc19leHBlY3RhdGlvbnNfZmlsZShzZWxmKToKKyAgICAgICAgY29t bWFuZCA9IFJlYmFzZWxpbmVUZXN0KCkKKyAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKKyAgICAg ICAgY29tbWFuZC5iaW5kX3RvX3Rvb2wodG9vbCkKKworICAgICAgICBsaW9uX3BvcnQgPSB0b29s LnBvcnRfZmFjdG9yeS5nZXRfZnJvbV9idWlsZGVyX25hbWUoIldlYmtpdCBNYWMxMC43IikKKyAg ICAgICAgdG9vbC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShsaW9uX3BvcnQucGF0aF90b190 ZXN0X2V4cGVjdGF0aW9uc19maWxlKCksICJCVUdYIE1BQyA6IHVzZXJzY3JpcHRzL2Fub3RoZXIt dGVzdC5odG1sID0gSU1BR0VcbkJVR1ogTElOVVggOiB1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3Qu aHRtbFxuIikKKyAgICAgICAgdG9vbC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShvcy5wYXRo LmpvaW4obGlvbl9wb3J0LmxheW91dF90ZXN0c19kaXIoKSwgInVzZXJzY3JpcHRzL2Fub3RoZXIt dGVzdC5odG1sIiksICJEdW1teSB0ZXN0IGNvbnRlbnRzIikKKworICAgICAgICBleHBlY3RlZF9z dGRvdXQgPSAiUmV0cmlldmluZyBodHRwOi8vZXhhbXBsZS5jb20vZi9idWlsZGVycy9XZWJraXQg TWFjMTAuNy9yZXN1bHRzL2xheW91dC10ZXN0LXJlc3VsdHMvdXNlcnNjcmlwdHMvYW5vdGhlci10 ZXN0LWFjdHVhbC5wbmcuXG5SZXRyaWV2aW5nIGh0dHA6Ly9leGFtcGxlLmNvbS9mL2J1aWxkZXJz L1dlYmtpdCBNYWMxMC43L3Jlc3VsdHMvbGF5b3V0LXRlc3QtcmVzdWx0cy91c2Vyc2NyaXB0cy9h bm90aGVyLXRlc3QtYWN0dWFsLnR4dC5cbiIKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2Vy dF9vdXRwdXRzKHNlbGYsIGNvbW1hbmQuX3JlYmFzZWxpbmVfdGVzdF9hbmRfdXBkYXRlX2V4cGVj dGF0aW9ucywgWyJXZWJraXQgTWFjMTAuNyIsICJ1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRt bCIsIE5vbmVdLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQorCisgICAgICAgIG5l d19leHBlY3RhdGlvbnMgPSB0b29sLmZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUobGlvbl9wb3J0 LnBhdGhfdG9fdGVzdF9leHBlY3RhdGlvbnNfZmlsZSgpKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKG5ld19leHBlY3RhdGlvbnMsICJCVUdYIFNOT1dMRU9QQVJEIDogdXNlcnNjcmlwdHMvYW5v dGhlci10ZXN0Lmh0bWwgPSBJTUFHRVxuQlVHWCBMRU9QQVJEIDogdXNlcnNjcmlwdHMvYW5vdGhl ci10ZXN0Lmh0bWwgPSBJTUFHRVxuQlVHWiBMSU5VWCA6IHVzZXJzY3JpcHRzL2Fub3RoZXItdGVz dC5odG1sXG4iKQorCiAgICAgZGVmIHRlc3RfcmViYXNlbGluZV90ZXN0KHNlbGYpOgogICAgICAg ICBjb21tYW5kID0gUmViYXNlbGluZVRlc3QoKQogICAgICAgICBjb21tYW5kLmJpbmRfdG9fdG9v bChNb2NrVG9vbCgpKQo=