187716 2018-07-16 16:20:11 -0700 run-leaks should run leaks with --list (on Mojave) 2018-09-10 10:23:06 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 joepeck ap ap ews-watchlist glenn joepeck lforschler lingcherd_ho webkit-bug-importer oldest_to_newest 1442547 0 joepeck 2018-07-16 16:20:11 -0700 run-leaks should run leaks with --list (on Mojave) or LeaksViewer should parse new format (ROOT leaks) I think currently on new enough macOS builds or with a new enough Xcode the leaks output will differ such that LeaksViewer's LeaksParserImpl would not be able to parse out individual leaks. 1442548 1 webkit-bug-importer 2018-07-16 16:20:49 -0700 <rdar://problem/42261676> 1442561 2 joepeck 2018-07-16 16:59:50 -0700 Also `parseLeaksOutput` in Tools/Scripts/run-leaks 1455741 3 ap 2018-08-31 10:20:46 -0700 I don't think that parsing the new format is feasible without deep changes to LeaksViewer. 1455745 4 348647 ap 2018-08-31 10:27:22 -0700 Created attachment 348647 proposed patch 1455783 5 ap 2018-08-31 11:27:32 -0700 Hmm, I got 1.7 GB of memgraphs when running locally. We'll probably need custom aggressive pruning for leaks queue archives for this to be feasible. 1456409 6 348647 lforschler 2018-09-04 12:14:10 -0700 Comment on attachment 348647 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=348647&action=review > Tools/ChangeLog:14 > + (runLeaks): Ad there is no way to test whether the new format is supported in advance, nit: Ad = Add? 1456448 7 ap 2018-09-04 14:06:50 -0700 Committed http://trac.webkit.org/r235633 1456450 8 ap 2018-09-04 14:16:14 -0700 And r235634 for a "print" forgotten in run-leaks. 1458154 9 348647 joepeck 2018-09-10 10:23:06 -0700 Comment on attachment 348647 proposed patch Nice! 348647 2018-08-31 10:27:22 -0700 2018-09-04 12:14:10 -0700 proposed patch LeaksList.txt text/plain 9273 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNTU1OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDE4LTA4LTMxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIHJ1bi1sZWFrcyBzaG91bGQgcnVuIGxlYWtzIHdpdGggLS1saXN0IChvbiBN b2phdmUpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODc3MTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQyMjYxNjc2PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsc28gZW5hYmxlZCBkdW1waW5nIG1l bWdyYXBocy4gV2UnbGwgbmVlZCB0byBzZWUgaG93IG11Y2ggc3BhY2UgdGhlc2UgdGFrZSBvbgor ICAgICAgICBidWlsZC53ZWJraXQub3JnIHRob3VnaC4KKworICAgICAgICAqIFNjcmlwdHMvcnVu LWxlYWtzOgorICAgICAgICAobWFpbik6IEFkZGVkIGFuIG9wdGlvbiB0byBzdG9yZSBtZW1ncmFw aHMuCisgICAgICAgIChydW5MZWFrcyk6IEFkIHRoZXJlIGlzIG5vIHdheSB0byB0ZXN0IHdoZXRo ZXIgdGhlIG5ldyBmb3JtYXQgaXMgc3VwcG9ydGVkIGluIGFkdmFuY2UsCisgICAgICAgIHdlIGhh dmUgdG8gdHJ5IHdpdGggLS1saXN0IGZpcnN0LCBhbmQgcmV0cnkgaWYgdGhhdCBmYWlscy4gQWxz bywgbWFkZSBsZWFrcyBvcGVyYXRlCisgICAgICAgIG9uIGEgbWVtZ3JhcGggZmlsZSBpZiB3ZSBh cmUgc2F2aW5nIGl0IGFueXdheS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9s ZWFrZGV0ZWN0b3IucHk6CisgICAgICAgIChMZWFrRGV0ZWN0b3IuX2xlYWtzX2FyZ3MpOiBQYXNz IC0tbWVtZ3JhcGgtZmlsZSB0byBydW4tbGVha3MuCisgICAgICAgIChMZWFrRGV0ZWN0b3IubGVh a3NfZmlsZV9uYW1lKTogUmVtb3ZlZCBhbiBpbmNvcnJlY3QgY29tbWVudC4KKyAgICAgICAgKExl YWtEZXRlY3Rvci5tZW1ncmFwaF9maWxlX25hbWUpOiBBZGRlZC4KKyAgICAgICAgKExlYWtEZXRl Y3Rvci5jaGVja19mb3JfbGVha3MpOiBDaGFuZ2VkIGhvdyBhcmd1bWVudHMgYXJlIHBhc3NlZCB0 byBfbGVha3NfYXJncy4KKyAgICAgICAgSXQgaXMgYSBiaXQgdWdseSB0aGF0IGxlYWtzIHBhdGgg ZW5kcyB1cCBiZWluZyBjb21wdXRlZCB0d2ljZSwgYnV0IHRoaXMgaXMgdGhlIGxlYXN0CisgICAg ICAgIHVnbHkgYXBwcm9hY2ggdGhhdCBJIGNvdWxkIGZpbmQuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BvcnQvbGVha2RldGVjdG9yX3VuaXR0ZXN0LnB5OiBVcGRhdGVkIGZvciBfbGVh a3NfYXJncyBjaGFuZ2VzLgorCiAyMDE4LTA4LTMxICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFw cGxlLmNvbT4KIAogICAgICAgICBsbGRiLXdlYmtpdDogS2V5RXJyb3IgdGhyb3duIGZvciBPcHRp b25TZXQgd2l0aCBpbnZhbGlkIHZhbHVlCkluZGV4OiBUb29scy9TY3JpcHRzL3J1bi1sZWFrcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1sZWFrcwkocmV2aXNpb24gMjM0OTAyKQor KysgVG9vbHMvU2NyaXB0cy9ydW4tbGVha3MJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcg QEAgdXNlIHdhcm5pbmdzOwogdXNlIEZpbGU6OkJhc2VuYW1lOwogdXNlIEdldG9wdDo6TG9uZzsK IAotc3ViIHJ1bkxlYWtzKCQpOworc3ViIHJ1bkxlYWtzKCQkKTsKIHN1YiBwYXJzZUxlYWtzT3V0 cHV0KFxAKTsKIHN1YiByZW1vdmVNYXRjaGluZ1JlY29yZHMoXEAkXEApOwogc3ViIHJlcG9ydEVy cm9yKCQpOwpAQCAtNDcsMTcgKzQ3LDIwIEBAIHN1YiBtYWluKCkKICAgICAgICAgIiAgLS1leGNs dWRlLWNhbGxzdGFjayByZWdleHAgICBFeGNsdWRlIGxlYWtzIHdob3NlIGNhbGwgc3RhY2tzIG1h dGNoIHRoZSByZWd1bGFyIGV4cHJlc3Npb24gJ3JlZ2V4cCcuXG4iIC4KICAgICAgICAgIiAgLS1l eGNsdWRlLXR5cGUgcmVnZXhwICAgICAgICBFeGNsdWRlIGxlYWtzIHdob3NlIGRhdGEgdHlwZXMg bWF0Y2ggdGhlIHJlZ3VsYXIgZXhwcmVzc2lvbiAncmVnZXhwJy5cbiIgLgogICAgICAgICAiICAt LW91dHB1dC1maWxlIHBhdGggICAgICAgICAgIFN0b3JlIHJlc3VsdCBpbiBhIGZpbGUuIElmIG5v dCBzcGVjaWZpZWQsIHN0YW5kYXJkIG91dHB1dCBpcyB1c2VkLlxuIiAuCisgICAgICAgICIgIC0t bWVtZ3JhcGgtZmlsZSBwYXRoICAgICAgICAgU3RvcmUgbWVtZ3JhcGggaW4gYSBmaWxlLlxuIiAu CiAgICAgICAgICIgIC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAg bWVzc2FnZS5cbiI7CiAKICAgICBteSBAY2FsbFN0YWNrc1RvRXhjbHVkZSA9ICgpOwogICAgIG15 IEB0eXBlc1RvRXhjbHVkZSA9ICgpOwogICAgIG15ICRvdXRwdXRQYXRoOworICAgIG15ICRtZW1n cmFwaFBhdGg7CiAgICAgbXkgJGhlbHAgPSAwOwogCiAgICAgbXkgJGdldE9wdGlvbnNSZXN1bHQg PSBHZXRPcHRpb25zKAogICAgICAgICAnZXhjbHVkZS1jYWxsc3RhY2s6cycgPT4gXEBjYWxsU3Rh Y2tzVG9FeGNsdWRlLAogICAgICAgICAnZXhjbHVkZS10eXBlOnMnID0+IFxAdHlwZXNUb0V4Y2x1 ZGUsCiAgICAgICAgICdvdXRwdXQtZmlsZTpzJyA9PiBcJG91dHB1dFBhdGgsCisgICAgICAgICdt ZW1ncmFwaC1maWxlOnMnID0+IFwkbWVtZ3JhcGhQYXRoLAogICAgICAgICAnaGVscCcgPT4gXCRo ZWxwCiAgICAgKTsKICAgICBteSAkcGlkT3JFeGVjdXRhYmxlTmFtZSA9ICRBUkdWWzBdOwpAQCAt NzQsNyArNzcsNyBAQCBzdWIgbWFpbigpCiAgICAgfQogCiAgICAgIyBSdW4gbGVha3MgdG9vbC4K LSAgICBteSAkbGVha3NPdXRwdXQgPSBydW5MZWFrcygkcGlkT3JFeGVjdXRhYmxlTmFtZSk7Cisg ICAgbXkgJGxlYWtzT3V0cHV0ID0gcnVuTGVha3MoJHBpZE9yRXhlY3V0YWJsZU5hbWUsICRtZW1n cmFwaFBhdGgpOwogICAgIGlmICghJGxlYWtzT3V0cHV0KSB7CiAgICAgICAgIHJldHVybiAxOwog ICAgIH0KQEAgLTExMiwxNiArMTE1LDI4IEBAIHN1YiBtYWluKCkKIGV4aXQobWFpbigpKTsKIAog IyBSZXR1cm5zIHRoZSBvdXRwdXQgb2YgdGhlIGxlYWtzIHRvb2wgaW4gbGlzdCBmb3JtLgotc3Vi IHJ1bkxlYWtzKCQpCitzdWIgcnVuTGVha3MoJCQpCiB7Ci0gICAgbXkgKCRwaWRPckV4ZWN1dGFi bGVOYW1lKSA9IEBfOwotICAgIAotICAgIG15IEBsZWFrc091dHB1dCA9IGBsZWFrcyAkcGlkT3JF eGVjdXRhYmxlTmFtZWA7Ci0gICAgaWYgKCFAbGVha3NPdXRwdXQpIHsKLSAgICAgICAgcmVwb3J0 RXJyb3IoIkVycm9yIHJ1bm5pbmcgbGVha3MgdG9vbC4iKTsKLSAgICAgICAgcmV0dXJuOworICAg IG15ICgkdGFyZ2V0LCAkbWVtZ3JhcGhQYXRoKSA9IEBfOworCisgICAgaWYgKGRlZmluZWQgJG1l bWdyYXBoUGF0aCkgeworICAgICAgICBgL3Vzci9iaW4vbGVha3MgXCIkdGFyZ2V0XCIgLS1vdXRw dXRHcmFwaD1cIiRtZW1ncmFwaFBhdGhcImA7CisgICAgICAgICR0YXJnZXQgPSAkbWVtZ3JhcGhQ YXRoOworICAgIH0KKworICAgICMgVG8gZ2V0IGEgcmVzdWx0IHdlIGNhbiBwYXJzZSwgd2UgbmVl ZCB0byBwYXNzIC0tbGlzdCB0byBhbGwgdmVyc2lvbnMgb2YgdGhlIGxlYWtzIHRvb2wKKyAgICAj IHRoYXQgcmVjb2duaXplIGl0LCBidXQgdGhlcmUgaXMgbm8gY2VydGFpbiB3YXkgdG8gdGVsbCBp biBhZHZhbmNlICh0aGUgdmVyc2lvbiBvZiB0aGUKKyAgICAjIHRvb2wgaXMgbm90IGFsd2F5cyB0 aWVkIHRvIE9TIHZlcnNpb24sIGFuZCAtLWhlbHAgZG9lc24ndCBkb2N1bWVudCB0aGUgb3B0aW9u IGluIHNvbWUKKyAgICAjIG9mIHRoZSB0b29sIHZlcnNpb25zIHdoZXJlIGl0J3Mgc3VwcG9ydGVk IGFuZCBuZWVkZWQpLgorICAgIHByaW50IFNUREVSUiAiU3RhcnRpbmcgbGVha3NcbiI7CisgICAg bXkgQGxlYWtzT3V0cHV0ID0gYC91c3IvYmluL2xlYWtzIFwiJHRhcmdldFwiIC0tbGlzdGA7CisK KyAgICAjIEZJWE1FOiBSZW1vdmUgdGhlIGZhbGxiYWNrIG9uY2UgbWFjT1MgTW9qYXZlIGlzIHRo ZSBvbGRlc3Qgc3VwcG9ydGVkIHZlcnNpb24uCisgICAgbXkgJGxlYWtzRXhpdENvZGUgPSAkPyA+ PiA4OworICAgIGlmICgkbGVha3NFeGl0Q29kZSA+IDEpIHsKKyAgICAgICAgQGxlYWtzT3V0cHV0 ID0gYC91c3IvYmluL2xlYWtzIFwiJHRhcmdldFwiYDsKICAgICB9Ci0gICAgCisKICAgICByZXR1 cm4gXEBsZWFrc091dHB1dDsKIH0KIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2xlYWtkZXRlY3Rvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvbGVha2RldGVjdG9yLnB5CShyZXZpc2lvbiAyMzQ5MDIpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvbGVha2RldGVjdG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MywxNCArNjMs MTUgQEAgY2xhc3MgTGVha0RldGVjdG9yKG9iamVjdCk6CiAgICAgICAgIF0KICAgICAgICAgcmV0 dXJuIGNhbGxzdGFja3MKIAotICAgIGRlZiBfbGVha3NfYXJncyhzZWxmLCBwaWQsIGxlYWtzX291 dHB1dF9wYXRoKToKKyAgICBkZWYgX2xlYWtzX2FyZ3Moc2VsZiwgcHJvY2Vzc19uYW1lLCBwcm9j ZXNzX3BpZCk6CiAgICAgICAgIGxlYWtzX2FyZ3MgPSBbXQogICAgICAgICBmb3IgY2FsbHN0YWNr IGluIHNlbGYuX2NhbGxzdGFja3NfdG9fZXhjbHVkZV9mcm9tX2xlYWtzKCk6CiAgICAgICAgICAg ICBsZWFrc19hcmdzICs9IFsnLS1leGNsdWRlLWNhbGxzdGFjaz0lcycgJSBjYWxsc3RhY2tdCiAg ICAgICAgIGZvciBleGNsdWRlZF90eXBlIGluIHNlbGYuX3R5cGVzX3RvX2V4Y2x1ZGVfZnJvbV9s ZWFrcygpOgogICAgICAgICAgICAgbGVha3NfYXJncyArPSBbJy0tZXhjbHVkZS10eXBlPSVzJyAl IGV4Y2x1ZGVkX3R5cGVdCi0gICAgICAgIGxlYWtzX2FyZ3MgKz0gWyctLW91dHB1dC1maWxlPSVz JyAlIGxlYWtzX291dHB1dF9wYXRoXQotICAgICAgICBsZWFrc19hcmdzLmFwcGVuZChwaWQpCisg ICAgICAgIGxlYWtzX2FyZ3MgKz0gWyctLW91dHB1dC1maWxlPSVzJyAlIHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihzZWxmLl9wb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCksIHNlbGYubGVha3NfZmlsZV9u YW1lKHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpKV0KKyAgICAgICAgbGVha3NfYXJncyArPSBb Jy0tbWVtZ3JhcGgtZmlsZT0lcycgJSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcG9ydC5y ZXN1bHRzX2RpcmVjdG9yeSgpLCBzZWxmLm1lbWdyYXBoX2ZpbGVfbmFtZShwcm9jZXNzX25hbWUs IHByb2Nlc3NfcGlkKSldCisgICAgICAgIGxlYWtzX2FyZ3MuYXBwZW5kKHByb2Nlc3NfcGlkKQog ICAgICAgICByZXR1cm4gbGVha3NfYXJncwogCiAgICAgZGVmIF9wYXJzZV9sZWFrc19vdXRwdXQo c2VsZiwgbGVha3Nfb3V0cHV0KToKQEAgLTgzLDkgKzg0LDExIEBAIGNsYXNzIExlYWtEZXRlY3Rv cihvYmplY3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5nbG9iKHNlbGYuX2Zp bGVzeXN0ZW0uam9pbihkaXJlY3RvcnksICIqLWxlYWtzLnR4dCIpKQogCiAgICAgZGVmIGxlYWtz X2ZpbGVfbmFtZShzZWxmLCBwcm9jZXNzX25hbWUsIHByb2Nlc3NfcGlkKToKLSAgICAgICAgIyBX ZSBpbmNsdWRlIHRoZSBudW1iZXIgb2YgZmlsZXMgdGhpcyB3b3JrZXIgaGFzIGFscmVhZHkgd3Jp dHRlbiBpbiB0aGUgbmFtZSB0byBwcmV2ZW50IG92ZXJ3cml0dGluZyBwcmV2aW91cyBsZWFrIHJl c3VsdHMuLgogICAgICAgICByZXR1cm4gIiVzLSVzLWxlYWtzLnR4dCIgJSAocHJvY2Vzc19uYW1l LCBwcm9jZXNzX3BpZCkKIAorICAgIGRlZiBtZW1ncmFwaF9maWxlX25hbWUoc2VsZiwgcHJvY2Vz c19uYW1lLCBwcm9jZXNzX3BpZCk6CisgICAgICAgIHJldHVybiAiJXMtJXMubWVtZ3JhcGgiICUg KHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpCisKICAgICBkZWYgY291bnRfdG90YWxfYnl0ZXNf YW5kX3VuaXF1ZV9sZWFrcyhzZWxmLCBsZWFrX2ZpbGVzKToKICAgICAgICAgbWVyZ2VfZGVwdGgg PSA1ICAjIE9SV1QgaGFkIGEgLS1tZXJnZS1sZWFrLWRlcHRoIGFyZ3VtZW50LCBidXQgdGhhdCBz ZWVtcyBvdXQgb2Ygc2NvcGUgZm9yIHRoZSBydW4td2Via2l0LXRlc3RzIHRvb2wuCiAgICAgICAg IGFyZ3MgPSBbCkBAIC0xMTUsMTMgKzExOCwxMyBAQCBjbGFzcyBMZWFrRGV0ZWN0b3Iob2JqZWN0 KToKIAogICAgIGRlZiBjaGVja19mb3JfbGVha3Moc2VsZiwgcHJvY2Vzc19uYW1lLCBwcm9jZXNz X3BpZCk6CiAgICAgICAgIF9sb2cuZGVidWcoIkNoZWNraW5nIGZvciBsZWFrcyBpbiAlcyIgJSBw cm9jZXNzX25hbWUpCi0gICAgICAgIGxlYWtzX2ZpbGVuYW1lID0gc2VsZi5sZWFrc19maWxlX25h bWUocHJvY2Vzc19uYW1lLCBwcm9jZXNzX3BpZCkKLSAgICAgICAgbGVha3Nfb3V0cHV0X3BhdGgg PSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpLCBs ZWFrc19maWxlbmFtZSkKICAgICAgICAgdHJ5OgorICAgICAgICAgICAgbGVha3NfZmlsZW5hbWUg PSBzZWxmLmxlYWtzX2ZpbGVfbmFtZShwcm9jZXNzX25hbWUsIHByb2Nlc3NfcGlkKQorICAgICAg ICAgICAgbGVha3Nfb3V0cHV0X3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcG9y dC5yZXN1bHRzX2RpcmVjdG9yeSgpLCBsZWFrc19maWxlbmFtZSkKICAgICAgICAgICAgICMgT2Rk bHkgZW5vdWdoLCBydW4tbGVha3MgKG9yIHRoZSB1bmRlcmx5aW5nIGxlYWtzIHRvb2wpIGRvZXMg bm90IHNlZW0gdG8gYWx3YXlzIG91dHB1dCB1dGYtOCwKICAgICAgICAgICAgICMgdGh1cyB3ZSBw YXNzIGRlY29kZV9vdXRwdXQ9RmFsc2UuICBXaXRob3V0IHRoaXMgY29kZSB3ZSd2ZSBzZWVuIGVy cm9ycyBsaWtlOgogICAgICAgICAgICAgIyAiVW5pY29kZURlY29kZUVycm9yOiAndXRmOCcgY29k ZWMgY2FuJ3QgZGVjb2RlIGJ5dGUgMHg4OCBpbiBwb3NpdGlvbiA3Nzk4NzQ6IHVuZXhwZWN0ZWQg Y29kZSBieXRlIgotICAgICAgICAgICAgc2VsZi5fcG9ydC5fcnVuX3NjcmlwdCgicnVuLWxlYWtz Iiwgc2VsZi5fbGVha3NfYXJncyhwcm9jZXNzX3BpZCwgbGVha3Nfb3V0cHV0X3BhdGgpLCBpbmNs dWRlX2NvbmZpZ3VyYXRpb25fYXJndW1lbnRzPUZhbHNlLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQor ICAgICAgICAgICAgc2VsZi5fcG9ydC5fcnVuX3NjcmlwdCgicnVuLWxlYWtzIiwgc2VsZi5fbGVh a3NfYXJncyhwcm9jZXNzX25hbWUsIHByb2Nlc3NfcGlkKSwgaW5jbHVkZV9jb25maWd1cmF0aW9u X2FyZ3VtZW50cz1GYWxzZSwgZGVjb2RlX291dHB1dD1GYWxzZSkKICAgICAgICAgICAgIGxlYWtz X291dHB1dCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmlsZShsZWFrc19vdXRwdXRf cGF0aCkKICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yIGFzIGU6CiAgICAgICAgICAgICBfbG9n Lndhcm4oIkZhaWxlZCB0byBydW4gbGVha3MgdG9vbDogJXMiICUgZS5tZXNzYWdlX3dpdGhfb3V0 cHV0KCkpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbGVha2RldGVjdG9yX3Vu aXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9sZWFr ZGV0ZWN0b3JfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIzNDkwMikKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9sZWFrZGV0ZWN0b3JfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAg LTQxLDYgKzQxLDkgQEAgY2xhc3MgTGVha0RldGVjdG9yVGVzdCh1bml0dGVzdC5UZXN0Q2FzZQog ICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0gPSBNb2NrRmlsZVN5c3RlbSgpCiAgICAg ICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZSgpCiAKKyAgICAgICAg ICAgIGRlZiByZXN1bHRzX2RpcmVjdG9yeShzZWxmKToKKyAgICAgICAgICAgICAgICByZXR1cm4g Ii90bXAvIgorCiAgICAgICAgIHJldHVybiBNb2NrUG9ydCgpCiAKICAgICBkZWYgX21ha2VfZGV0 ZWN0b3Ioc2VsZik6CkBAIC01MCw4ICs1Myw4IEBAIGNsYXNzIExlYWtEZXRlY3RvclRlc3QodW5p dHRlc3QuVGVzdENhc2UKICAgICAgICAgZGV0ZWN0b3IgPSBzZWxmLl9tYWtlX2RldGVjdG9yKCkK ICAgICAgICAgZGV0ZWN0b3IuX2NhbGxzdGFja3NfdG9fZXhjbHVkZV9mcm9tX2xlYWtzID0gbGFt YmRhOiBbJ2ZvbyBiYXInLCAnQkFaJ10KICAgICAgICAgZGV0ZWN0b3IuX3R5cGVzX3RvX2V4Y2x1 ZGVfZnJvbV9sZWFrcyA9IGxhbWJkYTogWydhYmNkZWZnJywgJ2hpIGprbG1ubyddCi0gICAgICAg IGV4cGVjdGVkX2FyZ3MgPSBbJy0tZXhjbHVkZS1jYWxsc3RhY2s9Zm9vIGJhcicsICctLWV4Y2x1 ZGUtY2FsbHN0YWNrPUJBWicsICctLWV4Y2x1ZGUtdHlwZT1hYmNkZWZnJywgJy0tZXhjbHVkZS10 eXBlPWhpIGprbG1ubycsICctLW91dHB1dC1maWxlPWxlYWtzLnR4dCcsIDEyMzRdCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoZGV0ZWN0b3IuX2xlYWtzX2FyZ3MoMTIzNCwgJ2xlYWtzLnR4dCcp LCBleHBlY3RlZF9hcmdzKQorICAgICAgICBleHBlY3RlZF9hcmdzID0gWyctLWV4Y2x1ZGUtY2Fs bHN0YWNrPWZvbyBiYXInLCAnLS1leGNsdWRlLWNhbGxzdGFjaz1CQVonLCAnLS1leGNsdWRlLXR5 cGU9YWJjZGVmZycsICctLWV4Y2x1ZGUtdHlwZT1oaSBqa2xtbm8nLCAnLS1vdXRwdXQtZmlsZT0v dG1wL0R1bXBSZW5kZXJUcmVlLTEyMzQtbGVha3MudHh0JywgJy0tbWVtZ3JhcGgtZmlsZT0vdG1w L0R1bXBSZW5kZXJUcmVlLTEyMzQubWVtZ3JhcGgnLCAxMjM0XQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGRldGVjdG9yLl9sZWFrc19hcmdzKCJEdW1wUmVuZGVyVHJlZSIsIDEyMzQpLCBleHBl Y3RlZF9hcmdzKQogCiAgICAgZXhhbXBsZV9sZWFrc19vdXRwdXQgPSAiIiJQcm9jZXNzIDUxMjI6 IDY2Mzc0NCBub2RlcyBtYWxsb2NlZCBmb3IgNzg2ODMgS0IKIFByb2Nlc3MgNTEyMjogMzM3MzAx IGxlYWtzIGZvciA2NTI1MjE2IHRvdGFsIGxlYWtlZCBieXRlcy4K