175126 2017-08-03 04:32:51 -0700 REGRESSION(r219850): run-benchmark script broken on Linux 2017-08-03 18:14:12 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174445 1 clopez clopez buildbot cgarcia commit-queue dino glenn lforschler matthew_r_stewart simon.fraser slewis webkit-bug-importer oldest_to_newest 1334741 0 clopez 2017-08-03 04:32:51 -0700 The run-benchmark script dynamically generates the list of supported browsers and platforms (currently linux and osx) by loading all python files from Tools/Scripts/webkitpy/benchmark_runner/browser_driver and getting the browser_name and platform variables from the classes defined there. This means, that this classes should never raise an exception when loaded on other platforms or otherwise they will broke the whole script. Its fine if they raise an exception when executing on any of the methods they implement, but not when just loading/importing the class. So, yo avoid raising exceptions on another platforms we load the python modules that are platform specific on the functions rather than on the main file or the main class body. Example: https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py?rev=216213#L110 On r219850 <https://trac.webkit.org/r219850> a method for _screen_size() was added also for the OSX platform, but this method is called from the main file so its evaluated when the load of the classes is done to get the lists of platforms an browsers. Therefore it aborts on Linux like this: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Perf%29/builds/850/steps/benchmark-test/logs/stdio 1334742 1 317111 clopez 2017-08-03 04:40:40 -0700 Created attachment 317111 Patch 1334937 2 317111 matthew_r_stewart 2017-08-03 14:17:28 -0700 Comment on attachment 317111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=317111&action=review > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:17 > + window_size_arg = '--window-size={width},{height}'.format(width=int(OSXBrowserDriver._screen_size().width), height=int(OSXBrowserDriver._screen_size().height)) Add this line inside create_chrome_options() as well 1334955 3 317111 slewis 2017-08-03 14:43:38 -0700 Comment on attachment 317111 Patch Sorry for the breakage. Rather than copying the code everywhere can we just create get_screen_size_method in browser_driver than OSX implements. We should have done that in the first place 1334961 4 slewis 2017-08-03 14:53:33 -0700 I didn't think that one through all the way. I still think thats a long line to duplicate but that's irrelevant to the issue at hand. If one of you upload a patch with the change Matthew requested I'll r+ it 1335020 5 clopez 2017-08-03 16:36:08 -0700 (In reply to Stephanie Lewis from comment #3) > Comment on attachment 317111 [details] > Patch > > Sorry for the breakage. Rather than copying the code everywhere can we just > create get_screen_size_method in browser_driver than OSX implements. We > should have done that in the first place There is already a _screen_size() method in osx_browser_driver. I will try to use a create_args() function on this firefox and chrome files to avoid duplicating code. Patch incoming soon 1335032 6 317182 clopez 2017-08-03 16:58:06 -0700 Created attachment 317182 Patch 1335036 7 matthew_r_stewart 2017-08-03 17:10:54 -0700 Looks good to me! 1335064 8 317182 commit-queue 2017-08-03 18:12:57 -0700 Comment on attachment 317182 Patch Clearing flags on attachment: 317182 Committed r220246: <http://trac.webkit.org/changeset/220246> 1335065 9 commit-queue 2017-08-03 18:12:59 -0700 All reviewed patches have been landed. Closing bug. 1335068 10 webkit-bug-importer 2017-08-03 18:14:12 -0700 <rdar://problem/33714151> 317111 2017-08-03 04:40:40 -0700 2017-08-03 16:57:37 -0700 Patch bug-175126-20170803134039.patch text/plain 5412 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMjAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjc2MDc3MzE5MTM2ZjUyZjQxMzcxZWRmYjE2OWFlNzgz NjJlMzI3Zi4uYjE2ZGI5YjQzNWY1ZDA3MjMyMDg2YzU0NzM1YzQ0ZGM4ZjliMTE5NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE3LTA4LTAzICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjIxOTg1MCk6IHJ1bi1iZW5jaG1hcmsgc2Ny aXB0IGJyb2tlbiBvbiBMaW51eAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc1MTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIHJ1bi1iZW5jaG1hcmsgc2NyaXB0IGR5bmFtaWNhbGx5IGdlbmVyYXRl cyB0aGUgbGlzdCBvZiBzdXBwb3J0ZWQKKyAgICAgICAgYnJvd3NlcnMgYW5kIHBsYXRmb3JtcyAo Y3VycmVudGx5IExpbnV4IGFuZCBPU1gpIGJ5IGxvYWRpbmcgYWxsCisgICAgICAgIHB5dGhvbiBm aWxlcyBmcm9tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2Vy X2RyaXZlcgorICAgICAgICBhbmQgZ2V0dGluZyB0aGUgYnJvd3Nlcl9uYW1lIGFuZCBwbGF0Zm9y bSB2YXJpYWJsZXMgZnJvbSB0aGUKKyAgICAgICAgY2xhc3NlcyBkZWZpbmVkIHRoZXJlLgorCisg ICAgICAgIFRoaXMgbWVhbnMgdGhhdCB0aGlzIGNsYXNzZXMgc2hvdWxkIG5vdCByYWlzZSBhbiBl eGNlcHRpb24gd2hlbgorICAgICAgICBsb2FkZWQgb24gb3RoZXIgcGxhdGZvcm1zIG9yIG90aGVy d2lzZSB0aGV5IHdpbGwgYnJva2UgdGhlIHdob2xlCisgICAgICAgIHNjcmlwdC4gSXRzIGZpbmUg aWYgdGhleSByYWlzZSBhbiBleGNlcHRpb24gd2hlbiBleGVjdXRpbmcgYW55IG9mCisgICAgICAg IHRoZSBtZXRob2RzIHRoZXkgaW1wbGVtZW50LCBidXQgbm90IHdoZW4ganVzdCBsb2FkaW5nL2lt cG9ydGluZworICAgICAgICB0aGUgY2xhc3MuCisKKyAgICAgICAgTW92ZSB0aGUgYXJndW1lbnQg dmFyaWFibGUgZGVmaW5pdGlvbnMgdGhhdCBjYWxsIG9uIHRoZSBwbGF0Zm9ybQorICAgICAgICBz cGVjaWZpYyBPU1hCcm93c2VyRHJpdmVyLl9zY3JlZW5fc2l6ZSgpIGZ1bmN0aW9uIGZyb20gdGhl IG1haW4KKyAgICAgICAgZmlsZXMgdG8gdGhlIGxhdW5jaF91cmwoKSBmdW5jdGlvbiBkZWZpbml0 aW9uLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dz ZXJfZHJpdmVyL29zeF9jaHJvbWVfZHJpdmVyLnB5OgorICAgICAgICAoT1NYQ2hyb21lRHJpdmVy LmxhdW5jaF91cmwpOgorICAgICAgICAoT1NYQ2hyb21lQ2FuYXJ5RHJpdmVyLmxhdW5jaF91cmwp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2Ry aXZlci9vc3hfZmlyZWZveF9kcml2ZXIucHk6CisgICAgICAgIChPU1hGaXJlZm94RHJpdmVyLmxh dW5jaF91cmwpOgorICAgICAgICAoT1NYRmlyZWZveE5pZ2h0bHlEcml2ZXIubGF1bmNoX3VybCk6 CisKIDIwMTctMDgtMDIgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg ICAgIEhUVFAgdGVzdHMgd2l0aCAnaHR0cHMnIHN1ZmZpeCBhcmUgb25seSBydW4gb3ZlciBIVFRQ UyBmb3IgV0syLCBub3QgV0sxCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Jl bmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2No cm9tZV9kcml2ZXIucHkKaW5kZXggYzY3MDY2YmJhZmZhMTI5MWU5Y2ViODcyNGIxODU4M2E4NDJi ZTAyZS4uOTZiODdiZWM5ODgzNjU4MzM3ZDZjMzRmYWRmYjIxNThiOTY5ODgzNSAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVy L29zeF9jaHJvbWVfZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weQpAQCAtNyw4ICs3 LDYgQEAgZnJvbSBvc3hfYnJvd3Nlcl9kcml2ZXIgaW1wb3J0IE9TWEJyb3dzZXJEcml2ZXIKIAog CiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCi13aW5kb3dfc2l6ZV9hcmcgPSAn LS13aW5kb3ctc2l6ZT17d2lkdGh9LHtoZWlnaHR9Jy5mb3JtYXQod2lkdGg9aW50KE9TWEJyb3dz ZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkud2lkdGgpLCBoZWlnaHQ9aW50KE9TWEJyb3dzZXJEcml2 ZXIuX3NjcmVlbl9zaXplKCkuaGVpZ2h0KSkKLWFyZ3MgPSBbJy0tYXJncycsICctLWhvbWVwYWdl Jywgd2luZG93X3NpemVfYXJnXQogCiBjbGFzcyBPU1hDaHJvbWVEcml2ZXIoT1NYQnJvd3NlckRy aXZlcik6CiAgICAgcHJvY2Vzc19uYW1lID0gJ0dvb2dsZSBDaHJvbWUnCkBAIC0xNiw2ICsxNCw4 IEBAIGNsYXNzIE9TWENocm9tZURyaXZlcihPU1hCcm93c2VyRHJpdmVyKToKICAgICBhcHBfbmFt ZSA9ICdHb29nbGUgQ2hyb21lLmFwcCcKIAogICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwg b3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKToKKyAgICAgICAgd2luZG93X3NpemVfYXJnID0g Jy0td2luZG93LXNpemU9e3dpZHRofSx7aGVpZ2h0fScuZm9ybWF0KHdpZHRoPWludChPU1hCcm93 c2VyRHJpdmVyLl9zY3JlZW5fc2l6ZSgpLndpZHRoKSwgaGVpZ2h0PWludChPU1hCcm93c2VyRHJp dmVyLl9zY3JlZW5fc2l6ZSgpLmhlaWdodCkpCisgICAgICAgIGFyZ3MgPSBbJy0tYXJncycsICct LWhvbWVwYWdlJywgd2luZG93X3NpemVfYXJnXQogICAgICAgICBhcmdzX3dpdGhfdXJsID0gc2Vs Zi5faW5zZXJ0X3VybChhcmdzLCAyLCB1cmwpCiAgICAgICAgIHNlbGYuX2xhdW5jaF9wcm9jZXNz KGJ1aWxkX2Rpcj1icm93c2VyX2J1aWxkX3BhdGgsIGFwcF9uYW1lPXNlbGYuYXBwX25hbWUsIHVy bD11cmwsIGFyZ3M9YXJnc193aXRoX3VybCkKIApAQCAtMzgsNiArMzgsOCBAQCBjbGFzcyBPU1hD aHJvbWVDYW5hcnlEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CiAgICAgYXBwX25hbWUgPSAnR29v Z2xlIENocm9tZSBDYW5hcnkuYXBwJwogCiAgICAgZGVmIGxhdW5jaF91cmwoc2VsZiwgdXJsLCBv cHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgorICAgICAgICB3aW5kb3dfc2l6ZV9hcmcgPSAn LS13aW5kb3ctc2l6ZT17d2lkdGh9LHtoZWlnaHR9Jy5mb3JtYXQod2lkdGg9aW50KE9TWEJyb3dz ZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkud2lkdGgpLCBoZWlnaHQ9aW50KE9TWEJyb3dzZXJEcml2 ZXIuX3NjcmVlbl9zaXplKCkuaGVpZ2h0KSkKKyAgICAgICAgYXJncyA9IFsnLS1hcmdzJywgJy0t aG9tZXBhZ2UnLCB3aW5kb3dfc2l6ZV9hcmddCiAgICAgICAgIGFyZ3Nfd2l0aF91cmwgPSBzZWxm Ll9pbnNlcnRfdXJsKGFyZ3MsIDIsIHVybCkKICAgICAgICAgc2VsZi5fbGF1bmNoX3Byb2Nlc3Mo YnVpbGRfZGlyPWJyb3dzZXJfYnVpbGRfcGF0aCwgYXBwX25hbWU9c2VsZi5hcHBfbmFtZSwgdXJs PXVybCwgYXJncz1hcmdzX3dpdGhfdXJsKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hfZHJpdmVy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJp dmVyL29zeF9maXJlZm94X2RyaXZlci5weQppbmRleCA1NGEwNTZiMGZlNjIzMDMzMTBlYTFhMDA2 MGZlMTIxMDZiMTczMWJkLi4wODhkODA4ZWNkMWIxNjEwZjE5MDhjYmQ5NDdhZTFjNzUzYTQ4MTU1 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJv d3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hfZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfZmlyZWZveF9kcml2ZXIu cHkKQEAgLTgsMTUgKzgsMTMgQEAgZnJvbSBvc3hfYnJvd3Nlcl9kcml2ZXIgaW1wb3J0IE9TWEJy b3dzZXJEcml2ZXIKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCi1hcmdz ID0gWyctLWFyZ3MnLCAnLXdpZHRoJywgc3RyKGludChPU1hCcm93c2VyRHJpdmVyLl9zY3JlZW5f c2l6ZSgpLndpZHRoKSksICctaGVpZ2h0Jywgc3RyKGludChPU1hCcm93c2VyRHJpdmVyLl9zY3Jl ZW5fc2l6ZSgpLmhlaWdodCkpXQotCi0KIGNsYXNzIE9TWEZpcmVmb3hEcml2ZXIoT1NYQnJvd3Nl ckRyaXZlcik6CiAgICAgcHJvY2Vzc19uYW1lID0gJ2ZpcmVmb3gnCiAgICAgYnJvd3Nlcl9uYW1l ID0gJ2ZpcmVmb3gnCiAgICAgYXBwX25hbWUgPSAnRmlyZWZveC5hcHAnCiAKICAgICBkZWYgbGF1 bmNoX3VybChzZWxmLCB1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRfcGF0aCk6CisgICAgICAg IGFyZ3MgPSBbJy0tYXJncycsICctd2lkdGgnLCBzdHIoaW50KE9TWEJyb3dzZXJEcml2ZXIuX3Nj cmVlbl9zaXplKCkud2lkdGgpKSwgJy1oZWlnaHQnLCBzdHIoaW50KE9TWEJyb3dzZXJEcml2ZXIu X3NjcmVlbl9zaXplKCkuaGVpZ2h0KSldCiAgICAgICAgIGFyZ3Nfd2l0aF91cmwgPSBzZWxmLl9p bnNlcnRfdXJsKGFyZ3MsIDAsIHVybCkKICAgICAgICAgc2VsZi5fbGF1bmNoX3Byb2Nlc3MoYnVp bGRfZGlyPWJyb3dzZXJfYnVpbGRfcGF0aCwgYXBwX25hbWU9c2VsZi5hcHBfbmFtZSwgdXJsPXVy bCwgYXJncz1hcmdzX3dpdGhfdXJsKQogCkBAIC00MCw2ICszOCw3IEBAIGNsYXNzIE9TWEZpcmVm b3hOaWdodGx5RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgIGFwcF9uYW1lID0gJ0ZpcmVm b3hOaWdodGx5LmFwcCcKIAogICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwgb3B0aW9ucywg YnJvd3Nlcl9idWlsZF9wYXRoKToKKyAgICAgICAgYXJncyA9IFsnLS1hcmdzJywgJy13aWR0aCcs IHN0cihpbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS53aWR0aCkpLCAnLWhlaWdo dCcsIHN0cihpbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS5oZWlnaHQpKV0KICAg ICAgICAgYXJnc193aXRoX3VybCA9IHNlbGYuX2luc2VydF91cmwoYXJncywgMCwgdXJsKQogICAg ICAgICBzZWxmLl9sYXVuY2hfcHJvY2VzcyhidWlsZF9kaXI9YnJvd3Nlcl9idWlsZF9wYXRoLCBh cHBfbmFtZT1zZWxmLmFwcF9uYW1lLCB1cmw9dXJsLCBhcmdzPWFyZ3Nfd2l0aF91cmwpCiAK 317182 2017-08-03 16:58:06 -0700 2017-08-03 18:12:57 -0700 Patch bug-175126-20170804015805.patch text/plain 6897 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFkOThiZjE2ODA1MmE3MmQ1ZGQ5ZjU1NDM3MmQ1NDBk OWRhMWZhNy4uM2JhZDc3MmRkZDczMDJkY2M5NDQ2OGZiNzk5ZDQ1OWE3M2E3YmUwZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQy IEBACiAyMDE3LTA4LTAzICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgogCisgICAgICAgIFJFR1JFU1NJT04ocjIxOTg1MCk6IHJ1bi1iZW5jaG1hcmsgc2Ny aXB0IGJyb2tlbiBvbiBMaW51eAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc1MTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIHJ1bi1iZW5jaG1hcmsgc2NyaXB0IGR5bmFtaWNhbGx5IGdlbmVyYXRl cyB0aGUgbGlzdCBvZiBzdXBwb3J0ZWQKKyAgICAgICAgYnJvd3NlcnMgYW5kIHBsYXRmb3JtcyAo Y3VycmVudGx5IExpbnV4IGFuZCBPU1gpIGJ5IGxvYWRpbmcgYWxsCisgICAgICAgIHB5dGhvbiBm aWxlcyBmcm9tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2Vy X2RyaXZlcgorICAgICAgICBhbmQgZ2V0dGluZyB0aGUgYnJvd3Nlcl9uYW1lIGFuZCBwbGF0Zm9y bSB2YXJpYWJsZXMgZnJvbSB0aGUKKyAgICAgICAgY2xhc3NlcyBkZWZpbmVkIHRoZXJlLgorCisg ICAgICAgIFRoaXMgbWVhbnMgdGhhdCB0aGlzIGNsYXNzZXMgc2hvdWxkIG5vdCByYWlzZSBhbiBl eGNlcHRpb24gd2hlbgorICAgICAgICBsb2FkZWQgb24gb3RoZXIgcGxhdGZvcm1zIG9yIG90aGVy d2lzZSB0aGV5IHdpbGwgYnJva2UgdGhlIHdob2xlCisgICAgICAgIHNjcmlwdC4gSXRzIGZpbmUg aWYgdGhleSByYWlzZSBhbiBleGNlcHRpb24gd2hlbiBleGVjdXRpbmcgYW55IG9mCisgICAgICAg IHRoZSBtZXRob2RzIHRoZXkgaW1wbGVtZW50LCBidXQgbm90IHdoZW4ganVzdCBsb2FkaW5nL2lt cG9ydGluZworICAgICAgICB0aGUgY2xhc3MuCisKKyAgICAgICAgTW92ZSB0aGUgYXJndW1lbnQg dmFyaWFibGUgZGVmaW5pdGlvbnMgdGhhdCBjYWxsIG9uIHRoZSBwbGF0Zm9ybQorICAgICAgICBz cGVjaWZpYyBPU1hCcm93c2VyRHJpdmVyLl9zY3JlZW5fc2l6ZSgpIGZ1bmN0aW9uIGZyb20gYmVl aW5nCisgICAgICAgIHZhcmlhYmxlcyB0aGF0IGFyZSBldmFsdWF0ZWQgd2hlbiBsb2FkaW5nIHRo ZSBmaWxlLCB0byBiZSBmdW5jdGlvbnMKKyAgICAgICAgdGhhdCBhcmUgb25seSBldmFsdWF0ZWQg d2hlbiB0aGUgYWN0dWFsIGZ1bmN0aW9uYWxpdHkgbmVlZHMgdG8gYmUKKyAgICAgICAgZXhlY3V0 ZWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nl cl9kcml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHk6CisgICAgICAgIChPU1hDaHJvbWVEcml2ZXIu bGF1bmNoX3VybCk6CisgICAgICAgIChPU1hDaHJvbWVDYW5hcnlEcml2ZXIubGF1bmNoX3VybCk6 CisgICAgICAgIChjcmVhdGVfYXJncyk6CisgICAgICAgIChjcmVhdGVfY2hyb21lX29wdGlvbnMp OgorICAgICAgICAoY3JlYXRlX3dpbmRvd19zaXplX2FyZyk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9maXJlZm94X2RyaXZl ci5weToKKyAgICAgICAgKE9TWEZpcmVmb3hEcml2ZXIubGF1bmNoX3VybCk6CisgICAgICAgIChP U1hGaXJlZm94TmlnaHRseURyaXZlci5sYXVuY2hfdXJsKToKKyAgICAgICAgKE9TWEZpcmVmb3hO aWdodGx5RHJpdmVyLmxhdW5jaF9kcml2ZXIpOgorICAgICAgICAoY3JlYXRlX2FyZ3MpOgorCisy MDE3LTA4LTAzICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29t PgorCiAgICAgICAgIFtHVEtdW1dLRV0gUGFzcyB0aGUgLS1tZW1vcnktbGltaXRlZCBvcHRpb24g b24gdGhlIEdUSyBhbmQgV1BFIGJ1aWxkYm90cyBmb3IgdGhlIEpTQyB0ZXN0cy4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTE0MAogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2 ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkKaW5kZXggYzY3MDY2 YmJhZmZhMTI5MWU5Y2ViODcyNGIxODU4M2E4NDJiZTAyZS4uOWMzODVkNzg3YTI5NmJkMmU0MDNl ZTUwZTU2YjJkNDdlZDVkMTkxOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9jaHJvbWVfZHJpdmVyLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9v c3hfY2hyb21lX2RyaXZlci5weQpAQCAtNyw4ICs3LDYgQEAgZnJvbSBvc3hfYnJvd3Nlcl9kcml2 ZXIgaW1wb3J0IE9TWEJyb3dzZXJEcml2ZXIKIAogCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIo X19uYW1lX18pCi13aW5kb3dfc2l6ZV9hcmcgPSAnLS13aW5kb3ctc2l6ZT17d2lkdGh9LHtoZWln aHR9Jy5mb3JtYXQod2lkdGg9aW50KE9TWEJyb3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkud2lk dGgpLCBoZWlnaHQ9aW50KE9TWEJyb3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkuaGVpZ2h0KSkK LWFyZ3MgPSBbJy0tYXJncycsICctLWhvbWVwYWdlJywgd2luZG93X3NpemVfYXJnXQogCiBjbGFz cyBPU1hDaHJvbWVEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CiAgICAgcHJvY2Vzc19uYW1lID0g J0dvb2dsZSBDaHJvbWUnCkBAIC0xNiw3ICsxNCw3IEBAIGNsYXNzIE9TWENocm9tZURyaXZlcihP U1hCcm93c2VyRHJpdmVyKToKICAgICBhcHBfbmFtZSA9ICdHb29nbGUgQ2hyb21lLmFwcCcKIAog ICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwgb3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRo KToKLSAgICAgICAgYXJnc193aXRoX3VybCA9IHNlbGYuX2luc2VydF91cmwoYXJncywgMiwgdXJs KQorICAgICAgICBhcmdzX3dpdGhfdXJsID0gc2VsZi5faW5zZXJ0X3VybChjcmVhdGVfYXJncygp LCAyLCB1cmwpCiAgICAgICAgIHNlbGYuX2xhdW5jaF9wcm9jZXNzKGJ1aWxkX2Rpcj1icm93c2Vy X2J1aWxkX3BhdGgsIGFwcF9uYW1lPXNlbGYuYXBwX25hbWUsIHVybD11cmwsIGFyZ3M9YXJnc193 aXRoX3VybCkKIAogICAgIGRlZiBsYXVuY2hfZHJpdmVyKHNlbGYsIHVybCwgb3B0aW9ucywgYnJv d3Nlcl9idWlsZF9wYXRoKToKQEAgLTM4LDcgKzM2LDcgQEAgY2xhc3MgT1NYQ2hyb21lQ2FuYXJ5 RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgIGFwcF9uYW1lID0gJ0dvb2dsZSBDaHJvbWUg Q2FuYXJ5LmFwcCcKIAogICAgIGRlZiBsYXVuY2hfdXJsKHNlbGYsIHVybCwgb3B0aW9ucywgYnJv d3Nlcl9idWlsZF9wYXRoKToKLSAgICAgICAgYXJnc193aXRoX3VybCA9IHNlbGYuX2luc2VydF91 cmwoYXJncywgMiwgdXJsKQorICAgICAgICBhcmdzX3dpdGhfdXJsID0gc2VsZi5faW5zZXJ0X3Vy bChjcmVhdGVfYXJncygpLCAyLCB1cmwpCiAgICAgICAgIHNlbGYuX2xhdW5jaF9wcm9jZXNzKGJ1 aWxkX2Rpcj1icm93c2VyX2J1aWxkX3BhdGgsIGFwcF9uYW1lPXNlbGYuYXBwX25hbWUsIHVybD11 cmwsIGFyZ3M9YXJnc193aXRoX3VybCkKIAogICAgIGRlZiBsYXVuY2hfZHJpdmVyKHNlbGYsIHVy bCwgb3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoKToKQEAgLTU1LDExICs1MywyMCBAQCBjbGFz cyBPU1hDaHJvbWVDYW5hcnlEcml2ZXIoT1NYQnJvd3NlckRyaXZlcik6CiAgICAgICAgIHJldHVy biBkcml2ZXIKIAogCitkZWYgY3JlYXRlX2FyZ3MoKToKKyAgICBhcmdzID0gWyctLWFyZ3MnLCAn LS1ob21lcGFnZScsIGNyZWF0ZV93aW5kb3dfc2l6ZV9hcmcoKV0KKyAgICByZXR1cm4gYXJncwor CiBkZWYgY3JlYXRlX2Nocm9tZV9vcHRpb25zKCk6CiAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBh cnR5LmF1dG9pbnN0YWxsZWQuc2VsZW5pdW0ud2ViZHJpdmVyLmNocm9tZS5vcHRpb25zIGltcG9y dCBPcHRpb25zCiAgICAgY2hyb21lX29wdGlvbnMgPSBPcHRpb25zKCkKICAgICBjaHJvbWVfb3B0 aW9ucy5hZGRfYXJndW1lbnQoIi0tZGlzYWJsZS13ZWItc2VjdXJpdHkiKQogICAgIGNocm9tZV9v cHRpb25zLmFkZF9hcmd1bWVudCgiLS11c2VyLWRhdGEtZGlyIikKICAgICBjaHJvbWVfb3B0aW9u cy5hZGRfYXJndW1lbnQoIi0tZGlzYWJsZS1leHRlbnNpb25zIikKLSAgICBjaHJvbWVfb3B0aW9u cy5hZGRfYXJndW1lbnQod2luZG93X3NpemVfYXJnKQorICAgIGNocm9tZV9vcHRpb25zLmFkZF9h cmd1bWVudChjcmVhdGVfd2luZG93X3NpemVfYXJnKCkpCiAgICAgcmV0dXJuIGNocm9tZV9vcHRp b25zCisKKworZGVmIGNyZWF0ZV93aW5kb3dfc2l6ZV9hcmcoKToKKyAgICB3aW5kb3dfc2l6ZV9h cmcgPSAnLS13aW5kb3ctc2l6ZT17d2lkdGh9LHtoZWlnaHR9Jy5mb3JtYXQod2lkdGg9aW50KE9T WEJyb3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkud2lkdGgpLCBoZWlnaHQ9aW50KE9TWEJyb3dz ZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkuaGVpZ2h0KSkKKyAgICByZXR1cm4gd2luZG93X3NpemVf YXJnCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YnJvd3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hfZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9maXJlZm94X2RyaXZlci5w eQppbmRleCA1NGEwNTZiMGZlNjIzMDMzMTBlYTFhMDA2MGZlMTIxMDZiMTczMWJkLi5kZGY0NmE5 NDgyNzZkMWMxZDQ3MGU4ODRiY2M4NDM4MGVlZjJhM2IzIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2ZpcmVmb3hf ZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9i cm93c2VyX2RyaXZlci9vc3hfZmlyZWZveF9kcml2ZXIucHkKQEAgLTgsOCArOCw2IEBAIGZyb20g b3N4X2Jyb3dzZXJfZHJpdmVyIGltcG9ydCBPU1hCcm93c2VyRHJpdmVyCiAKIF9sb2cgPSBsb2dn aW5nLmdldExvZ2dlcihfX25hbWVfXykKIAotYXJncyA9IFsnLS1hcmdzJywgJy13aWR0aCcsIHN0 cihpbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS53aWR0aCkpLCAnLWhlaWdodCcs IHN0cihpbnQoT1NYQnJvd3NlckRyaXZlci5fc2NyZWVuX3NpemUoKS5oZWlnaHQpKV0KLQogCiBj bGFzcyBPU1hGaXJlZm94RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgIHByb2Nlc3NfbmFt ZSA9ICdmaXJlZm94JwpAQCAtMTcsNyArMTUsNyBAQCBjbGFzcyBPU1hGaXJlZm94RHJpdmVyKE9T WEJyb3dzZXJEcml2ZXIpOgogICAgIGFwcF9uYW1lID0gJ0ZpcmVmb3guYXBwJwogCiAgICAgZGVm IGxhdW5jaF91cmwoc2VsZiwgdXJsLCBvcHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgotICAg ICAgICBhcmdzX3dpdGhfdXJsID0gc2VsZi5faW5zZXJ0X3VybChhcmdzLCAwLCB1cmwpCisgICAg ICAgIGFyZ3Nfd2l0aF91cmwgPSBzZWxmLl9pbnNlcnRfdXJsKGNyZWF0ZV9hcmdzKCksIDAsIHVy bCkKICAgICAgICAgc2VsZi5fbGF1bmNoX3Byb2Nlc3MoYnVpbGRfZGlyPWJyb3dzZXJfYnVpbGRf cGF0aCwgYXBwX25hbWU9c2VsZi5hcHBfbmFtZSwgdXJsPXVybCwgYXJncz1hcmdzX3dpdGhfdXJs KQogCiAgICAgZGVmIGxhdW5jaF9kcml2ZXIoc2VsZiwgdXJsLCBvcHRpb25zLCBicm93c2VyX2J1 aWxkX3BhdGgpOgpAQCAtNDAsNyArMzgsNyBAQCBjbGFzcyBPU1hGaXJlZm94TmlnaHRseURyaXZl cihPU1hCcm93c2VyRHJpdmVyKToKICAgICBhcHBfbmFtZSA9ICdGaXJlZm94TmlnaHRseS5hcHAn CiAKICAgICBkZWYgbGF1bmNoX3VybChzZWxmLCB1cmwsIG9wdGlvbnMsIGJyb3dzZXJfYnVpbGRf cGF0aCk6Ci0gICAgICAgIGFyZ3Nfd2l0aF91cmwgPSBzZWxmLl9pbnNlcnRfdXJsKGFyZ3MsIDAs IHVybCkKKyAgICAgICAgYXJnc193aXRoX3VybCA9IHNlbGYuX2luc2VydF91cmwoY3JlYXRlX2Fy Z3MoKSwgMCwgdXJsKQogICAgICAgICBzZWxmLl9sYXVuY2hfcHJvY2VzcyhidWlsZF9kaXI9YnJv d3Nlcl9idWlsZF9wYXRoLCBhcHBfbmFtZT1zZWxmLmFwcF9uYW1lLCB1cmw9dXJsLCBhcmdzPWFy Z3Nfd2l0aF91cmwpCiAKICAgICBkZWYgbGF1bmNoX2RyaXZlcihzZWxmLCB1cmwsIG9wdGlvbnMs IGJyb3dzZXJfYnVpbGRfcGF0aCk6CkBAIC01NiwzICs1NCw4IEBAIGNsYXNzIE9TWEZpcmVmb3hO aWdodGx5RHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgICAgICBkcml2ZXIgPSB3ZWJkcml2 ZXIuRmlyZWZveChmaXJlZm94X29wdGlvbnM9ZmlyZWZveF9vcHRpb25zLCBleGVjdXRhYmxlX3Bh dGg9ZHJpdmVyX2V4ZWN1dGFibGUpCiAgICAgICAgIHNlbGYuX2xhdW5jaF93ZWJkcml2ZXIodXJs PXVybCwgZHJpdmVyPWRyaXZlcikKICAgICAgICAgcmV0dXJuIGRyaXZlcgorCisKK2RlZiBjcmVh dGVfYXJncygpOgorICAgIGFyZ3MgPSBbJy0tYXJncycsICctd2lkdGgnLCBzdHIoaW50KE9TWEJy b3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkud2lkdGgpKSwgJy1oZWlnaHQnLCBzdHIoaW50KE9T WEJyb3dzZXJEcml2ZXIuX3NjcmVlbl9zaXplKCkuaGVpZ2h0KSldCisgICAgcmV0dXJuIGFyZ3MK