144835 2015-05-09 17:05:42 -0700 Make arguments of run-benchmark more user friendly 2015-05-09 23:47:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 144842 1 rniwa rniwa benjamin commit-queue dewei_zhu glenn kling slewis oldest_to_newest 1093461 0 rniwa 2015-05-09 17:05:42 -0700 Having to know the location of .plan files, for example, is not desirable. 1093462 1 252789 rniwa 2015-05-09 17:18:54 -0700 Created attachment 252789 Patch 1093463 2 252789 darin 2015-05-09 17:20:15 -0700 Comment on attachment 252789 Patch rs=me 1093505 3 rniwa 2015-05-09 23:47:54 -0700 Committed r184044: <http://trac.webkit.org/changeset/184044> 252789 2015-05-09 17:18:54 -0700 2015-05-09 17:20:15 -0700 Patch bug-144835-20150509171735.patch text/plain 10511 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MDMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzJiZWRlOWUyMTdhZjhhNDVmNTFhOTE2YjU0MGM2YmUz NWEzYTNiZC4uM2I2YTUxODA4NDg2MTA3YzIxOGM4NzY3ZTI2OTAzMzRkYWQyOGRhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDE1LTA1LTA5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIE1ha2UgYXJndW1lbnRzIG9mIHJ1bi1iZW5jaG1hcmsgbW9yZSB1c2VyIGZyaWVuZGx5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ4MzUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWRlIC0tYnVp bGQtZGlyZWN0b3J5IG9wdGlvbmFsIHNpbmNlIEkgZG9uJ3QgZXhwZWN0IGEgdHlwaWNhbCBXZWJL aXQgZGV2ZWxvcGVyIHRvIGhhdmUgYSBsb2NhbCBidWlsZAorICAgICAgICBvZiBDaHJvbWUgYW5k IEZpcmVmb3guIEFsc28gbWFkZSAtLXBsYW4gYWNjZXB0IGp1c3QgYSBmaWxlbmFtZSBzbyB0aGF0 IHdlIGNhbiBqdXN0IHNheSAic3BlZWRvbWV0ZXIiCisgICAgICAgIGluc3RlYWQgb2YgIlRvb2xz L1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL3BsYW5zL3NwZWVkb21ldGVy LnBsYW4iLiBGaW5hbGx5LCByZW1vdmVkCisgICAgICAgIGRlZmF1bHQgdmFsdWVzIGZyb20gLS1w bGF0Zm9ybSBhbmQgLS1icm93c2VyIGFzIHRoZXkgYXJlIHJlcXVpcmVkIGFyZ3VtZW50cy4KKwor ICAgICAgICAqIFNjcmlwdHMvcnVuLWJlbmNobWFyazoKKyAgICAgICAgKG1haW4pOiBNYWRlIC0t YnVpbGQtZGlyZWN0b3J5IG9wdGlvbmFsLCBhbmQgcmVtb3ZlZCBkZWZhdWx0IHZhbHVlcyBmcm9t IC0tcGxhdGZvcm0gYW5kIC0tYnJvd3Nlci4KKyAgICAgICAgQWxzbyBhZGRlZCBoZWxwIHRleHQg Zm9yIC0tYnVpbGQtZGlyZWN0b3J5IGFuZCAtLXBsYW4uIEluIGFkZGl0aW9uLCB0aGUgbGlzdCBv ZiBwbGF0Zm9ybXMgYW5kIGJyb3dzZXJzCisgICAgICAgIGFyZSBub3QgZHluYW1pY2FsbHkgb2J0 YWluZWQgdmlhIEJyb3dzZXJEcml2ZXJGYWN0b3J5LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5OgorICAgICAgICAoQmVuY2ht YXJrUnVubmVyLl9faW5pdF9fKTogUmFpc2Ugd2hlbiB3ZSBjYW4ndCBmaW5kIHRoZSBwbGFuIGZp bGUgb3IgdGhlIHBsYW4gZmlsZSBpcyBub3QgYSB2YWxpZCBKU09OCisgICAgICAgIGZpbGUgaW5z dGVhZCBvZiBzdXBwcmVzc2luZyB0aGUgZXJyb3IgaGVyZSBhbmQgYmxvd2luZyB1cCBsYXRlciBt eXN0ZXJpb3VzbHkgc2luY2Ugd2Ugd29uJ3QgYmUgYWJsZSB0bworICAgICAgICBydW4gYW55IGJl bmNobWFyayBpbiB0aGF0IGNhc2UuCisgICAgICAgIChCZW5jaG1hcmtSdW5uZXIuX2ZpbmRQbGFu RmlsZSk6IEFkZGVkLiBMb29rIGZvciB0aGUgcGxhbiBpbiB3ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2RhdGEvcGxhbnMgaWYKKyAgICAgICAgdGhlIHNwZWNpZmllZCBmaWxlIGlzbid0IGEgdmFs aWQgcmVsYXRpdmUgb3IgYW4gYWJzb2x1dGUgcGF0aC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvYnJvd3Nlcl9kcml2ZXJfZmFjdG9y eS5weToKKyAgICAgICAgKEJyb3dzZXJEcml2ZXJGYWN0b3J5LmF2YWlsYWJsZV9wbGF0Zm9ybXMp OiBBZGRlZC4gVXNlZCBpbiBtYWluIHRvIHByb3ZpZGUgdGhlIGxpc3Qgb2YgdmFsaWQgcGxhdGZv cm1zCisgICAgICAgIGFuZCBicm93c2Vycy4KKyAgICAgICAgKEJyb3dzZXJEcml2ZXJGYWN0b3J5 LmF2YWlsYWJsZV9icm93c2Vycyk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weToKKyAg ICAgICAgKE9TWENocm9tZURyaXZlci5sYXVuY2hVcmwpOiBicm93c2VyQnVpbGRQYXRoIGlzIG5l dmVyIG9wdGlvbmFsIHNpbmNlIEJlbmNobWFya1J1bm5lci5leGVjdXRlIGFsd2F5cworICAgICAg ICBjYWxscyBsYXVuY2hVcmwgd2l0aCB0aGlzIGFyZ3VtZW50IHNvIHJlbW92ZWQgdGhlIGRlZmF1 bHQgdmFsdWUuIEFsc28gYWRkZWQgYSBmYWxsYmFjayBwYXRoIGZvciB3aGVuCisgICAgICAgIGJy b3dzZXJCdWlsZFBhdGggd2FzIE5vbmUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9zYWZhcmlfZHJpdmVyLnB5OgorICAgICAg ICAoT1NYU2FmYXJpRHJpdmVyLmxhdW5jaFVybCk6IERpdHRvLiBXZSBhbHNvIGZhbGxiYWNrIHdo ZW4gdGhlIGJ1aWxkIGRpcmVjdG9yeSBkb2Vzbid0IGNvbnRhaW4gU2FmYXJpCisgICAgICAgIHNv IHRoYXQgd2UgY2FuIHVzZSBsb2NhbGx5IGJ1aWx0IFdlYktpdCB0byBsYXVuY2ggU2FmYXJpLgor CiAyMDE1LTA1LTA4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAg ICAgIEJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyayBi L1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyawppbmRleCAzMDQ4MGY4MzY5NTYwY2U0OWI3ZWRh ZDExZjZhMjBlMTFiYmEzNmU2Li42ZDVmNjZlMzU5ODcyOTQ3YjYzNWU1NWYyMmJlOWJlNTllNjA0 NjQ0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsKKysrIGIvVG9vbHMv U2NyaXB0cy9ydW4tYmVuY2htYXJrCkBAIC0yLDkgKzIsMTEgQEAKIAogaW1wb3J0IGFyZ3BhcnNl CiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IHBsYXRmb3JtCiBpbXBvcnQgc3lzCiAKIGZyb20gd2Vi a2l0cHkuYmVuY2htYXJrX3J1bm5lci5iZW5jaG1hcmtfcnVubmVyIGltcG9ydCBCZW5jaG1hcmtS dW5uZXIKK2Zyb20gd2Via2l0cHkuYmVuY2htYXJrX3J1bm5lci5icm93c2VyX2RyaXZlci5icm93 c2VyX2RyaXZlcl9mYWN0b3J5IGltcG9ydCBCcm93c2VyRHJpdmVyRmFjdG9yeQogCiAKIF9sb2cg PSBsb2dnaW5nLmdldExvZ2dlcigpCkBAIC0xOCwxNCArMjAsMTQgQEAgX2xvZy5hZGRIYW5kbGVy KGNoKQogZGVmIG1haW4oKToKICAgICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihk ZXNjcmlwdGlvbj0nQXV0b21hdGUgdGhlIGJyb3dzZXIgYmFzZWQgcGVyZm9ybWFuY2UgYmVuY2ht YXJrcycpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1vdXRwdXQtZmlsZScsIGRlc3Q9J291 dHB1dCcsIGRlZmF1bHQ9Tm9uZSkKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWJ1aWxkLWRp cmVjdG9yeScsIGRlc3Q9J2J1aWxkRGlyJywgcmVxdWlyZWQ9VHJ1ZSkKLSAgICBwYXJzZXIuYWRk X2FyZ3VtZW50KCctLXBsYW4nLCBkZXN0PSdwbGFuJywgcmVxdWlyZWQ9VHJ1ZSkKLSAgICBwYXJz ZXIuYWRkX2FyZ3VtZW50KCctLXBsYXRmb3JtJywgZGVzdD0ncGxhdGZvcm0nLCBkZWZhdWx0PSdv c3gnLCBjaG9pY2VzPVsnb3N4JywgJ2lvcycsICd3aW5kb3dzJ10sIHJlcXVpcmVkPVRydWUpCisg ICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1idWlsZC1kaXJlY3RvcnknLCBkZXN0PSdidWlsZERp cicsIGhlbHA9J1BhdGggdG8gdGhlIGJyb3dzZXIgZXhlY3V0YWJsZS4gZS5nLiBXZWJLaXRCdWls ZC9SZWxlYXNlLycpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1wbGFuJywgZGVzdD0ncGxh bicsIHJlcXVpcmVkPVRydWUsIGhlbHA9J0JlbmNobWFyayBwbGFuIHRvIHJ1bi4gZS5nLiBzcGVl ZG9tZXRlciwgamV0c3RyZWFtJykKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXBsYXRmb3Jt JywgZGVzdD0ncGxhdGZvcm0nLCByZXF1aXJlZD1UcnVlLCBjaG9pY2VzPUJyb3dzZXJEcml2ZXJG YWN0b3J5LmF2YWlsYWJsZV9wbGF0Zm9ybXMoKSkKICAgICAjIEZJWE1FOiBTaG91bGQgd2UgYWRk IGNocm9tZSBhcyBhbiBvcHRpb24/IFdlbGwsIGNocm9tZSB1c2VzIHdlYmtpdCBpbiBpT1MuCi0g ICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1icm93c2VyJywgZGVzdD0nYnJvd3NlcicsIGRlZmF1 bHQ9J3NhZmFyaScsIGNob2ljZXM9WydzYWZhcmknLCAnY2hyb21lJ10sIHJlcXVpcmVkPVRydWUp CisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1icm93c2VyJywgZGVzdD0nYnJvd3NlcicsIHJl cXVpcmVkPVRydWUsIGNob2ljZXM9QnJvd3NlckRyaXZlckZhY3RvcnkuYXZhaWxhYmxlX2Jyb3dz ZXJzKCkpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1kZWJ1ZycsIGFjdGlvbj0nc3RvcmVf dHJ1ZScpCiAgICAgYXJncyA9IHBhcnNlci5wYXJzZV9hcmdzKCkKLSAgICAKKwogICAgIGlmIGFy Z3MuZGVidWc6CiAgICAgICAgIF9sb2cuc2V0TGV2ZWwobG9nZ2luZy5ERUJVRykKICAgICBfbG9n LmRlYnVnKCdJbml0aWFsaXppbmcgcHJvZ3JhbSB3aXRoIGZvbGxvd2luZyBwYXJhbWV0ZXJzJykK QEAgLTM1LDUgKzM3LDYgQEAgZGVmIG1haW4oKToKICAgICBydW5uZXIgPSBCZW5jaG1hcmtSdW5u ZXIoYXJncy5wbGFuLCBhcmdzLmJ1aWxkRGlyLCBhcmdzLm91dHB1dCwgYXJncy5wbGF0Zm9ybSwg YXJncy5icm93c2VyKQogICAgIHJldHVybiBydW5uZXIuZXhlY3V0ZSgpCiAKKwogaWYgX19uYW1l X18gPT0gJ19fbWFpbl9fJzoKICAgICBzeXMuZXhpdChtYWluKCkpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVy LnB5CmluZGV4IGJhZmJiN2EwYjI5NDlhOTJkOTZlNjdhZjQyYzczNWRkZmVkZmMwZjAuLjE3OTI4 N2Q3YTIwYjM4MzA0ZGVkZGMxMDAxNmNkODQ4Y2NkNjQxYTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVy LnB5CkBAIC0yNiwxOSArMjYsMzEgQEAgY2xhc3MgQmVuY2htYXJrUnVubmVyKG9iamVjdCk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYW5GaWxlLCBidWlsZERpciwgb3V0cHV0RmlsZSwgcGxh dGZvcm0sIGJyb3dzZXIpOgogICAgICAgICBfbG9nLmluZm8oJ0luaXRpYWxpemluZyBiZW5jaG1h cmsgcnVubmluZycpCiAgICAgICAgIHRyeToKKyAgICAgICAgICAgIHBsYW5GaWxlID0gc2VsZi5f ZmluZFBsYW5GaWxlKHBsYW5GaWxlKQogICAgICAgICAgICAgd2l0aCBvcGVuKHBsYW5GaWxlLCAn cicpIGFzIGZwOgogICAgICAgICAgICAgICAgIHNlbGYucGxhbiA9IGpzb24ubG9hZChmcCkKICAg ICAgICAgICAgICAgICBzZWxmLmJyb3dzZXJEcml2ZXIgPSBCcm93c2VyRHJpdmVyRmFjdG9yeS5j cmVhdGUoW3BsYXRmb3JtLCBicm93c2VyXSkKICAgICAgICAgICAgICAgICBzZWxmLmh0dHBTZXJ2 ZXJEcml2ZXIgPSBIVFRQU2VydmVyRHJpdmVyRmFjdG9yeS5jcmVhdGUoW3NlbGYucGxhblsnaHR0 cF9zZXJ2ZXJfZHJpdmVyJ11dKQotICAgICAgICAgICAgICAgIHNlbGYuYnVpbGREaXIgPSBvcy5w YXRoLmFic3BhdGgoYnVpbGREaXIpCisgICAgICAgICAgICAgICAgc2VsZi5idWlsZERpciA9IG9z LnBhdGguYWJzcGF0aChidWlsZERpcikgaWYgYnVpbGREaXIgZWxzZSBOb25lCiAgICAgICAgICAg ICAgICAgc2VsZi5vdXRwdXRGaWxlID0gb3V0cHV0RmlsZQogICAgICAgICBleGNlcHQgSU9FcnJv cjoKICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0NhbiBub3Qgb3BlbiBwbGFuIGZpbGU6ICVzJyAl IHBsYW5GaWxlKQorICAgICAgICAgICAgcmFpc2UKICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3I6 CiAgICAgICAgICAgICBfbG9nLmVycm9yKCdQbGFuIGZpbGU6JXMgbWF5IG5vdCBmb2xsb3cgSlNP TiBmb3JtYXQnICUgcGxhbkZpbGUpCi0gICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgIHJhaXNl CiAKKyAgICBkZWYgX2ZpbmRQbGFuRmlsZShzZWxmLCBwbGFuRmlsZSk6CisgICAgICAgIGlmIG5v dCBvcy5wYXRoLmV4aXN0cyhwbGFuRmlsZSk6CisgICAgICAgICAgICBhYnNQYXRoID0gb3MucGF0 aC5qb2luKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICdkYXRhL3BsYW5zJywgcGxhbkZpbGUp CisgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhhYnNQYXRoKToKKyAgICAgICAgICAgICAg ICByZXR1cm4gYWJzUGF0aAorICAgICAgICAgICAgaWYgbm90IGFic1BhdGguZW5kc3dpdGgoJy5w bGFuJyk6CisgICAgICAgICAgICAgICAgYWJzUGF0aCArPSAnLnBsYW4nCisgICAgICAgICAgICBp ZiBvcy5wYXRoLmV4aXN0cyhhYnNQYXRoKToKKyAgICAgICAgICAgICAgICByZXR1cm4gYWJzUGF0 aAorICAgICAgICByZXR1cm4gcGxhbkZpbGUKKwogICAgIGRlZiBleGVjdXRlKHNlbGYpOgogICAg ICAgICBfbG9nLmluZm8oJ1N0YXJ0IHRvIGV4ZWN1dGUgdGhlIHBsYW4nKQogICAgICAgICBfbG9n LmluZm8oJ1N0YXJ0IGEgbmV3IGJlbmNobWFyaycpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvYnJvd3Nlcl9kcml2ZXJf ZmFjdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93 c2VyX2RyaXZlci9icm93c2VyX2RyaXZlcl9mYWN0b3J5LnB5CmluZGV4IGI5OThiNGY3N2ViMTIz M2NlZjNjMDJiMGY4Y2ZjYjM1Yjg1ZDQ2NmEuLmExNDBlYzA3ZjM5OTFiN2VlNWY1YmQ2ODdmYTgz ZjU5ZGIzMjk3N2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9icm93c2VyX2RyaXZlci9icm93c2VyX2RyaXZlcl9mYWN0b3J5LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9icm93 c2VyX2RyaXZlcl9mYWN0b3J5LnB5CkBAIC0xNCwzICsxNCwxNSBAQCBkcml2ZXJGaWxlTmFtZSA9 ICdicm93c2VyX2RyaXZlcnMuanNvbicKIGNsYXNzIEJyb3dzZXJEcml2ZXJGYWN0b3J5KEdlbmVy aWNGYWN0b3J5KToKIAogICAgIHByb2R1Y3RzID0gbG9hZEpTT05Gcm9tRmlsZShvcy5wYXRoLmpv aW4ob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSwgZHJpdmVyRmlsZU5hbWUpKQorCisgICAgQGNs YXNzbWV0aG9kCisgICAgZGVmIGF2YWlsYWJsZV9wbGF0Zm9ybXMoY2xzKToKKyAgICAgICAgcmV0 dXJuIGNscy5wcm9kdWN0cy5rZXlzKCkKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBhdmFp bGFibGVfYnJvd3NlcnMoY2xzKToKKyAgICAgICAgYnJvd3NlcnMgPSBbXQorICAgICAgICBmb3Ig cGxhdGZvcm0gaW4gY2xzLnByb2R1Y3RzLnZhbHVlcygpOgorICAgICAgICAgICAgZm9yIGJyb3dz ZXIgaW4gcGxhdGZvcm06CisgICAgICAgICAgICAgICAgYnJvd3NlcnMuYXBwZW5kKGJyb3dzZXIp CisgICAgICAgIHJldHVybiBicm93c2VycwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9jaHJvbWVfZHJpdmVyLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVy L29zeF9jaHJvbWVfZHJpdmVyLnB5CmluZGV4IDI2NjMxOWE5ODY0NGIwZDYwNDA1MDFiZWVjMzYz YWI4NjgzODlmNTYuLjg3OGIxNDA3MWY1OGI4MTY4YjMxOTQwYjFmMDRiYzFmOTA5ZTI2ZTkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2Vy X2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkKQEAg LTE5LDcgKzE5LDkgQEAgY2xhc3MgT1NYQ2hyb21lRHJpdmVyKEJyb3dzZXJEcml2ZXIpOgogICAg ICAgICBzZWxmLmNsb3NlQnJvd3NlcnMoKQogICAgICAgICBzZWxmLmNocm9tZVByZWZlcmVuY2Vz ID0gW10KIAotICAgIGRlZiBsYXVuY2hVcmwoc2VsZiwgdXJsLCBicm93c2VyQnVpbGRQYXRoPU5v bmUpOgorICAgIGRlZiBsYXVuY2hVcmwoc2VsZiwgdXJsLCBicm93c2VyQnVpbGRQYXRoKToKKyAg ICAgICAgaWYgbm90IGJyb3dzZXJCdWlsZFBhdGg6CisgICAgICAgICAgICBicm93c2VyQnVpbGRQ YXRoID0gJy9BcHBsaWNhdGlvbnMvJwogICAgICAgICBfbG9nLmluZm8oJ0xhdW5jaGluZyBjaHJv bWU6ICVzIHdpdGggdXJsOiAlcycgJSAob3MucGF0aC5qb2luKGJyb3dzZXJCdWlsZFBhdGgsICdH b29nbGUgQ2hyb21lLmFwcCcpLCB1cmwpKQogICAgICAgICAjIEZJWE1FOiBNYXkgbmVlZCB0byBi ZSBtb2RpZmllZCBmb3IgZGV2ZWxvcCBidWlsZCwgc3VjaCBhcyBzZXR0aW5nIHVwIGxpYnJhcmll cwogICAgICAgICBzdWJwcm9jZXNzLlBvcGVuKFsnb3BlbicsICctYScsIG9zLnBhdGguam9pbihi cm93c2VyQnVpbGRQYXRoLCAnR29vZ2xlIENocm9tZS5hcHAnKSwgJy0tYXJncycsICctLWhvbWVw YWdlJywgdXJsXSArIHNlbGYuY2hyb21lUHJlZmVyZW5jZXMpLmNvbW11bmljYXRlKCkKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2Ry aXZlci9vc3hfc2FmYXJpX2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5weQppbmRleCBmZGI5 MDZiNGNlN2EwMGIwZjZhMTA4MmZmMWVlM2E2OTA5NjA1M2I4Li5hYTMxNThkYTBjMzI0OTg4ZmY4 MzZkZjM0MDczMjYzMmI1ZWMzMTM2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVy L29zeF9zYWZhcmlfZHJpdmVyLnB5CkBAIC0yMyw4ICsyMywxNSBAQCBjbGFzcyBPU1hTYWZhcmlE cml2ZXIoQnJvd3NlckRyaXZlcik6CiAgICAgICAgIGZvcmNlUmVtb3ZlKG9zLnBhdGguam9pbihv cy5wYXRoLmV4cGFuZHVzZXIoJ34nKSwgJ0xpYnJhcnkvU2FmYXJpL0xhc3RTZXNzaW9uLnBsaXN0 JykpCiAgICAgICAgIHNlbGYuc2FmYXJpUHJlZmVyZW5jZXMgPSBbIi1Ib21lUGFnZSIsICJhYm91 dDpibGFuayIsICItV2FybkFib3V0RnJhdWR1bGVudFdlYnNpdGVzIiwgIjAiLCAiLUV4dGVuc2lv bnNFbmFibGVkIiwgIjAiLCAiLVNob3dTdGF0dXNCYXIiLCAiMCIsICItTmV3V2luZG93QmVoYXZp b3IiLCAiMSIsICItTmV3VGFiQmVoYXZpb3IiLCAiMSJdCiAKLSAgICBkZWYgbGF1bmNoVXJsKHNl bGYsIHVybCwgYnJvd3NlckJ1aWxkUGF0aD1Ob25lKToKLSAgICAgICAgYXJncyA9IFtvcy5wYXRo LmpvaW4oYnJvd3NlckJ1aWxkUGF0aCwgJ1NhZmFyaS5hcHAvQ29udGVudHMvTWFjT1MvU2FmYXJp JyldCisgICAgZGVmIGxhdW5jaFVybChzZWxmLCB1cmwsIGJyb3dzZXJCdWlsZFBhdGgpOgorICAg ICAgICBhcmdzID0gWycvQXBwbGljYXRpb25zL1NhZmFyaS5hcHAvQ29udGVudHMvTWFjT1MvU2Fm YXJpRm9yV2ViS2l0RGV2ZWxvcG1lbnQnXQorICAgICAgICBpZiBicm93c2VyQnVpbGRQYXRoOgor ICAgICAgICAgICAgc2FmYXJpQXBwSW5CdWlsZFBhdGggPSBvcy5wYXRoLmpvaW4oYnJvd3NlckJ1 aWxkUGF0aCwgJ1NhZmFyaS5hcHAvQ29udGVudHMvTWFjT1MvU2FmYXJpJykKKyAgICAgICAgICAg IGlmIG9zLnBhdGguZXhpc3RzKHNhZmFyaUFwcEluQnVpbGRQYXRoKToKKyAgICAgICAgICAgICAg ICBhcmdzID0gW3NhZmFyaUFwcEluQnVpbGRQYXRoXQorICAgICAgICAgICAgZWxzZToKKyAgICAg ICAgICAgICAgICBfbG9nLmluZm8oJ0NvdWxkIG5vdCBmaW5kIFNhZmFyaS5hcHAgYXQgJXMsIHVz aW5nIHRoZSBzeXN0ZW0gU2FmYXJpRm9yV2ViS2l0RGV2ZWxvcG1lbnQgaW4gL0FwcGxpY2F0aW9u cyBpbnN0ZWFkJyAlIHNhZmFyaUFwcEluQnVpbGRQYXRoKQorCiAgICAgICAgIGFyZ3MuZXh0ZW5k KHNlbGYuc2FmYXJpUHJlZmVyZW5jZXMpCiAgICAgICAgIF9sb2cuaW5mbygnTGF1bmNoaW5nIHNh ZmFyaTogJXMgd2l0aCB1cmw6ICVzJyAlIChhcmdzWzBdLCB1cmwpKQogICAgICAgICBzZWxmLnNh ZmFyaVByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MsIGVudj17J0RZTERfRlJBTUVXT1JL X1BBVEgnOiBicm93c2VyQnVpbGRQYXRoLCAnRFlMRF9MSUJSQVJZX1BBVEgnOiBicm93c2VyQnVp bGRQYXRofSwgc3RkaW49c3VicHJvY2Vzcy5QSVBFLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBz dGRlcnI9c3VicHJvY2Vzcy5QSVBFKQo=