66693 2011-08-22 11:39:21 -0700 [chromium] Update builder names for chromium gpu bots due to CG switchover 2011-08-22 14:57:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth dglazkov dpranke ojan oldest_to_newest 454747 0 jamesr 2011-08-22 11:39:21 -0700 [chromium] Update builder names for chromium gpu bots due to CG switchover 454759 1 104707 jamesr 2011-08-22 11:44:22 -0700 Created attachment 104707 Patch 454772 2 104707 abarth 2011-08-22 11:55:00 -0700 Comment on attachment 104707 Patch Why do we have chromium-gpu-cg bots? That wasn't part of the CG migration plan. 454776 3 dpranke 2011-08-22 11:59:59 -0700 (In reply to comment #2) > (From update of attachment 104707 [details]) > Why do we have chromium-gpu-cg bots? That wasn't part of the CG migration plan. The GPU tests are a separate step on the existing bots, not separate bots, and the "bot name" is formed by appending "- GPU" to the existing bot name. So, by renaming the bots and not renaming the GPU components, we stopped being able to rebaseline things. This patch just brings everything back to consistency. 454809 4 jamesr 2011-08-22 12:33:53 -0700 (In reply to comment #2) > (From update of attachment 104707 [details]) > Why do we have chromium-gpu-cg bots? That wasn't part of the CG migration plan. We'll need to handle gpu mac baselines the same way as non-gpu mac baselines, so they definitely need to be part of the plan. 454811 5 jamesr 2011-08-22 12:36:00 -0700 Committed r93530: <http://trac.webkit.org/changeset/93530> 454870 6 abarth 2011-08-22 13:48:59 -0700 > We'll need to handle gpu mac baselines the same way as non-gpu mac baselines, so they definitely need to be part of the plan. Is there something wrong with using the name chromium-gpu-mac-leopard rather than chromium-gpu-cg-mac-leopard? Maybe we should update the plan? The GPU bots seems hacked into our tools in undesirable ways. 454872 7 jamesr 2011-08-22 13:50:09 -0700 Where do you put the pixel baselines for tests that render differently with skia+gpu than they do for cg+gpu? I'm not really aware that we had a plan for chromium-mac-gpu, it seems like nobody thought about it when making these changes because everything broke. 454882 8 abarth 2011-08-22 13:54:16 -0700 The plan doesn't ever call for having both GPU Skia and GPU CG bots running at the same time, so that problem will not occur according to the plan. 454903 9 dpranke 2011-08-22 14:09:45 -0700 (In reply to comment #8) > The plan doesn't ever call for having both GPU Skia and GPU CG bots running at the same time, so that problem will not occur according to the plan. In comment #3, I wrote that "The GPU tests are a separate step on the existing bots, not separate bots". As soon as you have both Skia and CG bots, you will have Skia CG GPU bots. It seems someone needs to update the plan. 454905 10 jamesr 2011-08-22 14:12:39 -0700 I updated the plan document to call out adding the webkit_gpu_tests step to the skia bots as an explicit item. 454907 11 abarth 2011-08-22 14:14:25 -0700 Is there some reason we represent the webkit_gpu_tests step as a separate bot in the code? That seems like a giant hack that causes more problems then it's worth. 454909 12 jamesr 2011-08-22 14:15:24 -0700 Actually it looks like Elliot already took care of this for the new skia mac bot, so there's no new work to do. 454914 13 dpranke 2011-08-22 14:22:15 -0700 (In reply to comment #11) > Is there some reason we represent the webkit_gpu_tests step as a separate bot in the code? (adding Ojan to double-check my memory here) We did this because the TestResultsServer (aka Flakiness Dashboard) only stores results by bot name; adding an additional dimension would have required us to add a secondary key (in one form or another) in order to be able to look up things. Arguably we could have done this by posting the bot name plus the cpu/gpu flag to the TestResultsServer, and having it do the strcat; I'm not sure if we would've run into other complications once we started down that path. 454917 14 dpranke 2011-08-22 14:22:53 -0700 I do agree that it's a hack, though. 454921 15 abarth 2011-08-22 14:24:24 -0700 I guess I never fully understood why webkit_gpu_tests needs to be a separate step at all. It's the same binary, right? Can we just run those tests in the same step as the other tests? That would eliminate all this special-case logic for GPU. (Maybe we should take this discussion to a mailing list rather than a bug.) 454943 16 jamesr 2011-08-22 14:43:25 -0700 It's the same binary but different flags passed to DRT. One motivation for having it this way is that we want to run the canvas tests through both the HW and SW paths, since users may encounter either. I'm not sure how to say "run this set of tests with a different set of flags than last time" without making it a different step or adding something truly bizarre to NRWT. 454958 17 abarth 2011-08-22 14:57:10 -0700 I posted some of these questions to webkit-dev just now. Sorry if that causes you to repeat some of your answers. It's probably better to continue the discussion there. 104707 2011-08-22 11:44:22 -0700 2011-08-22 11:55:00 -0700 Patch bug-66693-20110822114421.patch text/plain 7693 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0NTUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxNTNkMDYxNDFkNDAwMjZjZmYwOGJkZDkyZGFiYzI4MDlh ZGZmMzVjLi5hMjY1ZWRlYjc0NmUzN2JhNzUwOGRiYjlkMDAxNDMxMGQ3NWRjNWI3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDgtMjIgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbY2hyb21pdW1dIFVwZGF0ZSBidWlsZGVyIG5hbWVzIGZvciBjaHJvbWl1bSBncHUg Ym90cyBkdWUgdG8gQ0cgc3dpdGNob3ZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjY2OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIHBvcnQgYW5kIGJ1aWxkZXIgbmFtZXMgZm9yIHRo ZSBjaHJvbWl1bSBtYWMgZ3B1IGJvdHMgdG8KKyAgICAgICAgYWNjb3VudCBmb3IgdGhlIENHIHRy YW5zaXRpb24uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2J1aWxkZXJzLnB5OgorCiAyMDExLTA4LTE5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcu Ym90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTM0MjYu CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2J1 aWxkZXJzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9idWls ZGVycy5weQppbmRleCA2NzViMWUzZTJjMWM0MTM2OGRhOTE3NDNiZDUxMWI4Y2NkMjZlMWE4Li4x ZDIxYTQ3NjllZDYwMjA0ZTUyNGNkYzMzOGE3MDYxNDZiNjRkZDk3IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYnVpbGRlcnMucHkKQEAgLTUx LDE0ICs1MSwxMyBAQCBfZXhhY3RfbWF0Y2hlcyA9IHsKICAgICAiV2Via2l0IE1hYzEwLjUgKENH KShkYmcpKDIpIjogeyJwb3J0X25hbWUiOiAiY2hyb21pdW0tY2ctbWFjLWxlb3BhcmQiLCAic3Bl Y2lmaWVycyI6IHNldChbImxlb3BhcmQiLCAiZGVidWciXSl9LAogICAgICJXZWJraXQgTWFjMTAu NiAoQ0cpIjogeyJwb3J0X25hbWUiOiAiY2hyb21pdW0tY2ctbWFjLXNub3dsZW9wYXJkIiwgInNw ZWNpZmllcnMiOiBzZXQoWyJzbm93bGVvcGFyZCJdKX0sCiAgICAgIldlYmtpdCBNYWMxMC42IChD RykoZGJnKSI6IHsicG9ydF9uYW1lIjogImNocm9taXVtLWNnLW1hYy1zbm93bGVvcGFyZCIsICJz cGVjaWZpZXJzIjogc2V0KFsic25vd2xlb3BhcmQiLCAiZGVidWciXSl9LAotICAgICJXZWJraXQg TWFjMTAuNiAtIEdQVSI6IHsicG9ydF9uYW1lIjogImNocm9taXVtLWdwdS1tYWMtc25vd2xlb3Bh cmQiLCAic3BlY2lmaWVycyI6IHNldChbInNub3dsZW9wYXJkIiwgImdwdSJdKX0sCiAgICAgIldl YmtpdCBXaW4gLSBHUFUiOiB7InBvcnRfbmFtZSI6ICJjaHJvbWl1bS1ncHUtd2luLXhwIiwgInNw ZWNpZmllcnMiOiBzZXQoWyJ4cCIsICJyZWxlYXNlIiwgImdwdSJdKX0sCiAgICAgIldlYmtpdCBX aW43IC0gR1BVIjogeyJwb3J0X25hbWUiOiAiY2hyb21pdW0tZ3B1LXdpbi13aW43IiwgInNwZWNp ZmllcnMiOiBzZXQoWyJ3aW43IiwgInZpc3RhIiwgInJlbGVhc2UiLCAiZ3B1Il0pfSwKICAgICAj IEZJWE1FOiBGb3Igc29tZSByZWFzb24sIHRoZXNlIHBvcnQgbmFtZXMgZG9uJ3Qgd29yayBjb3Jy ZWN0bHkuCiAgICAgIyAiV2Via2l0IExpbnV4IC0gR1BVIjogeyJwb3J0X25hbWUiOiAiY2hyb21p dW0tZ3B1LWxpbnV4LXg4Nl82NCIsICJzcGVjaWZpZXJzIjogc2V0KFsibGludXgiLCAiZ3B1Il0p fSwKICAgICAjICJXZWJraXQgTGludXggMzIgLSBHUFUiOiB7InBvcnRfbmFtZSI6ICJjaHJvbWl1 bS1ncHUtbGludXgteDg2IiwgInNwZWNpZmllcnMiOiBzZXQoWyJsaW51eCIsICJ4ODYiLCAiZ3B1 Il0pfSwKLSAgICAiV2Via2l0IE1hYzEwLjUgLSBHUFUiOiB7InBvcnRfbmFtZSI6ICJjaHJvbWl1 bS1ncHUtbWFjLWxlb3BhcmQiLCAic3BlY2lmaWVycyI6IHNldChbImxlb3BhcmQiLCAiZ3B1Il0p fSwKLSAgICAiV2Via2l0IE1hYzEwLjYgLSBHUFUiOiB7InBvcnRfbmFtZSI6ICJjaHJvbWl1bS1n cHUtbWFjLXNub3dsZW9wYXJkIiwgInNwZWNpZmllcnMiOiBzZXQoWyJtYWMiLCAiZ3B1Il0pfSwK KyAgICAiV2Via2l0IE1hYzEwLjUgKENHKSAtIEdQVSI6IHsicG9ydF9uYW1lIjogImNocm9taXVt LWdwdS1jZy1tYWMtbGVvcGFyZCIsICJzcGVjaWZpZXJzIjogc2V0KFsibGVvcGFyZCIsICJncHUi XSl9LAorICAgICJXZWJraXQgTWFjMTAuNiAoQ0cpIC0gR1BVIjogeyJwb3J0X25hbWUiOiAiY2hy b21pdW0tZ3B1LWNnLW1hYy1zbm93bGVvcGFyZCIsICJzcGVjaWZpZXJzIjogc2V0KFsibWFjIiwg ImdwdSJdKX0sCiAKICAgICAjIFRoZXNlIGJ1aWxkZXJzIGFyZSBvbiBidWlsZC53ZWJraXQub3Jn LgogICAgICJHVEsgTGludXggMzItYml0IERlYnVnIjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNw ZWNpZmllcnMiOiBzZXQoWyJndGsiXSl9LApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQppbmRleCA1OGQ0MTg0NDI0 M2NkMzc1ZjE4ZTRhMDEyMTEzMTIyNWM3ZWVlMjQxLi5lYmViODlhNTNkZDUzYzA5MzQzYzY4MTYw NWIxNWExZTRmM2I1OWY5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQpAQCAtNDQsMTMgKzQ0LDEzIEBAIGRl ZiBnZXQocGxhdGZvcm09Tm9uZSwgcG9ydF9uYW1lPSdjaHJvbWl1bS1ncHUnLCAqKmt3YXJncyk6 CiAgICAgICAgIGVsaWYgcGxhdGZvcm0uc3RhcnRzd2l0aCgnbGludXgnKToKICAgICAgICAgICAg IHBvcnRfbmFtZSA9ICdjaHJvbWl1bS1ncHUtbGludXgnCiAgICAgICAgIGVsaWYgcGxhdGZvcm0g PT0gJ2Rhcndpbic6Ci0gICAgICAgICAgICBwb3J0X25hbWUgPSAnY2hyb21pdW0tZ3B1LW1hYycK KyAgICAgICAgICAgIHBvcnRfbmFtZSA9ICdjaHJvbWl1bS1ncHUtY2ctbWFjJwogICAgICAgICBl bHNlOgogICAgICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigndW5zdXBwb3J0ZWQg cGxhdGZvcm06ICVzJyAlIHBsYXRmb3JtKQogCiAgICAgaWYgcG9ydF9uYW1lLnN0YXJ0c3dpdGgo J2Nocm9taXVtLWdwdS1saW51eCcpOgogICAgICAgICByZXR1cm4gQ2hyb21pdW1HcHVMaW51eFBv cnQocG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCi0gICAgaWYgcG9ydF9uYW1lLnN0YXJ0 c3dpdGgoJ2Nocm9taXVtLWdwdS1tYWMnKToKKyAgICBpZiBwb3J0X25hbWUuc3RhcnRzd2l0aCgn Y2hyb21pdW0tZ3B1LWNnLW1hYycpOgogICAgICAgICByZXR1cm4gQ2hyb21pdW1HcHVNYWNQb3J0 KHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dhcmdzKQogICAgIGlmIHBvcnRfbmFtZS5zdGFydHN3 aXRoKCdjaHJvbWl1bS1ncHUtd2luJyk6CiAgICAgICAgIHJldHVybiBDaHJvbWl1bUdwdVdpblBv cnQocG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCkBAIC03NSw3ICs3NSw3IEBAIGRlZiBf c2V0X2dwdV9vcHRpb25zKHBvcnQpOgogZGVmIF90ZXN0cyhwb3J0LCBwYXRocyk6CiAgICAgaWYg bm90IHBhdGhzOgogICAgICAgICBwYXRocyA9IFsnY29tcG9zaXRpbmcnLCAncGxhdGZvcm0vY2hy b21pdW0vY29tcG9zaXRpbmcnLCAnbWVkaWEnLCAnYW5pbWF0aW9ucy8zZCddCi0gICAgICAgIGlm IG5vdCBwb3J0Lm5hbWUoKS5zdGFydHN3aXRoKCdjaHJvbWl1bS1ncHUtbWFjJyk6CisgICAgICAg IGlmIG5vdCBwb3J0Lm5hbWUoKS5zdGFydHN3aXRoKCdjaHJvbWl1bS1ncHUtY2ctbWFjJyk6CiAg ICAgICAgICAgICAjIENhbnZhcyBpcyBub3QgeWV0IGFjY2VsZXJhdGVkIG9uIHRoZSBNYWMsIHNv IHRoZXJlJ3Mgbm8gcG9pbnQKICAgICAgICAgICAgICMgaW4gcnVubmluZyB0aGUgdGVzdHMgdGhl cmUuCiAgICAgICAgICAgICBwYXRocyArPSBbJ2Zhc3QvY2FudmFzJywgJ2NhbnZhcy9waGlsaXAn XQpAQCAtMTAwLDEyICsxMDAsMTIgQEAgY2xhc3MgQ2hyb21pdW1HcHVMaW51eFBvcnQoY2hyb21p dW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQpOgogCiAKIGNsYXNzIENocm9taXVtR3B1TWFjUG9y dChjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwg cG9ydF9uYW1lPSdjaHJvbWl1bS1ncHUtbWFjJywgKiprd2FyZ3MpOgorICAgIGRlZiBfX2luaXRf XyhzZWxmLCBwb3J0X25hbWU9J2Nocm9taXVtLWdwdS1jZy1tYWMnLCAqKmt3YXJncyk6CiAgICAg ICAgIGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQuX19pbml0X18oc2VsZiwgcG9ydF9uYW1l PXBvcnRfbmFtZSwgKiprd2FyZ3MpCiAgICAgICAgIF9zZXRfZ3B1X29wdGlvbnMoc2VsZikKIAog ICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKLSAgICAgICAgcmV0dXJuIChtYXAo c2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIFsnY2hyb21pdW0tZ3B1LW1hYycsICdjaHJvbWl1 bS1ncHUnXSkgKworICAgICAgICByZXR1cm4gKG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0 aCwgWydjaHJvbWl1bS1ncHUtY2ctbWFjJywgJ2Nocm9taXVtLWdwdSddKSArCiAgICAgICAgICAg ICAgICAgY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aChz ZWxmKSkKIAogICAgIGRlZiB0ZXN0cyhzZWxmLCBwYXRocyk6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdV91bml0dGVzdC5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1 X3VuaXR0ZXN0LnB5CmluZGV4IDk5YTFiODg1YjhlZDA2ZTNiMjg2YjM1YWU0MWRmYmY4OTZjNzFj MjkuLjk2MzI1ZGMwMjFlMGRmODk2N2ZmNzRkOGUwZTk4ODBhMmFlYmE5MzQgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1X3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5CkBAIC00NCw4ICs0NCw4IEBAIGNsYXNzIENocm9taXVt R3B1VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIGludGVncmF0aW9uX3Rlc3RfY2hy b21pdW1fZ3B1X21hYyhzZWxmKToKICAgICAgICAgaWYgc3lzLnBsYXRmb3JtICE9ICdkYXJ3aW4n OgogICAgICAgICAgICAgcmV0dXJuCi0gICAgICAgIHNlbGYuYXNzZXJ0X3BvcnRfd29ya3MoJ2No cm9taXVtLWdwdS1tYWMnKQotICAgICAgICBzZWxmLmFzc2VydF9wb3J0X3dvcmtzKCdjaHJvbWl1 bS1ncHUtbWFjJywgJ2Nocm9taXVtLWdwdScsICdkYXJ3aW4nKQorICAgICAgICBzZWxmLmFzc2Vy dF9wb3J0X3dvcmtzKCdjaHJvbWl1bS1ncHUtY2ctbWFjJykKKyAgICAgICAgc2VsZi5hc3NlcnRf cG9ydF93b3JrcygnY2hyb21pdW0tZ3B1LWNnLW1hYycsICdjaHJvbWl1bS1ncHUnLCAnZGFyd2lu JykKIAogICAgIGRlZiBpbnRlZ3JhdGlvbl90ZXN0X2Nocm9taXVtX2dwdV93aW4oc2VsZik6CiAg ICAgICAgIGlmIHN5cy5wbGF0Zm9ybSBub3QgaW4gKCdjeWd3aW4nLCAnd2luMzInKToKQEAgLTk0 LDcgKzk0LDcgQEAgY2xhc3MgQ2hyb21pdW1HcHVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgcGF0aCA9ICdmYXN0L2h0bWwva2V5Z2VuLmh0bWwnCiAgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZShwb3J0Ll9maWxlc3lzdGVtLmV4aXN0cyhwb3J0LmFic3BhdGhfZm9yX3Rlc3QocGF0aCkp KQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBhdGggaW4gZmlsZXMpCi0gICAgICAgIGlmIHBv cnRfbmFtZS5zdGFydHN3aXRoKCdjaHJvbWl1bS1ncHUtbWFjJyk6CisgICAgICAgIGlmIHBvcnRf bmFtZS5zdGFydHN3aXRoKCdjaHJvbWl1bS1ncHUtY2ctbWFjJyk6CiAgICAgICAgICAgICBwYXRo ID0gJ2Zhc3QvY2FudmFzL3NldC1jb2xvcnMuaHRtbCcKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZShwb3J0Ll9maWxlc3lzdGVtLmV4aXN0cyhwb3J0LmFic3BhdGhfZm9yX3Rlc3QocGF0aCkp KQogICAgICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwYXRoIGluIGZpbGVzKQpAQCAtMTE1LDE0 ICsxMTUsMTQgQEAgY2xhc3MgQ2hyb21pdW1HcHVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtp dF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS1ncHUtd2luJykpCiAKICAgICBkZWYgdGVzdF9jaHJv bWl1bV9ncHVfX2xlb3BhcmQoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBmYWN0b3J5LmdldCgnY2hy b21pdW0tZ3B1LW1hYy1sZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5u YW1lKCksICdjaHJvbWl1bS1ncHUtbWFjLWxlb3BhcmQnKQotICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhwb3J0LmJhc2VsaW5lX3BhdGgoKSwgcG9ydC5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2No cm9taXVtLWdwdS1tYWMnKSkKKyAgICAgICAgcG9ydCA9IGZhY3RvcnkuZ2V0KCdjaHJvbWl1bS1n cHUtY2ctbWFjLWxlb3BhcmQnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Lm5hbWUo KSwgJ2Nocm9taXVtLWdwdS1jZy1tYWMtbGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hy b21pdW0tZ3B1LWNnLW1hYycpKQogCiAgICAgZGVmIHRlc3RfY2hyb21pdW1fZ3B1X19zbm93bGVv cGFyZChzZWxmKToKLSAgICAgICAgcG9ydCA9IGZhY3RvcnkuZ2V0KCdjaHJvbWl1bS1ncHUtbWFj LXNub3dsZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5uYW1lKCksICdj aHJvbWl1bS1ncHUtbWFjLXNub3dsZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo cG9ydC5iYXNlbGluZV9wYXRoKCksIHBvcnQuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1 bS1ncHUtbWFjJykpCisgICAgICAgIHBvcnQgPSBmYWN0b3J5LmdldCgnY2hyb21pdW0tZ3B1LWNn LW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQubmFtZSgp LCAnY2hyb21pdW0tZ3B1LWNnLW1hYy1zbm93bGVvcGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHBvcnQuYmFzZWxpbmVfcGF0aCgpLCBwb3J0Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgn Y2hyb21pdW0tZ3B1LWNnLW1hYycpKQogCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Cg==