187687 2018-07-15 14:17:22 -0700 Add --target-path option to dump-class-layout 2019-05-02 16:25:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki darin dbates sam simon.fraser webkit-bug-importer wiba oldest_to_newest 1442300 0 ysuzuki 2018-07-15 14:17:22 -0700 Add --target option to dump-class-layout 1442301 1 345064 ysuzuki 2018-07-15 14:19:14 -0700 Created attachment 345064 Patch 1442302 2 345065 ysuzuki 2018-07-15 14:21:14 -0700 Created attachment 345065 Patch 1442310 3 345065 dbates 2018-07-15 16:21:48 -0700 Comment on attachment 345065 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345065&action=review > Tools/Scripts/dump-class-layout:78 > + if not args.target_path == None: I do not know much about the JSCOnly port. Would it make sense (and solve the problem your are having) to expose a —root option like we do for run-webkit-tests to provide a path to an arbitrary directory for the built products? If so, I suggest we do that for consistency. If we choose to go with the approach proposed in this patch then please change “== None” to “is None” (per PEP8) and I am assuming that argparse will emit and error if target-path is the empty string. Otherwise, we should handle that. Again I would prefer we add —root over —target-path. 1442311 4 345065 ysuzuki 2018-07-15 18:04:05 -0700 Comment on attachment 345065 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345065&action=review >> Tools/Scripts/dump-class-layout:78 >> + if not args.target_path == None: > > I do not know much about the JSCOnly port. Would it make sense (and solve the problem your are having) to expose a —root option like we do for run-webkit-tests to provide a path to an arbitrary directory for the built products? If so, I suggest we do that for consistency. > > If we choose to go with the approach proposed in this patch then please change “== None” to “is None” (per PEP8) and I am assuming that argparse will emit and error if target-path is the empty string. Otherwise, we should handle that. Again I would prefer we add —root over —target-path. I don't think `--root` solves the problem. While macOS ports build JSC and WebCore as `framework`, JSCOnly, GTK, and WPE ports are not. They build JSC and WebCore as shared library `.so`. Furthermore, the names of shared libraries are slightly different in each port. JSCOnly port's shared library is `libJavaScriptCore.so`, GTK ports one is `libjavascriptcoregtk-4.0.so`. To support these things with `--root` option, we need to handle these differences in python code, which complicates dump-class-layout. Instead of doing that, just passing a library with `--target-path` is simple. So I would like to choose this approach. I'll fix `is None` thing and upload the patch. 1442312 5 345071 ysuzuki 2018-07-15 18:05:08 -0700 Created attachment 345071 Patch 1442385 7 345071 simon.fraser 2018-07-16 08:39:23 -0700 Comment on attachment 345071 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345071&action=review > Tools/ChangeLog:8 > + We add a hatch to dump-class-layout for specifying target path directly. A hatch? Maybe "argument"? 1442450 8 345071 ysuzuki 2018-07-16 11:51:47 -0700 Comment on attachment 345071 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345071&action=review >> Tools/ChangeLog:8 >> + We add a hatch to dump-class-layout for specifying target path directly. > > A hatch? Maybe "argument"? Ah, that means `an escape hatch`. Fixed. 1442451 9 ysuzuki 2018-07-16 11:52:27 -0700 Committed r233856: <https://trac.webkit.org/changeset/233856> 1442452 10 webkit-bug-importer 2018-07-16 11:53:19 -0700 <rdar://problem/42249696> 345064 2018-07-15 14:19:14 -0700 2018-07-15 14:21:12 -0700 Patch bug-187687-20180716061913.patch text/plain 2518 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2ZiYjY3Yjk3NWRmMDJkODhhYzNmNDc4Y2I4MGNhMGI1 NWY3ODQwMi4uMGEwMDMyMzIwOWE3ZmQ5Nzc5YzU2MzhkNjcwYWQwMGVkZWY0ZDAxZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE4LTA3LTE1ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgor CisgICAgICAgIEFkZCAtLXRhcmdldCBvcHRpb24gdG8gZHVtcC1jbGFzcy1sYXlvdXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzY4NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGFkZCBhIGhhdGNo IHRvIGR1bXAtY2xhc3MtbGF5b3V0IGZvciBzcGVjaWZ5aW5nIHRhcmdldCBwYXRoIGRpcmVjdGx5 LgorICAgICAgICBUaGlzIGAtLXRhcmdldGAgYWxsb3dzIHVzIHRvIHVzZSBkdW1wLWNsYXNzLWxh eW91dCBpbiB0aGUgb3RoZXIgcG9ydHMKKyAgICAgICAgbGlrZSBKU0NPbmx5LgorCisgICAgICAg IFdlIGNhbiBkdW1wIGNsYXNzIGxheW91dCBpZiB3ZSBidWlsZCB0YXJnZXQgd2l0aCBjbGFuZyBi eSB1c2luZyB0aGUgZm9sbG93aW5nIGNvbW1hbmQuCisKKyAgICAgICAgVG9vbHMvU2NyaXB0cy9k dW1wLWNsYXNzLWxheW91dCBcCisgICAgICAgICAgICAtLWFyY2hpdGVjdHVyZT14ODZfNjQgXAor ICAgICAgICAgICAgLS10YXJnZXQ9cGF0aC90by9saWJKYXZhU2NyaXB0Q29yZS5zbyBcCisgICAg ICAgICAgICBKYXZhU2NyaXB0Q29yZSBcCisgICAgICAgICAgICBTY29wZU5vZGUKKworICAgICAg ICAqIFNjcmlwdHMvZHVtcC1jbGFzcy1sYXlvdXQ6CisgICAgICAgIChtYWluKToKKwogMjAxOC0w Ny0xMyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAg W1dpbkNhaXJvXSBydW4tYXBpLXRlc3RzIGlzIHRpbWluZyBvdXQgZm9yIGFsbW9zdCBhbGwgdGVz dCBjYXNlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9kdW1wLWNsYXNzLWxheW91dCBiL1Rv b2xzL1NjcmlwdHMvZHVtcC1jbGFzcy1sYXlvdXQKaW5kZXggMDA1ZmY5MmMzZjRiMWI4NDYxZjky M2E5NGNjYWVkMTM3MWRkMjY3Yi4uOWE0OTE4YjIyYTIwMDZlZTY2NWU0YzllZDViYzA0YzI0OWQz YTFiMyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9kdW1wLWNsYXNzLWxheW91dAorKysgYi9U b29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0CkBAIC0zOSw2ICszOSw3IEBAIGZyb20gbGxk Yl9kdW1wX2NsYXNzX2xheW91dCBpbXBvcnQgTExEQkRlYnVnZ2VySW5zdGFuY2UsIENsYXNzTGF5 b3V0CiAKIGZyYW1ld29yayA9ICJXZWJDb3JlIgogYnVpbGRfZGlyZWN0b3J5ID0gIiIKK3Rhcmdl dF9wYXRoID0gIiIKIGNvbmZpZyA9ICJSZWxlYXNlIgogYXJjaCA9IE5vbmUKIApAQCAtNjIsNiAr NjMsOSBAQCBkZWYgbWFpbigpOgogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1hJywgJy0tYXJj aGl0ZWN0dXJlJywgZGVzdD0nYXJjaCcsIGFjdGlvbj0nc3RvcmUnLAogICAgICAgICBoZWxwPSdB cmNoaXRlY3R1cmUgKGkzODYsIHg4Nl82NCwgYXJtdjcsIGFybXY3cywgYXJtNjQpLiBVc2VzIHRo ZSBmaXJzdCBhcmNoaXRlY3R1cmUgbGlzdGVkIGJ5IFwnZmlsZVwnIGJ5IGRlZmF1bHQnKQogCisg ICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLXQnLCAnLS10YXJnZXQtcGF0aCcsIGRlc3Q9J3Rhcmdl dF9wYXRoJywgYWN0aW9uPSdzdG9yZScsCisgICAgICAgIGhlbHA9J1BhdGggdG8gdGhlIHRhcmdl dCcpCisKICAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQogICAgIGJ1aWxkX2RpciA9IHdl YmtpdF9idWlsZF9kaXIoKQogCkBAIC03MSw3ICs3NSwxMCBAQCBkZWYgbWFpbigpOgogICAgIGlm IG5vdCBhcmdzLmJ1aWxkX2RpcmVjdG9yeSA9PSBOb25lOgogICAgICAgICBidWlsZF9kaXIgPSBh cmdzLmJ1aWxkX2RpcmVjdG9yeQogCi0gICAgdGFyZ2V0X3BhdGggPSBvcy5wYXRoLmpvaW4oYnVp bGRfZGlyLCBhcmdzLmNvbmZpZywgYXJncy5mcmFtZXdvcmsgKyAiLmZyYW1ld29yayIsIGFyZ3Mu ZnJhbWV3b3JrKTsKKyAgICBpZiBub3QgYXJncy50YXJnZXRfcGF0aCA9PSBOb25lOgorICAgICAg ICB0YXJnZXRfcGF0aCA9IGFyZ3MudGFyZ2V0X3BhdGgKKyAgICBlbHNlOgorICAgICAgICB0YXJn ZXRfcGF0aCA9IG9zLnBhdGguam9pbihidWlsZF9kaXIsIGFyZ3MuY29uZmlnLCBhcmdzLmZyYW1l d29yayArICIuZnJhbWV3b3JrIiwgYXJncy5mcmFtZXdvcmspOwogICAgIAogICAgIGxsZGJfaW5z dGFuY2UgPSBMTERCRGVidWdnZXJJbnN0YW5jZSh0YXJnZXRfcGF0aCwgYXJncy5hcmNoKQogICAg IGNsYXNzX2xheW91dCA9IGxsZGJfaW5zdGFuY2UubGF5b3V0X2Zvcl9jbGFzc25hbWUoYXJncy5j bGFzc25hbWUpCg== 345065 2018-07-15 14:21:14 -0700 2018-07-15 18:05:07 -0700 Patch bug-187687-20180716062113.patch text/plain 2537 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2ZiYjY3Yjk3NWRmMDJkODhhYzNmNDc4Y2I4MGNhMGI1 NWY3ODQwMi4uYWFjNmUxNzYzNWRhMjIwYzM1OTIyODU0ZWU0ZGM0ZmJmNWQ5OTg0MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE4LTA3LTE1ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgor CisgICAgICAgIEFkZCAtLXRhcmdldC1wYXRoIG9wdGlvbiB0byBkdW1wLWNsYXNzLWxheW91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Njg3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYWRkIGEg aGF0Y2ggdG8gZHVtcC1jbGFzcy1sYXlvdXQgZm9yIHNwZWNpZnlpbmcgdGFyZ2V0IHBhdGggZGly ZWN0bHkuCisgICAgICAgIFRoaXMgYC0tdGFyZ2V0LXBhdGhgIGFsbG93cyB1cyB0byB1c2UgZHVt cC1jbGFzcy1sYXlvdXQgaW4gdGhlIG90aGVyIHBvcnRzCisgICAgICAgIGxpa2UgSlNDT25seS4K KworICAgICAgICBXZSBjYW4gZHVtcCBjbGFzcyBsYXlvdXQgaWYgd2UgYnVpbGQgdGhlIHRhcmdl dCB3aXRoIGNsYW5nIGJ5IHVzaW5nIHRoZSBmb2xsb3dpbmcgY29tbWFuZC4KKworICAgICAgICBU b29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0IFwKKyAgICAgICAgICAgIC0tYXJjaGl0ZWN0 dXJlPXg4Nl82NCBcCisgICAgICAgICAgICAtLXRhcmdldC1wYXRoPXBhdGgvdG8vbGliSmF2YVNj cmlwdENvcmUuc28gXAorICAgICAgICAgICAgSmF2YVNjcmlwdENvcmUgXAorICAgICAgICAgICAg U2NvcGVOb2RlCisKKyAgICAgICAgKiBTY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0OgorICAgICAg ICAobWFpbik6CisKIDIwMTgtMDctMTMgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNv bnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gcnVuLWFwaS10ZXN0cyBpcyB0aW1pbmcgb3V0 IGZvciBhbG1vc3QgYWxsIHRlc3QgY2FzZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvZHVt cC1jbGFzcy1sYXlvdXQgYi9Ub29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0CmluZGV4IDAw NWZmOTJjM2Y0YjFiODQ2MWY5MjNhOTRjY2FlZDEzNzFkZDI2N2IuLjlhNDkxOGIyMmEyMDA2ZWU2 NjVlNGM5ZWQ1YmMwNGMyNDlkM2ExYjMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZHVtcC1j bGFzcy1sYXlvdXQKKysrIGIvVG9vbHMvU2NyaXB0cy9kdW1wLWNsYXNzLWxheW91dApAQCAtMzks NiArMzksNyBAQCBmcm9tIGxsZGJfZHVtcF9jbGFzc19sYXlvdXQgaW1wb3J0IExMREJEZWJ1Z2dl ckluc3RhbmNlLCBDbGFzc0xheW91dAogCiBmcmFtZXdvcmsgPSAiV2ViQ29yZSIKIGJ1aWxkX2Rp cmVjdG9yeSA9ICIiCit0YXJnZXRfcGF0aCA9ICIiCiBjb25maWcgPSAiUmVsZWFzZSIKIGFyY2gg PSBOb25lCiAKQEAgLTYyLDYgKzYzLDkgQEAgZGVmIG1haW4oKToKICAgICBwYXJzZXIuYWRkX2Fy Z3VtZW50KCctYScsICctLWFyY2hpdGVjdHVyZScsIGRlc3Q9J2FyY2gnLCBhY3Rpb249J3N0b3Jl JywKICAgICAgICAgaGVscD0nQXJjaGl0ZWN0dXJlIChpMzg2LCB4ODZfNjQsIGFybXY3LCBhcm12 N3MsIGFybTY0KS4gVXNlcyB0aGUgZmlyc3QgYXJjaGl0ZWN0dXJlIGxpc3RlZCBieSBcJ2ZpbGVc JyBieSBkZWZhdWx0JykKIAorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy10JywgJy0tdGFyZ2V0 LXBhdGgnLCBkZXN0PSd0YXJnZXRfcGF0aCcsIGFjdGlvbj0nc3RvcmUnLAorICAgICAgICBoZWxw PSdQYXRoIHRvIHRoZSB0YXJnZXQnKQorCiAgICAgYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkK ICAgICBidWlsZF9kaXIgPSB3ZWJraXRfYnVpbGRfZGlyKCkKIApAQCAtNzEsNyArNzUsMTAgQEAg ZGVmIG1haW4oKToKICAgICBpZiBub3QgYXJncy5idWlsZF9kaXJlY3RvcnkgPT0gTm9uZToKICAg ICAgICAgYnVpbGRfZGlyID0gYXJncy5idWlsZF9kaXJlY3RvcnkKIAotICAgIHRhcmdldF9wYXRo ID0gb3MucGF0aC5qb2luKGJ1aWxkX2RpciwgYXJncy5jb25maWcsIGFyZ3MuZnJhbWV3b3JrICsg Ii5mcmFtZXdvcmsiLCBhcmdzLmZyYW1ld29yayk7CisgICAgaWYgbm90IGFyZ3MudGFyZ2V0X3Bh dGggPT0gTm9uZToKKyAgICAgICAgdGFyZ2V0X3BhdGggPSBhcmdzLnRhcmdldF9wYXRoCisgICAg ZWxzZToKKyAgICAgICAgdGFyZ2V0X3BhdGggPSBvcy5wYXRoLmpvaW4oYnVpbGRfZGlyLCBhcmdz LmNvbmZpZywgYXJncy5mcmFtZXdvcmsgKyAiLmZyYW1ld29yayIsIGFyZ3MuZnJhbWV3b3JrKTsK ICAgICAKICAgICBsbGRiX2luc3RhbmNlID0gTExEQkRlYnVnZ2VySW5zdGFuY2UodGFyZ2V0X3Bh dGgsIGFyZ3MuYXJjaCkKICAgICBjbGFzc19sYXlvdXQgPSBsbGRiX2luc3RhbmNlLmxheW91dF9m b3JfY2xhc3NuYW1lKGFyZ3MuY2xhc3NuYW1lKQo= 345071 2018-07-15 18:05:08 -0700 2018-07-16 08:39:23 -0700 Patch bug-187687-20180716100508.patch text/plain 2643 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2ZiYjY3Yjk3NWRmMDJkODhhYzNmNDc4Y2I4MGNhMGI1 NWY3ODQwMi4uYWFjNmUxNzYzNWRhMjIwYzM1OTIyODU0ZWU0ZGM0ZmJmNWQ5OTg0MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE4LTA3LTE1ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgor CisgICAgICAgIEFkZCAtLXRhcmdldC1wYXRoIG9wdGlvbiB0byBkdW1wLWNsYXNzLWxheW91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3Njg3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYWRkIGEg aGF0Y2ggdG8gZHVtcC1jbGFzcy1sYXlvdXQgZm9yIHNwZWNpZnlpbmcgdGFyZ2V0IHBhdGggZGly ZWN0bHkuCisgICAgICAgIFRoaXMgYC0tdGFyZ2V0LXBhdGhgIGFsbG93cyB1cyB0byB1c2UgZHVt cC1jbGFzcy1sYXlvdXQgaW4gdGhlIG90aGVyIHBvcnRzCisgICAgICAgIGxpa2UgSlNDT25seS4K KworICAgICAgICBXZSBjYW4gZHVtcCBjbGFzcyBsYXlvdXQgaWYgd2UgYnVpbGQgdGhlIHRhcmdl dCB3aXRoIGNsYW5nIGJ5IHVzaW5nIHRoZSBmb2xsb3dpbmcgY29tbWFuZC4KKworICAgICAgICBU b29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0IFwKKyAgICAgICAgICAgIC0tYXJjaGl0ZWN0 dXJlPXg4Nl82NCBcCisgICAgICAgICAgICAtLXRhcmdldC1wYXRoPXBhdGgvdG8vbGliSmF2YVNj cmlwdENvcmUuc28gXAorICAgICAgICAgICAgSmF2YVNjcmlwdENvcmUgXAorICAgICAgICAgICAg U2NvcGVOb2RlCisKKyAgICAgICAgKiBTY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0OgorICAgICAg ICAobWFpbik6CisKIDIwMTgtMDctMTMgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNv bnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gcnVuLWFwaS10ZXN0cyBpcyB0aW1pbmcgb3V0 IGZvciBhbG1vc3QgYWxsIHRlc3QgY2FzZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvZHVt cC1jbGFzcy1sYXlvdXQgYi9Ub29scy9TY3JpcHRzL2R1bXAtY2xhc3MtbGF5b3V0CmluZGV4IDAw NWZmOTJjM2Y0YjFiODQ2MWY5MjNhOTRjY2FlZDEzNzFkZDI2N2IuLmE1NDdlMjA1ZDYzZDA4OTE5 MzgzYjJkYmJkMzcwNThjMjVmNWNkYzIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZHVtcC1j bGFzcy1sYXlvdXQKKysrIGIvVG9vbHMvU2NyaXB0cy9kdW1wLWNsYXNzLWxheW91dApAQCAtMzks NiArMzksNyBAQCBmcm9tIGxsZGJfZHVtcF9jbGFzc19sYXlvdXQgaW1wb3J0IExMREJEZWJ1Z2dl ckluc3RhbmNlLCBDbGFzc0xheW91dAogCiBmcmFtZXdvcmsgPSAiV2ViQ29yZSIKIGJ1aWxkX2Rp cmVjdG9yeSA9ICIiCit0YXJnZXRfcGF0aCA9ICIiCiBjb25maWcgPSAiUmVsZWFzZSIKIGFyY2gg PSBOb25lCiAKQEAgLTYyLDE2ICs2MywyMiBAQCBkZWYgbWFpbigpOgogICAgIHBhcnNlci5hZGRf YXJndW1lbnQoJy1hJywgJy0tYXJjaGl0ZWN0dXJlJywgZGVzdD0nYXJjaCcsIGFjdGlvbj0nc3Rv cmUnLAogICAgICAgICBoZWxwPSdBcmNoaXRlY3R1cmUgKGkzODYsIHg4Nl82NCwgYXJtdjcsIGFy bXY3cywgYXJtNjQpLiBVc2VzIHRoZSBmaXJzdCBhcmNoaXRlY3R1cmUgbGlzdGVkIGJ5IFwnZmls ZVwnIGJ5IGRlZmF1bHQnKQogCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLXQnLCAnLS10YXJn ZXQtcGF0aCcsIGRlc3Q9J3RhcmdldF9wYXRoJywgYWN0aW9uPSdzdG9yZScsCisgICAgICAgIGhl bHA9J1BhdGggdG8gdGhlIHRhcmdldCcpCisKICAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3Mo KQogICAgIGJ1aWxkX2RpciA9IHdlYmtpdF9idWlsZF9kaXIoKQogCi0gICAgaWYgYXJncy5jb25m aWcgPT0gTm9uZToKKyAgICBpZiBhcmdzLmNvbmZpZyBpcyBOb25lOgogICAgICAgICBhcmdzLmNv bmZpZyA9ICJSZWxlYXNlIgogCi0gICAgaWYgbm90IGFyZ3MuYnVpbGRfZGlyZWN0b3J5ID09IE5v bmU6CisgICAgaWYgYXJncy5idWlsZF9kaXJlY3RvcnkgaXMgbm90IE5vbmU6CiAgICAgICAgIGJ1 aWxkX2RpciA9IGFyZ3MuYnVpbGRfZGlyZWN0b3J5CiAKLSAgICB0YXJnZXRfcGF0aCA9IG9zLnBh dGguam9pbihidWlsZF9kaXIsIGFyZ3MuY29uZmlnLCBhcmdzLmZyYW1ld29yayArICIuZnJhbWV3 b3JrIiwgYXJncy5mcmFtZXdvcmspOworICAgIGlmIGFyZ3MudGFyZ2V0X3BhdGggaXMgbm90IE5v bmU6CisgICAgICAgIHRhcmdldF9wYXRoID0gYXJncy50YXJnZXRfcGF0aAorICAgIGVsc2U6Cisg ICAgICAgIHRhcmdldF9wYXRoID0gb3MucGF0aC5qb2luKGJ1aWxkX2RpciwgYXJncy5jb25maWcs IGFyZ3MuZnJhbWV3b3JrICsgIi5mcmFtZXdvcmsiLCBhcmdzLmZyYW1ld29yayk7CiAgICAgCiAg ICAgbGxkYl9pbnN0YW5jZSA9IExMREJEZWJ1Z2dlckluc3RhbmNlKHRhcmdldF9wYXRoLCBhcmdz LmFyY2gpCiAgICAgY2xhc3NfbGF5b3V0ID0gbGxkYl9pbnN0YW5jZS5sYXlvdXRfZm9yX2NsYXNz bmFtZShhcmdzLmNsYXNzbmFtZSkK