174808 2017-07-24 19:21:41 -0700 Fix BenchmarkRunner to only import Selenium when needed 2017-07-24 21:36:50 -0700 1 1 1 Unclassified WebKit Tools / Tests Safari 10 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 matthew_r_stewart webkit-unassigned commit-queue lforschler slewis oldest_to_newest 1331839 0 matthew_r_stewart 2017-07-24 19:21:41 -0700 Fix BenchmarkRunner to only import selenium when needed. 1331840 1 316341 matthew_r_stewart 2017-07-24 19:34:36 -0700 Created attachment 316341 Patch 1331871 2 316341 commit-queue 2017-07-24 21:36:49 -0700 Comment on attachment 316341 Patch Clearing flags on attachment: 316341 Committed r219860: <http://trac.webkit.org/changeset/219860> 1331872 3 commit-queue 2017-07-24 21:36:50 -0700 All reviewed patches have been landed. Closing bug. 316341 2017-07-24 19:34:36 -0700 2017-07-24 21:36:49 -0700 Patch patch text/plain 12354 matthew_r_stewart ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTE5 ZTYzMDI4OC4uNWRmMzJmNWU3YWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOCBAQAogMjAxNy0wNy0yNCAgTWF0dGhldyBTdGV3 YXJ0ICA8bWF0dGhld19yX3N0ZXdhcnRAYXBwbGUuY29tPgogCisgICAgICAgIEZpeCBCZW5jaG1h cmtSdW5uZXIgdG8gb25seSBpbXBvcnQgc2VsZW5pdW0gd2hlbiBuZWVkZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDgwOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL2xpbnV4X2Nocm9tZV9kcml2ZXIucHk6Cisg ICAgICAgIChMaW51eENocm9tZURyaXZlci5sYXVuY2hfZHJpdmVyKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvbGludXhfZmlyZWZv eF9kcml2ZXIucHk6CisgICAgICAgIChMaW51eEZpcmVmb3hEcml2ZXIubGF1bmNoX2RyaXZlcik6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJp dmVyL29zeF9jaHJvbWVfZHJpdmVyLnB5OgorICAgICAgICAoT1NYQ2hyb21lRHJpdmVyLmxhdW5j aF9kcml2ZXIpOgorICAgICAgICAoT1NYQ2hyb21lQ2FuYXJ5RHJpdmVyLmxhdW5jaF9kcml2ZXIp OgorICAgICAgICAoY3JlYXRlX2Nocm9tZV9vcHRpb25zKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hfZHJpdmVy LnB5OgorICAgICAgICAoT1NYRmlyZWZveERyaXZlci5sYXVuY2hfZHJpdmVyKToKKyAgICAgICAg KE9TWEZpcmVmb3hOaWdodGx5RHJpdmVyLmxhdW5jaF9kcml2ZXIpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2Ry aXZlci5weToKKyAgICAgICAgKE9TWFNhZmFyaURyaXZlci5sYXVuY2hfZHJpdmVyKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvd2ViZHJpdmVyX2JlbmNobWFy a19ydW5uZXIucHk6CisgICAgICAgIChXZWJEcml2ZXJCZW5jaG1hcmtSdW5uZXIuX3J1bl9vbmVf dGVzdCk6CisKKzIwMTctMDctMjQgIE1hdHRoZXcgU3Rld2FydCAgPG1hdHRoZXdfcl9zdGV3YXJ0 QGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgQmVuY2htYXJrUnVubmVyIHBhdGNoZXMgd2l0aCBX ZWJEcml2ZXIgc3VwcG9ydCBmb3IgZWFjaCB0ZXN0aW5nIHBsYW4KICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDQ0MwogCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvbGludXhf Y2hyb21lX2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l ci9icm93c2VyX2RyaXZlci9saW51eF9jaHJvbWVfZHJpdmVyLnB5CmluZGV4IDYwYzBmZmZmNjc4 Li42Yjg3M2Y1ZjdmNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL2xpbnV4X2Nocm9tZV9kcml2ZXIucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL2xpbnV4 X2Nocm9tZV9kcml2ZXIucHkKQEAgLTI3LDggKzI3LDYgQEAKIGltcG9ydCBvcwogCiBmcm9tIGxp bnV4X2Jyb3dzZXJfZHJpdmVyIGltcG9ydCBMaW51eEJyb3dzZXJEcml2ZXIKLWZyb20gc2VsZW5p dW0gaW1wb3J0IHdlYmRyaXZlcgotZnJvbSBzZWxlbml1bS53ZWJkcml2ZXIuY2hyb21lLm9wdGlv bnMgaW1wb3J0IE9wdGlvbnMKIAogCiBjbGFzcyBMaW51eENocm9tZURyaXZlcihMaW51eEJyb3dz ZXJEcml2ZXIpOgpAQCAtNDEsNiArMzksNyBAQCBjbGFzcyBMaW51eENocm9tZURyaXZlcihMaW51 eEJyb3dzZXJEcml2ZXIpOgogICAgICAgICBzdXBlcihMaW51eENocm9tZURyaXZlciwgc2VsZiku bGF1bmNoX3VybCh1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCkKIAogICAgIGRlZiBs YXVuY2hfZHJpdmVyKHNlbGYsIHVybCwgb3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKToKKyAg ICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQuc2VsZW5pdW0ud2Vi ZHJpdmVyLmNocm9tZS5vcHRpb25zIGltcG9ydCBPcHRpb25zCiAgICAgICAgIG9wdGlvbnMgPSBP cHRpb25zKCkKICAgICAgICAgb3B0aW9ucy5hZGRfYXJndW1lbnQoIi0tZGlzYWJsZS13ZWItc2Vj dXJpdHkiKQogICAgICAgICBvcHRpb25zLmFkZF9hcmd1bWVudCgiLS11c2VyLWRhdGEtZGlyIikK QEAgLTUwLDYgKzQ5LDcgQEAgY2xhc3MgTGludXhDaHJvbWVEcml2ZXIoTGludXhCcm93c2VyRHJp dmVyKToKICAgICAgICAgICAgIGJpbmFyeV9wYXRoID0gb3MucGF0aC5qb2luKGJyb3dzZXJfYnVp bGRfcGF0aCwgJ2Nocm9taXVtLWJyb3dzZXInKQogICAgICAgICAgICAgb3B0aW9ucy5iaW5hcnlf bG9jYXRpb24gPSBiaW5hcnlfcGF0aAogICAgICAgICBkcml2ZXJfZXhlY3V0YWJsZSA9IHNlbGYu d2ViZHJpdmVyX2JpbmFyeV9wYXRoCisgICAgICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5h dXRvaW5zdGFsbGVkLnNlbGVuaXVtIGltcG9ydCB3ZWJkcml2ZXIKICAgICAgICAgZHJpdmVyID0g d2ViZHJpdmVyLkNocm9tZShjaHJvbWVfb3B0aW9ucz1vcHRpb25zLCBleGVjdXRhYmxlX3BhdGg9 ZHJpdmVyX2V4ZWN1dGFibGUpCiAgICAgICAgIHN1cGVyKExpbnV4Q2hyb21lRHJpdmVyLCBzZWxm KS5sYXVuY2hfd2ViZHJpdmVyKHVybCwgZHJpdmVyKQogICAgICAgICByZXR1cm4gZHJpdmVyCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nl cl9kcml2ZXIvbGludXhfZmlyZWZveF9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvbGludXhfZmlyZWZveF9kcml2ZXIucHkK aW5kZXggNmJlYTE3MjgxNzguLmRlZTk3NTQ1NmU1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvbGludXhfZmlyZWZveF9k cml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jy b3dzZXJfZHJpdmVyL2xpbnV4X2ZpcmVmb3hfZHJpdmVyLnB5CkBAIC0yNyw4ICsyNyw2IEBACiBp bXBvcnQgb3MKIAogZnJvbSBsaW51eF9icm93c2VyX2RyaXZlciBpbXBvcnQgTGludXhCcm93c2Vy RHJpdmVyCi1mcm9tIHNlbGVuaXVtIGltcG9ydCB3ZWJkcml2ZXIKLWZyb20gc2VsZW5pdW0ud2Vi ZHJpdmVyLmZpcmVmb3gub3B0aW9ucyBpbXBvcnQgT3B0aW9ucwogCiAKIGNsYXNzIExpbnV4Rmly ZWZveERyaXZlcihMaW51eEJyb3dzZXJEcml2ZXIpOgpAQCAtNDMsMTEgKzQxLDEzIEBAIGNsYXNz IExpbnV4RmlyZWZveERyaXZlcihMaW51eEJyb3dzZXJEcml2ZXIpOgogICAgICAgICBzdXBlcihM aW51eEZpcmVmb3hEcml2ZXIsIHNlbGYpLmxhdW5jaF91cmwodXJsLCBvcHRpb25zLCBicm93c2Vy X2J1aWxkX3BhdGgpCiAKICAgICBkZWYgbGF1bmNoX2RyaXZlcihzZWxmLCB1cmwsIG9wdGlvbnMs IGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAgIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5h dXRvaW5zdGFsbGVkLnNlbGVuaXVtLndlYmRyaXZlci5maXJlZm94Lm9wdGlvbnMgaW1wb3J0IE9w dGlvbnMKICAgICAgICAgb3B0aW9ucyA9IE9wdGlvbnMoKQogICAgICAgICBpZiBicm93c2VyX2J1 aWxkX3BhdGg6CiAgICAgICAgICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGguam9pbihicm93c2Vy X2J1aWxkX3BhdGgsICdmaXJlZm94LWJpbicpCiAgICAgICAgICAgICBvcHRpb25zLmJpbmFyeV9s b2NhdGlvbiA9IGJpbmFyeV9wYXRoCiAgICAgICAgIGRyaXZlcl9leGVjdXRhYmxlID0gc2VsZi53 ZWJkcml2ZXJfYmluYXJ5X3BhdGgKKyAgICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1 dG9pbnN0YWxsZWQuc2VsZW5pdW0gaW1wb3J0IHdlYmRyaXZlcgogICAgICAgICBkcml2ZXIgPSB3 ZWJkcml2ZXIuRmlyZWZveChmaXJlZm94X29wdGlvbnM9b3B0aW9ucywgZXhlY3V0YWJsZV9wYXRo PWRyaXZlcl9leGVjdXRhYmxlKQogICAgICAgICBzdXBlcihMaW51eEZpcmVmb3hEcml2ZXIsIHNl bGYpLmxhdW5jaF93ZWJkcml2ZXIodXJsLCBkcml2ZXIpCiAgICAgICAgIHJldHVybiBkcml2ZXIK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93 c2VyX2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weQppbmRl eCAwMTNiMTAwNjY4Ni4uYzY3MDY2YmJhZmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9k cml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkKQEAgLTQsMTkgKzQsMTEgQEAgaW1wb3J0IGxvZ2dp bmcKIGltcG9ydCBvcwogCiBmcm9tIG9zeF9icm93c2VyX2RyaXZlciBpbXBvcnQgT1NYQnJvd3Nl ckRyaXZlcgotZnJvbSBzZWxlbml1bSBpbXBvcnQgd2ViZHJpdmVyCi1mcm9tIHNlbGVuaXVtLndl YmRyaXZlci5jaHJvbWUub3B0aW9ucyBpbXBvcnQgT3B0aW9ucwogCiAKIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKIHdpbmRvd19zaXplX2FyZyA9ICctLXdpbmRvdy1zaXplPXt3 aWR0aH0se2hlaWdodH0nLmZvcm1hdCh3aWR0aD1pbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVu X3NpemUoKS53aWR0aCksIGhlaWdodD1pbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUo KS5oZWlnaHQpKQogYXJncyA9IFsnLS1hcmdzJywgJy0taG9tZXBhZ2UnLCB3aW5kb3dfc2l6ZV9h cmddCi1jaHJvbWVfb3B0aW9ucyA9IE9wdGlvbnMoKQotY2hyb21lX29wdGlvbnMuYWRkX2FyZ3Vt ZW50KCItLWRpc2FibGUtd2ViLXNlY3VyaXR5IikKLWNocm9tZV9vcHRpb25zLmFkZF9hcmd1bWVu dCgiLS11c2VyLWRhdGEtZGlyIikKLWNocm9tZV9vcHRpb25zLmFkZF9hcmd1bWVudCgiLS1kaXNh YmxlLWV4dGVuc2lvbnMiKQotY2hyb21lX29wdGlvbnMuYWRkX2FyZ3VtZW50KHdpbmRvd19zaXpl X2FyZykKLQogCiBjbGFzcyBPU1hDaHJvbWVEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CiAgICAg cHJvY2Vzc19uYW1lID0gJ0dvb2dsZSBDaHJvbWUnCkBAIC0yOCwxMSArMjAsMTMgQEAgY2xhc3Mg T1NYQ2hyb21lRHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgICAgICBzZWxmLl9sYXVuY2hf cHJvY2VzcyhidWlsZF9kaXI9YnJvd3Nlcl9idWlsZF9wYXRoLCBhcHBfbmFtZT1zZWxmLmFwcF9u YW1lLCB1cmw9dXJsLCBhcmdzPWFyZ3Nfd2l0aF91cmwpCiAKICAgICBkZWYgbGF1bmNoX2RyaXZl cihzZWxmLCB1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAgIGNocm9t ZV9vcHRpb25zID0gY3JlYXRlX2Nocm9tZV9vcHRpb25zKCkKICAgICAgICAgaWYgYnJvd3Nlcl9i dWlsZF9wYXRoOgogICAgICAgICAgICAgYXBwX3BhdGggPSBvcy5wYXRoLmpvaW4oYnJvd3Nlcl9i dWlsZF9wYXRoLCBzZWxmLmFwcF9uYW1lKQogICAgICAgICAgICAgYmluYXJ5X3BhdGggPSBvcy5w YXRoLmpvaW4oYXBwX3BhdGgsICJDb250ZW50cy9NYWNPUyIsIHNlbGYucHJvY2Vzc19uYW1lKQog ICAgICAgICAgICAgY2hyb21lX29wdGlvbnMuYmluYXJ5X2xvY2F0aW9uID0gYmluYXJ5X3BhdGgK ICAgICAgICAgZHJpdmVyX2V4ZWN1dGFibGUgPSBzZWxmLndlYmRyaXZlcl9iaW5hcnlfcGF0aAor ICAgICAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5zZWxlbml1bSBp bXBvcnQgd2ViZHJpdmVyCiAgICAgICAgIGRyaXZlciA9IHdlYmRyaXZlci5DaHJvbWUoY2hyb21l X29wdGlvbnM9Y2hyb21lX29wdGlvbnMsIGV4ZWN1dGFibGVfcGF0aD1kcml2ZXJfZXhlY3V0YWJs ZSkKICAgICAgICAgc2VsZi5fbGF1bmNoX3dlYmRyaXZlcih1cmw9dXJsLCBkcml2ZXI9ZHJpdmVy KQogICAgICAgICByZXR1cm4gZHJpdmVyCkBAIC00OCwxMiArNDIsMjQgQEAgY2xhc3MgT1NYQ2hy b21lQ2FuYXJ5RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgICAgICBzZWxmLl9sYXVuY2hf cHJvY2VzcyhidWlsZF9kaXI9YnJvd3Nlcl9idWlsZF9wYXRoLCBhcHBfbmFtZT1zZWxmLmFwcF9u YW1lLCB1cmw9dXJsLCBhcmdzPWFyZ3Nfd2l0aF91cmwpCiAKICAgICBkZWYgbGF1bmNoX2RyaXZl cihzZWxmLCB1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAgIGNocm9t ZV9vcHRpb25zID0gY3JlYXRlX2Nocm9tZV9vcHRpb25zKCkKICAgICAgICAgaWYgbm90IGJyb3dz ZXJfYnVpbGRfcGF0aDoKICAgICAgICAgICAgIGJyb3dzZXJfYnVpbGRfcGF0aCA9ICcvQXBwbGlj YXRpb25zLycKICAgICAgICAgYXBwX3BhdGggPSBvcy5wYXRoLmpvaW4oYnJvd3Nlcl9idWlsZF9w YXRoLCBzZWxmLmFwcF9uYW1lKQogICAgICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGguam9pbihh cHBfcGF0aCwgIkNvbnRlbnRzL01hY09TIiwgc2VsZi5wcm9jZXNzX25hbWUpCiAgICAgICAgIGNo cm9tZV9vcHRpb25zLmJpbmFyeV9sb2NhdGlvbiA9IGJpbmFyeV9wYXRoCiAgICAgICAgIGRyaXZl cl9leGVjdXRhYmxlID0gc2VsZi53ZWJkcml2ZXJfYmluYXJ5X3BhdGgKKyAgICAgICAgZnJvbSB3 ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQuc2VsZW5pdW0gaW1wb3J0IHdlYmRyaXZl cgogICAgICAgICBkcml2ZXIgPSB3ZWJkcml2ZXIuQ2hyb21lKGNocm9tZV9vcHRpb25zPWNocm9t ZV9vcHRpb25zLCBleGVjdXRhYmxlX3BhdGg9ZHJpdmVyX2V4ZWN1dGFibGUpCiAgICAgICAgIHNl bGYuX2xhdW5jaF93ZWJkcml2ZXIodXJsPXVybCwgZHJpdmVyPWRyaXZlcikKICAgICAgICAgcmV0 dXJuIGRyaXZlcgorCisKK2RlZiBjcmVhdGVfY2hyb21lX29wdGlvbnMoKToKKyAgICBmcm9tIHdl YmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5zZWxlbml1bS53ZWJkcml2ZXIuY2hyb21l Lm9wdGlvbnMgaW1wb3J0IE9wdGlvbnMKKyAgICBjaHJvbWVfb3B0aW9ucyA9IE9wdGlvbnMoKQor ICAgIGNocm9tZV9vcHRpb25zLmFkZF9hcmd1bWVudCgiLS1kaXNhYmxlLXdlYi1zZWN1cml0eSIp CisgICAgY2hyb21lX29wdGlvbnMuYWRkX2FyZ3VtZW50KCItLXVzZXItZGF0YS1kaXIiKQorICAg IGNocm9tZV9vcHRpb25zLmFkZF9hcmd1bWVudCgiLS1kaXNhYmxlLWV4dGVuc2lvbnMiKQorICAg IGNocm9tZV9vcHRpb25zLmFkZF9hcmd1bWVudCh3aW5kb3dfc2l6ZV9hcmcpCisgICAgcmV0dXJu IGNocm9tZV9vcHRpb25zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hfZHJpdmVyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9maXJl Zm94X2RyaXZlci5weQppbmRleCA2N2FmZTgzOWE0Yi4uNTRhMDU2YjBmZTYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9v c3hfZmlyZWZveF9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9maXJlZm94X2RyaXZlci5weQpAQCAtNCwxNCAr NCwxMSBAQCBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9zCiAKIGZyb20gb3N4X2Jyb3dzZXJfZHJp dmVyIGltcG9ydCBPU1hCcm93c2VyRHJpdmVyCi1mcm9tIHNlbGVuaXVtIGltcG9ydCB3ZWJkcml2 ZXIKLWZyb20gc2VsZW5pdW0ud2ViZHJpdmVyLmZpcmVmb3gub3B0aW9ucyBpbXBvcnQgT3B0aW9u cwogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogYXJncyA9IFsnLS1h cmdzJywgJy13aWR0aCcsIHN0cihpbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS53 aWR0aCkpLCAnLWhlaWdodCcsIHN0cihpbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUo KS5oZWlnaHQpKV0KLWZpcmVmb3hfb3B0aW9ucyA9IE9wdGlvbnMoKQogCiAKIGNsYXNzIE9TWEZp cmVmb3hEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CkBAIC0yNCwxMSArMjEsMTQgQEAgY2xhc3Mg T1NYRmlyZWZveERyaXZlcihPU1hCcm93c2VyRHJpdmVyKToKICAgICAgICAgc2VsZi5fbGF1bmNo X3Byb2Nlc3MoYnVpbGRfZGlyPWJyb3dzZXJfYnVpbGRfcGF0aCwgYXBwX25hbWU9c2VsZi5hcHBf bmFtZSwgdXJsPXVybCwgYXJncz1hcmdzX3dpdGhfdXJsKQogCiAgICAgZGVmIGxhdW5jaF9kcml2 ZXIoc2VsZiwgdXJsLCBvcHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgorICAgICAgICBmcm9t IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5zZWxlbml1bS53ZWJkcml2ZXIuZmly ZWZveC5vcHRpb25zIGltcG9ydCBPcHRpb25zCisgICAgICAgIGZpcmVmb3hfb3B0aW9ucyA9IE9w dGlvbnMoKQogICAgICAgICBpZiBicm93c2VyX2J1aWxkX3BhdGg6CiAgICAgICAgICAgICBhcHBf cGF0aCA9IG9zLnBhdGguam9pbihicm93c2VyX2J1aWxkX3BhdGgsIHNlbGYuYXBwX25hbWUpCiAg ICAgICAgICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGguam9pbihhcHBfcGF0aCwgIkNvbnRlbnRz L01hY09TIiwgc2VsZi5wcm9jZXNzX25hbWUpCiAgICAgICAgICAgICBmaXJlZm94X29wdGlvbnMu YmluYXJ5X2xvY2F0aW9uID0gYmluYXJ5X3BhdGgKICAgICAgICAgZHJpdmVyX2V4ZWN1dGFibGUg PSBzZWxmLndlYmRyaXZlcl9iaW5hcnlfcGF0aAorICAgICAgICBmcm9tIHdlYmtpdHB5LnRoaXJk cGFydHkuYXV0b2luc3RhbGxlZC5zZWxlbml1bSBpbXBvcnQgd2ViZHJpdmVyCiAgICAgICAgIGRy aXZlciA9IHdlYmRyaXZlci5GaXJlZm94KGZpcmVmb3hfb3B0aW9ucz1maXJlZm94X29wdGlvbnMs IGV4ZWN1dGFibGVfcGF0aD1kcml2ZXJfZXhlY3V0YWJsZSkKICAgICAgICAgc2VsZi5fbGF1bmNo X3dlYmRyaXZlcih1cmw9dXJsLCBkcml2ZXI9ZHJpdmVyKQogICAgICAgICByZXR1cm4gZHJpdmVy CkBAIC00NCwxMiArNDQsMTUgQEAgY2xhc3MgT1NYRmlyZWZveE5pZ2h0bHlEcml2ZXIoT1NYQnJv d3NlckRyaXZlcik6CiAgICAgICAgIHNlbGYuX2xhdW5jaF9wcm9jZXNzKGJ1aWxkX2Rpcj1icm93 c2VyX2J1aWxkX3BhdGgsIGFwcF9uYW1lPXNlbGYuYXBwX25hbWUsIHVybD11cmwsIGFyZ3M9YXJn c193aXRoX3VybCkKIAogICAgIGRlZiBsYXVuY2hfZHJpdmVyKHNlbGYsIHVybCwgb3B0aW9ucywg YnJvd3Nlcl9idWlsZF9wYXRoKToKKyAgICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1 dG9pbnN0YWxsZWQuc2VsZW5pdW0ud2ViZHJpdmVyLmZpcmVmb3gub3B0aW9ucyBpbXBvcnQgT3B0 aW9ucworICAgICAgICBmaXJlZm94X29wdGlvbnMgPSBPcHRpb25zKCkKICAgICAgICAgaWYgbm90 IGJyb3dzZXJfYnVpbGRfcGF0aDoKICAgICAgICAgICAgIGJyb3dzZXJfYnVpbGRfcGF0aCA9ICcv QXBwbGljYXRpb25zLycKICAgICAgICAgYXBwX3BhdGggPSBvcy5wYXRoLmpvaW4oYnJvd3Nlcl9i dWlsZF9wYXRoLCBzZWxmLmFwcF9uYW1lKQogICAgICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGgu am9pbihhcHBfcGF0aCwgIkNvbnRlbnRzL01hY09TIiwgc2VsZi5wcm9jZXNzX25hbWUpCiAgICAg ICAgIGZpcmVmb3hfb3B0aW9ucy5iaW5hcnlfbG9jYXRpb24gPSBiaW5hcnlfcGF0aAogICAgICAg ICBkcml2ZXJfZXhlY3V0YWJsZSA9IHNlbGYud2ViZHJpdmVyX2JpbmFyeV9wYXRoCisgICAgICAg IGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnNlbGVuaXVtIGltcG9ydCB3 ZWJkcml2ZXIKICAgICAgICAgZHJpdmVyID0gd2ViZHJpdmVyLkZpcmVmb3goZmlyZWZveF9vcHRp b25zPWZpcmVmb3hfb3B0aW9ucywgZXhlY3V0YWJsZV9wYXRoPWRyaXZlcl9leGVjdXRhYmxlKQog ICAgICAgICBzZWxmLl9sYXVuY2hfd2ViZHJpdmVyKHVybD11cmwsIGRyaXZlcj1kcml2ZXIpCiAg ICAgICAgIHJldHVybiBkcml2ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hf c2FmYXJpX2RyaXZlci5weQppbmRleCA4OWEyZjA2ZDQ5Ny4uYzZhMGM0YTNmNzggMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZl ci9vc3hfc2FmYXJpX2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHkKQEAgLTcsNyAr Nyw2IEBAIGltcG9ydCB0aW1lCiAKIGZyb20gb3N4X2Jyb3dzZXJfZHJpdmVyIGltcG9ydCBPU1hC cm93c2VyRHJpdmVyCiBmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIudXRpbHMgaW1wb3J0 IGZvcmNlX3JlbW92ZQotZnJvbSBzZWxlbml1bSBpbXBvcnQgd2ViZHJpdmVyCiAKIAogX2xvZyA9 IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtNDYsNiArNDUsNyBAQCBjbGFzcyBPU1hT YWZhcmlEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CiAgICAgICAgIHN1YnByb2Nlc3MuUG9wZW4o WydvcGVuJywgJy1hJywgYXJnc1swXSwgdXJsXSkKIAogICAgIGRlZiBsYXVuY2hfZHJpdmVyKHNl bGYsIHVybCwgb3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKToKKyAgICAgICAgZnJvbSB3ZWJr aXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQuc2VsZW5pdW0gaW1wb3J0IHdlYmRyaXZlcgog ICAgICAgICBkcml2ZXIgPSB3ZWJkcml2ZXIuU2FmYXJpKHF1aWV0PUZhbHNlKQogICAgICAgICBz ZWxmLl9sYXVuY2hfd2ViZHJpdmVyKHVybD11cmwsIGRyaXZlcj1kcml2ZXIpCiAgICAgICAgIHJl dHVybiBkcml2ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci93ZWJkcml2ZXJfYmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci93ZWJkcml2ZXJfYmVuY2htYXJrX3J1bm5lci5weQppbmRl eCAxZWI1M2Y5OTY2Zi4uODJjMWQ0MWIyMTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci93ZWJkcml2ZXJfYmVuY2htYXJrX3J1bm5lci5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvd2ViZHJpdmVyX2JlbmNo bWFya19ydW5uZXIucHkKQEAgLTQsNyArNCw2IEBAIGltcG9ydCBqc29uCiBpbXBvcnQgbG9nZ2lu ZwogCiBmcm9tIGJlbmNobWFya19ydW5uZXIgaW1wb3J0IEJlbmNobWFya1J1bm5lcgotZnJvbSBz ZWxlbml1bS53ZWJkcml2ZXIuc3VwcG9ydC51aSBpbXBvcnQgV2ViRHJpdmVyV2FpdAogCiAKIF9s b2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKQEAgLTE4LDYgKzE3LDcgQEAgY2xhc3Mg V2ViRHJpdmVyQmVuY2htYXJrUnVubmVyKEJlbmNobWFya1J1bm5lcik6CiAgICAgICAgIHJldHVy biByZXN1bHQKIAogICAgIGRlZiBfcnVuX29uZV90ZXN0KHNlbGYsIHdlYl9yb290LCB0ZXN0X2Zp bGUpOgorICAgICAgICBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5zZWxl bml1bS53ZWJkcml2ZXIuc3VwcG9ydC51aSBpbXBvcnQgV2ViRHJpdmVyV2FpdAogICAgICAgICBy ZXN1bHQgPSBOb25lCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHVybCA9ICdmaWxlOi8ve3Jv b3R9L3twbGFuX25hbWV9L3t0ZXN0X2ZpbGV9Jy5mb3JtYXQocm9vdD13ZWJfcm9vdCwgcGxhbl9u YW1lPXNlbGYuX3BsYW5fbmFtZSwgdGVzdF9maWxlPXRlc3RfZmlsZSkK