104690 2012-12-11 11:24:54 -0800 [EFL] The WebKit2 bots are building and executing WebKit1 tests 2012-12-13 14:45:58 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tmpsantos tmpsantos dpranke d-r eric gyuyoung.kim kenneth laszlo.gombos lforschler lucas.de.marchi ossy rniwa webkit.review.bot oldest_to_newest 788626 0 tmpsantos 2012-12-11 11:24:54 -0800 It is a waste of CPU time since we have dedicated WebKit1 bots for that, not to mention that WK1 can make WK2 bots red. 788652 1 laszlo.gombos 2012-12-11 12:07:36 -0800 If it is a desire you do not even need to build the WK1 bits now, see http://trac.webkit.org/changeset/136398 http://trac.webkit.org/changeset/136957 788742 2 178865 tmpsantos 2012-12-11 13:40:42 -0800 Created attachment 178865 Patch 788962 3 178865 kenneth 2012-12-11 16:39:32 -0800 Comment on attachment 178865 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178865&action=review > Tools/Scripts/build-webkit:137 > --only-webkit Build only the WebKit project > --no-webkit2 Omit WebKit2 code from the build What is the difference? only-webkit? no-webkit2 ? > Tools/Scripts/build-webkit:139 > + --only-webkit2 Build only the WebKit2 project (EFL only) Qt (least used to) support this 789115 4 laszlo.gombos 2012-12-11 19:19:15 -0800 Have you considered using --cmakeargs="-DENABLE_WEBKIT=OFF" which would not require changing the build-webkit script) ? Introducing a new global flag (--only-webkit2) for all the 9 ports seems a bit of overkill for me as the flag is only available and hooked up for 1 port (EFL). 789116 5 laszlo.gombos 2012-12-11 19:21:08 -0800 (In reply to comment #3) > (From update of attachment 178865 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=178865&action=review > > > Tools/Scripts/build-webkit:137 > > --only-webkit Build only the WebKit project > > --no-webkit2 Omit WebKit2 code from the build > > What is the difference? only-webkit? no-webkit2 ? --only-webkit means here the Source/WebKit directory (it does not include WebCore), which is quite different than --no-webkit2 (which includes WebCore). 789571 6 178865 d-r 2012-12-12 08:15:40 -0800 Comment on attachment 178865 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178865&action=review After having a look and discussing offline - it'd be great if we could create a CompileClass and handle the "wk2 bot" distinction by using the existing BuildAndTestWebKit2 factory. Thanks for going the extra mile, I can help testing this on a separate master if needed. > Tools/BuildSlaveSupport/build.webkit.org-config/config.json:72 > + { "name": "efl-linux-slave-2", "platform": "efl-wk2" }, I'd be great if we could avoid introducing a "virtual" platform here. 790521 7 tmpsantos 2012-12-13 05:16:11 -0800 (In reply to comment #4) > Have you considered using --cmakeargs="-DENABLE_WEBKIT=OFF" which would not require changing the build-webkit script) ? > > Introducing a new global flag (--only-webkit2) for all the 9 ports seems a bit of overkill for me as the flag is only available and hooked up for 1 port (EFL). Hi Laszlo, I'm reworking the patch so this --only-webkit2 flag will make more sense. 790534 8 179258 tmpsantos 2012-12-13 06:01:02 -0800 Created attachment 179258 Patch 790547 9 179258 ossy 2012-12-13 06:23:19 -0800 Comment on attachment 179258 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179258&action=review The idea is good. Let me to think about the master.cfg change a little bit. > Tools/Scripts/build-webkit:63 > +my $onlyWebKit2 = 0; noWebKit1 similar to noWebKit2 > Tools/Scripts/build-webkit:140 > + --only-webkit2 Build only the WebKit2 project (EFL only) > + I prefer --no-webkit1, similar to --no-webkit2. > Tools/Scripts/build-webkit:155 > + 'only-webkit2' => \$onlyWebKit2, ditto. 790548 10 ossy 2012-12-13 06:23:55 -0800 Ouch, I shouldn't click on force submit ... 790557 11 ossy 2012-12-13 06:43:18 -0800 Let's see the master.cfg change. Adding the new --no-webkit1 to all slaves can be confusing and can cause problems on other platforms implements this option. What if you simple concatenate --no-webkit1 to the build command for only EFL-WK1 slaves? It would be better if we can determine wk1/wk2 from platform ... but it seems now we can do it from builddir only: if platform == 'efl' and not builddir.endswith('wk2'): self.setCommand(self.command + ['--no-webkit1']) What do you think about this simpler change now? Or the perfect fix would be to change efl platforms efl-wk1, efl-wk2. But I think it need more changes not to break existing code paths, for example all platform == 'efl' -> platform.startswith("efl") 790559 12 tmpsantos 2012-12-13 06:48:52 -0800 (In reply to comment #11) > Let's see the master.cfg change. Adding the new --no-webkit1 to all slaves can > be confusing and can cause problems on other platforms implements this option. > What if you simple concatenate --no-webkit1 to the build command for only > EFL-WK1 slaves? It would be better if we can determine wk1/wk2 from platform > ... but it seems now we can do it from builddir only: > > if platform == 'efl' and not builddir.endswith('wk2'): > self.setCommand(self.command + ['--no-webkit1']) > > What do you think about this simpler change now? Or the perfect fix > would be to change efl platforms efl-wk1, efl-wk2. But I think it > need more changes not to break existing code paths, for example all > platform == 'efl' -> platform.startswith("efl") It wont be added to all slaves, but only to those using the BuildAndTestWebKit2Factory (only the EFL WK2 bots for instance). 790565 13 ossy 2012-12-13 06:56:41 -0800 (In reply to comment #12) > It wont be added to all slaves, but only to those using the BuildAndTestWebKit2Factory (only the EFL WK2 bots for instance). It is true now. But what if X port added a new BuildAndTestWebKit2Factory slave? I think these classes should work in general. I don't want to block your change. But I prefer more general fixes. ;) What about the two-liner change I proposed? 790602 14 d-r 2012-12-13 07:31:34 -0800 (In reply to comment #11) > Let's see the master.cfg change. Adding the new --no-webkit1 to all slaves can > be confusing and can cause problems on other platforms implements this option. > What if you simple concatenate --no-webkit1 to the build command for only > EFL-WK1 slaves? It would be better if we can determine wk1/wk2 from platform > ... but it seems now we can do it from builddir only: > > if platform == 'efl' and not builddir.endswith('wk2'): > self.setCommand(self.command + ['--no-webkit1']) > > What do you think about this simpler change now? Or the perfect fix > would be to change efl platforms efl-wk1, efl-wk2. I disagree that this would be the perfect fix. I discussed this with Thiago here: In my opinion we should not create a "virtual" platform efl-wk1 and efl-wk2 to distinguish a builder configuration. A platform variable should just describe the platform, and the builder configuration should be used for telling the builder what to do. We are not making changes to the platform as a whole, we would just like to have certain builders not build webkit 1 any more. And re your other comments > It is true now. But what if X port added a new BuildAndTestWebKit2Factory > slave? I think these classes should work in general. They do work in general, right? We can argue the names could be more descriptive but otherwise these recipes just do what the name says. We could rename the CompileWebKit2 class to something like CompileWebKit2Only or so - and that's fine. I prefer this quite much over putting efl-* "virtual" platforms everywhere, including the config.json. 790615 15 ossy 2012-12-13 07:52:23 -0800 As I said I don't want to block your work. I only shared my ideas how can we make it better. It's all the same for me if you want to use efl / efl-wk1 / efl-wk2 platform names or not. I just don't understand why do you want this complex change which can affect other ports in the future instead of the simple two-liners? I have only one request: Please don't change BuildAndTestWebKit2Factory to only EFL friendly. I still think --no-webkit1 shouldn't be passed automatically to a slave typed BuildAndTestWebKit2, because --no-webkit1 is an EFL only willing for the bots. 790632 16 tmpsantos 2012-12-13 08:23:25 -0800 (In reply to comment #15) > As I said I don't want to block your work. I only shared my ideas how can we > make it better. It's all the same for me if you want to use efl / efl-wk1 / > efl-wk2 platform names or not. > > I just don't understand why do you want this complex change which can affect > other ports in the future instead of the simple two-liners? I have only one > request: Please don't change BuildAndTestWebKit2Factory to only EFL friendly. > I still think --no-webkit1 shouldn't be passed automatically to a slave typed > BuildAndTestWebKit2, because --no-webkit1 is an EFL only willing for the bots. My first patch on this bug is very similar to what you are suggesting. I tried first to use builddir but I since you don't have it at the CompileWebkit class, I had to use fullPlatform. It was becoming too hackish, that's why I moved to the approach on the second patch. What about renaming BuildAndTestWebKit2Factory to BuildAndTestWebKit2OnlyFactory. We make it explicit and with no side effects since EFL will be the only customer of this class. 790648 17 179281 tmpsantos 2012-12-13 08:59:13 -0800 Created attachment 179281 Patch 790649 18 tmpsantos 2012-12-13 09:00:45 -0800 (In reply to comment #17) > Created an attachment (id=179281) [details] > Patch Ossy, I added a patch implementing what I've just described for your evaluation. 790661 19 179281 ossy 2012-12-13 09:13:52 -0800 Comment on attachment 179281 Patch LGTM, r=me. 790748 20 179281 webkit.review.bot 2012-12-13 10:40:41 -0800 Comment on attachment 179281 Patch Clearing flags on attachment: 179281 Committed r137612: <http://trac.webkit.org/changeset/137612> 790749 21 webkit.review.bot 2012-12-13 10:40:47 -0800 All reviewed patches have been landed. Closing bug. 790960 22 lforschler 2012-12-13 14:45:58 -0800 I rebooted the master. Also debugged why it wasn't auto-restarted and believe we have fixed that problem. Future changes should automatically see a buildmaster restart. 178865 2012-12-11 13:40:42 -0800 2012-12-13 06:00:53 -0800 Patch bug-104690-20121211233803.patch text/plain 6840 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MzM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzVjMTliYzhkMTdjYjc2NDVmZDI1ODUzODJlM2MyN2E0 Yjg2MDU1ZC4uNjg3OWRlOTljZGEyMjY1MGM5NjJlNzMxMWFlMDYxMDY4OTc4M2JiNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTEyLTExICBUaGlhZ28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NA aW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdIFRoZSBXZWJLaXQyIGJvdHMgYXJlIGJ1aWxkaW5n IGFuZCBleGVjdXRpbmcgV2ViS2l0MSB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NjkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUGFzcyAtLW9ubHktd2Via2l0MiBvcHRpb24gdG8gdGhlIEVG TCBXSzIgYm90cyB3aGVuIGJ1aWxkaW5nLiBUaGlzCisgICAgICAgIHdpbGwgZGlzYWJsZSBXSzEg QVBJIGFuZCB0aHVzLCB0aGUgV0sxIEFQSSB0ZXN0cy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOgorICAgICAgICAqIEJ1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAg ICAgIEZvciBub3csIC0tb25seS13ZWJraXQyIGlzIG9ubHkgcGFzc2VkIHdoZW4gdGhlIHBsYXRm b3JtCisgICAgICAgIGlzICJlZmwtd2syIi4gSW4gdGhlIGZ1dHVyZSwgaWYgbW9yZSBwbGF0Zm9y bXMgd2FudHMgdGhpcworICAgICAgICBvcHRpb24sIHdlIGNhbiBpdCBhIGNvbnZlbnRpb24gYW5k IHJlcGxhY2Ugd2l0aAorICAgICAgICBlbmRzd2l0aCgiLXdrMiIpCisKKyAgICAgICAgKENvbXBp bGVXZWJLaXQuc3RhcnQpOgorICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChU ZXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChCdWlsZEFuZFRlc3RGYWN0b3J5Ll9faW5p dF9fKToKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAgQWRkIHRoZSAt LW9ubHktd2Via2l0MiBvcHRpb24gdG8gdGhlIGJ1aWxkLXdlYmtpdCBzY3JpcHQuCisKIDIwMTIt MTItMTEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAg IEZpeCBhIHR5cG8gaW4gbXkgcHJldmlvdXMgY29tbWl0IHRoYXQgaXMgY2F1c2luZyB0ZXN0IGZh aWx1cmVzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb24gYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbgppbmRleCBmYTFmMTA5Y2E1NThiMjZkMGJhNjlk ZGUwODBkOGJhNDQ2OGM3M2RkLi40ZGIyNGVkM2QxY2Y5NzRkODk3YzUyNGMyY2U4NzA5NGFkMzli NjA1IDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9jb25maWcuanNvbgorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbgpAQCAtNjksOSArNjksOSBAQAogICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogIndpbmNlLTEiLCAicGxhdGZvcm0iOiAid2luY2UiIH0sCiAg ICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImVmbC1s aW51eC1zbGF2ZS0xIiwgInBsYXRmb3JtIjogImVmbCIgfSwKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJlZmwtbGludXgtc2xhdmUtMiIsICJwbGF0Zm9ybSI6ICJlZmwiIH0sCisgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZWZsLWxpbnV4LXNsYXZlLTIiLCAicGxhdGZvcm0i OiAiZWZsLXdrMiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJlZmwtbGludXgt c2xhdmUtMyIsICJwbGF0Zm9ybSI6ICJlZmwiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiZWZsLWxpbnV4LXNsYXZlLTQiLCAicGxhdGZvcm0iOiAiZWZsIiB9LAorICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImVmbC1saW51eC1zbGF2ZS00IiwgInBsYXRmb3JtIjogImVm bC13azIiIH0sCiAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtaXBzLTEiLCAicGxh dGZvcm0iOiAicXQtbWlwc2VsIn0sCiAKQEAgLTMyOSwxMiArMzI5LDEyIEBACiAgICAgICAgICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAg ICAibmFtZSI6ICJFRkwgTGludXggNjQtYml0IFJlbGVhc2UgV0syIiwgInR5cGUiOiAiQnVpbGRB bmRUZXN0V2ViS2l0MiIsICJidWlsZGRpciI6ICJlZmwtbGludXgtNjQtcmVsZWFzZS13azIiLAot ICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJlZmwiLCAiY29uZmlndXJhdGlvbiI6 ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAorICAgICAgICAgICAgICAg ICAgICAgICJwbGF0Zm9ybSI6ICJlZmwtd2syIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIs ICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwKICAgICAgICAgICAgICAgICAgICAgICAic2xh dmVuYW1lcyI6IFsiZWZsLWxpbnV4LXNsYXZlLTIiXQogICAgICAgICAgICAgICAgICAgICB9LAog ICAgICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiRUZM IExpbnV4IDY0LWJpdCBEZWJ1ZyBXSzIiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3RXZWJLaXQyIiwg ImJ1aWxkZGlyIjogImVmbC1saW51eC02NC1kZWJ1Zy13azIiLAotICAgICAgICAgICAgICAgICAg ICAgICJwbGF0Zm9ybSI6ICJlZmwiLCAiY29uZmlndXJhdGlvbiI6ICJkZWJ1ZyIsICJhcmNoaXRl Y3R1cmVzIjogWyJ4ODZfNjQiXSwKKyAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAi ZWZsLXdrMiIsICJjb25maWd1cmF0aW9uIjogImRlYnVnIiwgImFyY2hpdGVjdHVyZXMiOiBbIng4 Nl82NCJdLAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJlZmwtbGludXgt c2xhdmUtNCJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgICAgIHsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3Rlci5jZmcgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnCmluZGV4IDY4N2MxOTdkYjFhZDdiNWY2NDVhZjIzNzYxZGU1ZmE1 Mzk4Y2Q1NDkuLmMwYmQ3MGVlYjJjZTRkNzFmNjU5MmRlODAyOGQ2MzVhZDY0YzBiMDQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h c3Rlci5jZmcKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvbWFzdGVyLmNmZwpAQCAtMTk4LDExICsxOTgsMTQgQEAgY2xhc3MgQ29tcGlsZVdlYktp dChzaGVsbC5Db21waWxlKToKIAogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAgcGxhdGZv cm0gPSBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpCisgICAgICAgIGZ1bGxQbGF0Zm9ybSA9 IHNlbGYuZ2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScpCiAgICAgICAgIGJ1aWxkT25seSA9IHNl bGYuZ2V0UHJvcGVydHkoJ2J1aWxkT25seScpCiAgICAgICAgIGlmIHBsYXRmb3JtID09ICdtYWMn IGFuZCBidWlsZE9ubHk6CiAgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5k ICsgWydERUJVR19JTkZPUk1BVElPTl9GT1JNQVQ9ZHdhcmYtd2l0aC1kc3ltJ10pCisgICAgICAg IGlmIGZ1bGxQbGF0Zm9ybSA9PSAnZWZsLXdrMic6CisgICAgICAgICAgICBzZWxmLnNldENvbW1h bmQoc2VsZi5jb21tYW5kICsgWyctLW9ubHktd2Via2l0MiddKQogCi0gICAgICAgIGFwcGVuZEN1 c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgcGxhdGZvcm0sIHNlbGYuZ2V0UHJvcGVydHkoJ2Z1bGxQbGF0 Zm9ybScpKQorICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYsIHBsYXRmb3JtLCBm dWxsUGxhdGZvcm0pCiAKICAgICAgICAgcmV0dXJuIHNoZWxsLkNvbXBpbGUuc3RhcnQoc2VsZikK IApAQCAtNzMxLDcgKzczNCw3IEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3Rvcnkp OgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEluc3RhbGxDaHJvbWl1bURlcGVuZGVuY2llcygp KQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiZ3RrIjoKICAgICAgICAgICAgIHNlbGYuYWRkU3Rl cChJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKCkpCi0gICAgICAgIGlmIHBsYXRmb3JtID09ICJlZmwi OgorICAgICAgICBpZiBwbGF0Zm9ybS5zdGFydHN3aXRoKCJlZmwiKToKICAgICAgICAgICAgIHNl bGYuYWRkU3RlcChJbnN0YWxsRWZsRGVwZW5kZW5jaWVzKCkpCiAKIApAQCAtNzgwLDcgKzc4Myw3 IEBAIGNsYXNzIFRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBzZWxmLmFkZFN0ZXAoQXJj aGl2ZVRlc3RSZXN1bHRzKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChVcGxvYWRUZXN0UmVzdWx0 cygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoc2VsZi5FeHRyYWN0VGVzdFJlc3VsdHNDbGFzcygp KQotICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiZWZsIjoKKyAgICAgICAgaWYgcGxhdGZvcm0uc3Rh cnRzd2l0aCgiZWZsIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuRWZsQVBJVGVzdHMp CiAgICAgICAgIGlmIHBsYXRmb3JtID09ICJndGsiOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVw KFJ1bkd0a0FQSVRlc3RzKCkpCkBAIC04MTEsNyArODE0LDcgQEAgY2xhc3MgQnVpbGRBbmRUZXN0 RmFjdG9yeShGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVUZXN0UmVzdWx0 cygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoVXBsb2FkVGVzdFJlc3VsdHMoKSkKICAgICAgICAg c2VsZi5hZGRTdGVwKHNlbGYuRXh0cmFjdFRlc3RSZXN1bHRzQ2xhc3MoKSkKLSAgICAgICAgaWYg cGxhdGZvcm0gPT0gImVmbCI6CisgICAgICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgoImVmbCIp OgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkVmbEFQSVRlc3RzKQogICAgICAgICBpZiBw bGF0Zm9ybSA9PSAiZ3RrIjoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChSdW5HdGtBUElUZXN0 cygpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9Ub29scy9TY3Jp cHRzL2J1aWxkLXdlYmtpdAppbmRleCAyYTllNDdkMjRlZGZmY2ExZTM0M2UwNjc5MWQ4ZWRhOTg1 MGEyZDRkLi5lYTA1OTZhN2RiYmVhZDQ1ZDVmYWIwYjE4ZmJiN2ZhYzA0YjEzNWNiIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1aWxk LXdlYmtpdApAQCAtNjAsNiArNjAsNyBAQCBteSAkbWFrZUFyZ3MgPSAiIjsKIG15ICRjbWFrZUFy Z3MgPSAiIjsKIG15ICRvbmx5V2ViS2l0UHJvamVjdCA9IDA7CiBteSAkbm9XZWJLaXQyID0gMDsK K215ICRvbmx5V2ViS2l0MiA9IDA7CiBteSAkY292ZXJhZ2VTdXBwb3J0ID0gMDsKIG15ICRzdGFy dFRpbWUgPSB0aW1lKCk7CiAKQEAgLTEzNSw2ICsxMzYsOCBAQCBVc2FnZTogJHByb2dyYW1OYW1l IFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KICAgLS1vbmx5LXdl YmtpdCAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIG9ubHkgdGhlIFdlYktpdCBwcm9qZWN0CiAg IC0tbm8td2Via2l0MiAgICAgICAgICAgICAgICAgICAgICBPbWl0IFdlYktpdDIgY29kZSBmcm9t IHRoZSBidWlsZAogCisgIC0tb25seS13ZWJraXQyICAgICAgICAgICAgICAgICAgICBCdWlsZCBv bmx5IHRoZSBXZWJLaXQyIHByb2plY3QgKEVGTCBvbmx5KQorCiBFT0YKIAogbXkgJW9wdGlvbnMg PSAoCkBAIC0xNDksNiArMTUyLDcgQEAgbXkgJW9wdGlvbnMgPSAoCiAgICAgJ21pbmltYWwnID0+ IFwkbWluaW1hbCwKICAgICAnb25seS13ZWJraXQnID0+IFwkb25seVdlYktpdFByb2plY3QsCiAg ICAgJ25vLXdlYmtpdDInID0+IFwkbm9XZWJLaXQyLAorICAgICdvbmx5LXdlYmtpdDInID0+IFwk b25seVdlYktpdDIsCiAgICAgJ2NvdmVyYWdlJyA9PiBcJGNvdmVyYWdlU3VwcG9ydCwKICk7CiAK QEAgLTMxMiw2ICszMTYsMTEgQEAgaWYgKGlzRWZsKCkpIHsKICAgICAkbWFrZUFyZ3MgLj0gKCRt YWtlQXJncyA/ICIgIiA6ICIiKSAuICItaiIgLiBudW1iZXJPZkNQVXMoKSBpZiAkbWFrZUFyZ3Mg IX4gLy1qXHMqXGQrLzsKICAgICAkY21ha2VBcmdzID0gIi1ERU5BQkxFX1dFQktJVDI9T0ZGICIg LiAkY21ha2VBcmdzIGlmICRub1dlYktpdDI7CiAKKyAgICBpZiAoJG9ubHlXZWJLaXQyKSB7Cisg ICAgICAgICRjbWFrZUFyZ3MgPSAiLURFTkFCTEVfV0VCS0lUPU9GRiAiIC4gJGNtYWtlQXJnczsK KyAgICAgICAgJGNtYWtlQXJncyA9ICItREVOQUJMRV9XRUJLSVQyPU9OICIgLiAkY21ha2VBcmdz OworICAgIH0KKwogICAgICMgV2UgcmVtb3ZlIENNYWtlQ2FjaGUgdG8gYXZvaWQgdGhlIGJvdHMg dG8gcmV1c2UgY2FjaGVkIGZsYWdzIHdoZW4KICAgICAjIHdlIGVuYWJsZSBuZXcgZmVhdHVyZXMu IFRoaXMgZm9yY2VzIGEgcmVjb25maWd1cmF0aW9uLgogICAgIHJlbW92ZUNNYWtlQ2FjaGUoKTsK 179258 2012-12-13 06:01:02 -0800 2012-12-13 06:35:48 -0800 Patch bug-104690-20121213160252.patch text/plain 4500 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NTg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDcxN2NjY2VkMTA4ZGFjMWQ1NmFiMTY1ZWYyMzVkMGIy YTlkY2NlYy4uOTAwNWY3Mzg1MjBjYjE3NGMzMWYyNmFiMTg5N2QxMDI0MWQ3MmI4MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEyLTEyLTEzICBUaGlhZ28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NA aW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdIFRoZSBXZWJLaXQyIGJvdHMgYXJlIGJ1aWxkaW5n IGFuZCBleGVjdXRpbmcgV2ViS2l0MSB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NjkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUGFzcyAtLW9ubHktd2Via2l0MiBvcHRpb24gdG8gdGhlIEVG TCBXSzIgYm90cyB3aGVuIGJ1aWxkaW5nLiBUaGlzCisgICAgICAgIHdpbGwgZGlzYWJsZSBXSzEg QVBJIGFuZCB0aHVzLCB0aGUgV0sxIEFQSSB0ZXN0cy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAgICAgIE5vdyBi b3RzIHVzaW5nIEJ1aWxkQW5kVGVzdFdlYktpdDJGYWN0b3J5IChmb3IgaW5zdGFuY2Ugb25seSBF RkwpIHdpbGwKKyAgICAgICAgZ2V0IC0tb25seS13ZWJraXQyIGFzIGEgcGFyYW1ldGVyIG9uIHRo ZSBidWlsZC13ZWJraXQgc2NyaXB0LgorCisgICAgICAgIChDb21waWxlV2ViS2l0Mik6CisgICAg ICAgIChCdWlsZEFuZFRlc3RGYWN0b3J5KToKKyAgICAgICAgKEJ1aWxkQW5kVGVzdEZhY3Rvcnku X19pbml0X18pOgorICAgICAgICAoQnVpbGRBbmRUZXN0V2ViS2l0MkZhY3RvcnkpOgorICAgICAg ICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorCiAyMDEyLTEyLTEzICBDbGF1ZGlvIFNhYXZlZHJh ICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1Rvb2xzXSBBZGQgZXhjZXB0aW9u IGZvciBndGtfc3R5bGVfY29udGV4dF9nZXQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZyBiL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggMjRh M2JjZjVjYWU1MjVhYzg5ZTI3YTAxM2E0ODgzNmE0ODkyNGQzYi4uZWU1NGZiNjY3NzUwMDU1MzY0 YWI2ZmY5OTA4NTA1Zjg5ZDIwZTdlOSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZworKysgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCkBAIC0yMDcsNiAr MjA3LDEwIEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAgICAgICAgIHJl dHVybiBzaGVsbC5Db21waWxlLnN0YXJ0KHNlbGYpCiAKIAorY2xhc3MgQ29tcGlsZVdlYktpdDIo Q29tcGlsZVdlYktpdCk6CisgICAgY29tbWFuZCA9IFsicGVybCIsICIuL1Rvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0IiwgIi0tb25seS13ZWJraXQyIiwgV2l0aFByb3BlcnRpZXMoIi0tJShjb25m aWd1cmF0aW9uKXMiKV0KKworCiBjbGFzcyBBcmNoaXZlQnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxs Q29tbWFuZCk6CiAgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlIiwKICAgICAgICAgICAgICAgIFdpdGhQcm9wZXJ0 aWVzKCItLXBsYXRmb3JtPSUoZnVsbFBsYXRmb3JtKXMiKSwgV2l0aFByb3BlcnRpZXMoIi0tJShj b25maWd1cmF0aW9uKXMiKSwgImFyY2hpdmUiXQpAQCAtNzg3LDEzICs3OTEsMTQgQEAgY2xhc3Mg VGVzdEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuUXRBUElU ZXN0cykKIAogY2xhc3MgQnVpbGRBbmRUZXN0RmFjdG9yeShGYWN0b3J5KToKKyAgICBDb21waWxl Q2xhc3MgPSBDb21waWxlV2ViS2l0CiAgICAgVGVzdENsYXNzID0gUnVuV2ViS2l0VGVzdHMKICAg ICBFeHRyYWN0VGVzdFJlc3VsdHNDbGFzcyA9IEV4dHJhY3RUZXN0UmVzdWx0cwogICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgdHJp Z2dlcnM9Tm9uZSwgU1ZOTWlycm9yPU5vbmUsICoqa3dhcmdzKToKICAgICAgICAgRmFjdG9yeS5f X2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgRmFs c2UsIFNWTk1pcnJvciwgKiprd2FyZ3MpCiAgICAgICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dpdGgo ImNocm9taXVtIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoQ2xlYW51cENocm9taXVtQ3Jh c2hMb2dzKQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdlYktpdCgpKQorICAgICAgICBz ZWxmLmFkZFN0ZXAoc2VsZi5Db21waWxlQ2xhc3MoKSkKICAgICAgICAgaWYgbm90IHBsYXRmb3Jt LnN0YXJ0c3dpdGgoImNocm9taXVtIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuSmF2 YVNjcmlwdENvcmVUZXN0cygpKQogICAgICAgICBpZiBwbGF0Zm9ybS5zdGFydHN3aXRoKCJjaHJv bWl1bSIpOgpAQCAtODIyLDYgKzgyNyw3IEBAIGNsYXNzIEJ1aWxkQW5kVGVzdEZhY3RvcnkoRmFj dG9yeSk6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAodHJpZ2dlci5UcmlnZ2VyKHNjaGVkdWxl ck5hbWVzPXRyaWdnZXJzKSkKIAogY2xhc3MgQnVpbGRBbmRUZXN0V2ViS2l0MkZhY3RvcnkoQnVp bGRBbmRUZXN0RmFjdG9yeSk6CisgICAgQ29tcGlsZUNsYXNzID0gQ29tcGlsZVdlYktpdDIKICAg ICBUZXN0Q2xhc3MgPSBSdW5XZWJLaXQyVGVzdHMKIAogY2xhc3MgQnVpbGRBbmRUZXN0TGVha3NG YWN0b3J5KEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9i dWlsZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCAyYTllNDdkMjRl ZGZmY2ExZTM0M2UwNjc5MWQ4ZWRhOTg1MGEyZDRkLi5iOGQxZGRhNGRlYjlmNzgwNzViNDgxNzcw MjY3YjRmYzBkYjg1MzVhIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAor KysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtNjAsNiArNjAsNyBAQCBteSAkbWFr ZUFyZ3MgPSAiIjsKIG15ICRjbWFrZUFyZ3MgPSAiIjsKIG15ICRvbmx5V2ViS2l0UHJvamVjdCA9 IDA7CiBteSAkbm9XZWJLaXQyID0gMDsKK215ICRvbmx5V2ViS2l0MiA9IDA7CiBteSAkY292ZXJh Z2VTdXBwb3J0ID0gMDsKIG15ICRzdGFydFRpbWUgPSB0aW1lKCk7CiAKQEAgLTEzNSw2ICsxMzYs OCBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1 aWxkIHN5c3RlbV0KICAgLS1vbmx5LXdlYmtpdCAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIG9u bHkgdGhlIFdlYktpdCBwcm9qZWN0CiAgIC0tbm8td2Via2l0MiAgICAgICAgICAgICAgICAgICAg ICBPbWl0IFdlYktpdDIgY29kZSBmcm9tIHRoZSBidWlsZAogCisgIC0tb25seS13ZWJraXQyICAg ICAgICAgICAgICAgICAgICBCdWlsZCBvbmx5IHRoZSBXZWJLaXQyIHByb2plY3QgKEVGTCBvbmx5 KQorCiBFT0YKIAogbXkgJW9wdGlvbnMgPSAoCkBAIC0xNDksNiArMTUyLDcgQEAgbXkgJW9wdGlv bnMgPSAoCiAgICAgJ21pbmltYWwnID0+IFwkbWluaW1hbCwKICAgICAnb25seS13ZWJraXQnID0+ IFwkb25seVdlYktpdFByb2plY3QsCiAgICAgJ25vLXdlYmtpdDInID0+IFwkbm9XZWJLaXQyLAor ICAgICdvbmx5LXdlYmtpdDInID0+IFwkb25seVdlYktpdDIsCiAgICAgJ2NvdmVyYWdlJyA9PiBc JGNvdmVyYWdlU3VwcG9ydCwKICk7CiAKQEAgLTMxMSw2ICszMTUsNyBAQCBpZiAoaXNFZmwoKSkg ewogICAgICMgQnkgZGVmYXVsdCB3ZSBidWlsZCB1c2luZyBhbGwgb2YgdGhlIGF2YWlsYWJsZSBD UFVzLgogICAgICRtYWtlQXJncyAuPSAoJG1ha2VBcmdzID8gIiAiIDogIiIpIC4gIi1qIiAuIG51 bWJlck9mQ1BVcygpIGlmICRtYWtlQXJncyAhfiAvLWpccypcZCsvOwogICAgICRjbWFrZUFyZ3Mg PSAiLURFTkFCTEVfV0VCS0lUMj1PRkYgIiAuICRjbWFrZUFyZ3MgaWYgJG5vV2ViS2l0MjsKKyAg ICAkY21ha2VBcmdzID0gIi1ERU5BQkxFX1dFQktJVDI9T04gLURFTkFCTEVfV0VCS0lUPU9GRiAi IC4gJGNtYWtlQXJncyBpZiAkb25seVdlYktpdDI7CiAKICAgICAjIFdlIHJlbW92ZSBDTWFrZUNh Y2hlIHRvIGF2b2lkIHRoZSBib3RzIHRvIHJldXNlIGNhY2hlZCBmbGFncyB3aGVuCiAgICAgIyB3 ZSBlbmFibGUgbmV3IGZlYXR1cmVzLiBUaGlzIGZvcmNlcyBhIHJlY29uZmlndXJhdGlvbi4K 179281 2012-12-13 08:59:13 -0800 2012-12-13 10:40:40 -0800 Patch bug-104690-20121213190104.patch text/plain 6672 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NTg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDcxN2NjY2VkMTA4ZGFjMWQ1NmFiMTY1ZWYyMzVkMGIy YTlkY2NlYy4uODkxMjk4YzQ2ODM1ZDVjODgwM2ZiYWY2ODU0NjliOGQxYWY1OTkzZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTEyLTEzICBUaGlhZ28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NA aW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdIFRoZSBXZWJLaXQyIGJvdHMgYXJlIGJ1aWxkaW5n IGFuZCBleGVjdXRpbmcgV2ViS2l0MSB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NjkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUGFzcyAtLW5vLXdlYmtpdDEgb3B0aW9uIHRvIHRoZSBFRkwg V0syIGJvdHMgd2hlbiBidWlsZGluZy4gVGhpcworICAgICAgICB3aWxsIGRpc2FibGUgV0sxIEFQ SSBhbmQgdGh1cywgdGhlIFdLMSBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoKKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorICAgICAg ICAoQ29tcGlsZVdlYktpdDJPbmx5KToKKyAgICAgICAgKEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgor ICAgICAgICAoQnVpbGRBbmRUZXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChCdWlsZEFu ZFRlc3RXZWJLaXQyT25seUZhY3RvcnkpOgorICAgICAgICBOb3cgYm90cyB1c2luZyBCdWlsZEFu ZFRlc3RXZWJLaXQyT25seUZhY3RvcnkgKGZvciBpbnN0YW5jZSBvbmx5IEVGTCkgd2lsbAorICAg ICAgICBnZXQgLS1uby13ZWJraXQxIGFzIGEgcGFyYW1ldGVyIG9uIHRoZSBidWlsZC13ZWJraXQg c2NyaXB0LgorICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAgICAgICBBZGRlZCBz dXBwb3J0IGZvciAtbm8td2Via2l0MSBmb3IgdGhlIFF0IGFuZCBFRkwgcG9ydC4KKwogMjAxMi0x Mi0xMyAgQ2xhdWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtUb29sc10gQWRkIGV4Y2VwdGlvbiBmb3IgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0KCkKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2Nv bmZpZy5qc29uIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvY29uZmlnLmpzb24KaW5kZXggZmExZjEwOWNhNTU4YjI2ZDBiYTY5ZGRlMDgwZDhiYTQ0Njhj NzNkZC4uNjYwNmYxZjlhODVjYzYxM2UzMThlMTRjNmY1YzhmMmIwM2NkMjYzMiAxMDA2NDQKLS0t IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvY29uZmlnLmpzb24KQEAgLTMyOCwxMiArMzI4LDEyIEBACiAgICAgICAgICAgICAgICAgICAg ICAgInNsYXZlbmFtZXMiOiBbImVmbC1saW51eC1zbGF2ZS0xIl0KICAgICAgICAgICAgICAgICAg ICAgfSwKICAgICAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICAgICJuYW1l IjogIkVGTCBMaW51eCA2NC1iaXQgUmVsZWFzZSBXSzIiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3RX ZWJLaXQyIiwgImJ1aWxkZGlyIjogImVmbC1saW51eC02NC1yZWxlYXNlLXdrMiIsCisgICAgICAg ICAgICAgICAgICAgICAgIm5hbWUiOiAiRUZMIExpbnV4IDY0LWJpdCBSZWxlYXNlIFdLMiIsICJ0 eXBlIjogIkJ1aWxkQW5kVGVzdFdlYktpdDJPbmx5IiwgImJ1aWxkZGlyIjogImVmbC1saW51eC02 NC1yZWxlYXNlLXdrMiIsCiAgICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogImVmbCIs ICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0s CiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImVmbC1saW51eC1zbGF2ZS0y Il0KICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgewotICAgICAg ICAgICAgICAgICAgICAgICJuYW1lIjogIkVGTCBMaW51eCA2NC1iaXQgRGVidWcgV0syIiwgInR5 cGUiOiAiQnVpbGRBbmRUZXN0V2ViS2l0MiIsICJidWlsZGRpciI6ICJlZmwtbGludXgtNjQtZGVi dWctd2syIiwKKyAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJFRkwgTGludXggNjQtYml0 IERlYnVnIFdLMiIsICJ0eXBlIjogIkJ1aWxkQW5kVGVzdFdlYktpdDJPbmx5IiwgImJ1aWxkZGly IjogImVmbC1saW51eC02NC1kZWJ1Zy13azIiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0 Zm9ybSI6ICJlZmwiLCAiY29uZmlndXJhdGlvbiI6ICJkZWJ1ZyIsICJhcmNoaXRlY3R1cmVzIjog WyJ4ODZfNjQiXSwKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZWZsLWxp bnV4LXNsYXZlLTQiXQogICAgICAgICAgICAgICAgICAgICB9LApkaWZmIC0tZ2l0IGEvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZyBiL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcK aW5kZXggMjRhM2JjZjVjYWU1MjVhYzg5ZTI3YTAxM2E0ODgzNmE0ODkyNGQzYi4uMGI5MjAyMTQz ZDRjMDhlOGJiNGYwNWRlNGRjMGZjYzZmNmI3MzI5NyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZworKysgYi9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCkBA IC0yMDcsNiArMjA3LDEwIEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAg ICAgICAgIHJldHVybiBzaGVsbC5Db21waWxlLnN0YXJ0KHNlbGYpCiAKIAorY2xhc3MgQ29tcGls ZVdlYktpdDJPbmx5KENvbXBpbGVXZWJLaXQpOgorICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9U b29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCIsICItLW5vLXdlYmtpdDEiLCBXaXRoUHJvcGVydGll cygiLS0lKGNvbmZpZ3VyYXRpb24pcyIpXQorCisKIGNsYXNzIEFyY2hpdmVCdWlsdFByb2R1Y3Qo c2hlbGwuU2hlbGxDb21tYW5kKToKICAgICBjb21tYW5kID0gWyJweXRob24iLCAiLi9Ub29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUiLAogICAgICAgICAgICAgICAg V2l0aFByb3BlcnRpZXMoIi0tcGxhdGZvcm09JShmdWxsUGxhdGZvcm0pcyIpLCBXaXRoUHJvcGVy dGllcygiLS0lKGNvbmZpZ3VyYXRpb24pcyIpLCAiYXJjaGl2ZSJdCkBAIC03ODcsMTMgKzc5MSwx NCBAQCBjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToKICAgICAgICAgICAgIHNlbGYuYWRkU3Rl cChSdW5RdEFQSVRlc3RzKQogCiBjbGFzcyBCdWlsZEFuZFRlc3RGYWN0b3J5KEZhY3RvcnkpOgor ICAgIENvbXBpbGVDbGFzcyA9IENvbXBpbGVXZWJLaXQKICAgICBUZXN0Q2xhc3MgPSBSdW5XZWJL aXRUZXN0cwogICAgIEV4dHJhY3RUZXN0UmVzdWx0c0NsYXNzID0gRXh0cmFjdFRlc3RSZXN1bHRz CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCB0cmlnZ2Vycz1Ob25lLCBTVk5NaXJyb3I9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCBGYWxzZSwgU1ZOTWlycm9yLCAqKmt3YXJncykKICAgICAgICAgaWYgcGxhdGZvcm0u c3RhcnRzd2l0aCgiY2hyb21pdW0iKToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDbGVhbnVw Q2hyb21pdW1DcmFzaExvZ3MpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlV2ViS2l0KCkp CisgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkNvbXBpbGVDbGFzcygpKQogICAgICAgICBpZiBu b3QgcGxhdGZvcm0uc3RhcnRzd2l0aCgiY2hyb21pdW0iKToKICAgICAgICAgICAgIHNlbGYuYWRk U3RlcChSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKCkpCiAgICAgICAgIGlmIHBsYXRmb3JtLnN0YXJ0 c3dpdGgoImNocm9taXVtIik6CkBAIC04MjEsNyArODI2LDggQEAgY2xhc3MgQnVpbGRBbmRUZXN0 RmFjdG9yeShGYWN0b3J5KToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChVcGxvYWRCdWlsdFBy b2R1Y3QoKSkKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2VyLlRyaWdnZXIoc2NoZWR1 bGVyTmFtZXM9dHJpZ2dlcnMpKQogCi1jbGFzcyBCdWlsZEFuZFRlc3RXZWJLaXQyRmFjdG9yeShC dWlsZEFuZFRlc3RGYWN0b3J5KToKK2NsYXNzIEJ1aWxkQW5kVGVzdFdlYktpdDJPbmx5RmFjdG9y eShCdWlsZEFuZFRlc3RGYWN0b3J5KToKKyAgICBDb21waWxlQ2xhc3MgPSBDb21waWxlV2ViS2l0 Mk9ubHkKICAgICBUZXN0Q2xhc3MgPSBSdW5XZWJLaXQyVGVzdHMKIAogY2xhc3MgQnVpbGRBbmRU ZXN0TGVha3NGYWN0b3J5KEJ1aWxkQW5kVGVzdEZhY3RvcnkpOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCAy YTllNDdkMjRlZGZmY2ExZTM0M2UwNjc5MWQ4ZWRhOTg1MGEyZDRkLi5kZTkxYTlmMGQ4Mzc1MjQ5 NjZiMjBmNzBmY2UxOTQ3NDcxNWU4YjE1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxk LXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtNTksNiArNTksNyBA QCBteSAkcHJlZml4UGF0aDsKIG15ICRtYWtlQXJncyA9ICIiOwogbXkgJGNtYWtlQXJncyA9ICIi OwogbXkgJG9ubHlXZWJLaXRQcm9qZWN0ID0gMDsKK215ICRub1dlYktpdDEgPSAwOwogbXkgJG5v V2ViS2l0MiA9IDA7CiBteSAkY292ZXJhZ2VTdXBwb3J0ID0gMDsKIG15ICRzdGFydFRpbWUgPSB0 aW1lKCk7CkBAIC0xMzMsNiArMTM0LDcgQEAgVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10g W29wdGlvbnMgdG8gcGFzcyB0byBidWlsZCBzeXN0ZW1dCiAgIC0tbWluaW1hbCAgICAgICAgICAg ICAgICAgICAgICAgICBObyBvcHRpb25hbCBmZWF0dXJlcywgdW5sZXNzIGV4cGxpY2l0bHkgZW5h YmxlZAogCiAgIC0tb25seS13ZWJraXQgICAgICAgICAgICAgICAgICAgICBCdWlsZCBvbmx5IHRo ZSBXZWJLaXQgcHJvamVjdAorICAtLW5vLXdlYmtpdDEgICAgICAgICAgICAgICAgICAgICAgT21p dCBXZWJLaXQxIGNvZGUgZnJvbSB0aGUgYnVpbGQgKFF0L0VGTCBvbmx5KQogICAtLW5vLXdlYmtp dDIgICAgICAgICAgICAgICAgICAgICAgT21pdCBXZWJLaXQyIGNvZGUgZnJvbSB0aGUgYnVpbGQK IAogRU9GCkBAIC0xNDgsNiArMTUwLDcgQEAgbXkgJW9wdGlvbnMgPSAoCiAgICAgJ2NtYWtlYXJn cz1zJyA9PiBcJGNtYWtlQXJncywKICAgICAnbWluaW1hbCcgPT4gXCRtaW5pbWFsLAogICAgICdv bmx5LXdlYmtpdCcgPT4gXCRvbmx5V2ViS2l0UHJvamVjdCwKKyAgICAnbm8td2Via2l0MScgPT4g XCRub1dlYktpdDEsCiAgICAgJ25vLXdlYmtpdDInID0+IFwkbm9XZWJLaXQyLAogICAgICdjb3Zl cmFnZScgPT4gXCRjb3ZlcmFnZVN1cHBvcnQsCiApOwpAQCAtMjQ1LDYgKzI0OCw3IEBAIGlmIChp c0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICBwdXNoIEBvcHRpb25zLCAiLS1pbnN0YWxsLWhlYWRl cnM9IiAuICRpbnN0YWxsSGVhZGVycyBpZiBkZWZpbmVkKCRpbnN0YWxsSGVhZGVycyk7CiAgICAg cHVzaCBAb3B0aW9ucywgIi0taW5zdGFsbC1saWJzPSIgLiAkaW5zdGFsbExpYnMgaWYgZGVmaW5l ZCgkaW5zdGFsbExpYnMpOwogICAgIHB1c2ggQG9wdGlvbnMsICItLW1ha2VhcmdzPSIgLiAkbWFr ZUFyZ3MgaWYgJG1ha2VBcmdzOworICAgIHB1c2ggQG9wdGlvbnMsICJXRUJLSVRfQ09ORklHLT1i dWlsZF93ZWJraXQxIiBpZiAkbm9XZWJLaXQxOwogICAgIHB1c2ggQG9wdGlvbnMsICJXRUJLSVRf Q09ORklHLT1idWlsZF93ZWJraXQyIiBpZiAkbm9XZWJLaXQyOwogCiAgICAgaWYgKGNoZWNrRm9y QXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLTIiKSkgewpAQCAtMzEwLDYgKzMxNCw3IEBAIGlm IChpc0Nocm9taXVtKCkpIHsKIGlmIChpc0VmbCgpKSB7CiAgICAgIyBCeSBkZWZhdWx0IHdlIGJ1 aWxkIHVzaW5nIGFsbCBvZiB0aGUgYXZhaWxhYmxlIENQVXMuCiAgICAgJG1ha2VBcmdzIC49ICgk bWFrZUFyZ3MgPyAiICIgOiAiIikgLiAiLWoiIC4gbnVtYmVyT2ZDUFVzKCkgaWYgJG1ha2VBcmdz ICF+IC8talxzKlxkKy87CisgICAgJGNtYWtlQXJncyA9ICItREVOQUJMRV9XRUJLSVQ9T0ZGICIg IC4gJGNtYWtlQXJncyBpZiAkbm9XZWJLaXQxOwogICAgICRjbWFrZUFyZ3MgPSAiLURFTkFCTEVf V0VCS0lUMj1PRkYgIiAuICRjbWFrZUFyZ3MgaWYgJG5vV2ViS2l0MjsKIAogICAgICMgV2UgcmVt b3ZlIENNYWtlQ2FjaGUgdG8gYXZvaWQgdGhlIGJvdHMgdG8gcmV1c2UgY2FjaGVkIGZsYWdzIHdo ZW4K