160574 2016-08-04 16:12:14 -0700 Syncing script's configuration duplicates a lot of boilerplate 2016-08-04 16:25:34 -0700 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez dewei_zhu rniwa slewis oldest_to_newest 1217642 0 rniwa 2016-08-04 16:12:14 -0700 We've reduced the amount of duplication significantly in https://bugs.webkit.org/show_bug.cgi?id=152196 but we're still creating a new entry for each test, platform pair. Avoid doing that by accepting an array of platforms and types (tests) in each configuration entry. 1217645 1 285375 rniwa 2016-08-04 16:22:04 -0700 Created attachment 285375 Patch 1217646 2 285375 cdumez 2016-08-04 16:24:48 -0700 Comment on attachment 285375 Patch rs=me 1217647 3 rniwa 2016-08-04 16:25:34 -0700 Committed r204151: <http://trac.webkit.org/changeset/204151> 285375 2016-08-04 16:22:04 -0700 2016-08-04 16:24:48 -0700 Patch bug-160574-20160804162038.patch text/plain 14285 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjA0MTUwKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDQ1IEBACisyMDE2LTA4LTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFN5bmNpbmcgc2NyaXB0J3MgY29uZmlndXJhdGlvbiBkdXBsaWNhdGVzIGEgbG90 IG9mIGJvaWxlcnBsYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjA1NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIHBhdGNoIG1ha2VzIGVhY2ggY29uZmlndXJhdGlvbiBhY2NlcHQgYW4gYXJy YXkgb2YgcGxhdGZvcm1zIGFuZCB0eXBlcyBzbyB0aGF0IHdlIGNhbiB3cml0ZToKKworICAgICAg ICB7InR5cGUiOiAic3BlZWRvbWV0ZXIiLCAiYnVpbGRlciI6ICJtYmEiLCAicGxhdGZvcm0iOiAi VHJ1bmsgRWwgQ2FwaXRhbiBNYWNCb29rQWlyIn0sCisgICAgICAgIHsidHlwZSI6ICJzcGVlZG9t ZXRlciIsICJidWlsZGVyIjogIm1icCIsICJwbGF0Zm9ybSI6ICJUcnVuayBFbCBDYXBpdGFuIE1h Y0Jvb2tQcm8ifSwKKyAgICAgICAgeyJ0eXBlIjogInNwZWVkb21ldGVyIiwgImJ1aWxkZXIiOiAi bWJhIiwgInBsYXRmb3JtIjogIlRydW5rIFNpZXJyYSBNYWNCb29rQWlyIn0sCisgICAgICAgIHsi dHlwZSI6ICJzcGVlZG9tZXRlciIsICJidWlsZGVyIjogIm1icCIsICJwbGF0Zm9ybSI6ICJUcnVu ayBTaWVycmEgTWFjQm9va1BybyJ9LAorICAgICAgICB7InR5cGUiOiAiamV0c3RyZWFtIiwgImJ1 aWxkZXIiOiAibWJhIiwgInBsYXRmb3JtIjogIlRydW5rIEVsIENhcGl0YW4gTWFjQm9va0FpciJ9 LAorICAgICAgICB7InR5cGUiOiAiamV0c3RyZWFtIiwgImJ1aWxkZXIiOiAibWJwIiwgInBsYXRm b3JtIjogIlRydW5rIEVsIENhcGl0YW4gTWFjQm9va1BybyJ9LAorICAgICAgICB7InR5cGUiOiAi amV0c3RyZWFtIiwgImJ1aWxkZXIiOiAibWJhIiwgInBsYXRmb3JtIjogIlRydW5rIFNpZXJyYSBN YWNCb29rQWlyIn0sCisgICAgICAgIHsidHlwZSI6ICJqZXRzdHJlYW0iLCAiYnVpbGRlciI6ICJt YnAiLCAicGxhdGZvcm0iOiAiVHJ1bmsgU2llcnJhIE1hY0Jvb2tQcm8ifSwKKworICAgICAgICBt b3JlIGNvbmNpc2VseSBhczoKKworICAgICAgICB7ImJ1aWxkZXIiOiAibWJhIiwgInR5cGVzIjog WyJzcGVlZG9tZXRlciIsICJqZXRzdHJlYW0iXSwKKyAgICAgICAgICAgICJwbGF0Zm9ybXMiOiBb IlRydW5rIEVsIENhcGl0YW4gTWFjQm9va0FpciIsICJUcnVuayBTaWVycmEgTWFjQm9va0FpciJd fSwKKyAgICAgICAgeyJidWlsZGVyIjogIm1icCIsICJ0eXBlcyI6IFsic3BlZWRvbWV0ZXIiLCAi amV0c3RyZWFtIl0sCisgICAgICAgICAgICAicGxhdGZvcm1zIjogWyJUcnVuayBFbCBDYXBpdGFu IE1hY0Jvb2tQcm8iLCAiVHJ1bmsgU2llcnJhIE1hY0Jvb2tQcm8iXX0sCisKKyAgICAgICAgKiB0 b29scy9qcy9idWlsZGJvdC1zeW5jZXIuanM6CisgICAgICAgIChCdWlsZGJvdFN5bmNlci5fbG9h ZENvbmZpZyk6CisgICAgICAgIChCdWlsZGJvdFN5bmNlci5fZXhwYW5kVHlwZXNBbmRQbGF0Zm9y bXMpOiBBZGRlZC4gQ2xvbmVzIGEgbmV3IGNvbmZpZ3VyYXRpb24gZW50cnkgZm9yIGVhY2ggdHlw ZQorICAgICAgICBhbmQgcGxhdGZvcm0uCisgICAgICAgIChCdWlsZGJvdFN5bmNlci5fY3JlYXRl VGVzdENvbmZpZ3VyYXRpb24pOiBFeHRyYWN0ZWQgZnJvbSBfbG9hZENvbmZpZy4KKyAgICAgICAg KEJ1aWxkYm90U3luY2VyLl92YWxpZGF0ZUFuZE1lcmdlQ29uZmlnKTogQWRkZWQgYSBuZXcgYXJn dW1lbnQgdGhhdCBzcGVjaWZpZXMgYSBwcm9wZXJ0eSB0aGF0CisgICAgICAgIHNob3VsZG4ndCBi ZSBtZXJnZWQgaW50byB0aGUgY29uZmlndXJhdGlvbi4gQWxzbyBhZGRlZCB0aGUgc3VwcG9ydCBm b3IgJ3R5cGVzJyBhbmQgJ3BsYXRmb3JtcycsCisgICAgICAgIGFuZCBtZXJnZWQgdGhlIGNvZGUg Zm9yIHZlcmlmeSBhbiBhcnJheSBvZiBzdHJpbmdzLiBGaW5hbGx5LCBhbGxvdyB0aGUgYXBwZWFy YW5jZSBvZiAncHJvcGVydGllcycKKyAgICAgICAgc2luY2UgdGhpcyBmdW5jdGlvbiBjYW4gbm93 IGJlIGNhbGxlZCBvbiBhIGNsb25lZCBjb25maWd1cmF0aW9uIGluIHdoaWNoICdhcmd1bWVudHMn IGhhZCBhbHJlYWR5CisgICAgICAgIGJlZW4gcmVuYW1lZCB0byAncHJvcGVydGllcycuCisKKyAg ICAgICAgKiB1bml0LXRlc3RzL2J1aWxkYm90LXN5bmNlci10ZXN0cy5qczogQWRkZWQgYSB0ZXN0 IGNhc2UgdG8gcGFyc2UgYSBjb25zb2xpZGF0ZWQgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKHNh bXBsZWlPU0NvbmZpZ1dpdGhFeHBhbnNpb25zKTogQWRkZWQuCisKKyAgICAgICAgKiB1bml0LXRl c3RzL3Jlc291cmNlcy9tb2NrLXYzLW1vZGVscy5qczoKKyAgICAgICAgKE1vY2tNb2RlbHMuaW5q ZWN0KTogQWRkZWQgYSBmZXcgbW9yZSBtb2NrIG1vZGVscyBmb3IgdGhlIG5ld2x5IGFkZGVkIHRl c3QuCisKIDIwMTYtMDctMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUkVHUkVTU0lPTjogVG9vbHRpcCBmb3IgYW5hbHlzaXMgdGFza3MgZG9lc24ndCBzaG93 IHVwIG9uIGNoYXJ0cwpJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1 aWxkYm90LXN5bmNlci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcv dG9vbHMvanMvYnVpbGRib3Qtc3luY2VyLmpzCShyZXZpc2lvbiAyMDQxNTApCisrKyBXZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvYnVpbGRib3Qtc3luY2VyLmpzCSh3b3JraW5nIGNv cHkpCkBAIC0yNjIsNjMgKzI2Miw5MyBAQCBjbGFzcyBCdWlsZGJvdFN5bmNlciB7CiAgICAgICAg IGZvciAobGV0IGVudHJ5IG9mIGNvbmZpZ1snY29uZmlndXJhdGlvbnMnXSkgewogICAgICAgICAg ICAgbGV0IG5ld0NvbmZpZyA9IHt9OwogICAgICAgICAgICAgdGhpcy5fdmFsaWRhdGVBbmRNZXJn ZUNvbmZpZyhuZXdDb25maWcsIHNoYXJlZCk7Ci0KICAgICAgICAgICAgIHRoaXMuX3ZhbGlkYXRl QW5kTWVyZ2VDb25maWcobmV3Q29uZmlnLCBlbnRyeSk7CiAKLSAgICAgICAgICAgIGxldCB0eXBl ID0gZW50cnlbJ3R5cGUnXTsKLSAgICAgICAgICAgIGlmICh0eXBlKSB7Ci0gICAgICAgICAgICAg ICAgYXNzZXJ0KHR5cGVzW3R5cGVdKTsKLSAgICAgICAgICAgICAgICB0aGlzLl92YWxpZGF0ZUFu ZE1lcmdlQ29uZmlnKG5ld0NvbmZpZywgdHlwZXNbdHlwZV0pOwotICAgICAgICAgICAgfQorICAg ICAgICAgICAgbGV0IGV4cGFuZGVkQ29uZmlndXJhdGlvbnMgPSB0aGlzLl9leHBhbmRUeXBlc0Fu ZFBsYXRmb3JtcyhuZXdDb25maWcpOworICAgICAgICAgICAgZm9yIChsZXQgY29uZmlnIG9mIGV4 cGFuZGVkQ29uZmlndXJhdGlvbnMpIHsKKyAgICAgICAgICAgICAgICBpZiAoJ3R5cGUnIGluIGNv bmZpZykgeworICAgICAgICAgICAgICAgICAgICBsZXQgdHlwZSA9IGNvbmZpZ1sndHlwZSddOwor ICAgICAgICAgICAgICAgICAgICBhc3NlcnQodHlwZSwgYCR7dHlwZX0gaXMgbm90IGEgdmFsaWQg dHlwZSBpbiB0aGUgY29uZmlndXJhdGlvbmApOworICAgICAgICAgICAgICAgICAgICB0aGlzLl92 YWxpZGF0ZUFuZE1lcmdlQ29uZmlnKGNvbmZpZywgdHlwZXNbdHlwZV0pOworICAgICAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgICAgIGxldCBidWlsZGVyID0gZW50cnlbJ2J1aWxkZXInXTsK KyAgICAgICAgICAgICAgICBpZiAoYnVpbGRlcnNbYnVpbGRlcl0pCisgICAgICAgICAgICAgICAg ICAgIHRoaXMuX3ZhbGlkYXRlQW5kTWVyZ2VDb25maWcoY29uZmlnLCBidWlsZGVyc1tidWlsZGVy XSk7CiAKLSAgICAgICAgICAgIGxldCBidWlsZGVyID0gZW50cnlbJ2J1aWxkZXInXTsKLSAgICAg ICAgICAgIGlmIChidWlsZGVyc1tidWlsZGVyXSkKLSAgICAgICAgICAgICAgICB0aGlzLl92YWxp ZGF0ZUFuZE1lcmdlQ29uZmlnKG5ld0NvbmZpZywgYnVpbGRlcnNbYnVpbGRlcl0pOwotCi0gICAg ICAgICAgICBhc3NlcnQoJ3BsYXRmb3JtJyBpbiBuZXdDb25maWcsICdjb25maWd1cmF0aW9uIG11 c3Qgc3BlY2lmeSBhIHBsYXRmb3JtJyk7Ci0gICAgICAgICAgICBhc3NlcnQoJ3Rlc3QnIGluIG5l d0NvbmZpZywgJ2NvbmZpZ3VyYXRpb24gbXVzdCBzcGVjaWZ5IGEgdGVzdCcpOwotICAgICAgICAg ICAgYXNzZXJ0KCdidWlsZGVyJyBpbiBuZXdDb25maWcsICdjb25maWd1cmF0aW9uIG11c3Qgc3Bl Y2lmeSBhIGJ1aWxkZXInKTsKLSAgICAgICAgICAgIGFzc2VydCgncHJvcGVydGllcycgaW4gbmV3 Q29uZmlnLCAnY29uZmlndXJhdGlvbiBtdXN0IHNwZWNpZnkgYXJndW1lbnRzIHRvIHBvc3Qgb24g YSBidWlsZGVyJyk7Ci0gICAgICAgICAgICBhc3NlcnQoJ2J1aWxkUmVxdWVzdEFyZ3VtZW50JyBp biBuZXdDb25maWcsICdjb25maWd1cmF0aW9uIG11c3Qgc3BlY2lmeSBidWlsZFJlcXVlc3RBcmd1 bWVudCcpOwotCi0gICAgICAgICAgICBsZXQgdGVzdCA9IFRlc3QuZmluZEJ5UGF0aChuZXdDb25m aWcudGVzdCk7Ci0gICAgICAgICAgICBhc3NlcnQodGVzdCwgYCR7bmV3Q29uZmlnLnRlc3R9IGlz IG5vdCBhIHZhbGlkIHRlc3QgcGF0aGApOwotCi0gICAgICAgICAgICBsZXQgcGxhdGZvcm0gPSBQ bGF0Zm9ybS5maW5kQnlOYW1lKG5ld0NvbmZpZy5wbGF0Zm9ybSk7Ci0gICAgICAgICAgICBhc3Nl cnQocGxhdGZvcm0sIGAke25ld0NvbmZpZy5wbGF0Zm9ybX0gaXMgbm90IGEgdmFsaWQgcGxhdGZv cm0gbmFtZWApOwotCi0gICAgICAgICAgICBsZXQgc3luY2VyID0gc3luY2VyQnlCdWlsZGVyLmdl dChuZXdDb25maWcuYnVpbGRlcik7Ci0gICAgICAgICAgICBpZiAoIXN5bmNlcikgewotICAgICAg ICAgICAgICAgIHN5bmNlciA9IG5ldyBCdWlsZGJvdFN5bmNlcihyZW1vdGUsIG5ld0NvbmZpZyk7 Ci0gICAgICAgICAgICAgICAgc3luY2VyQnlCdWlsZGVyLnNldChuZXdDb25maWcuYnVpbGRlciwg c3luY2VyKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9jcmVhdGVUZXN0Q29uZmlndXJhdGlvbihy ZW1vdGUsIHN5bmNlckJ5QnVpbGRlciwgY29uZmlnKTsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHN5bmNlci5hZGRUZXN0Q29uZmlndXJhdGlvbih0ZXN0LCBwbGF0Zm9ybSwgbmV3Q29uZmln LnByb3BlcnRpZXMpOwogICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIEFycmF5LmZyb20oc3lu Y2VyQnlCdWlsZGVyLnZhbHVlcygpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgX3ZhbGlkYXRlQW5k TWVyZ2VDb25maWcoY29uZmlnLCB2YWx1ZXNUb01lcmdlKQorICAgIHN0YXRpYyBfZXhwYW5kVHlw ZXNBbmRQbGF0Zm9ybXModW5yZXNvbHZlZENvbmZpZykKKyAgICB7CisgICAgICAgIGxldCB0eXBl RXhwYW5kZWQgPSBbXTsKKyAgICAgICAgaWYgKCd0eXBlcycgaW4gdW5yZXNvbHZlZENvbmZpZykg eworICAgICAgICAgICAgZm9yIChsZXQgdHlwZSBvZiB1bnJlc29sdmVkQ29uZmlnWyd0eXBlcydd KQorICAgICAgICAgICAgICAgIHR5cGVFeHBhbmRlZC5wdXNoKHRoaXMuX3ZhbGlkYXRlQW5kTWVy Z2VDb25maWcoeyd0eXBlJzogdHlwZX0sIHVucmVzb2x2ZWRDb25maWcsICd0eXBlcycpKTsKKyAg ICAgICAgfSBlbHNlCisgICAgICAgICAgICB0eXBlRXhwYW5kZWQucHVzaCh1bnJlc29sdmVkQ29u ZmlnKTsKKworICAgICAgICBsZXQgY29uZmlndXJhdGlvbnMgPSBbXTsKKyAgICAgICAgZm9yIChs ZXQgY29uZmlnIG9mIHR5cGVFeHBhbmRlZCkgeworICAgICAgICAgICAgaWYgKCdwbGF0Zm9ybXMn IGluIGNvbmZpZykgeworICAgICAgICAgICAgICAgIGZvciAobGV0IHBsYXRmb3JtIG9mIGNvbmZp Z1sncGxhdGZvcm1zJ10pCisgICAgICAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25zLnB1c2go dGhpcy5fdmFsaWRhdGVBbmRNZXJnZUNvbmZpZyh7J3BsYXRmb3JtJzogcGxhdGZvcm19LCBjb25m aWcsICdwbGF0Zm9ybXMnKSk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBj b25maWd1cmF0aW9ucy5wdXNoKGNvbmZpZyk7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4g Y29uZmlndXJhdGlvbnM7CisgICAgfQorCisgICAgc3RhdGljIF9jcmVhdGVUZXN0Q29uZmlndXJh dGlvbihyZW1vdGUsIHN5bmNlckJ5QnVpbGRlciwgbmV3Q29uZmlnKQorICAgIHsKKyAgICAgICAg YXNzZXJ0KCdwbGF0Zm9ybScgaW4gbmV3Q29uZmlnLCAnY29uZmlndXJhdGlvbiBtdXN0IHNwZWNp ZnkgYSBwbGF0Zm9ybScpOworICAgICAgICBhc3NlcnQoJ3Rlc3QnIGluIG5ld0NvbmZpZywgJ2Nv bmZpZ3VyYXRpb24gbXVzdCBzcGVjaWZ5IGEgdGVzdCcpOworICAgICAgICBhc3NlcnQoJ2J1aWxk ZXInIGluIG5ld0NvbmZpZywgJ2NvbmZpZ3VyYXRpb24gbXVzdCBzcGVjaWZ5IGEgYnVpbGRlcicp OworICAgICAgICBhc3NlcnQoJ3Byb3BlcnRpZXMnIGluIG5ld0NvbmZpZywgJ2NvbmZpZ3VyYXRp b24gbXVzdCBzcGVjaWZ5IGFyZ3VtZW50cyB0byBwb3N0IG9uIGEgYnVpbGRlcicpOworICAgICAg ICBhc3NlcnQoJ2J1aWxkUmVxdWVzdEFyZ3VtZW50JyBpbiBuZXdDb25maWcsICdjb25maWd1cmF0 aW9uIG11c3Qgc3BlY2lmeSBidWlsZFJlcXVlc3RBcmd1bWVudCcpOworCisgICAgICAgIGxldCB0 ZXN0ID0gVGVzdC5maW5kQnlQYXRoKG5ld0NvbmZpZy50ZXN0KTsKKyAgICAgICAgYXNzZXJ0KHRl c3QsIGAke25ld0NvbmZpZy50ZXN0fSBpcyBub3QgYSB2YWxpZCB0ZXN0IHBhdGhgKTsKKworICAg ICAgICBsZXQgcGxhdGZvcm0gPSBQbGF0Zm9ybS5maW5kQnlOYW1lKG5ld0NvbmZpZy5wbGF0Zm9y bSk7CisgICAgICAgIGFzc2VydChwbGF0Zm9ybSwgYCR7bmV3Q29uZmlnLnBsYXRmb3JtfSBpcyBu b3QgYSB2YWxpZCBwbGF0Zm9ybSBuYW1lYCk7CisKKyAgICAgICAgbGV0IHN5bmNlciA9IHN5bmNl ckJ5QnVpbGRlci5nZXQobmV3Q29uZmlnLmJ1aWxkZXIpOworICAgICAgICBpZiAoIXN5bmNlcikg eworICAgICAgICAgICAgc3luY2VyID0gbmV3IEJ1aWxkYm90U3luY2VyKHJlbW90ZSwgbmV3Q29u ZmlnKTsKKyAgICAgICAgICAgIHN5bmNlckJ5QnVpbGRlci5zZXQobmV3Q29uZmlnLmJ1aWxkZXIs IHN5bmNlcik7CisgICAgICAgIH0KKyAgICAgICAgc3luY2VyLmFkZFRlc3RDb25maWd1cmF0aW9u KHRlc3QsIHBsYXRmb3JtLCBuZXdDb25maWcucHJvcGVydGllcyk7CisgICAgfQorCisgICAgc3Rh dGljIF92YWxpZGF0ZUFuZE1lcmdlQ29uZmlnKGNvbmZpZywgdmFsdWVzVG9NZXJnZSwgZXhjbHVk ZWRQcm9wZXJ0eSkKICAgICB7CiAgICAgICAgIGZvciAobGV0IG5hbWUgaW4gdmFsdWVzVG9NZXJn ZSkgewogICAgICAgICAgICAgbGV0IHZhbHVlID0gdmFsdWVzVG9NZXJnZVtuYW1lXTsKKyAgICAg ICAgICAgIGlmIChuYW1lID09IGV4Y2x1ZGVkUHJvcGVydHkpCisgICAgICAgICAgICAgICAgY29u dGludWU7CisKICAgICAgICAgICAgIHN3aXRjaCAobmFtZSkgeworICAgICAgICAgICAgY2FzZSAn cHJvcGVydGllcyc6IC8vIGZhbGx0aHJvdWdoCiAgICAgICAgICAgICBjYXNlICdhcmd1bWVudHMn OgogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbCh0eXBlb2YodmFsdWUpLCAnb2JqZWN0Jywg J2FyZ3VtZW50cyBzaG91bGQgYmUgYSBkaWN0aW9uYXJ5Jyk7CiAgICAgICAgICAgICAgICAgaWYg KCFjb25maWdbJ3Byb3BlcnRpZXMnXSkKICAgICAgICAgICAgICAgICAgICAgY29uZmlnWydwcm9w ZXJ0aWVzJ10gPSB7fTsKICAgICAgICAgICAgICAgICB0aGlzLl92YWxpZGF0ZUFuZE1lcmdlUHJv cGVydGllcyhjb25maWdbJ3Byb3BlcnRpZXMnXSwgdmFsdWUpOwogICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgY2FzZSAndGVzdCc6Ci0gICAgICAgICAgICAgICAgYXNzZXJ0KHZh bHVlIGluc3RhbmNlb2YgQXJyYXksICd0ZXN0IHNob3VsZCBiZSBhbiBhcnJheScpOwotICAgICAg ICAgICAgICAgIGFzc2VydCh2YWx1ZS5ldmVyeShmdW5jdGlvbiAocGFydCkgeyByZXR1cm4gdHlw ZW9mIHBhcnQgPT0gJ3N0cmluZyc7IH0pLCAndGVzdCBzaG91bGQgYmUgYW4gYXJyYXkgb2Ygc3Ry aW5ncycpOworICAgICAgICAgICAgY2FzZSAndGVzdCc6IC8vIGZhbGx0aHJvdWdoCisgICAgICAg ICAgICBjYXNlICdzbGF2ZUxpc3QnOiAvLyBmYWxsdGhyb3VnaAorICAgICAgICAgICAgY2FzZSAn cGxhdGZvcm1zJzoKKyAgICAgICAgICAgIGNhc2UgJ3R5cGVzJzoKKyAgICAgICAgICAgICAgICBh c3NlcnQodmFsdWUgaW5zdGFuY2VvZiBBcnJheSwgYCR7bmFtZX0gc2hvdWxkIGJlIGFuIGFycmF5 YCk7CisgICAgICAgICAgICAgICAgYXNzZXJ0KHZhbHVlLmV2ZXJ5KGZ1bmN0aW9uIChwYXJ0KSB7 IHJldHVybiB0eXBlb2YgcGFydCA9PSAnc3RyaW5nJzsgfSksIGAke25hbWV9IHNob3VsZCBiZSBh biBhcnJheSBvZiBzdHJpbmdzYCk7CiAgICAgICAgICAgICAgICAgY29uZmlnW25hbWVdID0gdmFs dWUuc2xpY2UoKTsKICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgJ3Ns YXZlTGlzdCc6Ci0gICAgICAgICAgICAgICAgYXNzZXJ0KHZhbHVlIGluc3RhbmNlb2YgQXJyYXks ICdzbGF2ZUxpc3Qgc2hvdWxkIGJlIGFuIGFycmF5Jyk7Ci0gICAgICAgICAgICAgICAgYXNzZXJ0 KHZhbHVlLmV2ZXJ5KGZ1bmN0aW9uIChwYXJ0KSB7IHJldHVybiB0eXBlb2YgcGFydCA9PSAnc3Ry aW5nJzsgfSksICdzbGF2ZUxpc3Qgc2hvdWxkIGJlIGFuIGFycmF5IG9mIHN0cmluZ3MnKTsKLSAg ICAgICAgICAgICAgICBjb25maWdbbmFtZV0gPSB2YWx1ZTsKLSAgICAgICAgICAgICAgICBicmVh azsKICAgICAgICAgICAgIGNhc2UgJ3R5cGUnOiAvLyBmYWxsdGhyb3VnaAogICAgICAgICAgICAg Y2FzZSAnYnVpbGRlcic6IC8vIGZhbGx0aHJvdWdoCiAgICAgICAgICAgICBjYXNlICdwbGF0Zm9y bSc6IC8vIGZhbGx0aHJvdWdoCkBAIC0zMzEsNiArMzYxLDcgQEAgY2xhc3MgQnVpbGRib3RTeW5j ZXIgewogICAgICAgICAgICAgICAgIGFzc2VydChmYWxzZSwgYFVucmVjb2duaXplZCBwYXJhbWV0 ZXIgJHtuYW1lfWApOwogICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIHJldHVybiBj b25maWc7CiAgICAgfQogCiAgICAgc3RhdGljIF92YWxpZGF0ZUFuZE1lcmdlUHJvcGVydGllcyhw cm9wZXJ0aWVzLCBjb25maWdBcmd1bWVudHMpCkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpz CShyZXZpc2lvbiAyMDQxNTApCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0 cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanMJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDU4 IEBAIGZ1bmN0aW9uIHNhbXBsZWlPU0NvbmZpZygpCiAgICAgfTsKIH0KIAorZnVuY3Rpb24gc2Ft cGxlaU9TQ29uZmlnV2l0aEV4cGFuc2lvbnMoKQoreworICAgIHJldHVybiB7CisgICAgICAgICJ0 cmlnZ2VyYWJsZU5hbWUiOiAiYnVpbGQtd2Via2l0LWlvcyIsCisgICAgICAgICJzaGFyZWQiOgor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJhcmd1bWVudHMiOiB7CisgICAgICAgICAg ICAgICAgICAgICJ3ZWJraXQtcmV2aXNpb24iOiB7InJvb3QiOiAiV2ViS2l0In0sCisgICAgICAg ICAgICAgICAgICAgICJvcy12ZXJzaW9uIjogeyJyb290IjogImlPUyJ9CisgICAgICAgICAgICAg ICAgfSwKKyAgICAgICAgICAgICAgICAiYnVpbGRSZXF1ZXN0QXJndW1lbnQiOiAiYnVpbGQtcmVx dWVzdC1pZCIKKyAgICAgICAgICAgIH0sCisgICAgICAgICJ0eXBlcyI6IHsKKyAgICAgICAgICAg ICJpcGhvbmUtcGx0IjogeworICAgICAgICAgICAgICAgICJ0ZXN0IjogWyJQTFQtaVBob25lIl0s CisgICAgICAgICAgICAgICAgImFyZ3VtZW50cyI6IHsidGVzdF9uYW1lIjogInBsdCJ9CisgICAg ICAgICAgICB9LAorICAgICAgICAgICAgImlwYWQtcGx0IjogeworICAgICAgICAgICAgICAgICJ0 ZXN0IjogWyJQTFQtaVBhZCJdLAorICAgICAgICAgICAgICAgICJhcmd1bWVudHMiOiB7InRlc3Rf bmFtZSI6ICJwbHQifQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICJzcGVlZG9tZXRlciI6 IHsKKyAgICAgICAgICAgICAgICAidGVzdCI6IFsiU3BlZWRvbWV0ZXIiXSwKKyAgICAgICAgICAg ICAgICAiYXJndW1lbnRzIjogeyJ0ZXN0cyI6ICJzcGVlZG9tZXRlciJ9CisgICAgICAgICAgICB9 LAorICAgICAgICB9LAorICAgICAgICAiYnVpbGRlcnMiOiB7CisgICAgICAgICAgICAiaXBob25l IjogeworICAgICAgICAgICAgICAgICJidWlsZGVyIjogImlQaG9uZSBBQiBUZXN0cyIsCisgICAg ICAgICAgICAgICAgImFyZ3VtZW50cyI6IHsiZm9yY2VzY2hlZHVsZXIiOiAiZm9yY2UtaXBob25l LWFiLXRlc3RzIn0KKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICAiaXBhZCI6IHsKKyAgICAg ICAgICAgICAgICAiYnVpbGRlciI6ICJpUGFkIEFCIFRlc3RzIiwKKyAgICAgICAgICAgICAgICAi YXJndW1lbnRzIjogeyJmb3JjZXNjaGVkdWxlciI6ICJmb3JjZS1pcGFkLWFiLXRlc3RzIn0KKyAg ICAgICAgICAgIH0sCisgICAgICAgIH0sCisgICAgICAgICJjb25maWd1cmF0aW9ucyI6IFsKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiYnVpbGRlciI6ICJpcGhvbmUiLAorICAgICAg ICAgICAgICAgICJwbGF0Zm9ybXMiOiBbImlQaG9uZSIsICJpT1MgMTAgaVBob25lIl0sCisgICAg ICAgICAgICAgICAgInR5cGVzIjogWyJpcGhvbmUtcGx0IiwgInNwZWVkb21ldGVyIl0sCisgICAg ICAgICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJidWlsZGVyIjogImlw YWQiLAorICAgICAgICAgICAgICAgICJwbGF0Zm9ybXMiOiBbImlQYWQiXSwKKyAgICAgICAgICAg ICAgICAidHlwZXMiOiBbImlwYWQtcGx0IiwgInNwZWVkb21ldGVyIl0sCisgICAgICAgICAgICB9 LAorICAgICAgICBdCisgICAgfQorICAgIAorfQorCiBsZXQgc2FtcGxlUm9vdFNldERhdGEgPSB7 CiAgICAgJ1dlYktpdCc6IHsKICAgICAgICAgJ2lkJzogJzExMTEyNycsCkBAIC00ODIsNiArNTM0 LDMwIEBAIGRlc2NyaWJlKCdCdWlsZGJvdFN5bmNlcicsIGZ1bmN0aW9uICgpIHsKICAgICAgICAg ICAgIGFzc2VydC5lcXVhbChjb25maWd1cmF0aW9uc1sxXS5wbGF0Zm9ybSwgTW9ja01vZGVscy5p cGFkKTsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChjb25maWd1cmF0aW9uc1sxXS50ZXN0LCBN b2NrTW9kZWxzLmpldHN0cmVhbSk7CiAgICAgICAgIH0pOworCisgICAgICAgIGl0KCdzaG91bGQg cGFyc2UgdGVzdCBjb25maWd1cmF0aW9ucyB3aXRoIHR5cGVzIGFuZCBwbGF0Zm9ybXMgZXhwYW5z aW9ucyBjb3JyZWN0bHknLCBmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICBsZXQgc3luY2VycyA9 IEJ1aWxkYm90U3luY2VyLl9sb2FkQ29uZmlnKFJlbW90ZUFQSSwgc2FtcGxlaU9TQ29uZmlnV2l0 aEV4cGFuc2lvbnMoKSk7CisKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChzeW5jZXJzLmxlbmd0 aCwgMik7CisKKyAgICAgICAgICAgIGxldCBjb25maWd1cmF0aW9ucyA9IHN5bmNlcnNbMF0udGVz dENvbmZpZ3VyYXRpb25zKCk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoY29uZmlndXJhdGlv bnMubGVuZ3RoLCA0KTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChjb25maWd1cmF0aW9uc1sw XS5wbGF0Zm9ybSwgTW9ja01vZGVscy5pcGhvbmUpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KGNvbmZpZ3VyYXRpb25zWzBdLnRlc3QsIE1vY2tNb2RlbHMuaVBob25lUExUKTsKKyAgICAgICAg ICAgIGFzc2VydC5lcXVhbChjb25maWd1cmF0aW9uc1sxXS5wbGF0Zm9ybSwgTW9ja01vZGVscy5p T1MxMGlQaG9uZSk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoY29uZmlndXJhdGlvbnNbMV0u dGVzdCwgTW9ja01vZGVscy5pUGhvbmVQTFQpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNv bmZpZ3VyYXRpb25zWzJdLnBsYXRmb3JtLCBNb2NrTW9kZWxzLmlwaG9uZSk7CisgICAgICAgICAg ICBhc3NlcnQuZXF1YWwoY29uZmlndXJhdGlvbnNbMl0udGVzdCwgTW9ja01vZGVscy5zcGVlZG9t ZXRlcik7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwoY29uZmlndXJhdGlvbnNbM10ucGxhdGZv cm0sIE1vY2tNb2RlbHMuaU9TMTBpUGhvbmUpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNv bmZpZ3VyYXRpb25zWzNdLnRlc3QsIE1vY2tNb2RlbHMuc3BlZWRvbWV0ZXIpOworCisgICAgICAg ICAgICBjb25maWd1cmF0aW9ucyA9IHN5bmNlcnNbMV0udGVzdENvbmZpZ3VyYXRpb25zKCk7Cisg ICAgICAgICAgICBhc3NlcnQuZXF1YWwoY29uZmlndXJhdGlvbnMubGVuZ3RoLCAyKTsKKyAgICAg ICAgICAgIGFzc2VydC5lcXVhbChjb25maWd1cmF0aW9uc1swXS5wbGF0Zm9ybSwgTW9ja01vZGVs cy5pcGFkKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChjb25maWd1cmF0aW9uc1swXS50ZXN0 LCBNb2NrTW9kZWxzLmlQYWRQTFQpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKGNvbmZpZ3Vy YXRpb25zWzFdLnBsYXRmb3JtLCBNb2NrTW9kZWxzLmlwYWQpOworICAgICAgICAgICAgYXNzZXJ0 LmVxdWFsKGNvbmZpZ3VyYXRpb25zWzFdLnRlc3QsIE1vY2tNb2RlbHMuc3BlZWRvbWV0ZXIpOwor ICAgICAgICB9KTsKICAgICB9KTsKIAogICAgIGRlc2NyaWJlKCdfcHJvcGVydGllc0ZvckJ1aWxk UmVxdWVzdCcsIGZ1bmN0aW9uICgpIHsKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91 bml0LXRlc3RzL3Jlc291cmNlcy9tb2NrLXYzLW1vZGVscy5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9yZXNvdXJjZXMvbW9jay12My1tb2RlbHMu anMJKHJldmlzaW9uIDIwNDE1MCkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRl c3RzL3Jlc291cmNlcy9tb2NrLXYzLW1vZGVscy5qcwkod29ya2luZyBjb3B5KQpAQCAtMzEsOCAr MzEsMTEgQEAgdmFyIE1vY2tNb2RlbHMgPSB7CiAKICAgICAgICAgICAgIE1vY2tNb2RlbHMuaXBo b25lID0gUGxhdGZvcm0uZW5zdXJlU2luZ2xldG9uKDEyLCB7bmFtZTogJ2lQaG9uZScsIG1ldHJp Y3M6IFtdfSk7CiAgICAgICAgICAgICBNb2NrTW9kZWxzLmlwYWQgPSBQbGF0Zm9ybS5lbnN1cmVT aW5nbGV0b24oMTMsIHtuYW1lOiAnaVBhZCcsIG1ldHJpY3M6IFtdfSk7CisgICAgICAgICAgICBN b2NrTW9kZWxzLmlPUzEwaVBob25lID0gUGxhdGZvcm0uZW5zdXJlU2luZ2xldG9uKDE0LCB7bmFt ZTogJ2lPUyAxMCBpUGhvbmUnLCBtZXRyaWNzOiBbXX0pOwogCiAgICAgICAgICAgICBNb2NrTW9k ZWxzLnBsdCA9IFRlc3QuZW5zdXJlU2luZ2xldG9uKDg0NCwge25hbWU6ICdQYWdlIExvYWQgVGVz dCd9KTsKKyAgICAgICAgICAgIE1vY2tNb2RlbHMuaVBhZFBMVCA9IFRlc3QuZW5zdXJlU2luZ2xl dG9uKDE0NDQsIHtuYW1lOiAnUExULWlQYWQnfSk7CisgICAgICAgICAgICBNb2NrTW9kZWxzLmlQ aG9uZVBMVCA9IFRlc3QuZW5zdXJlU2luZ2xldG9uKDE1MDAsIHtuYW1lOiAnUExULWlQaG9uZSd9 KTsKICAgICAgICAgICAgIE1vY2tNb2RlbHMucGx0TWVhbiA9IE1ldHJpYy5lbnN1cmVTaW5nbGV0 b24oMTE1OCwge25hbWU6ICdUaW1lJywgYWdncmVnYXRvcjogJ0FyaXRobWV0aWMnLCB0ZXN0OiBN b2NrTW9kZWxzLnBsdH0pOwogICAgICAgICAgICAgTW9ja01vZGVscy5lbENhcGl0YW4gPSBQbGF0 Zm9ybS5lbnN1cmVTaW5nbGV0b24oMzEsIHtuYW1lOiAnRWwgQ2FwaXRhbicsIG1ldHJpY3M6IFtN b2NrTW9kZWxzLnBsdE1lYW5dfSk7CiAgICAgICAgIH0pOwo=