153993 2016-02-08 10:53:12 -0800 [GTK] Allow to run the WebKitGTK+ MiniBrowser with the run-benchmark script. 2016-02-26 22:19:10 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 154595 1 clopez clopez bugs-noreply cgarcia commit-queue darin dewei_zhu glenn lforschler mcatanzaro rniwa oldest_to_newest 1162924 0 clopez 2016-02-08 10:53:12 -0800 As stated on https://lists.webkit.org/pipermail/webkit-dev/2016-February/027948.html we would like to implement support on the run-benchmark script to execute the tests also with the WebKitGTK+ MiniBrowser. 1167387 1 272015 clopez 2016-02-23 07:09:58 -0800 Created attachment 272015 Patch 1167388 2 commit-queue 2016-02-23 07:11:43 -0800 Attachment 272015 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:89: [SimpleHTTPServerDriver.kill_server] Instance of 'Popen' has no 'terminate' member [pylint/E1101] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1167402 3 272015 cgarcia 2016-02-23 08:44:23 -0800 Comment on attachment 272015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272015&action=review Thanks for the patch! > Tools/MiniBrowser/gtk/main.c:43 > +static char *geometry = NULL; This doesn't need to be initialized, since all those statics are already 0 initialized. > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/gtk_minibrowser_driver.py:45 > + args.append("%s" % url) I guess this could just be args.append(url) > Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:88 > + if self._server_process.poll() == None: is None > Tools/Scripts/webkitpy/benchmark_runner/utils.py:28 > + filelist = os.listdir(dirname) > + filelist.remove(base_class_file) > + filelist.insert(0, base_class_file) > + for filename in filelist: > if not filename.endswith('.py') or filename in ['__init__.py']: > continue > module_name = filename[:-3] I think this could be simplified as something like this: filelist = [base_class_file] + [f for f in os.listdir(dirname) if f.endswith('.py') and f not in ['__init__.py', base_class_file]] for filename in filelist: module_name = os.path.splitext(filename)[0] 1167430 4 clopez 2016-02-23 09:38:42 -0800 Committed r196979: <http://trac.webkit.org/changeset/196979> 1167435 5 272015 clopez 2016-02-23 09:44:29 -0800 Comment on attachment 272015 Patch Clearing flags 1168841 6 mcatanzaro 2016-02-26 22:19:10 -0800 Committed r197241: <http://trac.webkit.org/changeset/197241> 272015 2016-02-23 07:09:58 -0800 2016-02-23 09:44:29 -0800 Patch bug-153993-20160223160939.patch text/plain 14390 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTc0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDhhYjc2YWU2MzI0ZDM5NDI3NGNjNThhNmMyMDU5Nzc1 ODFlMGNiMi4uMWE5NDM4OTYwZmNmMzBiMTBjZmEzYzI0ZTdmOTc0NjMwNGY4ZGVhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQw IEBACisyMDE2LTAyLTIzICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIEFsbG93IHRvIHJ1biB0aGUgV2ViS2l0R1RLKyBNaW5p QnJvd3NlciB3aXRoIHRoZSBydW4tYmVuY2htYXJrIHNjcmlwdC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzk5MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoK KyAgICAgICAgKGNyZWF0ZUJyb3dzZXJXaW5kb3cpOiBTdXBwb3J0IC0tZ2VvbWV0cnkgYXJndW1l bnQgZm9yIE1pbmlCcm93c2VyLgorICAgICAgICBXZSB1c2UgdGhpcyBvbiB0aGUgZ3RrX21pbmli cm93c2VyX2RyaXZlciBzY3JpcHQgdG8gc3RhcnQgdGhlIE1pbmlCcm93c2VyIG1heGltaXplZC4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2 ZXIvX19pbml0X18ucHk6IEZpeCBsb2FkaW5nIG9mIHN1YmNsYXNzZXM6CisgICAgICAgIFRoZSBi YXNlIGNsYXNzIGhhcyB0byBiZSBsb2FkZWQgZmlyc3QsIG90aGVyd2lzZSBhbnkgc3ViY2xhc2Ug cmVmZXJlbmNpbmcgaXQgd2lsbCBnaXZlIGltcG9ydCBlcnJvci4KKyAgICAgICAgSW4gT1NYIHRo ZSBvcmRlcmluZyBvZiBvcy5saXN0ZGlyKCkgY2F1c2VzIHRoZSBiYXNlIGNsYXNzIChicm93c2Vy X2RyaXZlci5weSkgdG8gYmUgZmlyc3Qgb24gdGhlIGxpc3QsIGJ1dCBub3Qgb24gTGludXguCisg ICAgICAgIEJ5IHNwZWNpZml5aW5nIHRoZSBuYW1lIG9mIHRoZSBiYXNlIGNsYXNzIGZpbGUsIHdl IGVuc3VyZSBpdCBpcyBhbHdheXMgbG9hZGVkIGZpcnN0IG9uIGFueSBzeXN0ZW0gZGVzcGl0ZSB0 aGUgb3JkZXJpbmcgb2YgbGlzdGRpci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvYnJvd3Nlcl9kcml2ZXJfZmFjdG9yeS5weToKKyAg ICAgICAgKEJyb3dzZXJEcml2ZXJGYWN0b3J5LmNyZWF0ZSk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL2d0a19icm93c2VyX2RyaXZl ci5weTogQWRkZWQuCisgICAgICAgIChHVEtCcm93c2VyRHJpdmVyKToKKyAgICAgICAgKEdUS0Jy b3dzZXJEcml2ZXIucHJlcGFyZV9lbnYpOgorICAgICAgICAoR1RLQnJvd3NlckRyaXZlci5yZXN0 b3JlX2Vudik6CisgICAgICAgIChHVEtCcm93c2VyRHJpdmVyLmNsb3NlX2Jyb3dzZXJzKToKKyAg ICAgICAgKEdUS0Jyb3dzZXJEcml2ZXIuX2xhdW5jaF9wcm9jZXNzKToKKyAgICAgICAgKEdUS0Jy b3dzZXJEcml2ZXIuX3Rlcm1pbmF0ZV9wcm9jZXNzZXMpOgorICAgICAgICAoR1RLQnJvd3NlckRy aXZlci5fc2NyZWVuX3NpemUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9icm93c2VyX2RyaXZlci9ndGtfbWluaWJyb3dzZXJfZHJpdmVyLnB5OiBBZGRlZC4K KyAgICAgICAgKEdUS01pbmlCcm93c2VyRHJpdmVyKToKKyAgICAgICAgKEdUS01pbmlCcm93c2Vy RHJpdmVyLnByZXBhcmVfZW52KToKKyAgICAgICAgKEdUS01pbmlCcm93c2VyRHJpdmVyLmxhdW5j aF91cmwpOgorICAgICAgICAoR1RLTWluaUJyb3dzZXJEcml2ZXIuY2xvc2VfYnJvd3NlcnMpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9k cml2ZXIvX19pbml0X18ucHk6IEZpeCBsb2FkaW5nIG9mIHN1YmNsYXNzZXMuIFNlZSBkZXNjcmlw dGlvbiBhYm92ZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv aHR0cF9zZXJ2ZXJfZHJpdmVyL3NpbXBsZV9odHRwX3NlcnZlcl9kcml2ZXIucHk6CisgICAgICAg IChTaW1wbGVIVFRQU2VydmVyRHJpdmVyKToKKyAgICAgICAgKFNpbXBsZUhUVFBTZXJ2ZXJEcml2 ZXIua2lsbF9zZXJ2ZXIpOiBDaGVjayBpZiB0aGUgc2VydmVyIGlzIHN0aWxsIHJ1bm5pbmcgYmVm b3JlIHRyeWluZyB0byB0ZXJtaW5hdGUgaXQuCisgICAgICAgIFVzdWFsbHkgdGhlIHNlcnZlciBl bmRzIGdyYWNlZnVsbHkgKG5vIG5lZWQgdG8gdGVybWluYXRlIGl0KSwgc28gdGhpcyB3YXMgY2F1 c2luZyB1Z2x5IGVycm9ycyBvbiB0aGUgbG9nLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci91dGlscy5weTogRml4IGxvYWRpbmcgb2Ygc3ViY2xhc3Nlcy4gU2Vl IGRlc2NyaXB0aW9uIGFib3ZlLgorICAgICAgICAobG9hZF9zdWJjbGFzc2VzKToKKwogMjAxNi0w Mi0yMyAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBNaXNzaW5nIGNvbmZpZ3VyYXRpb24gcGF0Y2ggZm9yIG9wZW5oMjY0IGNvbXBpbGF0aW9u CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jIGIvVG9vbHMvTWluaUJy b3dzZXIvZ3RrL21haW4uYwppbmRleCAzZjgzYjU1MzIyODhhYThmN2ZiZjBmNWJmOWY3YjNjNDBl NTQ4YWIzLi4yNGRiNGQ3N2EzODFhMmIxZTBjODc4YzAzZDYwYjZkYTI5OTk1ZWJlIDEwMDY0NAot LS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2Vy L2d0ay9tYWluLmMKQEAgLTQwLDYgKzQwLDcgQEAgc3RhdGljIGNvbnN0IGNoYXIgKm1pbmlCcm93 c2VyQWJvdXRTY2hlbWUgPSAibWluaWJyb3dzZXItYWJvdXQiOwogc3RhdGljIEdka1JHQkEgKmJh Y2tncm91bmRDb2xvcjsKIHN0YXRpYyBnYm9vbGVhbiBlZGl0b3JNb2RlOwogc3RhdGljIGNvbnN0 IGNoYXIgKnNlc3Npb25GaWxlOworc3RhdGljIGNoYXIgKmdlb21ldHJ5ID0gTlVMTDsKIAogdHlw ZWRlZiBlbnVtIHsKICAgICBNSU5JX0JST1dTRVJfRVJST1JfSU5WQUxJRF9BQk9VVF9QQVRICkBA IC02Nyw2ICs2OCw4IEBAIHN0YXRpYyB2b2lkIGNyZWF0ZUJyb3dzZXJXaW5kb3coY29uc3QgZ2No YXIgKnVyaSwgV2ViS2l0U2V0dGluZ3MgKndlYmtpdFNldHRpbmdzCiAgICAgR3RrV2lkZ2V0ICpt YWluV2luZG93ID0gYnJvd3Nlcl93aW5kb3dfbmV3KFdFQktJVF9XRUJfVklFVyh3ZWJWaWV3KSwg TlVMTCk7CiAgICAgaWYgKGJhY2tncm91bmRDb2xvcikKICAgICAgICAgYnJvd3Nlcl93aW5kb3df c2V0X2JhY2tncm91bmRfY29sb3IoQlJPV1NFUl9XSU5ET1cobWFpbldpbmRvdyksIGJhY2tncm91 bmRDb2xvcik7CisgICAgaWYgKGdlb21ldHJ5KQorICAgICAgICBndGtfd2luZG93X3BhcnNlX2dl b21ldHJ5KEJST1dTRVJfV0lORE9XKG1haW5XaW5kb3cpLCBnZW9tZXRyeSk7CiAKICAgICBpZiAo d2Via2l0U2V0dGluZ3MpCiAgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXRfc2V0dGluZ3MoV0VC S0lUX1dFQl9WSUVXKHdlYlZpZXcpLCB3ZWJraXRTZXR0aW5ncyk7CkBAIC0xMDIsNiArMTA1LDcg QEAgc3RhdGljIGNvbnN0IEdPcHRpb25FbnRyeSBjb21tYW5kTGluZU9wdGlvbnNbXSA9CiAgICAg eyAiYmctY29sb3IiLCAwLCAwLCBHX09QVElPTl9BUkdfQ0FMTEJBQ0ssIHBhcnNlQmFja2dyb3Vu ZENvbG9yLCAiQmFja2dyb3VuZCBjb2xvciIsIE5VTEwgfSwKICAgICB7ICJlZGl0b3ItbW9kZSIs ICdlJywgMCwgR19PUFRJT05fQVJHX05PTkUsICZlZGl0b3JNb2RlLCAiUnVuIGluIGVkaXRvciBt b2RlIiwgTlVMTCB9LAogICAgIHsgInNlc3Npb24tZmlsZSIsICdzJywgMCwgR19PUFRJT05fQVJH X0ZJTEVOQU1FLCAmc2Vzc2lvbkZpbGUsICJTZXNzaW9uIGZpbGUiLCAiRklMRSIgfSwKKyAgICB7 ICJnZW9tZXRyeSIsICdnJywgMCwgR19PUFRJT05fQVJHX1NUUklORywgJmdlb21ldHJ5LCAiU2V0 IHRoZSBzaXplIGFuZCBwb3NpdGlvbiBvZiB0aGUgd2luZG93IChXSURUSHhIRUlHSFQrWCtZKSIs ICJHRU9NRVRSWSIgfSwKICAgICB7IEdfT1BUSU9OX1JFTUFJTklORywgMCwgMCwgR19PUFRJT05f QVJHX0ZJTEVOQU1FX0FSUkFZLCAmdXJpQXJndW1lbnRzLCAwLCAiW1VSTOKApl0iIH0sCiAgICAg eyAwLCAwLCAwLCAwLCAwLCAwLCAwIH0KIH07CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvX19pbml0X18ucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvX19pbml0 X18ucHkKaW5kZXggMDEzYzI2NWU2NDA3MjI0ZTM5NjE1YmZjMmNlZTVjMmFjMWJmNzI3Zi4uNmEz M2RkNTkwMzA2NDkwOTZmMjc2NWM5OWE1NGQxNGUxNzdlZDJmMCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL19faW5pdF9f LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2Vy X2RyaXZlci9fX2luaXRfXy5weQpAQCAtMjUsNCArMjUsNSBAQCBkZWYgYnJvd3Nlcl9kcml2ZXJf bG9hZGVyKGJyb3dzZXJfZHJpdmVyX2NsYXNzKToKIGxvYWRfc3ViY2xhc3NlcygKICAgICBkaXJu YW1lPW9zLnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxlX18pKSwKICAgICBiYXNl X2NsYXNzX25hbWU9J0Jyb3dzZXJEcml2ZXInLAorICAgIGJhc2VfY2xhc3NfZmlsZT0nYnJvd3Nl cl9kcml2ZXIucHknLAogICAgIGxvYWRlcj1icm93c2VyX2RyaXZlcl9sb2FkZXIpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2 ZXIvYnJvd3Nlcl9kcml2ZXJfZmFjdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9icm93c2VyX2RyaXZlcl9mYWN0b3J5LnB5Cmlu ZGV4IDdiMjU1ZDc4MTE3MDE3MmUwMWI5NDg4ZjdjN2U5ODgxOTk2ZTU0YjMuLmNlZTE2NGRhOTMx OGI4YjNmYzI2YTNiNDlkOWIxN2FjMmI5YWE2NmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9icm93c2VyX2RyaXZlcl9m YWN0b3J5LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9i cm93c2VyX2RyaXZlci9icm93c2VyX2RyaXZlcl9mYWN0b3J5LnB5CkBAIC0zMCw0ICszMCw2IEBA IGNsYXNzIEJyb3dzZXJEcml2ZXJGYWN0b3J5KG9iamVjdCk6CiAKICAgICBAY2xhc3NtZXRob2QK ICAgICBkZWYgY3JlYXRlKGNscywgcGxhdGZvcm0sIGJyb3dzZXJfbmFtZSk6CisgICAgICAgIGlm IGJyb3dzZXJfbmFtZSBub3QgaW4gY2xzLmJyb3dzZXJfZHJpdmVyc1twbGF0Zm9ybV06CisgICAg ICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJCcm93c2VyIFwiJXNcIiBpcyBub3QgYXZhaWxhYmxl IG9uIHBsYXRmb3JtIFwiJXNcIiIgJSAoYnJvd3Nlcl9uYW1lLCBwbGF0Zm9ybSkpCiAgICAgICAg IHJldHVybiBjbHMuYnJvd3Nlcl9kcml2ZXJzW3BsYXRmb3JtXVticm93c2VyX25hbWVdKCkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2Vy X2RyaXZlci9ndGtfYnJvd3Nlcl9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jl bmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvZ3RrX2Jyb3dzZXJfZHJpdmVyLnB5Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjBiMDhlYTZhOGQxM2FmOTE0YmIwYTA4MTY2M2M4NmUxNmM5ZGQ5NjMKLS0tIC9kZXYv bnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nl cl9kcml2ZXIvZ3RrX2Jyb3dzZXJfZHJpdmVyLnB5CkBAIC0wLDAgKzEsNjYgQEAKKyMgQ29weXJp Z2h0IChDKSAyMDE2IElnYWxpYSBTLkwuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor IworIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjCisj IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBD T05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisj IE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkK KyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IGxv Z2dpbmcKK2ltcG9ydCBzdWJwcm9jZXNzCitmcm9tIGJyb3dzZXJfZHJpdmVyIGltcG9ydCBCcm93 c2VyRHJpdmVyCisKK19sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKKworCitjbGFz cyBHVEtCcm93c2VyRHJpdmVyKEJyb3dzZXJEcml2ZXIpOgorICAgIHByb2Nlc3NfbmFtZSA9IE5v bmUKKyAgICBwbGF0Zm9ybSA9ICdndGsnCisKKyAgICBkZWYgcHJlcGFyZV9lbnYoc2VsZiwgZGV2 aWNlX2lkKToKKyAgICAgICAgc2VsZi5jbG9zZV9icm93c2VycygpCisKKyAgICBkZWYgcmVzdG9y ZV9lbnYoc2VsZik6CisgICAgICAgIHBhc3MKKworICAgIGRlZiBjbG9zZV9icm93c2VycyhzZWxm KToKKyAgICAgICAgc2VsZi5fdGVybWluYXRlX3Byb2Nlc3NlcyhzZWxmLnByb2Nlc3NfbmFtZSkK KworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBfbGF1bmNoX3Byb2Nlc3MoY2xzLCBhcmdzLCBl bnY9Tm9uZSk6CisgICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MpCisgICAg ICAgIHJldHVybiBwcm9jZXNzCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgX3Rlcm1pbmF0 ZV9wcm9jZXNzZXMoY2xzLCBwcm9jZXNzX25hbWUpOgorICAgICAgICBfbG9nLmluZm8oJ0Nsb3Np bmcgYWxsIHByb2Nlc3NlcyB3aXRoIG5hbWUgJXMnICUgcHJvY2Vzc19uYW1lKQorICAgICAgICBz dWJwcm9jZXNzLmNhbGwoWycvdXNyL2Jpbi9raWxsYWxsJywgcHJvY2Vzc19uYW1lXSkKKworICAg IEBjbGFzc21ldGhvZAorICAgIGRlZiBfc2NyZWVuX3NpemUoY2xzKToKKyAgICAgICAgIyBsb2Fk X3N1YmNsYXNzZXMoKSBmcm9tIF9faW5pdF9fLnB5IHdpbGwgbG9hZCB0aGlzIGZpbGUgdG8KKyAg ICAgICAgIyBjaGVjayB0aGUgcGxhdGZvcm0gZGVmaW5lZC4gRG8gaGVyZSBhIGxhenkgaW1wb3J0 IGluc3RlYWQgb2YKKyAgICAgICAgIyB0cnlpbmcgdG8gaW1wb3J0IHRoZSBHdGsgbW9kdWxlIG9u IHRoZSBnbG9iYWwgc2NvcGUgb2YgdGhpcworICAgICAgICAjIGZpbGUgdG8gYXZvaWQgSW1wb3J0 RXJyb3IgZXJyb3JzIG9uIG90aGVyIHBsYXRmb3Jtcy4KKyAgICAgICAgIyBQeXRob24gaW1wb3J0 cyBhcmUgY2FjaGVkIGFuZCBvbmx5IHJ1biBvbmNlLCBzbyB0aGlzIHNob3VsZCBiZSBvay4KKyAg ICAgICAgZnJvbSBnaS5yZXBvc2l0b3J5IGltcG9ydCBHdGsKKyAgICAgICAgc2NyZWVuID0gR3Rr LldpbmRvdygpLmdldF9zY3JlZW4oKQorICAgICAgICByZXR1cm4gc2NyZWVuLmdldF9tb25pdG9y X2dlb21ldHJ5KHNjcmVlbi5nZXRfcHJpbWFyeV9tb25pdG9yKCkpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvZ3RrX21p bmlicm93c2VyX2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9icm93c2VyX2RyaXZlci9ndGtfbWluaWJyb3dzZXJfZHJpdmVyLnB5Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjhjYjZlYTIyNWY5MmE3ODM2NzgxZWZkNDc0OGI4NzQ1ZjNjMGRjZDQKLS0tIC9kZXYvbnVsbAor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2 ZXIvZ3RrX21pbmlicm93c2VyX2RyaXZlci5weQpAQCAtMCwwICsxLDUyIEBACisjIENvcHlyaWdo dCAoQykgMjAxNiBJZ2FsaWEgUy5MLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMK KyMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIworIyBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09O VFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBP V05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisj IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBsb2dn aW5nCitpbXBvcnQgc3lzCitmcm9tIGd0a19icm93c2VyX2RyaXZlciBpbXBvcnQgR1RLQnJvd3Nl ckRyaXZlcgorCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCisKKworY2xhc3Mg R1RLTWluaUJyb3dzZXJEcml2ZXIoR1RLQnJvd3NlckRyaXZlcik6CisgICAgcHJvY2Vzc19uYW1l ID0gJ01pbmlCcm93c2VyJworICAgIGJyb3dzZXJfbmFtZSA9ICdtaW5pYnJvd3NlcicKKworICAg IGRlZiBwcmVwYXJlX2VudihzZWxmLCBkZXZpY2VfaWQpOgorICAgICAgICBzZWxmLl9taW5pYnJv d3Nlcl9wcm9jZXNzID0gTm9uZQorICAgICAgICBzdXBlcihHVEtNaW5pQnJvd3NlckRyaXZlciwg c2VsZikucHJlcGFyZV9lbnYoZGV2aWNlX2lkKQorCisgICAgZGVmIGxhdW5jaF91cmwoc2VsZiwg dXJsLCBicm93c2VyX2J1aWxkX3BhdGgpOgorICAgICAgICBhcmdzID0gWydUb29scy9TY3JpcHRz L3J1bi1taW5pYnJvd3NlcicsICctLWd0ayddCisgICAgICAgIGFyZ3MuYXBwZW5kKCItLWdlb21l dHJ5PSVzeCVzIiAlIChzZWxmLl9zY3JlZW5fc2l6ZSgpLndpZHRoLCBzZWxmLl9zY3JlZW5fc2l6 ZSgpLmhlaWdodCkpCisgICAgICAgIGFyZ3MuYXBwZW5kKCIlcyIgJSB1cmwpCisgICAgICAgIF9s b2cuaW5mbygnTGF1bmNoaW5nIE1pbmlicm93c2VyIHdpdGggdXJsOiAlcycgJSB1cmwpCisgICAg ICAgIHNlbGYuX21pbmlicm93c2VyX3Byb2Nlc3MgPSBHVEtCcm93c2VyRHJpdmVyLl9sYXVuY2hf cHJvY2VzcyhhcmdzKQorCisgICAgZGVmIGNsb3NlX2Jyb3dzZXJzKHNlbGYpOgorICAgICAgICBz dXBlcihHVEtNaW5pQnJvd3NlckRyaXZlciwgc2VsZikuY2xvc2VfYnJvd3NlcnMoKQorICAgICAg ICBpZiBzZWxmLl9taW5pYnJvd3Nlcl9wcm9jZXNzIGFuZCBzZWxmLl9taW5pYnJvd3Nlcl9wcm9j ZXNzLnJldHVybmNvZGU6CisgICAgICAgICAgICBzeXMuZXhpdCgnTWluaUJyb3dzZXIgY3Jhc2hl ZCB3aXRoIGV4aXRjb2RlICVkJyAlIHNlbGYuX21pbmlicm93c2VyX3Byb2Nlc3MucmV0dXJuY29k ZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9o dHRwX3NlcnZlcl9kcml2ZXIvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jl bmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL19faW5pdF9fLnB5CmluZGV4IGNiNTZh NTI4NzA2YjcyMWI4MWMzM2Q1MTZmYmU1NGMzMzJkZWNhY2EuLjkxNzMyYzQyMTlkNzYzMDM3MGRm ZTJkN2M1ZjQxYzE4MTQ2YTIzZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9odHRwX3NlcnZlcl9kcml2ZXIvX19pbml0X18ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9f X2luaXRfXy5weQpAQCAtMjYsNCArMjYsNSBAQCBkZWYgaHR0cF9zZXJ2ZXJfZHJpdmVyX2xvYWRl cihodHRwX3NlcnZlcl9kcml2ZXJfY2xhc3MpOgogbG9hZF9zdWJjbGFzc2VzKAogICAgIGRpcm5h bWU9b3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChfX2ZpbGVfXykpLAogICAgIGJhc2Vf Y2xhc3NfbmFtZT0nSFRUUFNlcnZlckRyaXZlcicsCisgICAgYmFzZV9jbGFzc19maWxlPSdodHRw X3NlcnZlcl9kcml2ZXIucHknLAogICAgIGxvYWRlcj1odHRwX3NlcnZlcl9kcml2ZXJfbG9hZGVy KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0 dHBfc2VydmVyX2RyaXZlci9zaW1wbGVfaHR0cF9zZXJ2ZXJfZHJpdmVyLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9zaW1wbGVf aHR0cF9zZXJ2ZXJfZHJpdmVyLnB5CmluZGV4IDNlYWQwNWVhNjc3NTUwM2ViMGFiNTQ0MWU2NDUy NjM5YTVjYjU1MGIuLjk4NjQ2YjdiZDRiZTMyMWI0MjBmY2RmMGJkYjAzNTVkOTFiZDNkZmEgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3Nl cnZlcl9kcml2ZXIvc2ltcGxlX2h0dHBfc2VydmVyX2RyaXZlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL3NpbXBsZV9o dHRwX3NlcnZlcl9kcml2ZXIucHkKQEAgLTE5LDcgKzE5LDcgQEAgY2xhc3MgU2ltcGxlSFRUUFNl cnZlckRyaXZlcihIVFRQU2VydmVyRHJpdmVyKToKICAgICAiIiJUaGlzIGNsYXNzIGRlcGVuZHMg b24gdW5peCBlbnZpcm9ubWVudCwgbmVlZCB0byBiZSBtb2RpZmllZCB0byBhY2hpZXZlIGNyb3Nz cGxhdGZvcm0gY29tcGFiaWxpdHkKICAgICAiIiIKIAotICAgIHBsYXRmb3JtcyA9IFsnb3N4J10K KyAgICBwbGF0Zm9ybXMgPSBbJ29zeCcsICdndGsnXQogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYp OgogICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2VzcyA9IE5vbmUKQEAgLTg1LDcgKzg1LDggQEAg Y2xhc3MgU2ltcGxlSFRUUFNlcnZlckRyaXZlcihIVFRQU2VydmVyRHJpdmVyKToKIAogICAgIGRl ZiBraWxsX3NlcnZlcihzZWxmKToKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5fc2Vy dmVyX3Byb2Nlc3MudGVybWluYXRlKCkKKyAgICAgICAgICAgIGlmIHNlbGYuX3NlcnZlcl9wcm9j ZXNzLnBvbGwoKSA9PSBOb25lOgorICAgICAgICAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNz LnRlcm1pbmF0ZSgpCiAgICAgICAgIGV4Y2VwdCBPU0Vycm9yIGFzIGVycm9yOgogICAgICAgICAg ICAgX2xvZy5pbmZvKCdFcnJvciB0ZXJtaW5hdGluZyBzZXJ2ZXIgcHJvY2VzczogJXMnICUgKGVy cm9yKSkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL3V0aWxzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL3V0 aWxzLnB5CmluZGV4IGM3Y2I2MmViMjQwNDM2ODE0OWI2NTZkODZlOGMyYTdiMDI2ZGNmOTMuLjNh MDkyNGY3YTY4Mzk4NDhkNDE3M2IwZDg0ZGQzZDU0NmE0MmU5ZjEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci91dGlscy5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvdXRpbHMucHkKQEAgLTE4LDggKzE4LDEx IEBAIGRlZiBpc19zdWJjbGFzcyhjaGlsZCwgcGFyZW50X25hbWUpOgogICAgIHJldHVybiBpbnNw ZWN0LmlzY2xhc3MoY2hpbGQpIGFuZCBwYXJlbnRfbmFtZSBpbiBbY2xzLl9fbmFtZV9fIGZvciBj bHMgaW4gaW5zcGVjdC5nZXRtcm8oY2hpbGQpXQogCiAKLWRlZiBsb2FkX3N1YmNsYXNzZXMoZGly bmFtZSwgYmFzZV9jbGFzc19uYW1lLCBsb2FkZXIpOgotICAgIGZvciBmaWxlbmFtZSBpbiBvcy5s aXN0ZGlyKGRpcm5hbWUpOgorZGVmIGxvYWRfc3ViY2xhc3NlcyhkaXJuYW1lLCBiYXNlX2NsYXNz X25hbWUsIGJhc2VfY2xhc3NfZmlsZSwgbG9hZGVyKToKKyAgICBmaWxlbGlzdCA9IG9zLmxpc3Rk aXIoZGlybmFtZSkKKyAgICBmaWxlbGlzdC5yZW1vdmUoYmFzZV9jbGFzc19maWxlKQorICAgIGZp bGVsaXN0Lmluc2VydCgwLCBiYXNlX2NsYXNzX2ZpbGUpCisgICAgZm9yIGZpbGVuYW1lIGluIGZp bGVsaXN0OgogICAgICAgICBpZiBub3QgZmlsZW5hbWUuZW5kc3dpdGgoJy5weScpIG9yIGZpbGVu YW1lIGluIFsnX19pbml0X18ucHknXToKICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgIG1v ZHVsZV9uYW1lID0gZmlsZW5hbWVbOi0zXQo=