90186 2012-06-28 10:16:16 -0700 Make rebaseline-test and rebseline-expectations work for non-Chromium ports 2012-06-28 12:03:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth dpranke simon.fraser oldest_to_newest 659589 0 ojan 2012-06-28 10:16:16 -0700 Make rebaseline-test and rebseline-expectations work for non-Chromium ports 659594 1 149968 ojan 2012-06-28 10:23:18 -0700 Created attachment 149968 Patch 659595 2 simon.fraser 2012-06-28 10:24:39 -0700 \o/ 659653 3 149968 abarth 2012-06-28 11:35:16 -0700 Comment on attachment 149968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149968&action=review > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:84 > + if port.name().startswith('chromium-'): Should we have a way to ask the port whether it's a Chromium port rather than using string operations? > Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py:257 > +MOCK run_command: ['qmake', '-v'], cwd=None > +MOCK run_command: ['qmake', '-v'], cwd=None > +MOCK run_command: ['qmake', '-v'], cwd=None > +MOCK run_command: ['qmake', '-v'], cwd=None What's up with the qmake calls? Will this error out on systems that don't have qmake? 659665 4 149968 ojan 2012-06-28 11:54:56 -0700 Comment on attachment 149968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149968&action=review >> Tools/Scripts/webkitpy/tool/commands/rebaseline.py:84 >> + if port.name().startswith('chromium-'): > > Should we have a way to ask the port whether it's a Chromium port rather than using string operations? Probably. I thought about this briefly, but didn't come up with a solution I loved. I'll put a FIXME. >> Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py:257 >> +MOCK run_command: ['qmake', '-v'], cwd=None > > What's up with the qmake calls? Will this error out on systems that don't have qmake? The Qt port class calls out to qmake to find out which qt version to use. It handles failures by just choosing a specific version, so it works fine on my system that lacks qmake. This should probably be fixed, but I'm not really sure what the right fix is. 659672 5 ojan 2012-06-28 12:03:12 -0700 Committed r121447: <http://trac.webkit.org/changeset/121447> 149968 2012-06-28 10:23:18 -0700 2012-06-28 11:54:56 -0700 Patch bug-90186-20120628102318.patch text/plain 13420 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQzODUwMzU0MTRmOWExNTVkOTQyNDYyMWJkZjVkM2Vm Y2UyNGNmMi4uOTc4YWM5NzgxYzk0NjkyMjNmZTZkYjUzNjdhMWRmM2JjNWIxMzI3NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDEyLTA2LTI4ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgTWFrZSByZWJhc2VsaW5lLXRlc3QgYW5kIHJlYnNlbGluZS1leHBlY3RhdGlvbnMgd29yayBm b3Igbm9uLUNocm9taXVtIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MDE4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgbWFrZXMgcmViYXNlbGluaW5nIHdvcmsgZm9yIGFsbCBwb3J0cyB0 aGF0IGhhdmUgYSBUZXN0RXhwZWN0YXRpb25zIGZpbGUKKyAgICAgICAgaW4gdGhlIHRyZWUuIEkg ZGlkbid0IHRlc3Qgb3RoZXIgcG9ydHMuCisKKyAgICAgICAgVGhpcyBkb2Vzbid0IGFkZHJlc3Mg MTAwJSBvZiB0aGUgcHJvYmxlbS4gVGhlIHJlYmFzZWxpbmUgY29kZSBwdXRzIHRoZSBleHBlY3Rh dGlvbnMKKyAgICAgICAgaW4gdGhlIG1vc3Qgc3BlY2lmaWMgZGlyZWN0b3J5IGFuZCByZWxpZXMg b24gb3B0aW1pemUtYmFzZWxpbmVzIHRvIG1lcmdlIGJhc2VsaW5lcworICAgICAgICBhcHByb3By aWF0ZWx5LiBUaGlzIG9ubHkgd29ya3MgaWYgZXZlcnkgcGxhdGZvcm0gZGlyZWN0b3J5IGhhcyBh biBlcXVpdmFsZW50IGJvdAorICAgICAgICB0aGF0IHJ1bnMgdGhlIHRlc3RzLCB3aGljaCBpcyBu b3QgdHJ1ZSBmb3IgbW9zdCBwb3J0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL25ldC9idWlsZGJvdC9idWlsZGJvdC5weToKKyAgICAgICAgKEJ1aWxkZXIuX3JldmlzaW9u X2FuZF9idWlsZF9mb3JfZmlsZW5hbWUpOgorICAgICAgICBTb21lIGJvdHMgaGF2ZSBmaWxlbmFt ZXMgdGhhdCBhcmVuJ3QgcmV2aXNpb24vYnVpbGQgbnVtYmVyIHBhaXJzCisgICAgICAgIGUuZy4g dGhleSBhcmUgcmFuZG9tIGp1bmsgbGlrZSBhUWh4dnguIEhhbmRsZSB0aGlzIGdyYWNlZnVsbHku CisgICAgICAgIChCdWlsZGVyLl9mZXRjaF9yZXZpc2lvbl90b19idWlsZF9tYXApOgorICAgICAg ICAoQnVpbGRlci5fZmlsZV9pbmZvX2xpc3RfdG9fcmV2aXNpb25fdG9fYnVpbGRfbGlzdCk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90X3Vu aXR0ZXN0LnB5OgorICAgICAgICAoQnVpbGRlclRlc3QudGVzdF9idWlsZF9hbmRfcmV2aXNpb25f Zm9yX2ZpbGVuYW1lKToKKyAgICAgICAgKEJ1aWxkZXJUZXN0LnRlc3RfZmlsZV9pbmZvX2xpc3Rf dG9fcmV2aXNpb25fdG9fYnVpbGRfbGlzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9idWlsZGVycy5weToKKyAgICAgICAgVXBkYXRlIHRoZSBsaXN0IG9m IGJ1aWxkZXJzLiBUaGlzIGxpc3QgbmVlZHMgdG8gYmUga2VwdCB1cAorICAgICAgICB0byBkYXRl IGZvciB0aGUgcmViYXNlbGluZSB0b29sIHRvIHdvcmsuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChSZWJhc2VsaW5lVGVz dC5fcmVzdWx0c191cmwpOgorICAgICAgICAoUmViYXNlbGluZUV4cGVjdGF0aW9ucy5fcnVuX3dl YmtpdF9wYXRjaCk6CisgICAgICAgIChSZWJhc2VsaW5lRXhwZWN0YXRpb25zLl9yZWJhc2VsaW5l X3BvcnQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lX3VuaXR0ZXN0LnB5OgorCiAyMDEyLTA2LTI3ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBSRUdSRVNTSU9OKHIxMjEzMzkpOiBJdCBicm9r ZSB0aGUgYnVpbGQgb24gdGhlIFF0IFdpbmRvd3MgYm90cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90LnB5CmluZGV4IDE1OWIw MDc3ZGEzYWY0NTliMzlkZjc1M2ZmOGYzZDA4YWU5NmQ3YzIuLjRlODIwY2VlMGZlZjcyY2RiMWIz MjE4Y2E0NjkyYmRmZWE3MjhlNWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9idWlsZGJvdC9idWlsZGJvdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3QucHkKQEAgLTEyMCw2ICsxMjAsOCBAQCBj bGFzcyBCdWlsZGVyKG9iamVjdCk6CiAgICAgZGVmIF9yZXZpc2lvbl9hbmRfYnVpbGRfZm9yX2Zp bGVuYW1lKHNlbGYsIGZpbGVuYW1lKToKICAgICAgICAgIyBFeGFtcGxlOiAicjQ3NDgzICgxKS8i IG9yICJyNDc0ODMgKDEpLnppcCIKICAgICAgICAgbWF0Y2ggPSBzZWxmLmZpbGVfbmFtZV9yZWdl eHAubWF0Y2goZmlsZW5hbWUpCisgICAgICAgIGlmIG5vdCBtYXRjaDoKKyAgICAgICAgICAgIHJl dHVybiBOb25lCiAgICAgICAgIHJldHVybiAoaW50KG1hdGNoLmdyb3VwKCJyZXZpc2lvbiIpKSwg aW50KG1hdGNoLmdyb3VwKCJidWlsZF9udW1iZXIiKSkpCiAKICAgICBkZWYgX2ZldGNoX3Jldmlz aW9uX3RvX2J1aWxkX21hcChzZWxmKToKQEAgLTEzNSwxMCArMTM3LDE4IEBAIGNsYXNzIEJ1aWxk ZXIob2JqZWN0KToKICAgICAgICAgZXhjZXB0IHVybGxpYjIuSFRUUEVycm9yLCBlcnJvcjoKICAg ICAgICAgICAgIGlmIGVycm9yLmNvZGUgIT0gNDA0OgogICAgICAgICAgICAgICAgIHJhaXNlCisg ICAgICAgICAgICBfbG9nLmRlYnVnKCJSZXZpc2lvbi9idWlsZCBsaXN0IGZhaWxlZCB0byBsb2Fk LiIpCiAgICAgICAgICAgICByZXN1bHRfZmlsZXMgPSBbXQorICAgICAgICByZXR1cm4gZGljdChz ZWxmLl9maWxlX2luZm9fbGlzdF90b19yZXZpc2lvbl90b19idWlsZF9saXN0KHJlc3VsdF9maWxl cykpCiAKKyAgICBkZWYgX2ZpbGVfaW5mb19saXN0X3RvX3JldmlzaW9uX3RvX2J1aWxkX2xpc3Qo c2VsZiwgZmlsZV9pbmZvX2xpc3QpOgogICAgICAgICAjIFRoaXMgYXNzdW1lcyB0aGVyZSB3YXMg b25seSBvbmUgYnVpbGQgcGVyIHJldmlzaW9uLCB3aGljaCBpcyBmYWxzZSBidXQgd2UgZG9uJ3Qg Y2FyZSBmb3Igbm93LgotICAgICAgICByZXR1cm4gZGljdChbc2VsZi5fcmV2aXNpb25fYW5kX2J1 aWxkX2Zvcl9maWxlbmFtZShmaWxlX2luZm9bImZpbGVuYW1lIl0pIGZvciBmaWxlX2luZm8gaW4g cmVzdWx0X2ZpbGVzXSkKKyAgICAgICAgcmV2aXNpb25zX2FuZF9idWlsZHMgPSBbXQorICAgICAg ICBmb3IgZmlsZV9pbmZvIGluIGZpbGVfaW5mb19saXN0OgorICAgICAgICAgICAgcmV2aXNpb25f YW5kX2J1aWxkID0gc2VsZi5fcmV2aXNpb25fYW5kX2J1aWxkX2Zvcl9maWxlbmFtZShmaWxlX2lu Zm9bImZpbGVuYW1lIl0pCisgICAgICAgICAgICBpZiByZXZpc2lvbl9hbmRfYnVpbGQ6CisgICAg ICAgICAgICAgICAgcmV2aXNpb25zX2FuZF9idWlsZHMuYXBwZW5kKHJldmlzaW9uX2FuZF9idWls ZCkKKyAgICAgICAgcmV0dXJuIHJldmlzaW9uc19hbmRfYnVpbGRzCiAKICAgICBkZWYgX3Jldmlz aW9uX3RvX2J1aWxkX21hcChzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYuX3JldmlzaW9uX3Rv X2J1aWxkX251bWJlcjoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWlsZGJvdC9idWlsZGJvdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWlsZGJvdC9idWlsZGJvdF91bml0dGVzdC5weQppbmRleCAzNTU3ODZh ZTA0NWQ2MjFiZTNjMmM0ODBhMWFlNTk4M2RkODZmNmM4Li4yMzEzMzI2MTE3NDFkYmRmNmZlYjdh YTY0Y2IwMzMwNGQwMjQyYjVkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3RfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90X3VuaXR0ZXN0LnB5CkBAIC0x MTIsMTAgKzExMiwyMCBAQCBjbGFzcyBCdWlsZGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgIGV4cGVjdGF0aW9ucyA9IHsKICAgICAgICAgICAgICJyNDc0ODMgKDEpLyIgOiAoNDc0 ODMsIDEpLAogICAgICAgICAgICAgInI0NzQ4MyAoMSkuemlwIiA6ICg0NzQ4MywgMSksCisgICAg ICAgICAgICAicmFuZG9tIGp1bmsiOiBOb25lLAogICAgICAgICB9CiAgICAgICAgIGZvciBmaWxl bmFtZSwgcmV2aXNpb25fYW5kX2J1aWxkIGluIGV4cGVjdGF0aW9ucy5pdGVtcygpOgogICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmJ1aWxkZXIuX3JldmlzaW9uX2FuZF9idWlsZF9m b3JfZmlsZW5hbWUoZmlsZW5hbWUpLCByZXZpc2lvbl9hbmRfYnVpbGQpCiAKKyAgICBkZWYgdGVz dF9maWxlX2luZm9fbGlzdF90b19yZXZpc2lvbl90b19idWlsZF9saXN0KHNlbGYpOgorICAgICAg ICBmaWxlX2luZm9fbGlzdCA9IFsKKyAgICAgICAgICAgIHsiZmlsZW5hbWUiOiAicjQ3NDgzICgx KS8ifSwKKyAgICAgICAgICAgIHsiZmlsZW5hbWUiOiAicjQ3NDgzICgxKS56aXAifSwKKyAgICAg ICAgICAgIHsiZmlsZW5hbWUiOiAicmFuZG9tIGp1bmsifSwKKyAgICAgICAgXQorICAgICAgICBi dWlsZHNfYW5kX3JldmlzaW9uc19saXN0ID0gWyg0NzQ4MywgMSksICg0NzQ4MywgMSldCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLl9maWxlX2luZm9fbGlzdF90b19yZXZp c2lvbl90b19idWlsZF9saXN0KGZpbGVfaW5mb19saXN0KSwgYnVpbGRzX2FuZF9yZXZpc2lvbnNf bGlzdCkKKwogICAgIGRlZiB0ZXN0X2ZldGNoX2J1aWxkKHNlbGYpOgogICAgICAgICBidWlsZGJv dCA9IEJ1aWxkQm90KCkKICAgICAgICAgYnVpbGRlciA9IEJ1aWxkZXIodSJUZXN0IEJ1aWxkZXIg XHUyNjYxIiwgYnVpbGRib3QpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9idWlsZGVycy5weQppbmRleCAzYWQ0NWJlMTcxODEyZjUyN2Q3Mzg3ZDVl ZjIyZjhmODYwMGZkYWYyLi5iNjQzYTU4MTEwMGZlNTAyOGM5ZDdmZTMwYWFhZTM4MDkyYmI4YTEx IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2J1 aWxkZXJzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YnVpbGRlcnMucHkKQEAgLTU4LDExICs1OCwxNyBAQCBfZXhhY3RfbWF0Y2hlcyA9IHsKICAgICAi QXBwbGUgTGlvbiBEZWJ1ZyBXSzIgKFRlc3RzKSI6IHsicG9ydF9uYW1lIjogIm1hYy1saW9uIiwg InNwZWNpZmllcnMiOiBzZXQoWyJsaW9uIiwgIndrMiIsICJkZWJ1ZyJdKX0sCiAKICAgICAiQXBw bGUgV2luIFhQIERlYnVnIChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJ3aW4teHAiLCAic3BlY2lm aWVycyI6IHNldChbIndpbiIsICJkZWJ1ZyJdKX0sCi0gICAgIkFwcGxlIFdpbiA3IFJlbGVhc2Ug KFRlc3RzKSI6IHsicG9ydF9uYW1lIjogIndpbi14cCIsICJzcGVjaWZpZXJzIjogc2V0KFsid2lu Il0pfSwKKyAgICAiQXBwbGUgV2luIDcgUmVsZWFzZSAoVGVzdHMpIjogeyJwb3J0X25hbWUiOiAi d2luLTdzcDAiLCAic3BlY2lmaWVycyI6IHNldChbIndpbiJdKX0sCisKKyAgICAiR1RLIExpbnV4 IDMyLWJpdCBSZWxlYXNlIjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNwZWNpZmllcnMiOiBzZXQo WyJndGsiLCAieDg2IiwgInJlbGVhc2UiXSl9LAorICAgICJHVEsgTGludXggNjQtYml0IERlYnVn IjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2XzY0 IiwgImRlYnVnIl0pfSwKKyAgICAiR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlIjogeyJwb3J0X25h bWUiOiAiZ3RrIiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2XzY0IiwgInJlbGVhc2Ui XSl9LAorICAgICJHVEsgTGludXggNjQtYml0IFJlbGVhc2UgV0syIChUZXN0cykiOiB7InBvcnRf bmFtZSI6ICJndGsiLCAic3BlY2lmaWVycyI6IHNldChbImd0ayIsICJ4ODZfNjQiLCAid2syIiwg InJlbGVhc2UiXSl9LAogCi0gICAgIkdUSyBMaW51eCAzMi1iaXQgRGVidWciOiB7InBvcnRfbmFt ZSI6ICJndGsiLCAic3BlY2lmaWVycyI6IHNldChbImd0ayJdKX0sCiAgICAgIlF0IExpbnV4IFJl bGVhc2UiOiB7InBvcnRfbmFtZSI6ICJxdC1saW51eCIsICJzcGVjaWZpZXJzIjogc2V0KFsid2lu IiwgImxpbnV4IiwgIm1hYyJdKX0sCi0gICAgIkVGTCBMaW51eCBSZWxlYXNlIjogeyJwb3J0X25h bWUiOiAiZWZsIiwgInNwZWNpZmllcnMiOiBzZXQoWyJlZmwiXSl9LAorCisgICAgIkVGTCBMaW51 eCA2NC1iaXQgRGVidWciOiB7InBvcnRfbmFtZSI6ICJlZmwiLCAic3BlY2lmaWVycyI6IHNldChb ImVmbCIsICJkZWJ1ZyJdKX0sCisgICAgIkVGTCBMaW51eCA2NC1iaXQgUmVsZWFzZSI6IHsicG9y dF9uYW1lIjogImVmbCIsICJzcGVjaWZpZXJzIjogc2V0KFsiZWZsIiwgInJlbGVhc2UiXSl9LAog fQogCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9y ZWJhc2VsaW5lLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmUucHkKaW5kZXggYmQ4OTBjYzhlODBjZWVmN2UyMDc3NTM3YjRhNzRiMGNiMzZjMDg2Yi4u YTI0OGRlYjQwZjNiOWJhYTcwYWRhYWE4NTljZjc2ZmViMDdkYTVkZCAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKQEAgLTgwLDkg KzgwLDEwIEBAIGNsYXNzIFJlYmFzZWxpbmVUZXN0KEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFu ZCk6CiAgICAgICAgIHNlbGYuX3NjbV9jaGFuZ2VzID0ge30KIAogICAgIGRlZiBfcmVzdWx0c191 cmwoc2VsZiwgYnVpbGRlcl9uYW1lKToKLSAgICAgICAgIyBGSVhNRTogR2VuZXJhbGl6ZSB0aGlz IGNvbW1hbmQgdG8gd29yayB3aXRoIG5vbi1idWlsZC5jaHJvbWl1bS5vcmcgYnVpbGRlcnMuCi0g ICAgICAgIGJ1aWxkZXIgPSBzZWxmLl90b29sLmNocm9taXVtX2J1aWxkYm90KCkuYnVpbGRlcl93 aXRoX25hbWUoYnVpbGRlcl9uYW1lKQotICAgICAgICByZXR1cm4gYnVpbGRlci5hY2N1bXVsYXRl ZF9yZXN1bHRzX3VybCgpCisgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5n ZXRfZnJvbV9idWlsZGVyX25hbWUoYnVpbGRlcl9uYW1lKQorICAgICAgICBpZiBwb3J0Lm5hbWUo KS5zdGFydHN3aXRoKCdjaHJvbWl1bS0nKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl90b29s LmNocm9taXVtX2J1aWxkYm90KCkuYnVpbGRlcl93aXRoX25hbWUoYnVpbGRlcl9uYW1lKS5hY2N1 bXVsYXRlZF9yZXN1bHRzX3VybCgpCisgICAgICAgIHJldHVybiBzZWxmLl90b29sLmJ1aWxkYm90 LmJ1aWxkZXJfd2l0aF9uYW1lKGJ1aWxkZXJfbmFtZSkubGF0ZXN0X2NhY2hlZF9idWlsZCgpLnJl c3VsdHNfdXJsKCkKIAogICAgIGRlZiBfYmFzZWxpbmVfZGlyZWN0b3J5KHNlbGYsIGJ1aWxkZXJf bmFtZSk6CiAgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5nZXRfZnJvbV9i dWlsZGVyX25hbWUoYnVpbGRlcl9uYW1lKQpAQCAtMjUwLDE1ICsyNTEsOSBAQCBjbGFzcyBSZWJh c2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKICAgICAgICAg dHJ5OgogICAgICAgICAgICAgc2VsZi5fdG9vbC5leGVjdXRpdmUucnVuX2NvbW1hbmQoW3NlbGYu X3Rvb2wucGF0aCgpXSArIGFyZ3MsIGN3ZD1zZWxmLl90b29sLnNjbSgpLmNoZWNrb3V0X3Jvb3Qp CiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKLSAgICAgICAgICAgIHBhc3MKLQotICAg IGRlZiBfaXNfc3VwcG9ydGVkX3BvcnQoc2VsZiwgcG9ydF9uYW1lKToKLSAgICAgICAgIyBGSVhN RTogU3VwcG9ydCBub24tQ2hyb21pdW0gcG9ydHMuCi0gICAgICAgIHJldHVybiBwb3J0X25hbWUu c3RhcnRzd2l0aCgnY2hyb21pdW0tJykKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoZSkKIAogICAg IGRlZiBfdXBkYXRlX2V4cGVjdGF0aW9uc19maWxlKHNlbGYsIHBvcnRfbmFtZSk6Ci0gICAgICAg IGlmIG5vdCBzZWxmLl9pc19zdXBwb3J0ZWRfcG9ydChwb3J0X25hbWUpOgotICAgICAgICAgICAg cmV0dXJuCiAgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5nZXQocG9ydF9u YW1lKQogCiAgICAgICAgICMgRklYTUU6IFRoaXMgd2lsbCBpbnRlbnRpb25hbGx5IHNraXAgb3Zl ciBhbnkgUkVCQVNFTElORSBleHBlY3RhdGlvbnMgdGhhdCB3ZXJlIGluIGFuIG92ZXJyaWRlcyBm aWxlLgpAQCAtMjc3LDEzICsyNzIsMTMgQEAgY2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhB YnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgIHJldHVybiB0ZXN0c190b19yZWJh c2VsaW5lCiAKICAgICBkZWYgX3JlYmFzZWxpbmVfcG9ydChzZWxmLCBwb3J0X25hbWUpOgotICAg ICAgICBpZiBub3Qgc2VsZi5faXNfc3VwcG9ydGVkX3BvcnQocG9ydF9uYW1lKToKLSAgICAgICAg ICAgIHJldHVybgogICAgICAgICBidWlsZGVyX25hbWUgPSBidWlsZGVycy5idWlsZGVyX25hbWVf Zm9yX3BvcnRfbmFtZShwb3J0X25hbWUpCiAgICAgICAgIGlmIG5vdCBidWlsZGVyX25hbWU6CiAg ICAgICAgICAgICByZXR1cm4KLSAgICAgICAgX2xvZy5pbmZvKCJSZXRyaWV2aW5nIHJlc3VsdHMg Zm9yICVzIGZyb20gJXMuIiAlIChwb3J0X25hbWUsIGJ1aWxkZXJfbmFtZSkpCi0gICAgICAgIGZv ciB0ZXN0X25hbWUsIHN1ZmZpeGVzIGluIHNlbGYuX3Rlc3RzX3RvX3JlYmFzZWxpbmUoc2VsZi5f dG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KHBvcnRfbmFtZSkpLml0ZXJpdGVtcygpOgorICAgICAgICB0 ZXN0cyA9IHNlbGYuX3Rlc3RzX3RvX3JlYmFzZWxpbmUoc2VsZi5fdG9vbC5wb3J0X2ZhY3Rvcnku Z2V0KHBvcnRfbmFtZSkpLml0ZW1zKCkKKyAgICAgICAgaWYgdGVzdHM6CisgICAgICAgICAgICBf bG9nLmluZm8oIlJldHJpZXZpbmcgcmVzdWx0cyBmb3IgJXMgZnJvbSAlcy4iICUgKHBvcnRfbmFt ZSwgYnVpbGRlcl9uYW1lKSkKKyAgICAgICAgZm9yIHRlc3RfbmFtZSwgc3VmZml4ZXMgaW4gdGVz dHM6CiAgICAgICAgICAgICBzZWxmLl90b3VjaGVkX3Rlc3RzLnNldGRlZmF1bHQodGVzdF9uYW1l LCBzZXQoKSkudXBkYXRlKHNldChzdWZmaXhlcykpCiAgICAgICAgICAgICBfbG9nLmluZm8oIiAg ICAlcyAoJXMpIiAlICh0ZXN0X25hbWUsICcsJy5qb2luKHN1ZmZpeGVzKSkpCiAgICAgICAgICAg ICAjIEZJWE1FOiB3ZSBzaG91bGQgdXNlIGV4ZWN1dGl2ZS5ydW5faW5fcGFyYWxsZWwoKSB0byBz cGVlZCB0aGlzIHVwLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQppbmRleCA4NDAzNmQ0NmVmZGQ0YWM0 NmM1NjQ5MDNmOGI2ZWI4MDBkZjU4NGU3Li4yMmM1NmU4ZTM4NDE1ODVhY2EyNjNmN2JiOWUwYjM2 MjYxN2U4N2Y5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQpAQCAtMjEwLDYgKzIxMCwyMSBAQCBS ZXRyaWV2aW5nIHJlc3VsdHMgZm9yIGNocm9taXVtLXdpbi13aW43IGZyb20gV2Via2l0IFdpbjcu CiBSZXRyaWV2aW5nIHJlc3VsdHMgZm9yIGNocm9taXVtLXdpbi14cCBmcm9tIFdlYmtpdCBXaW4u CiAgICAgdXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwgKHR4dCkKICAgICB1c2Vyc2NyaXB0 cy9pbWFnZXMuc3ZnIChwbmcpCitSZXRyaWV2aW5nIHJlc3VsdHMgZm9yIGVmbCBmcm9tIEVGTCBM aW51eCA2NC1iaXQgUmVsZWFzZS4KKyAgICB1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCAo dHh0KQorICAgIHVzZXJzY3JpcHRzL2ltYWdlcy5zdmcgKHBuZykKK1JldHJpZXZpbmcgcmVzdWx0 cyBmb3IgZ3RrIGZyb20gR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlLgorICAgIHVzZXJzY3JpcHRz L2Fub3RoZXItdGVzdC5odG1sICh0eHQpCisgICAgdXNlcnNjcmlwdHMvaW1hZ2VzLnN2ZyAocG5n KQorUmV0cmlldmluZyByZXN1bHRzIGZvciBtYWMtbGlvbiBmcm9tIEFwcGxlIExpb24gUmVsZWFz ZSBXSzEgKFRlc3RzKS4KKyAgICB1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCAodHh0KQor ICAgIHVzZXJzY3JpcHRzL2ltYWdlcy5zdmcgKHBuZykKK1JldHJpZXZpbmcgcmVzdWx0cyBmb3Ig cXQtbGludXggZnJvbSBRdCBMaW51eCBSZWxlYXNlLgorICAgIHVzZXJzY3JpcHRzL2Fub3RoZXIt dGVzdC5odG1sICh0eHQpCisgICAgdXNlcnNjcmlwdHMvaW1hZ2VzLnN2ZyAocG5nKQorUmV0cmll dmluZyByZXN1bHRzIGZvciB3aW4tN3NwMCBmcm9tIEFwcGxlIFdpbiA3IFJlbGVhc2UgKFRlc3Rz KS4KKyAgICB1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCAodHh0KQorICAgIHVzZXJzY3Jp cHRzL2ltYWdlcy5zdmcgKHBuZykKICIiIgogCiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICIi Ik1PQ0sgcnVuX2NvbW1hbmQ6IFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QnLCAnLS1zdWZmaXhl cycsICd0eHQnLCAnV2Via2l0IExpbnV4IDMyJywgJ3VzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5o dG1sJ10sIGN3ZD0vbW9jay1jaGVja291dApAQCAtMjI2LDYgKzI0MSwyMCBAQCBNT0NLIHJ1bl9j b21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0JywgJy0tc3VmZml4ZXMnLCAndHh0Jywg J1dlYmtpdCBXaW43JwogTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVz dCcsICctLXN1ZmZpeGVzJywgJ3BuZycsICdXZWJraXQgV2luNycsICd1c2Vyc2NyaXB0cy9pbWFn ZXMuc3ZnJ10sIGN3ZD0vbW9jay1jaGVja291dAogTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywg J3JlYmFzZWxpbmUtdGVzdCcsICctLXN1ZmZpeGVzJywgJ3R4dCcsICdXZWJraXQgV2luJywgJ3Vz ZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJ10sIGN3ZD0vbW9jay1jaGVja291dAogTU9DSyBy dW5fY29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdCcsICctLXN1ZmZpeGVzJywgJ3Bu ZycsICdXZWJraXQgV2luJywgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwgY3dkPS9tb2NrLWNo ZWNrb3V0CitNT0NLIHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0JywgJy0t c3VmZml4ZXMnLCAndHh0JywgJ0VGTCBMaW51eCA2NC1iaXQgUmVsZWFzZScsICd1c2Vyc2NyaXB0 cy9hbm90aGVyLXRlc3QuaHRtbCddLCBjd2Q9L21vY2stY2hlY2tvdXQKK01PQ0sgcnVuX2NvbW1h bmQ6IFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QnLCAnLS1zdWZmaXhlcycsICdwbmcnLCAnRUZM IExpbnV4IDY0LWJpdCBSZWxlYXNlJywgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwgY3dkPS9t b2NrLWNoZWNrb3V0CitNT0NLIHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0 JywgJy0tc3VmZml4ZXMnLCAndHh0JywgJ0dUSyBMaW51eCA2NC1iaXQgUmVsZWFzZScsICd1c2Vy c2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCddLCBjd2Q9L21vY2stY2hlY2tvdXQKK01PQ0sgcnVu X2NvbW1hbmQ6IFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QnLCAnLS1zdWZmaXhlcycsICdwbmcn LCAnR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlJywgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwg Y3dkPS9tb2NrLWNoZWNrb3V0CitNT0NLIHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGlu ZS10ZXN0JywgJy0tc3VmZml4ZXMnLCAndHh0JywgJ0FwcGxlIExpb24gUmVsZWFzZSBXSzEgKFRl c3RzKScsICd1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCddLCBjd2Q9L21vY2stY2hlY2tv dXQKK01PQ0sgcnVuX2NvbW1hbmQ6IFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QnLCAnLS1zdWZm aXhlcycsICdwbmcnLCAnQXBwbGUgTGlvbiBSZWxlYXNlIFdLMSAoVGVzdHMpJywgJ3VzZXJzY3Jp cHRzL2ltYWdlcy5zdmcnXSwgY3dkPS9tb2NrLWNoZWNrb3V0CitNT0NLIHJ1bl9jb21tYW5kOiBb J2VjaG8nLCAncmViYXNlbGluZS10ZXN0JywgJy0tc3VmZml4ZXMnLCAndHh0JywgJ1F0IExpbnV4 IFJlbGVhc2UnLCAndXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnXSwgY3dkPS9tb2NrLWNo ZWNrb3V0CitNT0NLIHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0JywgJy0t c3VmZml4ZXMnLCAncG5nJywgJ1F0IExpbnV4IFJlbGVhc2UnLCAndXNlcnNjcmlwdHMvaW1hZ2Vz LnN2ZyddLCBjd2Q9L21vY2stY2hlY2tvdXQKK01PQ0sgcnVuX2NvbW1hbmQ6IFsnZWNobycsICdy ZWJhc2VsaW5lLXRlc3QnLCAnLS1zdWZmaXhlcycsICd0eHQnLCAnQXBwbGUgV2luIDcgUmVsZWFz ZSAoVGVzdHMpJywgJ3VzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJ10sIGN3ZD0vbW9jay1j aGVja291dAorTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdCcsICct LXN1ZmZpeGVzJywgJ3BuZycsICdBcHBsZSBXaW4gNyBSZWxlYXNlIChUZXN0cyknLCAndXNlcnNj cmlwdHMvaW1hZ2VzLnN2ZyddLCBjd2Q9L21vY2stY2hlY2tvdXQKK01PQ0sgcnVuX2NvbW1hbmQ6 IFsncW1ha2UnLCAnLXYnXSwgY3dkPU5vbmUKK01PQ0sgcnVuX2NvbW1hbmQ6IFsncW1ha2UnLCAn LXYnXSwgY3dkPU5vbmUKK01PQ0sgcnVuX2NvbW1hbmQ6IFsncW1ha2UnLCAnLXYnXSwgY3dkPU5v bmUKK01PQ0sgcnVuX2NvbW1hbmQ6IFsncW1ha2UnLCAnLXYnXSwgY3dkPU5vbmUKICIiIgogCiAg ICAgICAgIGNvbW1hbmQuX3Rlc3RzX3RvX3JlYmFzZWxpbmUgPSBsYW1iZGEgcG9ydDogeyd1c2Vy c2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCc6IHNldChbJ3R4dCddKSwgJ3VzZXJzY3JpcHRzL2lt YWdlcy5zdmcnOiBzZXQoWydwbmcnXSl9Cg==