132954 2014-05-15 08:09:46 -0700 webkitdirs.pm: Add setupMacWebKitEnvironment() to set __XPC_DYLD_FRAMEWORK_PATH consistently 2014-05-19 15:40:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 132955 1 ddkilzer ddkilzer ap cgarcia commit-queue dbates dfarler gustavo mitz mrobinson mrowe simon.fraser oldest_to_newest 1009528 0 ddkilzer 2014-05-15 08:09:46 -0700 This started out as just adding __XPC_DYLD_FRAMEWORK_PATH to bisect-builds, but then I tried to share more code in webkitdirs.pm by creating a common "environment setup" subroutine, but the extracted code also set up guardmalloc which seemed useful*, and it seemed silly to manually add '-g|--guard-malloc' switch parsing and help text to every script, so I added methods to make it easy to parse and print help for shared switching (initially just -g|--guard-malloc). In the mid-term, I think we should investigate a WebKit::Options[Parser] class that wraps Getopt::Long, knows about sets of common switches, and knows how to print help by passing it a list of switches for a particular script. * Already found a bug in WebKit2.CookieManager when run under guardmalloc. (Not a crash, but test expectation fails.) 1009540 1 231517 ddkilzer 2014-05-15 08:21:58 -0700 Created attachment 231517 Patch v1 1009542 2 ddkilzer 2014-05-15 08:23:56 -0700 (In reply to comment #0) > * Already found a bug in WebKit2.CookieManager when run under guardmalloc. (Not a crash, but test expectation fails.) I filed this as Bug 132955. 1010167 3 231517 commit-queue 2014-05-19 02:18:26 -0700 Comment on attachment 231517 Patch v1 Clearing flags on attachment: 231517 Committed r169042: <http://trac.webkit.org/changeset/169042> 1010168 4 commit-queue 2014-05-19 02:18:31 -0700 All reviewed patches have been landed. Closing bug. 1010220 5 simon.fraser 2014-05-19 10:45:01 -0700 Did this break run-api-tests? http://build.webkit.org/builders/Apple%20MountainLion%20Debug%20WK1%20%28Tests%29/builds/14033/steps/run-api-tests/logs/stdio 1010314 6 ddkilzer 2014-05-19 15:40:25 -0700 (In reply to comment #5) > Did this break run-api-tests? > http://build.webkit.org/builders/Apple%20MountainLion%20Debug%20WK1%20%28Tests%29/builds/14033/steps/run-api-tests/logs/stdio Speculative fix: Committed r169078: <http://trac.webkit.org/changeset/169078> 231517 2014-05-15 08:21:58 -0700 2014-05-19 02:18:26 -0700 Patch v1 bug-132954-20140515082100.patch text/plain 12403 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NjgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2UzZWMxMmY0MTM5YTUzZmYxYzIxZTUwNjBiYmY0NGJh OWE3NTFiZC4uNGVjMGQyNzRmYzk1ZTk0NTdlY2MxY2M4MTU0NjE2YTVjMDQzZGY3ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0 IEBACisyMDE0LTA1LTE1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgd2Via2l0ZGlycy5wbTogQWRkIHNldHVwTWFjV2ViS2l0RW52aXJvbm1lbnQoKSB0byBz ZXQgX19YUENfRFlMRF9GUkFNRVdPUktfUEFUSCBjb25zaXN0ZW50bHkKKyAgICAgICAgPGh0dHA6 Ly93ZWJraXQub3JnL2IvMTMyOTU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEV4dHJhY3QgY29kZSBpbnRvIHNldHVwTWFjV2ViS2l0RW52aXJvbm1l bnQoKSBmb3Igc2V0dGluZyB1cAorICAgICAgICBjb21tb24gZW52aXJvbm1lbnQgdmFyaWFibGVz IHNvIGl0IG1heSBiZSBzaGFyZWQuICBTZXRzCisgICAgICAgIF9fWFBDX0RZTERfRlJBTUVXT1JL X1BBVEggY29uc2lzdGVudGx5IGFuZCBhZGRzIHN1cHBvcnQgZm9yCisgICAgICAgIHVzaW5nIGd1 YXJkbWFsbG9jIHRvIHNvbWUgc2NyaXB0cy4KKworICAgICAgICBBbHNvIGFkZHMgc3VwcG9ydCBm b3IgcGFyc2luZyBzaGFyZWQgKGNvbW1vbikgY29tbWFuZC1saW5lCisgICAgICAgIHN3aXRjaGVz LCBpbml0aWFsbHkganVzdCAtZ3wtLWd1YXJkLW1hbGxvYy4KKworICAgICAgICAqIFNjcmlwdHMv YmlzZWN0LWJ1aWxkczogQWRkIC1nfC0tZ3VhcmQtbWFsbG9jIHN1cHBvcnQgYnkgdXNpbmcKKyAg ICAgICAgc2hhcmVkQ29tbWFuZExpbmVPcHRpb25zKCkgYW5kIHNoYXJlZENvbW1hbmRMaW5lT3B0 aW9uc1VzYWdlKCkuCisgICAgICAgIChtb3VudEFuZFJ1bk5pZ2h0bHkpOiBDYWxsIHNldHVwTWFj V2ViS2l0RW52aXJvbm1lbnQoKS4gIFVzZSBhCisgICAgICAgIGxvY2FsIGNvcHkgb2YgJUVOViB3 aGVuIGxhdW5jaGluZyBTYWZhcmkgc28gd2UgZG9uJ3QgaGF2ZSB0bworICAgICAgICByZXN0b3Jl IHZhcmlhYmxlcy4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWFwaS10ZXN0czogQWRkIC1nfC0t Z3VhcmQtbWFsbG9jIHN1cHBvcnQgYnkgdXNpbmcKKyAgICAgICAgc2hhcmVkQ29tbWFuZExpbmVP cHRpb25zKCkgYW5kIHNoYXJlZENvbW1hbmRMaW5lT3B0aW9uc1VzYWdlKCkuCisgICAgICAgIENo ZWNrIHJlc3VsdCBvZiBHZXRPcHRpb25zKCkgdG8gY2F0Y2ggaW52YWxpZCBjb21tYW5kLWxpbmUK KyAgICAgICAgc3dpdGNoZXMuCisgICAgICAgIChydW5UZXN0KTogVXNlIGEgbG9jYWwgY29weSBv ZiAlRU5WIHdoZW4gcnVubmluZyB0ZXN0cyBzbyB3ZQorICAgICAgICBkb24ndCBoYXZlIHRvIHJl c3RvcmUgdmFyaWFibGVzLgorICAgICAgICAocHJlcGFyZUVudmlyb25tZW50Rm9yUnVubmluZ1Rl c3RUb29sKTogQ2FsbAorICAgICAgICBzZXR1cE1hY1dlYktpdEVudmlyb25tZW50KCkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3J1bi1wYWdlbG9hZHRlc3Q6IEFkZCAtZ3wtLWd1YXJkLW1hbGxvYyBz dXBwb3J0IGJ5CisgICAgICAgIHVzaW5nIHNoYXJlZENvbW1hbmRMaW5lT3B0aW9ucygpIGFuZAor ICAgICAgICBzaGFyZWRDb21tYW5kTGluZU9wdGlvbnNVc2FnZSgpLiAgQ2FsbAorICAgICAgICBz ZXR1cE1hY1dlYktpdEVudmlyb25tZW50KCkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRp cnMucG06CisgICAgICAgIChzaGFyZWRDb21tYW5kTGluZU9wdGlvbnMpOiBSZXR1cm4gYXJyYXkg b2YgY29tbW9uIHN3aXRjaGVzIHRvCisgICAgICAgIHBhc3MgdG8gR2V0b3B0OjpMb25nOjpHZXRP cHRpb25zKCkuCisgICAgICAgIChzaGFyZWRDb21tYW5kTGluZU9wdGlvbnNVc2FnZSk6IFJldHVy biBmb3JtYXR0ZWQgc3RyaW5nIG9mCisgICAgICAgIGNvbW1vbiBzd2l0Y2hlcyBmb3IgcHJpbnRp bmcgdXNhZ2UgaGVscCB0ZXh0LgorICAgICAgICAoc2V0VXBHdWFyZE1hbGxvY0lmTmVlZGVkKTog U3VwcG9ydCB1c2luZyAnLWcnIGZvciBlbmFibGluZworICAgICAgICBndWFyZG1hbGxvYy4KKyAg ICAgICAgKHByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1Z1dlYktpdEFwcElmTmVlZGVkKTog RGl0dG8uCisgICAgICAgIChzZXR1cE1hY1dlYktpdEVudmlyb25tZW50KTogRXh0cmFjdGVkIGZy b20gcnVuTWFjV2ViS2l0QXBwKCkKKyAgICAgICAgYW5kIGNoYW5nZWQgbm90IHRvIGNsb2JiZXIg RFlMRF9GUkFNRVdPUktfUEFUSCBpZiBhbHJlYWR5IHNldC4KKyAgICAgICAgKHJ1bk1hY1dlYktp dEFwcCk6IENhbGwgc2V0dXBNYWNXZWJLaXRFbnZpcm9ubWVudCgpLiAgVXNlIGEKKyAgICAgICAg bG9jYWwgY29weSBvZiAlRU5WIHdoZW4gbGF1bmNoaW5nIFNhZmFyaSBzbyB3ZSBkb24ndCBoYXZl IHRvCisgICAgICAgIHJlc3RvcmUgdmFyaWFibGVzLgorICAgICAgICAoZXhlY01hY1dlYktpdEFw cEZvckRlYnVnZ2luZyk6IENhbGwKKyAgICAgICAgc2V0dXBNYWNXZWJLaXRFbnZpcm9ubWVudCgp LgorCiAyMDE0LTA1LTExICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVwbGFjZSBXS0NvbnRleHRTZXRMb2NhbFN0b3JhZ2VEaXJlY3Rvcnkgd2l0aCBh IGNvbnRleHQgY29uZmlndXJhdGlvbiBnZXR0ZXIvc2V0dGVyCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL2Jpc2VjdC1idWlsZHMgYi9Ub29scy9TY3JpcHRzL2Jpc2VjdC1idWlsZHMKaW5kZXgg Yzc3NjM4YzdhZWJmNmE1MjZjNTZhMzNlZGM5OTQxOGI4NDM0ZDIzNi4uMTEzMGIwMDEyMTU0Yjlj N2JkNGMxOTBhNmQ2ODFjMTljZGJiNjIzZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9iaXNl Y3QtYnVpbGRzCisrKyBiL1Rvb2xzL1NjcmlwdHMvYmlzZWN0LWJ1aWxkcwpAQCAtMSw2ICsxLDYg QEAKICMhL3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAw OSwgMjAxMSwgMjAxMiwgMjAxMyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBD b3B5cmlnaHQgKEMpIDIwMDctMjAwOSwgMjAxMS0yMDE0IEFwcGxlIEluYy4gIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTg0LDYgKzg0LDcgQEAg bXkgJHRlc3RVUkw7CiBAQVJHViA9IG1hcCB7IC9eKC1yKSguKykkLyA/ICgkMSwgJDIpIDogJF8g fSBAQVJHVjsKIAogbXkgJHJlc3VsdCA9IEdldE9wdGlvbnMoCisgICAgc2hhcmVkQ29tbWFuZExp bmVPcHRpb25zKCksCiAgICAgImJ8YnJhbmNoPXMiICAgICAgICAgICAgID0+IFwkYnJhbmNoLAog ICAgICJkfGRvd25sb2FkLWRpcmVjdG9yeT1zIiA9PiBcJG5pZ2h0bHlEb3dubG9hZERpcmVjdG9y eSwKICAgICAiaHxoZWxwIiAgICAgICAgICAgICAgICAgPT4gXCRzaG93SGVscCwKQEAgLTExNCw2 ICsxMTUsNyBAQCBpZiAoISRyZXN1bHQgfHwgJHNob3dIZWxwIHx8IHNjYWxhcihAQVJHVikgPiAw KSB7CiAgIFstLXNhZmFyaS1wYXRoIHBhdGhdICAgICAgICAgICBwYXRoIHRvIFNhZmFyaSBhcHBs aWNhdGlvbiBidW5kbGUgKGRlZmF1bHQ6IC9BcHBsaWNhdGlvbnMvU2FmYXJpLmFwcCkKICAgWy1z fC0tc2FuaXR5LWNoZWNrXSAgICAgICAgICAgIHZlcmlmeSBib3RoIHN0YXJ0aW5nIGFuZCBlbmRp bmcgcmV2aXNpb25zIGJlZm9yZSBiaXNlY3RpbmcKIEVORAorICAgIHByaW50IFNUREVSUiBzaGFy ZWRDb21tYW5kTGluZU9wdGlvbnNVc2FnZShicmFja2V0cyA9PiAxLCBpbmRlbnQgPT4gMiwgc3dp dGNoV2lkdGggPT4gMzApOwogICAgIGV4aXQgMTsKIH0KIApAQCAtNDA1LDcgKzQwNywxMyBAQCBz dWIgbW91bnRBbmRSdW5OaWdodGx5KCQkJCQpCiAgICAgfQogCiAgICAgJHRlbXBGaWxlIHx8PSAi IjsKLSAgICBgRFlMRF9GUkFNRVdPUktfUEFUSD0kZnJhbWV3b3JrUGF0aCBXRUJLSVRfVU5TRVRf RFlMRF9GUkFNRVdPUktfUEFUSD1ZRVMgJHNhZmFyaSAkdGVtcEZpbGVgOworCisgICAgeworICAg ICAgICBsb2NhbCAlRU5WID0gJUVOVjsKKyAgICAgICAgc2V0dXBNYWNXZWJLaXRFbnZpcm9ubWVu dCgkZnJhbWV3b3JrUGF0aCk7CisKKyAgICAgICAgYCRzYWZhcmkgJHRlbXBGaWxlYDsKKyAgICB9 CiAKICAgICBgaGRpdXRpbCBkZXRhY2ggJyRtb3VudFBhdGgnIDI+ICRkZXZOdWxsYDsKIH0KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVu LWFwaS10ZXN0cwppbmRleCBiMTlhMjcyMTFiNzlhMjA5NzA3NWI1OTU3ZmU0MTAwNDkxM2RkOGIw Li4wNjI1ZDM2ZTI0MmRkYmFlMzI1MGY3NjE3Yzg5MDU3OWZjZmI3MWZiIDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRl c3RzCkBAIC0xLDYgKzEsNiBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAKLSMgQ29weXJpZ2h0IChD KSAyMDEwLCAyMDExLCAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29w eXJpZ2h0IChDKSAyMDEwLTIwMTIsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02NSw3ICs2NSw3IEBAIFVzYWdlOiAk cHJvZ3JhbU5hbWUgW29wdGlvbnNdIFtzdWl0ZSBvciB0ZXN0IHByZWZpeGVzXQogICAtZHwtLWR1 bXAtdGVzdHMgICAgICAgRHVtcCB0aGUgbmFtZXMgb2YgdGVzdGNhc2VzIHdpdGhvdXQgcnVubmlu ZyB0aGVtCiAgIC0tW25vLV1idWlsZCAgICAgICAgICBCdWlsZCAob3IgZG8gbm90IGJ1aWxkKSB1 bml0IHRlc3RzIHByaW9yIHRvIHJ1bm5pbmcgKGRlZmF1bHQ6ICRidWlsZERlZmF1bHQpCiAgIC0t cm9vdD0gICAgICAgICAgICAgICBQYXRoIHRvIHRoZSBwcmUtYnVpbHQgcm9vdCBjb250YWluaW5n IFRlc3RXZWJLaXRBUEkKLQorQHtbIHNoYXJlZENvbW1hbmRMaW5lT3B0aW9uc1VzYWdlKGluZGVu dCA9PiAyLCBzd2l0Y2hXaWR0aCA9PiAyMSkgXX0KIEV4YW1wbGVzCiAKIFRoZSBmb2xsb3dpbmcg Y29tbWFuZCB3aWxsIHJ1biBhIHNpbmdsZSB0ZXN0OgpAQCAtNzYsNyArNzYsOCBAQCBUaGUgZm9s bG93aW5nIGNvbW1hbmQgd2lsbCBydW4gYWxsIHRlc3RzIGluIHN1aXRlcyB0aGF0IGJlZ2luIHdp dGggJ1dlYktpdDInOgogCiBFT0YKIAotR2V0T3B0aW9ucygKK215ICRnZXRPcHRpb25zUmVzdWx0 ID0gR2V0T3B0aW9ucygKKyAgICBzaGFyZWRDb21tYW5kTGluZU9wdGlvbnMoKSwKICAgICAnaGVs cCcgPT4gXCRzaG93SGVscCwKICAgICAndmVyYm9zZXx2JyA9PiBcJHZlcmJvc2UsCiAgICAgJ2R1 bXB8ZCcgPT4gXCRkdW1wVGVzdHMsCkBAIC04NCw3ICs4NSw3IEBAIEdldE9wdGlvbnMoCiAgICAg J3Jvb3Q9cycgPT4gXCRyb290CiApOwogCi1pZiAoJHNob3dIZWxwKSB7CitpZiAoISRnZXRPcHRp b25zUmVzdWx0IHx8ICRzaG93SGVscCkgewogICAgcHJpbnQgU1RERVJSICR1c2FnZTsKICAgIGV4 aXQgMTsKIH0KQEAgLTE3NCw2ICsxNzUsNyBAQCBzdWIgcnVuVGVzdCgkJCQpCiAKICAgICBkaWUg InJ1bi1hcGktdGVzdHMgaXMgbm90IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtLlxuIiB1bmxl c3MgaXNTdXBwb3J0ZWRQbGF0Zm9ybSgpOwogCisgICAgbG9jYWwgJUVOViA9ICVFTlY7CiAgICAg cHJlcGFyZUVudmlyb25tZW50Rm9yUnVubmluZ1Rlc3RUb29sKCk7CiAKICAgICBsb2NhbCAqREVW TlVMTDsKQEAgLTMyOSw4ICszMzEsNyBAQCBzdWIgcHJlcGFyZUVudmlyb25tZW50Rm9yUnVubmlu Z1Rlc3RUb29sKCkKIHsKICAgICByZXR1cm4gdW5sZXNzIGlzQXBwbGVNYWNXZWJLaXQoKTsKIAot ICAgICRFTlZ7RFlMRF9GUkFNRVdPUktfUEFUSH0gPSBwcm9kdWN0RGlyKCk7Ci0gICAgJEVOVntX RUJLSVRfVU5TRVRfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAiWUVTIjsKKyAgICBzZXR1cE1hY1dl YktpdEVudmlyb25tZW50KHByb2R1Y3REaXIoKSk7CiB9CiAKIHN1YiB0ZXN0VG9vbFBhdGgoKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tcGFnZWxvYWR0ZXN0IGIvVG9vbHMvU2NyaXB0 cy9ydW4tcGFnZWxvYWR0ZXN0CmluZGV4IGIyZjA3YTI3ZmYxZDM0ZDk5M2I2YjFmOWRkM2I3MDI1 YTU0ZWVlZTguLjYzMWMyMmI5N2NlNTZjNTMyMTYyMjI1NDM0NTk3NTdkNGZmYWIwZDEgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLXBhZ2Vsb2FkdGVzdAorKysgYi9Ub29scy9TY3JpcHRz L3J1bi1wYWdlbG9hZHRlc3QKQEAgLTEsNiArMSw3IEBACiAjIS91c3IvYmluL3BlcmwKIAogIyBD b3B5cmlnaHQgKEMpIDIwMDYgRXJpYyBTZWlkZWwgKGVyaWNAd2Via2l0Lm9yZykKKyMgQ29weXJp Z2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtNDcsOSArNDgsMTMgQEAgbXkgJHNob3dIZWxwID0gMDsKIAog bXkgJHVzYWdlID0KICAgICAiVXNhZ2U6ICIgLiBiYXNlbmFtZSgkMCkgLiAiW29wdGlvbnNdIHRl c3ROYW1lXG4iIC4KLSAgICAiICAtLWhlbHAgICAgICAgICAgICAgICAgICBTaG93IHRoaXMgaGVs cCBtZXNzYWdlXG4iOworICAgICIgIC0taGVscCAgICAgICAgICAgICAgICAgIFNob3cgdGhpcyBo ZWxwIG1lc3NhZ2VcbiIgLgorICAgIHNoYXJlZENvbW1hbmRMaW5lT3B0aW9uc1VzYWdlKGluZGVu dCA9PiAyLCBzd2l0Y2hXaWR0aCA9PiAyMyk7CiAKLW15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0 T3B0aW9ucygnaGVscCcgPT4gXCRzaG93SGVscCk7CitteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdl dE9wdGlvbnMoCisgICAgc2hhcmVkQ29tbWFuZExpbmVPcHRpb25zKCksCisgICAnaGVscCcgPT4g XCRzaG93SGVscAorKTsKIAogaWYgKCEkZ2V0T3B0aW9uc1Jlc3VsdCB8fCAkc2hvd0hlbHApIHsK ICAgICBwcmludCBTVERFUlIgJHVzYWdlOwpAQCAtODEsOCArODYsNyBAQCBteSAkcHJvZHVjdERp ciA9IHByb2R1Y3REaXIoKTsKIAogIyBTZXQgdXAgRFlMRF9GUkFNRVdPUktfUEFUSCB0byBwb2lu dCB0byB0aGUgcHJvZHVjdCBkaXJlY3RvcnkuCiBwcmludCAiU3RhcnRpbmcgU2FmYXJpIHdpdGgg RFlMRF9GUkFNRVdPUktfUEFUSCBzZXQgdG8gcG9pbnQgdG8gYnVpbHQgV2ViS2l0IGluICRwcm9k dWN0RGlyLlxuIjsKLSRFTlZ7RFlMRF9GUkFNRVdPUktfUEFUSH0gPSAkcHJvZHVjdERpcjsKLSRF TlZ7V0VCS0lUX1VOU0VUX0RZTERfRlJBTUVXT1JLX1BBVEh9ID0gIllFUyI7CitzZXR1cE1hY1dl YktpdEVudmlyb25tZW50KCRwcm9kdWN0RGlyKTsKIAogbXkgQHRlc3RDb21tYW5kcyA9ICgnYWN0 aXZhdGUnKTsKICMgQXV0b3ZpY2tpIHdvdWxkIGNsZWFyIGhpc3RvcnksIHdlIHNraXAgdGhhdCBo ZXJlIGFzIHRoaXMgaXMgbGlrZWx5IGFuIGFjdGl2ZSB1c2VyIGFjY291bnQKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCAxNzM4MWYxOWQ0MmU2M2I3YWZjOGZmNzU4ZWVkNjgwY2VlNDNiODgyLi4zMDJlZGVh YzhhMWNlYTg0ZjYzMTI2OWFiM2Q4ZGVjYmRhMTc3MGRiIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0x LDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYsIDIwMDcsIDIwMTAsIDIwMTEs IDIwMTIsIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQg KEMpIDIwMDUtMjAwNywgMjAxMC0yMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICMgQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAj IENvcHlyaWdodCAoQykgMjAxMSBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChDKSAyMDEzIE5va2lhIENvcnBvcmF0aW9uIGFuZC9v ciBpdHMgc3Vic2lkaWFyeSgtaWVzKS4KQEAgLTM5LDYgKzM5LDcgQEAgdXNlIEZpbGU6OkJhc2Vu YW1lOwogdXNlIEZpbGU6OlBhdGggcXcobWtwYXRoIHJtdHJlZSk7CiB1c2UgRmlsZTo6U3BlYzsK IHVzZSBGaWxlOjpzdGF0OwordXNlIExpc3Q6OlV0aWw7CiB1c2UgUE9TSVg7CiB1c2UgVkNTVXRp bHM7CiAKQEAgLTY1LDYgKzY2LDkgQEAgQkVHSU4gewogICAgICAgICZydW5NYWNXZWJLaXRBcHAK ICAgICAgICAmc2FmYXJpUGF0aAogICAgICAgICZzZXRDb25maWd1cmF0aW9uCisgICAgICAgJnNl dHVwTWFjV2ViS2l0RW52aXJvbm1lbnQKKyAgICAgICAmc2hhcmVkQ29tbWFuZExpbmVPcHRpb25z CisgICAgICAgJnNoYXJlZENvbW1hbmRMaW5lT3B0aW9uc1VzYWdlCiAgICAgICAgVVNFX09QRU5f Q09NTUFORAogICAgKTsKICAgICVFWFBPUlRfVEFHUyA9ICggKTsKQEAgLTEyODQsNiArMTI4OCwz NCBAQCBzdWIgYXBwZW5kVG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdAogICAgIH0KIH0KIAorc3Vi IHNoYXJlZENvbW1hbmRMaW5lT3B0aW9ucygpCit7CisgICAgcmV0dXJuICgKKyAgICAgICAgImd8 Z3VhcmQtbWFsbG9jIiA9PiBcJHNob3VsZFVzZUd1YXJkTWFsbG9jLAorICAgICk7Cit9CisKK3N1 YiBzaGFyZWRDb21tYW5kTGluZU9wdGlvbnNVc2FnZSgrQCkKK3sKKyAgICBteSAlb3B0cyA9IEBf OworCisgICAgbXkgJXN3aXRjaGVzID0gKAorICAgICAgICAnLWd8LS1ndWFyZC1tYWxsb2MnID0+ ICdVc2UgZ3VhcmRtYWxsb2Mgd2hlbiBydW5uaW5nIGV4ZWN1dGFibGUnLAorICAgICk7CisKKyAg ICBteSAkaW5kZW50ID0gIiAiIHggKCRvcHRze2luZGVudH0gfHwgMik7CisgICAgbXkgJHN3aXRj aFdpZHRoID0gTGlzdDo6VXRpbDo6bWF4KGludCgkb3B0c3tzd2l0Y2hXaWR0aH0pLCBMaXN0OjpV dGlsOjptYXgobWFwIHsgbGVuZ3RoKCRfKSB9IGtleXMgJXN3aXRjaGVzKSArICgkb3B0c3ticmFj a2V0c30gPyAyIDogMCkpOworCisgICAgbXkgJHJlc3VsdCA9ICJDb21tb24gc3dpdGNoZXM6XG4i OworCisgICAgZm9yIG15ICRzd2l0Y2ggKGtleXMgJXN3aXRjaGVzKSB7CisgICAgICAgIG15ICRz d2l0Y2hOYW1lID0gJG9wdHN7YnJhY2tldHN9ID8gIlsiIC4gJHN3aXRjaCAuICJdIiA6ICRzd2l0 Y2g7CisgICAgICAgICRyZXN1bHQgLj0gc3ByaW50ZigiJXMlLSIgLiAkc3dpdGNoV2lkdGggLiAi cyAlc1xuIiwgJGluZGVudCwgJHN3aXRjaE5hbWUsICRzd2l0Y2hlc3skc3dpdGNofSk7CisgICAg fQorCisgICAgcmV0dXJuICRyZXN1bHQ7Cit9CisKIHN1YiBzZXRVcEd1YXJkTWFsbG9jSWZOZWVk ZWQKIHsKICAgICBpZiAoIWlzRGFyd2luKCkpIHsKQEAgLTEyOTEsNyArMTMyMyw3IEBAIHN1YiBz ZXRVcEd1YXJkTWFsbG9jSWZOZWVkZWQKICAgICB9CiAKICAgICBpZiAoIWRlZmluZWQoJHNob3Vs ZFVzZUd1YXJkTWFsbG9jKSkgewotICAgICAgICAkc2hvdWxkVXNlR3VhcmRNYWxsb2MgPSBjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZ3VhcmQtbWFsbG9jIik7CisgICAgICAg ICRzaG91bGRVc2VHdWFyZE1hbGxvYyA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJH VigiLWciKSB8fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZ3VhcmQtbWFs bG9jIik7CiAgICAgfQogCiAgICAgaWYgKCRzaG91bGRVc2VHdWFyZE1hbGxvYykgewpAQCAtMTk4 Niw3ICsyMDE4LDcgQEAgc3ViIHByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1Z1dlYktpdEFw cElmTmVlZGVkCiBVc2FnZTogQHtbYmFzZW5hbWUoJDApXX0gW29wdGlvbnNdIFthcmdzIC4uLl0K ICAgLS1oZWxwICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNob3cgdGhpcyBoZWxwIG1lc3Nh Z2UKICAgLS1uby1zYXZlZC1zdGF0ZSAgICAgICAgICAgICAgICAgIExhdW5jaCB0aGUgYXBwbGlj YXRpb24gd2l0aG91dCBzdGF0ZSByZXN0b3JhdGlvbiAoT1MgWCAxMC43IGFuZCBsYXRlcikKLSAg LS1ndWFyZC1tYWxsb2MgICAgICAgICAgICAgICAgICAgIEVuYWJsZSBHdWFyZCBNYWxsb2MgKE9T IFggb25seSkKKyAgLWd8LS1ndWFyZC1tYWxsb2MgICAgICAgICAgICAgICAgIEVuYWJsZSBHdWFy ZCBNYWxsb2MgKE9TIFggb25seSkKICAgLS11c2Utd2ViLXByb2Nlc3MteHBjLXNlcnZpY2UgICAg IExhdW5jaCB0aGUgV2ViIFByb2Nlc3MgYXMgYW4gWFBDIFNlcnZpY2UgKE9TIFggb25seSkKIEVP RgogCkBAIC0yMDE1LDE2ICsyMDQ3LDI3IEBAIHN1YiBhcmd1bWVudHNGb3JSdW5BbmREZWJ1Z01h Y1dlYktpdEFwcCgpCiAgICAgcmV0dXJuIEBhcmdzOwogfQogCitzdWIgc2V0dXBNYWNXZWJLaXRF bnZpcm9ubWVudCgkKQoreworICAgIG15ICgkZHlsZEZyYW1ld29ya1BhdGgpID0gQF87CisKKyAg ICAkZHlsZEZyYW1ld29ya1BhdGggPSBGaWxlOjpTcGVjLT5yZWwyYWJzKCRkeWxkRnJhbWV3b3Jr UGF0aCk7CisKKyAgICAkRU5We0RZTERfRlJBTUVXT1JLX1BBVEh9ID0gJEVOVntEWUxEX0ZSQU1F V09SS19QQVRIfSA/IGpvaW4oIjoiLCAkZHlsZEZyYW1ld29ya1BhdGgsICRFTlZ7RFlMRF9GUkFN RVdPUktfUEFUSH0pIDogJGR5bGRGcmFtZXdvcmtQYXRoOworICAgICRFTlZ7X19YUENfRFlMRF9G UkFNRVdPUktfUEFUSH0gPSAkZHlsZEZyYW1ld29ya1BhdGg7CisgICAgJEVOVntXRUJLSVRfVU5T RVRfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAiWUVTIjsKKworICAgIHNldFVwR3VhcmRNYWxsb2NJ Zk5lZWRlZCgpOworfQorCiBzdWIgcnVuTWFjV2ViS2l0QXBwKCQ7JCkKIHsKICAgICBteSAoJGFw cFBhdGgsICR1c2VPcGVuQ29tbWFuZCkgPSBAXzsKICAgICBteSAkcHJvZHVjdERpciA9IHByb2R1 Y3REaXIoKTsKICAgICBwcmludCAiU3RhcnRpbmcgQHtbYmFzZW5hbWUoJGFwcFBhdGgpXX0gd2l0 aCBEWUxEX0ZSQU1FV09SS19QQVRIIHNldCB0byBwb2ludCB0byBidWlsdCBXZWJLaXQgaW4gJHBy b2R1Y3REaXIuXG4iOwotICAgICRFTlZ7RFlMRF9GUkFNRVdPUktfUEFUSH0gPSAkcHJvZHVjdERp cjsKLSAgICAkRU5We19fWFBDX0RZTERfRlJBTUVXT1JLX1BBVEh9ID0gRmlsZTo6U3BlYy0+cmVs MmFicygkcHJvZHVjdERpcik7Ci0gICAgJEVOVntXRUJLSVRfVU5TRVRfRFlMRF9GUkFNRVdPUktf UEFUSH0gPSAiWUVTIjsKIAotICAgIHNldFVwR3VhcmRNYWxsb2NJZk5lZWRlZCgpOworICAgIGxv Y2FsICVFTlYgPSAlRU5WOworICAgIHNldHVwTWFjV2ViS2l0RW52aXJvbm1lbnQoJHByb2R1Y3RE aXIpOwogCiAgICAgaWYgKGRlZmluZWQoJHVzZU9wZW5Db21tYW5kKSAmJiAkdXNlT3BlbkNvbW1h bmQgPT0gVVNFX09QRU5fQ09NTUFORCkgewogICAgICAgICByZXR1cm4gc3lzdGVtKCJvcGVuIiwg Ii1XIiwgIi1hIiwgJGFwcFBhdGgsICItLWFyZ3MiLCBhcmd1bWVudHNGb3JSdW5BbmREZWJ1Z01h Y1dlYktpdEFwcCgpKTsKQEAgLTIwNTYsMTEgKzIwOTksNyBAQCBzdWIgZXhlY01hY1dlYktpdEFw cEZvckRlYnVnZ2luZygkKQogICAgIGRpZSAiQ2FuJ3QgZmluZCB0aGUgJGRlYnVnZ2VyIGV4ZWN1 dGFibGUuXG4iIHVubGVzcyAteCAkZGVidWdnZXJQYXRoOwogCiAgICAgbXkgJHByb2R1Y3REaXIg PSBwcm9kdWN0RGlyKCk7Ci0gICAgJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9kdWN0 RGlyOwotICAgICRFTlZ7X19YUENfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSBGaWxlOjpTcGVjLT5y ZWwyYWJzKCRwcm9kdWN0RGlyKTsKLSAgICAkRU5We1dFQktJVF9VTlNFVF9EWUxEX0ZSQU1FV09S S19QQVRIfSA9ICJZRVMiOwotCi0gICAgc2V0VXBHdWFyZE1hbGxvY0lmTmVlZGVkKCk7CisgICAg c2V0dXBNYWNXZWJLaXRFbnZpcm9ubWVudCgkcHJvZHVjdERpcik7CiAKICAgICBteSBAYXJjaGl0 ZWN0dXJlRmxhZ3MgPSAoJGFyY2hpdGVjdHVyZVN3aXRjaCwgYXJjaGl0ZWN0dXJlKCkpOwogICAg IGlmICghc2hvdWxkVGFyZ2V0V2ViUHJvY2VzcygpKSB7Cg==