168626 2017-02-20 17:38:42 -0800 Add machine-readable results for bindings tests 2017-03-03 12:50:20 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=138235 https://bugs.webkit.org/show_bug.cgi?id=169144 P2 Normal --- 1 webkit webkit-unassigned aakash_jain ap commit-queue glenn jake.nielsen.webkit lforschler webkit oldest_to_newest 1279157 0 webkit 2017-02-20 17:38:42 -0800 Adding JSON results to bindings tests is a prerequisite to running bindings tests on EWS. 1279159 1 302213 webkit 2017-02-20 17:39:33 -0800 Created attachment 302213 Patch 1279160 2 webkit 2017-02-20 17:42:15 -0800 Note: webkit-patch upload failed trying to obsolete the attachment on the original bug, so I created a new bug and added the original to the 'See also' field. 1279229 3 ap 2017-02-20 22:35:33 -0800 *** Bug 138235 has been marked as a duplicate of this bug. *** 1279230 4 302213 ap 2017-02-20 22:39:07 -0800 Comment on attachment 302213 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302213&action=review Looks reasonable to me, but I'd like Python experts to take a look too. > Tools/Scripts/webkitpy/bindings/main.py:209 > + 'passes': self.passes, Why is it desirable to add passes to the results too? I don't think that we do it elsewhere. 1279392 5 aakash_jain 2017-02-21 09:59:29 -0800 looks good to me, apart from Alexey comment. 1280506 6 webkit 2017-02-23 14:31:27 -0800 (In reply to comment #4) > Comment on attachment 302213 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=302213&action=review > > Looks reasonable to me, but I'd like Python experts to take a look too. > > > Tools/Scripts/webkitpy/bindings/main.py:209 > > + 'passes': self.passes, > > Why is it desirable to add passes to the results too? I don't think that we > do it elsewhere. There's no need for it; I'll upload a new patch. 1280511 7 302581 webkit 2017-02-23 14:43:01 -0800 Created attachment 302581 Patch 1280588 8 302581 dean_johnson 2017-02-23 17:27:25 -0800 Comment on attachment 302581 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302581&action=review Looks good overall. Food for thought below. > Tools/Scripts/webkitpy/bindings/main.py:47 > + if self.json_file_name: All of the 'if self.json_file_name' might be a bit pre-mature for optimization. I don't think we will really see a performance hit from always appending errors/failure. The only one conditional I feel should remain is the one that actually does the writing to a file. > Tools/Scripts/webkitpy/bindings/main.py:118 > + if self.json_file_name: Ditto. > Tools/Scripts/webkitpy/bindings/main.py:125 > + if self.json_file_name: Ditto. 1280872 9 302581 ap 2017-02-24 14:18:28 -0800 Comment on attachment 302581 Patch I don't have a string opinion on the premature optimization. I agree that this is not necessary for performance, but the code may be easier to read when unnecessary work is not being done. 1281560 10 302581 commit-queue 2017-02-27 15:09:18 -0800 Comment on attachment 302581 Patch Clearing flags on attachment: 302581 Committed r213097: <http://trac.webkit.org/changeset/213097> 1281561 11 commit-queue 2017-02-27 15:09:23 -0800 All reviewed patches have been landed. Closing bug. 302213 2017-02-20 17:39:33 -0800 2017-02-23 14:42:57 -0800 Patch bug-168626-20170220173650.patch text/plain 5105 webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNjcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTk4NmE0NjQ3Zjg0YjJkZjA4MjAzYjgwZDU5NTc4NjIw NjQxMjkwOS4uYTU2OGYwOWZjMjgwYzg5ZmI3MmFlOTdjNDI2ZDJmOWI1MTdhOGI4ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTAyLTIwICBTcmluaXZhc2FuIFZpamF5YXJhZ2hhdmFuICA8c3ZpamF5YXJhZ2hh dmFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbWFjaGluZS1yZWFkYWJsZSByZXN1bHRzIGZv ciBiaW5kaW5ncyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY4NjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0czoKKyAgICAgICAgKG1haW4pOiBB ZGQgb3B0aW9uYWwgLS1qc29uLW91dHB1dCBjb21tYW5kLWxpbmUgcGFyYW1ldGVyLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weToKKyAgICAgICAgKEJpbmRpbmdz VGVzdHMuX19pbml0X18pOiBBZGQgdmFyaWFibGVzIHRvIHN0b3JlIG1hY2hpbmUtcmVhZGFibGUg cmVzdWx0cy4KKyAgICAgICAgKEJpbmRpbmdzVGVzdHMuZGV0ZWN0X2NoYW5nZXMpOiBTdG9yZSBy ZXN1bHRzIGluIG1hY2hpbmUtcmVhZGFibGUgZm9ybSBpZiBhcHBsaWNhYmxlLgorICAgICAgICAo QmluZGluZ3NUZXN0cy5tYWluKTogV3JpdGUgZGF0YSB0byBKU09OIGZpbGUgaWYgYXBwbGljYWJs ZS4KKwogMjAxNy0wMi0xNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBhIG5ldyBkcmFnIGNvZGUgcGF0aCBhbmQgdXNlIGl0IGZvciBkcmFnZ2lu ZyBwbGFpbiB0ZXh0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0 cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJpbmRpbmdzLXRlc3RzCmluZGV4IDlmN2MxYTFlOTMwMzBk ODQ1NjY0ODAwNTQ4NTNiZDFiNDFkNTEyMDAuLmMwOGI2M2NmYmZiNDdhM2I2YzJkMjQ3MTRmYjVl ZGFiYTY3ZGQ0YmUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWJpbmRpbmdzLXRlc3Rz CisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJpbmRpbmdzLXRlc3RzCkBAIC0yOSw2ICsyOSw3IEBA CiAjIHBhdGNoLiBUaGlzIG1ha2VzIGl0IGVhc2llciB0byB0cmFjayBhbmQgcmV2aWV3IGNoYW5n ZXMgaW4gZ2VuZXJhdGVkIGNvZGUuCiAKIGltcG9ydCBvcHRwYXJzZQoraW1wb3J0IG9zCiBpbXBv cnQgc3lzCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGV4ZWN1dGl2ZQogCkBA IC00MywxMSArNDQsMTYgQEAgZGVmIG1haW4oYXJndik6CiAgICAgICAgIGhlbHA9J0Rpc2FibGUg dmVyb2JzZSBvdXRwdXQnKQogICAgIG9wdGlvbl9wYXJzZXIuYWRkX29wdGlvbignLS1yZXNldC1y ZXN1bHRzJywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgaGVs cD0nT3ZlcndyaXRlcyB0aGUgcmVmZXJlbmNlIGZpbGVzIHdpdGggdGhlIGdlbmVyYXRlZCByZXN1 bHRzJykKKyAgICBvcHRpb25fcGFyc2VyLmFkZF9vcHRpb24oJy0tanNvbi1vdXRwdXQnLCBhY3Rp b249J3N0b3JlJywgdHlwZT0nc3RyaW5nJywgZGVzdD0nanNvbl9maWxlX25hbWUnLAorICAgICAg ICBoZWxwPSdDcmVhdGUgYSBmaWxlIGF0IHNwZWNpZmllZCBwYXRoLCBsaXN0aW5nIHRlc3QgcmVz dWx0cyBpbiBKU09OIGZvcm1hdC4nKQogICAgIG9wdGlvbnMsIGFyZ3MgPSBvcHRpb25fcGFyc2Vy LnBhcnNlX2FyZ3MoKSAgICAKIAogICAgIGZyb20gd2Via2l0cHkuYmluZGluZ3MubWFpbiBpbXBv cnQgQmluZGluZ3NUZXN0cwogCi0gICAgcmV0dXJuIEJpbmRpbmdzVGVzdHMob3B0aW9ucy5yZXNl dF9yZXN1bHRzLCBbICdKUycgXSwgZXhlY3V0aXZlLkV4ZWN1dGl2ZSgpLCBub3Qgb3B0aW9ucy5u b192ZXJib3NlLCBhcmdzKS5tYWluKCkKKyAgICBpZiBvcHRpb25zLmpzb25fZmlsZV9uYW1lOgor ICAgICAgICBvcHRpb25zLmpzb25fZmlsZV9uYW1lID0gb3MucGF0aC5hYnNwYXRoKG9wdGlvbnMu anNvbl9maWxlX25hbWUpCisKKyAgICByZXR1cm4gQmluZGluZ3NUZXN0cyhvcHRpb25zLnJlc2V0 X3Jlc3VsdHMsIFsgJ0pTJyBdLCBleGVjdXRpdmUuRXhlY3V0aXZlKCksIG5vdCBvcHRpb25zLm5v X3ZlcmJvc2UsIGFyZ3MsIG9wdGlvbnMuanNvbl9maWxlX25hbWUpLm1haW4oKQogCiAKIGlmIF9f bmFtZV9fID09ICdfX21haW5fXyc6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JpbmRpbmdzL21haW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JpbmRpbmdzL21haW4u cHkKaW5kZXggOGIzMmY1YmNmMDFiNjEwMzAxNzYwZGZkYmJkM2NmYzJlNTkwNDI5ZS4uNmM4MmI4 YTVkNDhkNTdkMjEwZGMzMmJhNTBjOTYxMGU1Y2I3Mzg4MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iaW5kaW5ncy9tYWluLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmluZGluZ3MvbWFpbi5weQpAQCAtMjMsNiArMjMsNyBAQAogIwogCiBpbXBvcnQgZm5tYXRj aAoraW1wb3J0IGpzb24KIGltcG9ydCBvcwogaW1wb3J0IG9zLnBhdGgKIGltcG9ydCBzaHV0aWwK QEAgLTM1LDEyICszNiwxOCBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZl IGltcG9ydCBTY3JpcHRFcnJvcgogCiBjbGFzcyBCaW5kaW5nc1Rlc3RzOgogCi0gICAgZGVmIF9f aW5pdF9fKHNlbGYsIHJlc2V0X3Jlc3VsdHMsIGdlbmVyYXRvcnMsIGV4ZWN1dGl2ZSwgdmVyYm9z ZSwgcGF0dGVybnMpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCByZXNldF9yZXN1bHRzLCBnZW5l cmF0b3JzLCBleGVjdXRpdmUsIHZlcmJvc2UsIHBhdHRlcm5zLCBqc29uX2ZpbGVfbmFtZSk6CiAg ICAgICAgIHNlbGYucmVzZXRfcmVzdWx0cyA9IHJlc2V0X3Jlc3VsdHMKICAgICAgICAgc2VsZi5n ZW5lcmF0b3JzID0gZ2VuZXJhdG9ycwogICAgICAgICBzZWxmLmV4ZWN1dGl2ZSA9IGV4ZWN1dGl2 ZQogICAgICAgICBzZWxmLnZlcmJvc2UgPSB2ZXJib3NlCiAgICAgICAgIHNlbGYucGF0dGVybnMg PSBwYXR0ZXJucworICAgICAgICBzZWxmLmpzb25fZmlsZV9uYW1lID0ganNvbl9maWxlX25hbWUK KworICAgICAgICBpZiBzZWxmLmpzb25fZmlsZV9uYW1lOgorICAgICAgICAgICAgc2VsZi5wYXNz ZXMgPSBbXQorICAgICAgICAgICAgc2VsZi5mYWlsdXJlcyA9IFtdCisgICAgICAgICAgICBzZWxm LmVycm9ycyA9IFtdCiAKICAgICBkZWYgZ2VuZXJhdGVfZnJvbV9pZGwoc2VsZiwgZ2VuZXJhdG9y LCBpZGxfZmlsZSwgb3V0cHV0X2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmls ZSk6CiAgICAgICAgIGNtZCA9IFsncGVybCcsICctdycsCkBAIC0xMDksMTMgKzExNiwyMCBAQCBj bGFzcyBCaW5kaW5nc1Rlc3RzOgogICAgICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgog ICAgICAgICAgICAgICAgIG91dHB1dCA9IGUub3V0cHV0CiAgICAgICAgICAgICAgICAgZXhpdF9j b2RlID0gZS5leGl0X2NvZGUKKyAgICAgICAgICAgICAgICBpZiBzZWxmLmpzb25fZmlsZV9uYW1l OgorICAgICAgICAgICAgICAgICAgICBzZWxmLmVycm9ycy5hcHBlbmQoIiglcykgJXMiICUgKGdl bmVyYXRvciwgb3V0cHV0X2ZpbGUpKQogCiAgICAgICAgICAgICBpZiBleGl0X2NvZGUgb3Igb3V0 cHV0OgogICAgICAgICAgICAgICAgIHByaW50ICdGQUlMOiAoJXMpICVzJyAlIChnZW5lcmF0b3Is IG91dHB1dF9maWxlKQogICAgICAgICAgICAgICAgIHByaW50IG91dHB1dAogICAgICAgICAgICAg ICAgIGNoYW5nZXNfZm91bmQgPSBUcnVlCi0gICAgICAgICAgICBlbGlmIHNlbGYudmVyYm9zZToK LSAgICAgICAgICAgICAgICBwcmludCAnUEFTUzogKCVzKSAlcycgJSAoZ2VuZXJhdG9yLCBvdXRw dXRfZmlsZSkKKyAgICAgICAgICAgICAgICBpZiBzZWxmLmpzb25fZmlsZV9uYW1lOgorICAgICAg ICAgICAgICAgICAgICBzZWxmLmZhaWx1cmVzLmFwcGVuZCgiKCVzKSAlcyIgJSAoZ2VuZXJhdG9y LCBvdXRwdXRfZmlsZSkpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGlmIHNl bGYudmVyYm9zZToKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQgJ1BBU1M6ICglcykgJXMnICUg KGdlbmVyYXRvciwgb3V0cHV0X2ZpbGUpCisgICAgICAgICAgICAgICAgaWYgc2VsZi5qc29uX2Zp bGVfbmFtZToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5wYXNzZXMuYXBwZW5kKCIoJXMpICVz IiAlIChnZW5lcmF0b3IsIG91dHB1dF9maWxlKSkKICAgICAgICAgcmV0dXJuIGNoYW5nZXNfZm91 bmQKIAogICAgIGRlZiB0ZXN0X21hdGNoZXNfcGF0dGVybnMoc2VsZiwgdGVzdCk6CkBAIC0xODks NiArMjAzLDE3IEBAIGNsYXNzIEJpbmRpbmdzVGVzdHM6CiAgICAgICAgIG9zLnJlbW92ZSh3aW5k b3dfY29uc3RydWN0b3JzX2ZpbGUpCiAgICAgICAgIG9zLnJlbW92ZSh3b3JrZXJnbG9iYWxzY29w ZV9jb25zdHJ1Y3RvcnNfZmlsZSkKICAgICAgICAgb3MucmVtb3ZlKGRlZGljYXRlZHdvcmtlcmds b2JhbHNjb3BlX2NvbnN0cnVjdG9yc19maWxlKQorCisgICAgICAgIGlmIHNlbGYuanNvbl9maWxl X25hbWU6CisgICAgICAgICAgICBqc29uX2RhdGEgPSB7CisgICAgICAgICAgICAgICAgJ3Bhc3Nl cyc6IHNlbGYucGFzc2VzLAorICAgICAgICAgICAgICAgICdmYWlsdXJlcyc6IHNlbGYuZmFpbHVy ZXMsCisgICAgICAgICAgICAgICAgJ2Vycm9ycyc6IHNlbGYuZXJyb3JzLAorICAgICAgICAgICAg fQorCisgICAgICAgICAgICB3aXRoIG9wZW4oc2VsZi5qc29uX2ZpbGVfbmFtZSwgJ3cnKSBhcyBq c29uX2ZpbGU6CisgICAgICAgICAgICAgICAganNvbi5kdW1wKGpzb25fZGF0YSwganNvbl9maWxl KQorCiAgICAgICAgIHByaW50ICcnCiAgICAgICAgIGlmIGFsbF90ZXN0c19wYXNzZWQ6CiAgICAg ICAgICAgICBwcmludCAnQWxsIHRlc3RzIFBBU1MhJwo= 302581 2017-02-23 14:43:01 -0800 2017-02-27 15:09:18 -0800 Patch bug-168626-20170223144011.patch text/plain 4723 webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyOTIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjg5NmRmNTlhNTc4MWU2NzdkYjM2NzRmYmZkY2UwNDlj YzcyN2NkZS4uNzkwZjQ4Nzk2MzVlZDRlYjhmYTYzMGFiZmQ4MTU5ZDI2ZmJiM2VjNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTAyLTIzICBTcmluaXZhc2FuIFZpamF5YXJhZ2hhdmFuICA8c3ZpamF5YXJhZ2hh dmFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbWFjaGluZS1yZWFkYWJsZSByZXN1bHRzIGZv ciBiaW5kaW5ncyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY4NjI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0czoKKyAgICAgICAgKG1haW4pOiBB ZGQgb3B0aW9uYWwgLS1qc29uLW91dHB1dCBjb21tYW5kLWxpbmUgcGFyYW1ldGVyLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weToKKyAgICAgICAgKEJpbmRpbmdz VGVzdHMuX19pbml0X18pOiBBZGQgdmFyaWFibGVzIHRvIHN0b3JlIG1hY2hpbmUtcmVhZGFibGUg cmVzdWx0cy4KKyAgICAgICAgKEJpbmRpbmdzVGVzdHMuZGV0ZWN0X2NoYW5nZXMpOiBTdG9yZSBy ZXN1bHRzIGluIG1hY2hpbmUtcmVhZGFibGUgZm9ybSBpZiBhcHBsaWNhYmxlLgorICAgICAgICAo QmluZGluZ3NUZXN0cy5tYWluKTogV3JpdGUgZGF0YSB0byBKU09OIGZpbGUgaWYgYXBwbGljYWJs ZS4KKwogMjAxNy0wMi0yMyAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAg ICAgICBTcGVjdWxhdGl2ZSBmaXggZm9yIGpzYyB0aW1pbmcgb3V0IHRlc3RzCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJp bmRpbmdzLXRlc3RzCmluZGV4IDlmN2MxYTFlOTMwMzBkODQ1NjY0ODAwNTQ4NTNiZDFiNDFkNTEy MDAuLmMwOGI2M2NmYmZiNDdhM2I2YzJkMjQ3MTRmYjVlZGFiYTY3ZGQ0YmUgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvcnVuLWJpbmRpbmdzLXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVu LWJpbmRpbmdzLXRlc3RzCkBAIC0yOSw2ICsyOSw3IEBACiAjIHBhdGNoLiBUaGlzIG1ha2VzIGl0 IGVhc2llciB0byB0cmFjayBhbmQgcmV2aWV3IGNoYW5nZXMgaW4gZ2VuZXJhdGVkIGNvZGUuCiAK IGltcG9ydCBvcHRwYXJzZQoraW1wb3J0IG9zCiBpbXBvcnQgc3lzCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0gaW1wb3J0IGV4ZWN1dGl2ZQogCkBAIC00MywxMSArNDQsMTYgQEAgZGVmIG1h aW4oYXJndik6CiAgICAgICAgIGhlbHA9J0Rpc2FibGUgdmVyb2JzZSBvdXRwdXQnKQogICAgIG9w dGlvbl9wYXJzZXIuYWRkX29wdGlvbignLS1yZXNldC1yZXN1bHRzJywgYWN0aW9uPSdzdG9yZV90 cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgaGVscD0nT3ZlcndyaXRlcyB0aGUgcmVmZXJl bmNlIGZpbGVzIHdpdGggdGhlIGdlbmVyYXRlZCByZXN1bHRzJykKKyAgICBvcHRpb25fcGFyc2Vy LmFkZF9vcHRpb24oJy0tanNvbi1vdXRwdXQnLCBhY3Rpb249J3N0b3JlJywgdHlwZT0nc3RyaW5n JywgZGVzdD0nanNvbl9maWxlX25hbWUnLAorICAgICAgICBoZWxwPSdDcmVhdGUgYSBmaWxlIGF0 IHNwZWNpZmllZCBwYXRoLCBsaXN0aW5nIHRlc3QgcmVzdWx0cyBpbiBKU09OIGZvcm1hdC4nKQog ICAgIG9wdGlvbnMsIGFyZ3MgPSBvcHRpb25fcGFyc2VyLnBhcnNlX2FyZ3MoKSAgICAKIAogICAg IGZyb20gd2Via2l0cHkuYmluZGluZ3MubWFpbiBpbXBvcnQgQmluZGluZ3NUZXN0cwogCi0gICAg cmV0dXJuIEJpbmRpbmdzVGVzdHMob3B0aW9ucy5yZXNldF9yZXN1bHRzLCBbICdKUycgXSwgZXhl Y3V0aXZlLkV4ZWN1dGl2ZSgpLCBub3Qgb3B0aW9ucy5ub192ZXJib3NlLCBhcmdzKS5tYWluKCkK KyAgICBpZiBvcHRpb25zLmpzb25fZmlsZV9uYW1lOgorICAgICAgICBvcHRpb25zLmpzb25fZmls ZV9uYW1lID0gb3MucGF0aC5hYnNwYXRoKG9wdGlvbnMuanNvbl9maWxlX25hbWUpCisKKyAgICBy ZXR1cm4gQmluZGluZ3NUZXN0cyhvcHRpb25zLnJlc2V0X3Jlc3VsdHMsIFsgJ0pTJyBdLCBleGVj dXRpdmUuRXhlY3V0aXZlKCksIG5vdCBvcHRpb25zLm5vX3ZlcmJvc2UsIGFyZ3MsIG9wdGlvbnMu anNvbl9maWxlX25hbWUpLm1haW4oKQogCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JpbmRpbmdzL21haW4ucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JpbmRpbmdzL21haW4ucHkKaW5kZXggOGIzMmY1YmNmMDFiNjEw MzAxNzYwZGZkYmJkM2NmYzJlNTkwNDI5ZS4uMDgxYWQyN2NiYzIxNjE0MTc4NzQwOTc0MDBjOWI5 ZTk4NmE3NTQzNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iaW5kaW5ncy9t YWluLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weQpAQCAt MjMsNiArMjMsNyBAQAogIwogCiBpbXBvcnQgZm5tYXRjaAoraW1wb3J0IGpzb24KIGltcG9ydCBv cwogaW1wb3J0IG9zLnBhdGgKIGltcG9ydCBzaHV0aWwKQEAgLTM1LDEyICszNiwxNyBAQCBmcm9t IHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogCiBj bGFzcyBCaW5kaW5nc1Rlc3RzOgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHJlc2V0X3Jlc3Vs dHMsIGdlbmVyYXRvcnMsIGV4ZWN1dGl2ZSwgdmVyYm9zZSwgcGF0dGVybnMpOgorICAgIGRlZiBf X2luaXRfXyhzZWxmLCByZXNldF9yZXN1bHRzLCBnZW5lcmF0b3JzLCBleGVjdXRpdmUsIHZlcmJv c2UsIHBhdHRlcm5zLCBqc29uX2ZpbGVfbmFtZSk6CiAgICAgICAgIHNlbGYucmVzZXRfcmVzdWx0 cyA9IHJlc2V0X3Jlc3VsdHMKICAgICAgICAgc2VsZi5nZW5lcmF0b3JzID0gZ2VuZXJhdG9ycwog ICAgICAgICBzZWxmLmV4ZWN1dGl2ZSA9IGV4ZWN1dGl2ZQogICAgICAgICBzZWxmLnZlcmJvc2Ug PSB2ZXJib3NlCiAgICAgICAgIHNlbGYucGF0dGVybnMgPSBwYXR0ZXJucworICAgICAgICBzZWxm Lmpzb25fZmlsZV9uYW1lID0ganNvbl9maWxlX25hbWUKKworICAgICAgICBpZiBzZWxmLmpzb25f ZmlsZV9uYW1lOgorICAgICAgICAgICAgc2VsZi5mYWlsdXJlcyA9IFtdCisgICAgICAgICAgICBz ZWxmLmVycm9ycyA9IFtdCiAKICAgICBkZWYgZ2VuZXJhdGVfZnJvbV9pZGwoc2VsZiwgZ2VuZXJh dG9yLCBpZGxfZmlsZSwgb3V0cHV0X2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lf ZmlsZSk6CiAgICAgICAgIGNtZCA9IFsncGVybCcsICctdycsCkBAIC0xMDksMTEgKzExNSwxNSBA QCBjbGFzcyBCaW5kaW5nc1Rlc3RzOgogICAgICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBl OgogICAgICAgICAgICAgICAgIG91dHB1dCA9IGUub3V0cHV0CiAgICAgICAgICAgICAgICAgZXhp dF9jb2RlID0gZS5leGl0X2NvZGUKKyAgICAgICAgICAgICAgICBpZiBzZWxmLmpzb25fZmlsZV9u YW1lOgorICAgICAgICAgICAgICAgICAgICBzZWxmLmVycm9ycy5hcHBlbmQoIiglcykgJXMiICUg KGdlbmVyYXRvciwgb3V0cHV0X2ZpbGUpKQogCiAgICAgICAgICAgICBpZiBleGl0X2NvZGUgb3Ig b3V0cHV0OgogICAgICAgICAgICAgICAgIHByaW50ICdGQUlMOiAoJXMpICVzJyAlIChnZW5lcmF0 b3IsIG91dHB1dF9maWxlKQogICAgICAgICAgICAgICAgIHByaW50IG91dHB1dAogICAgICAgICAg ICAgICAgIGNoYW5nZXNfZm91bmQgPSBUcnVlCisgICAgICAgICAgICAgICAgaWYgc2VsZi5qc29u X2ZpbGVfbmFtZToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5mYWlsdXJlcy5hcHBlbmQoIigl cykgJXMiICUgKGdlbmVyYXRvciwgb3V0cHV0X2ZpbGUpKQogICAgICAgICAgICAgZWxpZiBzZWxm LnZlcmJvc2U6CiAgICAgICAgICAgICAgICAgcHJpbnQgJ1BBU1M6ICglcykgJXMnICUgKGdlbmVy YXRvciwgb3V0cHV0X2ZpbGUpCiAgICAgICAgIHJldHVybiBjaGFuZ2VzX2ZvdW5kCkBAIC0xODks NiArMTk5LDE2IEBAIGNsYXNzIEJpbmRpbmdzVGVzdHM6CiAgICAgICAgIG9zLnJlbW92ZSh3aW5k b3dfY29uc3RydWN0b3JzX2ZpbGUpCiAgICAgICAgIG9zLnJlbW92ZSh3b3JrZXJnbG9iYWxzY29w ZV9jb25zdHJ1Y3RvcnNfZmlsZSkKICAgICAgICAgb3MucmVtb3ZlKGRlZGljYXRlZHdvcmtlcmds b2JhbHNjb3BlX2NvbnN0cnVjdG9yc19maWxlKQorCisgICAgICAgIGlmIHNlbGYuanNvbl9maWxl X25hbWU6CisgICAgICAgICAgICBqc29uX2RhdGEgPSB7CisgICAgICAgICAgICAgICAgJ2ZhaWx1 cmVzJzogc2VsZi5mYWlsdXJlcywKKyAgICAgICAgICAgICAgICAnZXJyb3JzJzogc2VsZi5lcnJv cnMsCisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHdpdGggb3BlbihzZWxmLmpzb25fZmls ZV9uYW1lLCAndycpIGFzIGpzb25fZmlsZToKKyAgICAgICAgICAgICAgICBqc29uLmR1bXAoanNv bl9kYXRhLCBqc29uX2ZpbGUpCisKICAgICAgICAgcHJpbnQgJycKICAgICAgICAgaWYgYWxsX3Rl c3RzX3Bhc3NlZDoKICAgICAgICAgICAgIHByaW50ICdBbGwgdGVzdHMgUEFTUyEnCg==