234107 2021-12-09 15:31:26 -0800 'run-benchmark' should launch browsers in a relative clean state. 2021-12-20 17:20:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dewei_zhu dewei_zhu dewei_zhu ews-watchlist glenn gsnedders jbedard slewis oldest_to_newest 1822384 0 dewei_zhu 2021-12-09 15:31:26 -0800 'run-benchmark' should launch browsers in a relative clean state. 1822394 1 446624 dewei_zhu 2021-12-09 15:46:37 -0800 Created attachment 446624 Patch 1822427 2 dewei_zhu 2021-12-09 16:51:50 -0800 <rdar://85831161> 1822960 3 446624 slewis 2021-12-10 13:58:04 -0800 Comment on attachment 446624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446624&action=review > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:34 > + chrome_options.add_argument("--disable-extensions") did you want disable-extensions in two places? > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:41 > + return '--window-size={width},{height}'.format(width=int(screen_size.width), height=int(screen_size.height)) does setting window size set content size or window size? > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:33 > + args_with_url = ['--args', '-width', str(int(screen_size.width)), '-height', str(int(screen_size.height))] Do we really run fullscreen? Same question does this set content size or window size because Chrome, Firefox, and Safari often have different sized chromes and we want the content size to match 1823370 4 446624 dewei_zhu 2021-12-12 17:52:50 -0800 Comment on attachment 446624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446624&action=review >> Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:34 >> + chrome_options.add_argument("--disable-extensions") > > did you want disable-extensions in two places? Those are different, one for webdriver, one for launch with 'open' command. >> Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:41 >> + return '--window-size={width},{height}'.format(width=int(screen_size.width), height=int(screen_size.height)) > > does setting window size set content size or window size? It will fill the screen, that's what we want. >> Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:33 >> + args_with_url = ['--args', '-width', str(int(screen_size.width)), '-height', str(int(screen_size.height))] > > Do we really run fullscreen? > Same question does this set content size or window size because Chrome, Firefox, and Safari often have different sized chromes and we want the content size to match This will not be full screen, it will fill screen without overlapping with docker. 1824903 5 446624 dewei_zhu 2021-12-16 16:06:09 -0800 Comment on attachment 446624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446624&action=review >>> Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:41 >>> + return '--window-size={width},{height}'.format(width=int(screen_size.width), height=int(screen_size.height)) >> >> does setting window size set content size or window size? > > It will fill the screen, that's what we want. Discussed in person. It looks like MotionMark is immune from slightly window height change and speedometer2 doesn't show significant change (100 iteration) with slightly different window size. 1825820 6 dewei_zhu 2021-12-20 17:20:24 -0800 Landed in r287289. 446624 2021-12-09 15:46:37 -0800 2021-12-16 16:23:57 -0800 Patch bug-234107-20211209154636.patch text/plain 14759 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NzYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjVmZDNmZmE1OWMxODYwMjYxMTBkNzg2ZWI3MDAyMDg2 M2U0YWM3MC4uMjVhMjUzNzVlZjEwYmE0MDAzOGM4MWU0MGRmMmZmZTQwYjQ0YmEzZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0 IEBACisyMDIxLTEyLTA5ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgICdydW4tYmVuY2htYXJrJyBzaG91bGQgbGF1bmNoIGJyb3dzZXJzIGluIGEgcmVsYXRpdmUg Y2xlYW4gc3RhdGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQxMDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgY29kZSB0byBlbnN1cmUgQ2hyb21lIGFuZCBGaXJlZm94IGxhdW5jaGVzIGluIGEg cmVsYXRpdmUgY2xlYW4gc3RhdGUuCisgICAgICAgIFJlZmFjdG9yIGJyb3dzZXIgZHJpdmVycyBm b3IgbWFjT1MgQ2hyb21lIGFuZCBGaXJlZm94IHRvIHNoYXJlIG1vcmUgY29kZS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hf Y2hyb21lX2RyaXZlci5weToKKyAgICAgICAgQWRkZWQgJy0tbm8tZmlyc3QtcnVuJywgJy0tbm8t ZGVmYXVsdC1icm93c2VyLWNoZWNrJywgJy0tZGlzYWJsZS1leHRlbnNpb25zJyBmbGFncy4KKyAg ICAgICAgKE9TWENocm9tZURyaXZlckJhc2UpOgorICAgICAgICAoT1NYQ2hyb21lRHJpdmVyQmFz ZS5sYXVuY2hfdXJsKToKKyAgICAgICAgKE9TWENocm9tZURyaXZlckJhc2UubGF1bmNoX2RyaXZl cik6CisgICAgICAgIChPU1hDaHJvbWVEcml2ZXJCYXNlLl9jcmVhdGVfY2hyb21lX29wdGlvbnMp OgorICAgICAgICAoT1NYQ2hyb21lRHJpdmVyQmFzZS5fd2luZG93X3NpemVfYXJnKToKKyAgICAg ICAgKE9TWENocm9tZURyaXZlckJhc2UuX3NldF9jaHJvbWVfYmluYXJ5X2xvY2F0aW9uKToKKyAg ICAgICAgKE9TWENocm9tZURyaXZlcik6CisgICAgICAgIChPU1hDaHJvbWVEcml2ZXIuX3NldF9j aHJvbWVfYmluYXJ5X2xvY2F0aW9uKToKKyAgICAgICAgKE9TWENocm9tZUNhbmFyeURyaXZlci5f c2V0X2Nocm9tZV9iaW5hcnlfbG9jYXRpb24pOgorICAgICAgICAoT1NYQ2hyb21lRHJpdmVyLmxh dW5jaF91cmwpOiBEZWxldGVkLgorICAgICAgICAoT1NYQ2hyb21lRHJpdmVyLmxhdW5jaF9kcml2 ZXIpOiBEZWxldGVkLgorICAgICAgICAoT1NYQ2hyb21lQ2FuYXJ5RHJpdmVyLmxhdW5jaF91cmwp OiBEZWxldGVkLgorICAgICAgICAoT1NYQ2hyb21lQ2FuYXJ5RHJpdmVyLmxhdW5jaF9kcml2ZXIp OiBEZWxldGVkLgorICAgICAgICAoY3JlYXRlX2FyZ3MpOiBEZWxldGVkLgorICAgICAgICAoY3Jl YXRlX2Nocm9tZV9vcHRpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKGNyZWF0ZV93aW5kb3dfc2l6 ZV9hcmcpOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9icm93c2VyX2RyaXZlci9vc3hfZmlyZWZveF9kcml2ZXIucHk6CisgICAgICAgIEFkZGVk IGNvZGUgdG8gdXNlIHByb2ZpbGVzIHRvIHN1cHByZXNzIGRlZmF1bHQgYnJvd3NlciBjaGVjayBh bmQgcHJpdmFjeSBub3RpY2UgdGFiLgorICAgICAgICAoT1NYRmlyZWZveERyaXZlckJhc2UpOgor ICAgICAgICAoT1NYRmlyZWZveERyaXZlckJhc2UuX19pbml0X18pOgorICAgICAgICAoT1NYRmly ZWZveERyaXZlckJhc2UucHJlcGFyZV9lbnYpOgorICAgICAgICAoT1NYRmlyZWZveERyaXZlckJh c2UucmVzdG9yZV9lbnYpOgorICAgICAgICAoT1NYRmlyZWZveERyaXZlckJhc2UubGF1bmNoX3Vy bCk6CisgICAgICAgIChPU1hGaXJlZm94RHJpdmVyQmFzZS5sYXVuY2hfZHJpdmVyKToKKyAgICAg ICAgKE9TWEZpcmVmb3hEcml2ZXJCYXNlLl9zZXR1cF90ZW1wb3JhcnlfcHJvZmlsZV9kaXJlY3Rv cnkpOgorICAgICAgICAoT1NYRmlyZWZveERyaXZlckJhc2UuX3RlYXJkb3duX3RlbXBvcmFyeV9w cm9maWxlX2RpcmVjdG9yeSk6CisgICAgICAgIChPU1hGaXJlZm94RHJpdmVyQmFzZS5fc2V0X2Zp cmVmb3hfYmluYXJ5X2xvY2F0aW9uKToKKyAgICAgICAgKE9TWEZpcmVmb3hEcml2ZXIpOgorICAg ICAgICAoT1NYRmlyZWZveERyaXZlci5fc2V0X2ZpcmVmb3hfYmluYXJ5X2xvY2F0aW9uKToKKyAg ICAgICAgKE9TWEZpcmVmb3hOaWdodGx5RHJpdmVyKToKKyAgICAgICAgKE9TWEZpcmVmb3hOaWdo dGx5RHJpdmVyLl9zZXRfZmlyZWZveF9iaW5hcnlfbG9jYXRpb24pOgorICAgICAgICAoT1NYRmly ZWZveERyaXZlci5sYXVuY2hfdXJsKTogRGVsZXRlZC4KKyAgICAgICAgKE9TWEZpcmVmb3hEcml2 ZXIubGF1bmNoX2RyaXZlcik6IERlbGV0ZWQuCisgICAgICAgIChPU1hGaXJlZm94TmlnaHRseURy aXZlci5sYXVuY2hfdXJsKTogRGVsZXRlZC4KKyAgICAgICAgKE9TWEZpcmVmb3hOaWdodGx5RHJp dmVyLmxhdW5jaF9kcml2ZXIpOiBEZWxldGVkLgorICAgICAgICAoY3JlYXRlX2FyZ3MpOiBEZWxl dGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9kYXRhL2Zp cmVmb3hfcHJvZmlsZS91c2VyLmpzOiBBZGRlZCB1c2VyIHByZWZlcmVuY2VzCisgICAgICAgIHNv IHRoYXQgRmlyZWZveCBjYW4gYmUgbGF1bmNoZWQgd2l0aG91dCBjaGVja2luZyBkZWZhdWx0IGJy b3dzZXIgYW5kIHByaXZhY3kgbm90aWNlLgorCiAyMDIxLTEyLTA4ICBLeWxlIFBpZGRpbmd0b24g IDxrcGlkZGluZ3RvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY0NhdGFseXN0XSBVcGRhdGUg aGVhZGVyIHNlYXJjaCBwYXRocyBmb3IgQU5HTEUgQ2F0YWx5c3QKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfY2hy b21lX2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9i cm93c2VyX2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weQppbmRleCA4MTFlYzNjYTNlMmY0OTI1 ODYxNGRjYWM0YzZmMDA2Nzc1M2ZjODA1Li5jMWJlMTI2NGQ3YmE5MjdmZTI3OGFlMGVlMjgxMzJh MjlkODU0OGJlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9jaHJvbWVf ZHJpdmVyLnB5CkBAIC05LDI5ICs5LDU0IEBAIGZyb20gd2Via2l0cHkuYmVuY2htYXJrX3J1bm5l ci5icm93c2VyX2RyaXZlci5vc3hfYnJvd3Nlcl9kcml2ZXIgaW1wb3J0IE9TWEJyb3dzCiBfbG9n ID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAotY2xhc3MgT1NYQ2hyb21lRHJpdmVy KE9TWEJyb3dzZXJEcml2ZXIpOgotICAgIHByb2Nlc3NfbmFtZSA9ICdHb29nbGUgQ2hyb21lJwot ICAgIGJyb3dzZXJfbmFtZSA9ICdjaHJvbWUnCi0gICAgYXBwX25hbWUgPSAnR29vZ2xlIENocm9t ZS5hcHAnCi0gICAgYnVuZGxlX2lkID0gJ2NvbS5nb29nbGUuQ2hyb21lJworY2xhc3MgT1NYQ2hy b21lRHJpdmVyQmFzZShPU1hCcm93c2VyRHJpdmVyKToKKyAgICBhcHBfbmFtZSA9IE5vbmUKIAog ICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwgb3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRo LCBicm93c2VyX3BhdGgpOgogICAgICAgICAjIEZJWE1FOiBoYW5kbGUgc2VsZi5fYnJvd3Nlcl9w YXRoLgotICAgICAgICBhcmdzX3dpdGhfdXJsID0gc2VsZi5faW5zZXJ0X3VybChjcmVhdGVfYXJn cygpLCAyLCB1cmwpCisgICAgICAgIGFyZ3Nfd2l0aF91cmwgPSBbJy0tYXJncycsICctLWhvbWVw YWdlJywgdXJsLCBzZWxmLl93aW5kb3dfc2l6ZV9hcmcoKSwgJy0tbm8tZmlyc3QtcnVuJywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAnLS1uby1kZWZhdWx0LWJyb3dzZXItY2hlY2snLCAnLS1k aXNhYmxlLWV4dGVuc2lvbnMnXQogICAgICAgICBzZWxmLl9sYXVuY2hfcHJvY2VzcyhidWlsZF9k aXI9YnJvd3Nlcl9idWlsZF9wYXRoLCBhcHBfbmFtZT1zZWxmLmFwcF9uYW1lLCB1cmw9dXJsLCBh cmdzPWFyZ3Nfd2l0aF91cmwpCiAKICAgICBkZWYgbGF1bmNoX2RyaXZlcihzZWxmLCB1cmwsIG9w dGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CiAgICAgICAgIGZyb20gc2VsZW5pdW0gaW1wb3J0 IHdlYmRyaXZlcgotICAgICAgICBjaHJvbWVfb3B0aW9ucyA9IGNyZWF0ZV9jaHJvbWVfb3B0aW9u cygpCi0gICAgICAgIGlmIGJyb3dzZXJfYnVpbGRfcGF0aDoKLSAgICAgICAgICAgIGFwcF9wYXRo ID0gb3MucGF0aC5qb2luKGJyb3dzZXJfYnVpbGRfcGF0aCwgc2VsZi5hcHBfbmFtZSkKLSAgICAg ICAgICAgIGJpbmFyeV9wYXRoID0gb3MucGF0aC5qb2luKGFwcF9wYXRoLCAiQ29udGVudHMvTWFj T1MiLCBzZWxmLnByb2Nlc3NfbmFtZSkKLSAgICAgICAgICAgIGNocm9tZV9vcHRpb25zLmJpbmFy eV9sb2NhdGlvbiA9IGJpbmFyeV9wYXRoCisgICAgICAgIGNocm9tZV9vcHRpb25zID0gc2VsZi5f Y3JlYXRlX2Nocm9tZV9vcHRpb25zKGJyb3dzZXJfYnVpbGRfcGF0aCkKICAgICAgICAgZHJpdmVy X2V4ZWN1dGFibGUgPSBzZWxmLndlYmRyaXZlcl9iaW5hcnlfcGF0aAogICAgICAgICBkcml2ZXIg PSB3ZWJkcml2ZXIuQ2hyb21lKGNocm9tZV9vcHRpb25zPWNocm9tZV9vcHRpb25zLCBleGVjdXRh YmxlX3BhdGg9ZHJpdmVyX2V4ZWN1dGFibGUpCiAgICAgICAgIHNlbGYuX2xhdW5jaF93ZWJkcml2 ZXIodXJsPXVybCwgZHJpdmVyPWRyaXZlcikKICAgICAgICAgcmV0dXJuIGRyaXZlcgogCisgICAg ZGVmIF9jcmVhdGVfY2hyb21lX29wdGlvbnMoc2VsZiwgYnJvd3Nlcl9idWlsZF9wYXRoKToKKyAg ICAgICAgZnJvbSBzZWxlbml1bS53ZWJkcml2ZXIuY2hyb21lLm9wdGlvbnMgaW1wb3J0IE9wdGlv bnMKKyAgICAgICAgY2hyb21lX29wdGlvbnMgPSBPcHRpb25zKCkKKyAgICAgICAgY2hyb21lX29w dGlvbnMuYWRkX2FyZ3VtZW50KCItLWRpc2FibGUtd2ViLXNlY3VyaXR5IikKKyAgICAgICAgY2hy b21lX29wdGlvbnMuYWRkX2FyZ3VtZW50KCItLXVzZXItZGF0YS1kaXIiKQorICAgICAgICBjaHJv bWVfb3B0aW9ucy5hZGRfYXJndW1lbnQoIi0tZGlzYWJsZS1leHRlbnNpb25zIikKKyAgICAgICAg Y2hyb21lX29wdGlvbnMuYWRkX2FyZ3VtZW50KHNlbGYuX3dpbmRvd19zaXplX2FyZygpKQorICAg ICAgICBzZWxmLl9zZXRfY2hyb21lX2JpbmFyeV9sb2NhdGlvbihjaHJvbWVfb3B0aW9ucywgYnJv d3Nlcl9idWlsZF9wYXRoKQorICAgICAgICByZXR1cm4gY2hyb21lX29wdGlvbnMKKworICAgIGRl ZiBfd2luZG93X3NpemVfYXJnKHNlbGYpOgorICAgICAgICBzY3JlZW5fc2l6ZSA9IHNlbGYuX3Nj cmVlbl9zaXplKCkKKyAgICAgICAgcmV0dXJuICctLXdpbmRvdy1zaXplPXt3aWR0aH0se2hlaWdo dH0nLmZvcm1hdCh3aWR0aD1pbnQoc2NyZWVuX3NpemUud2lkdGgpLCBoZWlnaHQ9aW50KHNjcmVl bl9zaXplLmhlaWdodCkpCisKKyAgICBkZWYgX3NldF9jaHJvbWVfYmluYXJ5X2xvY2F0aW9uKHNl bGYsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAgIHBhc3MKKworCitjbGFz cyBPU1hDaHJvbWVEcml2ZXIoT1NYQ2hyb21lRHJpdmVyQmFzZSk6CisgICAgcHJvY2Vzc19uYW1l ID0gJ0dvb2dsZSBDaHJvbWUnCisgICAgYnJvd3Nlcl9uYW1lID0gJ2Nocm9tZScKKyAgICBhcHBf bmFtZSA9ICdHb29nbGUgQ2hyb21lLmFwcCcKKyAgICBidW5kbGVfaWQgPSAnY29tLmdvb2dsZS5D aHJvbWUnCisKKyAgICBkZWYgX3NldF9jaHJvbWVfYmluYXJ5X2xvY2F0aW9uKHNlbGYsIG9wdGlv bnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAgIGlmIG5vdCBicm93c2VyX2J1aWxkX3Bh dGg6CisgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgYXBwX3BhdGggPSBvcy5wYXRoLmpvaW4o YnJvd3Nlcl9idWlsZF9wYXRoLCBzZWxmLmFwcF9uYW1lKQorICAgICAgICBiaW5hcnlfcGF0aCA9 IG9zLnBhdGguam9pbihhcHBfcGF0aCwgIkNvbnRlbnRzL01hY09TIiwgc2VsZi5wcm9jZXNzX25h bWUpCisgICAgICAgIG9wdGlvbnMuYmluYXJ5X2xvY2F0aW9uID0gYmluYXJ5X3BhdGgKKwogCiBj bGFzcyBPU1hDaHJvbWVDYW5hcnlEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CiAgICAgcHJvY2Vz c19uYW1lID0gJ0dvb2dsZSBDaHJvbWUgQ2FuYXJ5JwpAQCAtMzksNDAgKzY0LDkgQEAgY2xhc3Mg T1NYQ2hyb21lQ2FuYXJ5RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgIGFwcF9uYW1lID0g J0dvb2dsZSBDaHJvbWUgQ2FuYXJ5LmFwcCcKICAgICBidW5kbGVfaWQgPSAnY29tLmdvb2dsZS5D aHJvbWUuY2FuYXJ5JwogCi0gICAgZGVmIGxhdW5jaF91cmwoc2VsZiwgdXJsLCBvcHRpb25zLCBi cm93c2VyX2J1aWxkX3BhdGgsIGJyb3dzZXJfcGF0aCk6Ci0gICAgICAgICMgRklYTUU6IGhhbmRs ZSBzZWxmLl9icm93c2VyX3BhdGguCi0gICAgICAgIGFyZ3Nfd2l0aF91cmwgPSBzZWxmLl9pbnNl cnRfdXJsKGNyZWF0ZV9hcmdzKCksIDIsIHVybCkKLSAgICAgICAgc2VsZi5fbGF1bmNoX3Byb2Nl c3MoYnVpbGRfZGlyPWJyb3dzZXJfYnVpbGRfcGF0aCwgYXBwX25hbWU9c2VsZi5hcHBfbmFtZSwg dXJsPXVybCwgYXJncz1hcmdzX3dpdGhfdXJsKQotCi0gICAgZGVmIGxhdW5jaF9kcml2ZXIoc2Vs ZiwgdXJsLCBvcHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgotICAgICAgICBmcm9tIHNlbGVu aXVtIGltcG9ydCB3ZWJkcml2ZXIKLSAgICAgICAgY2hyb21lX29wdGlvbnMgPSBjcmVhdGVfY2hy b21lX29wdGlvbnMoKQorICAgIGRlZiBfc2V0X2Nocm9tZV9iaW5hcnlfbG9jYXRpb24oc2VsZiwg b3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKToKICAgICAgICAgaWYgbm90IGJyb3dzZXJfYnVp bGRfcGF0aDoKICAgICAgICAgICAgIGJyb3dzZXJfYnVpbGRfcGF0aCA9ICcvQXBwbGljYXRpb25z LycKICAgICAgICAgYXBwX3BhdGggPSBvcy5wYXRoLmpvaW4oYnJvd3Nlcl9idWlsZF9wYXRoLCBz ZWxmLmFwcF9uYW1lKQogICAgICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGguam9pbihhcHBfcGF0 aCwgIkNvbnRlbnRzL01hY09TIiwgc2VsZi5wcm9jZXNzX25hbWUpCi0gICAgICAgIGNocm9tZV9v cHRpb25zLmJpbmFyeV9sb2NhdGlvbiA9IGJpbmFyeV9wYXRoCi0gICAgICAgIGRyaXZlcl9leGVj dXRhYmxlID0gc2VsZi53ZWJkcml2ZXJfYmluYXJ5X3BhdGgKLSAgICAgICAgZHJpdmVyID0gd2Vi ZHJpdmVyLkNocm9tZShjaHJvbWVfb3B0aW9ucz1jaHJvbWVfb3B0aW9ucywgZXhlY3V0YWJsZV9w YXRoPWRyaXZlcl9leGVjdXRhYmxlKQotICAgICAgICBzZWxmLl9sYXVuY2hfd2ViZHJpdmVyKHVy bD11cmwsIGRyaXZlcj1kcml2ZXIpCi0gICAgICAgIHJldHVybiBkcml2ZXIKLQotCi1kZWYgY3Jl YXRlX2FyZ3MoKToKLSAgICBhcmdzID0gWyctLWFyZ3MnLCAnLS1ob21lcGFnZScsIGNyZWF0ZV93 aW5kb3dfc2l6ZV9hcmcoKV0KLSAgICByZXR1cm4gYXJncwotCi0KLWRlZiBjcmVhdGVfY2hyb21l X29wdGlvbnMoKToKLSAgICBmcm9tIHNlbGVuaXVtLndlYmRyaXZlci5jaHJvbWUub3B0aW9ucyBp bXBvcnQgT3B0aW9ucwotICAgIGNocm9tZV9vcHRpb25zID0gT3B0aW9ucygpCi0gICAgY2hyb21l X29wdGlvbnMuYWRkX2FyZ3VtZW50KCItLWRpc2FibGUtd2ViLXNlY3VyaXR5IikKLSAgICBjaHJv bWVfb3B0aW9ucy5hZGRfYXJndW1lbnQoIi0tdXNlci1kYXRhLWRpciIpCi0gICAgY2hyb21lX29w dGlvbnMuYWRkX2FyZ3VtZW50KCItLWRpc2FibGUtZXh0ZW5zaW9ucyIpCi0gICAgY2hyb21lX29w dGlvbnMuYWRkX2FyZ3VtZW50KGNyZWF0ZV93aW5kb3dfc2l6ZV9hcmcoKSkKLSAgICByZXR1cm4g Y2hyb21lX29wdGlvbnMKLQotCi1kZWYgY3JlYXRlX3dpbmRvd19zaXplX2FyZygpOgotICAgIHdp bmRvd19zaXplX2FyZyA9ICctLXdpbmRvdy1zaXplPXt3aWR0aH0se2hlaWdodH0nLmZvcm1hdCh3 aWR0aD1pbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS53aWR0aCksIGhlaWdodD1p bnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS5oZWlnaHQpKQotICAgIHJldHVybiB3 aW5kb3dfc2l6ZV9hcmcKKyAgICAgICAgb3B0aW9ucy5iaW5hcnlfbG9jYXRpb24gPSBiaW5hcnlf cGF0aApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L2Jyb3dzZXJfZHJpdmVyL29zeF9maXJlZm94X2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfZmlyZWZveF9kcml2ZXIu cHkKaW5kZXggNjNiYjM3YzY5NGFhMDRhNjM1ODFlNTg2MWVkMzc0MDVkNTZiNDQ1ZS4uMzRkMjUy MzRiOTM0YzM5NDg5MjAzNzM2MjU0NGE3ZmI4MDk1ZTBjZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9maXJlZm94 X2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YnJvd3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hfZHJpdmVyLnB5CkBAIC0yLDY1ICsyLDg1IEBACiAK IGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgb3MKK2ltcG9ydCBzaHV0aWwKK2ltcG9ydCB0ZW1wZmls ZQogCiBmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIuYnJvd3Nlcl9kcml2ZXIub3N4X2Jy b3dzZXJfZHJpdmVyIGltcG9ydCBPU1hCcm93c2VyRHJpdmVyCiAKIAogX2xvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKF9fbmFtZV9fKQordGVzdF9wcm9maWxlX2RpcmVjdG9yeSA9IG9zLnBhdGguam9p bihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAnLi4vZGF0YS9maXJlZm94X3Byb2ZpbGUvJykK IAogCi1jbGFzcyBPU1hGaXJlZm94RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgotICAgIHByb2Nl c3NfbmFtZSA9ICdmaXJlZm94JwotICAgIGJyb3dzZXJfbmFtZSA9ICdmaXJlZm94JwotICAgIGFw cF9uYW1lID0gJ0ZpcmVmb3guYXBwJwotICAgIGJ1bmRsZV9pZCA9ICdvcmcubW96aWxsYS5maXJl Zm94JworY2xhc3MgT1NYRmlyZWZveERyaXZlckJhc2UoT1NYQnJvd3NlckRyaXZlcik6CisgICAg YXBwX25hbWUgPSBOb25lCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdz KToKKyAgICAgICAgc3VwZXIoT1NYRmlyZWZveERyaXZlckJhc2UsIHNlbGYpLl9faW5pdF9fKCph cmdzLCAqKmt3YXJncykKKyAgICAgICAgc2VsZi5fcHJvZmlsZV9kaXJlY3RvcnkgPSBOb25lCisK KyAgICBkZWYgcHJlcGFyZV9lbnYoc2VsZiwgY29uZmlnKToKKyAgICAgICAgc3VwZXIoT1NYRmly ZWZveERyaXZlckJhc2UsIHNlbGYpLnByZXBhcmVfZW52KGNvbmZpZykKKyAgICAgICAgc2VsZi5f c2V0dXBfdGVtcG9yYXJ5X3Byb2ZpbGVfZGlyZWN0b3J5KCkKKworICAgIGRlZiByZXN0b3JlX2Vu dihzZWxmKToKKyAgICAgICAgc3VwZXIoT1NYRmlyZWZveERyaXZlckJhc2UsIHNlbGYpLnJlc3Rv cmVfZW52KCkKKyAgICAgICAgc2VsZi5fdGVhcmRvd25fdGVtcG9yYXJ5X3Byb2ZpbGVfZGlyZWN0 b3J5KCkKIAogICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwgb3B0aW9ucywgYnJvd3Nlcl9i dWlsZF9wYXRoLCBicm93c2VyX3BhdGgpOgogICAgICAgICAjIEZJWE1FOiBoYW5kbGUgc2VsZi5f YnJvd3Nlcl9wYXRoLgotICAgICAgICBhcmdzX3dpdGhfdXJsID0gc2VsZi5faW5zZXJ0X3VybChj cmVhdGVfYXJncygpLCAwLCB1cmwpCisgICAgICAgIHNjcmVlbl9zaXplID0gc2VsZi5fc2NyZWVu X3NpemUoKQorICAgICAgICBhcmdzX3dpdGhfdXJsID0gWyctLWFyZ3MnLCAnLXdpZHRoJywgc3Ry KGludChzY3JlZW5fc2l6ZS53aWR0aCkpLCAnLWhlaWdodCcsIHN0cihpbnQoc2NyZWVuX3NpemUu aGVpZ2h0KSldCisgICAgICAgIGlmIHNlbGYuX3Byb2ZpbGVfZGlyZWN0b3J5IGFuZCBvcy5wYXRo LmV4aXN0cyhzZWxmLl9wcm9maWxlX2RpcmVjdG9yeSk6CisgICAgICAgICAgICBhcmdzX3dpdGhf dXJsLmV4dGVuZChbJy0tcHJvZmlsZScsIHNlbGYuX3Byb2ZpbGVfZGlyZWN0b3J5XSkKKyAgICAg ICAgYXJnc193aXRoX3VybC5hcHBlbmQodXJsKQogICAgICAgICBzZWxmLl9sYXVuY2hfcHJvY2Vz cyhidWlsZF9kaXI9YnJvd3Nlcl9idWlsZF9wYXRoLCBhcHBfbmFtZT1zZWxmLmFwcF9uYW1lLCB1 cmw9dXJsLCBhcmdzPWFyZ3Nfd2l0aF91cmwpCiAKICAgICBkZWYgbGF1bmNoX2RyaXZlcihzZWxm LCB1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CiAgICAgICAgIGZyb20gc2VsZW5p dW0gaW1wb3J0IHdlYmRyaXZlcgogICAgICAgICBmcm9tIHNlbGVuaXVtLndlYmRyaXZlci5maXJl Zm94Lm9wdGlvbnMgaW1wb3J0IE9wdGlvbnMKICAgICAgICAgZmlyZWZveF9vcHRpb25zID0gT3B0 aW9ucygpCi0gICAgICAgIGlmIGJyb3dzZXJfYnVpbGRfcGF0aDoKLSAgICAgICAgICAgIGFwcF9w YXRoID0gb3MucGF0aC5qb2luKGJyb3dzZXJfYnVpbGRfcGF0aCwgc2VsZi5hcHBfbmFtZSkKLSAg ICAgICAgICAgIGJpbmFyeV9wYXRoID0gb3MucGF0aC5qb2luKGFwcF9wYXRoLCAiQ29udGVudHMv TWFjT1MiLCBzZWxmLnByb2Nlc3NfbmFtZSkKLSAgICAgICAgICAgIGZpcmVmb3hfb3B0aW9ucy5i aW5hcnlfbG9jYXRpb24gPSBiaW5hcnlfcGF0aAorICAgICAgICBzZWxmLl9zZXRfZmlyZWZveF9i aW5hcnlfbG9jYXRpb24ob3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKQogICAgICAgICBkcml2 ZXJfZXhlY3V0YWJsZSA9IHNlbGYud2ViZHJpdmVyX2JpbmFyeV9wYXRoCiAgICAgICAgIGRyaXZl ciA9IHdlYmRyaXZlci5GaXJlZm94KGZpcmVmb3hfb3B0aW9ucz1maXJlZm94X29wdGlvbnMsIGV4 ZWN1dGFibGVfcGF0aD1kcml2ZXJfZXhlY3V0YWJsZSkKICAgICAgICAgc2VsZi5fbGF1bmNoX3dl YmRyaXZlcih1cmw9dXJsLCBkcml2ZXI9ZHJpdmVyKQogICAgICAgICByZXR1cm4gZHJpdmVyCiAK KyAgICBkZWYgX3NldHVwX3RlbXBvcmFyeV9wcm9maWxlX2RpcmVjdG9yeShzZWxmKToKKyAgICAg ICAgc2VsZi5fcHJvZmlsZV9kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4odGVtcGZpbGUubWtkdGVt cCgpLCAnZmlyZWZveF9wcm9maWxlJykKKyAgICAgICAgc2h1dGlsLmNvcHl0cmVlKHRlc3RfcHJv ZmlsZV9kaXJlY3RvcnksIHNlbGYuX3Byb2ZpbGVfZGlyZWN0b3J5KQorCisgICAgZGVmIF90ZWFy ZG93bl90ZW1wb3JhcnlfcHJvZmlsZV9kaXJlY3Rvcnkoc2VsZik6CisgICAgICAgIGlmIHNlbGYu X3Byb2ZpbGVfZGlyZWN0b3J5IGFuZCBvcy5wYXRoLmV4aXN0cyhzZWxmLl9wcm9maWxlX2RpcmVj dG9yeSk6CisgICAgICAgICAgICBzaHV0aWwucm10cmVlKG9zLnBhdGguZGlybmFtZShzZWxmLl9w cm9maWxlX2RpcmVjdG9yeSkpCisKKyAgICBkZWYgX3NldF9maXJlZm94X2JpbmFyeV9sb2NhdGlv bihzZWxmLCBvcHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgorICAgICAgICBwYXNzCiAKLWNs YXNzIE9TWEZpcmVmb3hOaWdodGx5RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgorCitjbGFzcyBP U1hGaXJlZm94RHJpdmVyKE9TWEZpcmVmb3hEcml2ZXJCYXNlKToKICAgICBwcm9jZXNzX25hbWUg PSAnZmlyZWZveCcKLSAgICBicm93c2VyX25hbWUgPSAnZmlyZWZveC1uaWdodGx5JwotICAgIGFw cF9uYW1lID0gJ0ZpcmVmb3hOaWdodGx5LmFwcCcKKyAgICBicm93c2VyX25hbWUgPSAnZmlyZWZv eCcKKyAgICBhcHBfbmFtZSA9ICdGaXJlZm94LmFwcCcKICAgICBidW5kbGVfaWQgPSAnb3JnLm1v emlsbGEuZmlyZWZveCcKIAorICAgIGRlZiBfc2V0X2ZpcmVmb3hfYmluYXJ5X2xvY2F0aW9uKHNl bGYsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAgIGlmIG5vdCBicm93c2Vy X2J1aWxkX3BhdGg6CisgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgYXBwX3BhdGggPSBvcy5w YXRoLmpvaW4oYnJvd3Nlcl9idWlsZF9wYXRoLCBzZWxmLmFwcF9uYW1lKQorICAgICAgICBiaW5h cnlfcGF0aCA9IG9zLnBhdGguam9pbihhcHBfcGF0aCwgIkNvbnRlbnRzL01hY09TIiwgc2VsZi5w cm9jZXNzX25hbWUpCisgICAgICAgIG9wdGlvbnMuYmluYXJ5X2xvY2F0aW9uID0gYmluYXJ5X3Bh dGgKIAotICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwgb3B0aW9ucywgYnJvd3Nlcl9idWls ZF9wYXRoLCBicm93c2VyX3BhdGgpOgotICAgICAgICAjIEZJWE1FOiBoYW5kbGUgc2VsZi5fYnJv d3Nlcl9wYXRoLgotICAgICAgICBhcmdzX3dpdGhfdXJsID0gc2VsZi5faW5zZXJ0X3VybChjcmVh dGVfYXJncygpLCAwLCB1cmwpCi0gICAgICAgIHNlbGYuX2xhdW5jaF9wcm9jZXNzKGJ1aWxkX2Rp cj1icm93c2VyX2J1aWxkX3BhdGgsIGFwcF9uYW1lPXNlbGYuYXBwX25hbWUsIHVybD11cmwsIGFy Z3M9YXJnc193aXRoX3VybCkKIAotICAgIGRlZiBsYXVuY2hfZHJpdmVyKHNlbGYsIHVybCwgb3B0 aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKToKLSAgICAgICAgZnJvbSBzZWxlbml1bSBpbXBvcnQg d2ViZHJpdmVyCi0gICAgICAgIGZyb20gc2VsZW5pdW0ud2ViZHJpdmVyLmZpcmVmb3gub3B0aW9u cyBpbXBvcnQgT3B0aW9ucwotICAgICAgICBmaXJlZm94X29wdGlvbnMgPSBPcHRpb25zKCkKK2Ns YXNzIE9TWEZpcmVmb3hOaWdodGx5RHJpdmVyKE9TWEZpcmVmb3hEcml2ZXJCYXNlKToKKyAgICBw cm9jZXNzX25hbWUgPSAnZmlyZWZveCcKKyAgICBicm93c2VyX25hbWUgPSAnZmlyZWZveC1uaWdo dGx5JworICAgIGFwcF9uYW1lID0gJ0ZpcmVmb3hOaWdodGx5LmFwcCcKKyAgICBidW5kbGVfaWQg PSAnb3JnLm1vemlsbGEuZmlyZWZveCcKKworICAgIGRlZiBfc2V0X2ZpcmVmb3hfYmluYXJ5X2xv Y2F0aW9uKHNlbGYsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CiAgICAgICAgIGlmIG5v dCBicm93c2VyX2J1aWxkX3BhdGg6CiAgICAgICAgICAgICBicm93c2VyX2J1aWxkX3BhdGggPSAn L0FwcGxpY2F0aW9ucy8nCiAgICAgICAgIGFwcF9wYXRoID0gb3MucGF0aC5qb2luKGJyb3dzZXJf YnVpbGRfcGF0aCwgc2VsZi5hcHBfbmFtZSkKICAgICAgICAgYmluYXJ5X3BhdGggPSBvcy5wYXRo LmpvaW4oYXBwX3BhdGgsICJDb250ZW50cy9NYWNPUyIsIHNlbGYucHJvY2Vzc19uYW1lKQotICAg ICAgICBmaXJlZm94X29wdGlvbnMuYmluYXJ5X2xvY2F0aW9uID0gYmluYXJ5X3BhdGgKLSAgICAg ICAgZHJpdmVyX2V4ZWN1dGFibGUgPSBzZWxmLndlYmRyaXZlcl9iaW5hcnlfcGF0aAotICAgICAg ICBkcml2ZXIgPSB3ZWJkcml2ZXIuRmlyZWZveChmaXJlZm94X29wdGlvbnM9ZmlyZWZveF9vcHRp b25zLCBleGVjdXRhYmxlX3BhdGg9ZHJpdmVyX2V4ZWN1dGFibGUpCi0gICAgICAgIHNlbGYuX2xh dW5jaF93ZWJkcml2ZXIodXJsPXVybCwgZHJpdmVyPWRyaXZlcikKLSAgICAgICAgcmV0dXJuIGRy aXZlcgotCi0KLWRlZiBjcmVhdGVfYXJncygpOgotICAgIGFyZ3MgPSBbJy0tYXJncycsICctd2lk dGgnLCBzdHIoaW50KE9TWEJyb3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkud2lkdGgpKSwgJy1o ZWlnaHQnLCBzdHIoaW50KE9TWEJyb3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkuaGVpZ2h0KSld Ci0gICAgcmV0dXJuIGFyZ3MKKyAgICAgICAgb3B0aW9ucy5iaW5hcnlfbG9jYXRpb24gPSBiaW5h cnlfcGF0aApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2RhdGEvZmlyZWZveF9wcm9maWxlL3VzZXIuanMgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvZGF0YS9maXJlZm94X3Byb2ZpbGUvdXNlci5qcwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5kMzRhYTkxNmE1ODAzN2VkMWQwMzA4YzVmMWZlMTE2NTQxMDRjMzQ4Ci0tLSAvZGV2L251bGwK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2RhdGEvZmlyZWZv eF9wcm9maWxlL3VzZXIuanMKQEAgLTAsMCArMSw5IEBACit1c2VyX3ByZWYoImJyb3dzZXIuc2hl bGwuY2hlY2tEZWZhdWx0QnJvd3NlciIsIGZhbHNlKTsKK3VzZXJfcHJlZigiYnJvd3Nlci5zdGFy dHVwLmNvdWxkUmVzdG9yZVNlc3Npb24uY291bnQiLCAtMSk7Cit1c2VyX3ByZWYoImJyb3dzZXIu d2ViYXBwcy5jaGVja0ZvclVwZGF0ZXMiLCAwKTsKK3VzZXJfcHJlZigic3RhcnR1cC5ob21lcGFn ZV93ZWxjb21lX3VybCIsICIiKTsKK3VzZXJfcHJlZigic3RhcnR1cC5ob21lcGFnZV93ZWxjb21l X3VybC5hZGRpdGlvbmFsIiwgIiIpOwordXNlcl9wcmVmKCJhcHAudXBkYXRlLmNoZWNrSW5zdGFs bFRpbWUiLCBmYWxzZSk7Cit1c2VyX3ByZWYoImFwcC51cGRhdGUuZGlzYWJsZWRGb3JUZXN0aW5n IiwgdHJ1ZSk7Cit1c2VyX3ByZWYoImV4dGVuc2lvbnMudXBkYXRlLmVuYWJsZWQiLCBmYWxzZSk7 Cit1c2VyX3ByZWYoImRhdGFyZXBvcnRpbmcucG9saWN5LmRhdGFTdWJtaXNzaW9uUG9saWN5Qnlw YXNzTm90aWZpY2F0aW9uIiwgdHJ1ZSk7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=