31442 2009-11-12 15:24:13 -0800 Chromium Build Slaves 2009-11-18 18:54:12 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 1 yaar yaar commit-queue dglazkov mrowe oldest_to_newest 163077 0 43106 yaar 2009-11-12 15:24:13 -0800 Created attachment 43106 Patch These 3 new build slaves obsolete the existing chromium slave, and build the webkit chromium port. 163084 1 43109 yaar 2009-11-12 15:47:03 -0800 Created attachment 43109 buildbot configuration changes 163091 2 43109 dglazkov 2009-11-12 16:04:17 -0800 Comment on attachment 43109 buildbot configuration changes > > +class InstallChromiumDependencies(shell.ShellCommand): > + name = "gclient" > + description = ["updating chromium dependencies"] > + descriptionDone = ["updated chromium dependencies"] > + command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium"] this should be ["perl", "./WebKitTools/Scripts/update-webkit", "--chromium"] right? 163096 3 43109 mrowe 2009-11-12 16:12:05 -0800 Comment on attachment 43109 buildbot configuration changes > diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json > index 2b8faf6..04e7ad9 100644 > --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json > +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json > @@ -25,7 +25,9 @@ > > { "name": "szeged-linux-1", "platform": "qt"}, > > - { "name": "google-slave-1", "platform": "chromium-win" } > + { "name": "chromium-win-slave-1", "platform": "chromium" }, > + { "name": "chromium-mac-slave-1", "platform": "chromium" }, > + { "name": "chromium-linux-slave-1", "platform": "chromium” } Per my recent email these aren’t the slave names that will be used. > ], > > "builders": [ { "name": "Tiger Intel Release", "type": "BuildAndTest", "builddir": "tiger-intel-release", > @@ -98,9 +100,22 @@ > "slavenames": ["szeged-linux-1"] > }, > { > - "name": "Chromium Win Release", "type": "ChromiumBuild", "builddir": "chromium-win-release", > - "platform": "chromium-win", "configuration": "release", "architectures": ["i386"], > - "slavenames": ["google-slave-1"] > + "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release", > + "platform": "chromium", "configuration": "release", "architectures": ["i386"], > + "triggers": ["chromium-win-release"], > + "slavenames": ["chromium-win-slave-1"] > + }, > + { > + "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release", > + "platform": "chromium", "configuration": "release", "architectures": ["i386"], > + "triggers": ["chromium-mac-release"], > + "slavenames": ["chromium-mac-slave-1"] > + }, > + { > + "name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release", > + "platform": "chromium", "configuration": "release", "architectures": ["i386"], > + "triggers": ["chromium-linux-release"], > + "slavenames": ["chromium-linux-slave-1"] > } > ], The “triggers” values here seem bogus given that they don’t attempt to trigger anything and there’s no corresponding triggerable configuration. > +class InstallChromiumDependencies(shell.ShellCommand): > + name = "gclient" > + description = ["updating chromium dependencies"] > + descriptionDone = ["updated chromium dependencies"] > + command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium"] > + haltOnFailure = True This script doesn’t exist. Is that the right command to run? > def appendCustomBuildFlags(step, platform): > if platform in ('gtk', 'wx', 'qt'): > step.setCommand(step.command + ['--' + platform]) > @@ -119,6 +78,8 @@ class CompileWebKit(shell.Compile): > def start(self): > platform = self.getProperty('platform') > buildOnly = self.getProperty('buildOnly') > + if platform == 'chromium': > + self.setCommand(self.command + ['--chromium']) > if platform == 'mac' and buildOnly: > self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym’]) This should be handled in the same way it is for other platforms: in appendCustomBuildFlags. 163110 4 43115 yaar 2009-11-12 16:40:08 -0800 Created attachment 43115 buildbot configuration changes 163113 5 yaar 2009-11-12 16:46:25 -0800 Thanks for reviewing this. New patch is attached. See comments below: > (From update of attachment 43109 [details]) > > diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json > > index 2b8faf6..04e7ad9 100644 > > --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json > > +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json > > @@ -25,7 +25,9 @@ > > > > { "name": "szeged-linux-1", "platform": "qt"}, > > > > - { "name": "google-slave-1", "platform": "chromium-win" } > > + { "name": "chromium-win-slave-1", "platform": "chromium" }, > > + { "name": "chromium-mac-slave-1", "platform": "chromium" }, > > + { "name": "chromium-linux-slave-1", "platform": "chromium” } > > Per my recent email these aren’t the slave names that will be used. > Fixed. > > > ], > > > > "builders": [ { "name": "Tiger Intel Release", "type": "BuildAndTest", "builddir": "tiger-intel-release", > > @@ -98,9 +100,22 @@ > > "slavenames": ["szeged-linux-1"] > > }, > > { > > - "name": "Chromium Win Release", "type": "ChromiumBuild", "builddir": "chromium-win-release", > > - "platform": "chromium-win", "configuration": "release", "architectures": ["i386"], > > - "slavenames": ["google-slave-1"] > > + "name": "Chromium Win Release", "type": "Build", "builddir": "chromium-win-release", > > + "platform": "chromium", "configuration": "release", "architectures": ["i386"], > > + "triggers": ["chromium-win-release"], > > + "slavenames": ["chromium-win-slave-1"] > > + }, > > + { > > + "name": "Chromium Mac Release", "type": "Build", "builddir": "chromium-mac-release", > > + "platform": "chromium", "configuration": "release", "architectures": ["i386"], > > + "triggers": ["chromium-mac-release"], > > + "slavenames": ["chromium-mac-slave-1"] > > + }, > > + { > > + "name": "Chromium Linux Release", "type": "Build", "builddir": "chromium-linux-release", > > + "platform": "chromium", "configuration": "release", "architectures": ["i386"], > > + "triggers": ["chromium-linux-release"], > > + "slavenames": ["chromium-linux-slave-1"] > > } > > ], > > The “triggers” values here seem bogus given that they don’t attempt to trigger > anything and there’s no corresponding triggerable configuration. > I know, but BuildFactory require triggers, so I had to put something there. Once we also have testing harness, we will connect them to the triggers. > > +class InstallChromiumDependencies(shell.ShellCommand): > > + name = "gclient" > > + description = ["updating chromium dependencies"] > > + descriptionDone = ["updated chromium dependencies"] > > + command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium"] > > + haltOnFailure = True > > This script doesn’t exist. Is that the right command to run? Actually, update-webkit-chromium does exist and is reused by "update-webkit --chromium" too. > > > def appendCustomBuildFlags(step, platform): > > if platform in ('gtk', 'wx', 'qt'): > > step.setCommand(step.command + ['--' + platform]) > > @@ -119,6 +78,8 @@ class CompileWebKit(shell.Compile): > > def start(self): > > platform = self.getProperty('platform') > > buildOnly = self.getProperty('buildOnly') > > + if platform == 'chromium': > > + self.setCommand(self.command + ['--chromium']) > > if platform == 'mac' and buildOnly: > > self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym’]) > > This should be handled in the same way it is for other platforms: in > appendCustomBuildFlags. Done. 163117 6 mrowe 2009-11-12 16:57:16 -0800 (In reply to comment #5) > Thanks for reviewing this. New patch is attached. See comments below: > > > The “triggers” values here seem bogus given that they don’t attempt to trigger > > anything and there’s no corresponding triggerable configuration. > > > I know, but BuildFactory require triggers, so I had to put something there. > Once we also have testing harness, we will connect them to the triggers. A better fix would be to make the triggers optional. This would convert some Chromium-specific logic in master.cfg in to logic that is specific to whether or not BuildFactory has anything to trigger. > > > > +class InstallChromiumDependencies(shell.ShellCommand): > > > + name = "gclient" > > > + description = ["updating chromium dependencies"] > > > + descriptionDone = ["updated chromium dependencies"] > > > + command = ["perl", "./WebKitTools/Scripts/update-webkit-chromium"] > > > + haltOnFailure = True > > > > This script doesn’t exist. Is that the right command to run? > > Actually, update-webkit-chromium does exist and is reused by "update-webkit > --chromium" too. My mistake. 163118 7 mrowe 2009-11-12 16:57:50 -0800 And at least one of the slave names doesn’t match the ones from my email. 163119 8 43115 mrowe 2009-11-12 16:58:31 -0800 Comment on attachment 43115 buildbot configuration changes Marking as r- per last two comments. There’s no point marking this as commit-queue? since it needs to be manually landed anyway. 163122 9 43118 yaar 2009-11-12 17:38:52 -0800 Created attachment 43118 buildbot configuration changes 163135 10 43120 yaar 2009-11-12 18:20:10 -0800 Created attachment 43120 buildbot configuration changes 163141 11 43120 yaar 2009-11-12 18:22:13 -0800 Comment on attachment 43120 buildbot configuration changes Fixed the win slave names and made triggers optional. 164713 12 43120 mrowe 2009-11-18 14:21:29 -0800 Comment on attachment 43120 buildbot configuration changes > class BuildFactory(Factory): > - def __init__(self, platform, configuration, architectures, triggers): > + def __init__(self, platform, configuration, architectures, triggers=None): > Factory.__init__(self, platform, configuration, architectures, True) > self.addStep(CompileWebKit) > + if platform == "chromium": > + # FIXME: Chromium should archive and trigger tests too. > + return > self.addStep(ArchiveBuiltProduct) > self.addStep(UploadBuiltProduct) > - self.addStep(trigger.Trigger, schedulerNames=triggers) > + if triggers: > + self.addStep(trigger.Trigger, schedulerNames=triggers) Since there’s no point in archiving or uploading the built product unless you’re going to do something that uses it, this would make more sense if it were expressed as: self.addStep(CompileWebKit) if triggers: self.addStep(ArchiveBuiltProduct) self.addStep(UploadBuiltProduct) self.addStep(trigger.Trigger, schedulerNames=triggers) It also removes logic that special-cases Chromium. I’m going to say r=me but this should be fixed before it is landed. 164737 13 43464 yaar 2009-11-18 14:57:21 -0800 Created attachment 43464 buildbot configuration changes 164819 14 43464 darin 2009-11-18 16:47:13 -0800 Comment on attachment 43464 buildbot configuration changes r=me based on Mark's earlier review and comment 164828 15 yaar 2009-11-18 16:56:28 -0800 Thank you! 164852 16 43464 eric 2009-11-18 17:55:08 -0800 Comment on attachment 43464 buildbot configuration changes Yaar is not a committer quite yet, so marking cq+. I beleive Mark Rowe will have to push the config to the master manually once this is in. You can work that out with him. :) 164876 17 43464 commit-queue 2009-11-18 18:54:04 -0800 Comment on attachment 43464 buildbot configuration changes Clearing flags on attachment: 43464 Committed r51167: <http://trac.webkit.org/changeset/51167> 164877 18 commit-queue 2009-11-18 18:54:12 -0800 All reviewed patches have been landed. Closing bug. 43106 2009-11-12 15:24:13 -0800 2009-11-12 15:24:45 -0800 Patch 20091112152412.patch text/plain 815 yaar ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9ERVBTIGIvV2ViS2l0L2Nocm9taXVtL0RFUFMK aW5kZXggNWY1YjliOC4uYTAzNGYyNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0RFUFMK KysrIGIvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAgLTM1LDE4ICszNSwxOCBAQCB2YXJzID0gewog ICAnY2hyb21pdW1fZGVwc19zdm4nOiAnaHR0cDovL3NyYy5jaHJvbWl1bS5vcmcvc3ZuL3RydW5r L2RlcHMvdGhpcmRfcGFydHknLAogCiAgICMgRGVwZW5kZW5jaWVzJyByZXZpc2lvbnMgdG8gdXNl OgotICAnY2hyb21pdW1fcmV2JzogJzI4NzEwJywKLSAgJ2dvb2dsZS11cmxfcmV2JzogJzExOScs Ci0gICdndGVzdF9yZXYnOiAnMzI5JywKLSAgJ2d5cF9yZXYnOiAnNjg1JywKLSAgJ2ljdV9yZXYn OiAnMjc2ODcnLAorICAnY2hyb21pdW1fcmV2JzogJzMxODM0JywKKyAgJ2dvb2dsZS11cmxfcmV2 JzogJzEyMCcsCisgICdndGVzdF9yZXYnOiAnMzM2JywKKyAgJ2d5cF9yZXYnOiAnNzUxJywKKyAg J2ljdV9yZXYnOiAnMzE3MjQnLAogICAnb3BlbnZjZGlmZl9yZXYnOiAnMjgnLAotICAnc2tpYV9y ZXYnOiAnMzc2JywKLSAgJ3Y4X3Jldic6ICczMDMwJywKKyAgJ3NraWFfcmV2JzogJzQyNCcsCisg ICd2OF9yZXYnOiAnMzI3NicsCiAKICAgIyBXaW5kb3dzOgogICAnY3lnd2luX3Jldic6ICcxMTk4 NCcsCi0gICdmZm1wZWdfaWEzMl9yZXYnOiAnMjg0ODgnLAorICAnZmZtcGVnX2lhMzJfcmV2Jzog JzMwMzc0JywKICAgJ3B0aHJlYWRzLXdpbjMyX3Jldic6ICcyNjcxNicsCiAgICdweXRob25fMjRf cmV2JzogJzIyOTY3JywKIH0= 43109 2009-11-12 15:47:03 -0800 2009-11-12 16:40:04 -0800 buildbot configuration changes bug-31442-20091112154701.patch text/plain 8319 yaar ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL2NvbmZpZy5qc29uIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMmI4ZmFmNi4uMDRlN2FkOSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KKysrIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTI1LDcgKzI1LDkgQEAKIAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC1saW51eC0xIiwgInBsYXRmb3Jt IjogInF0In0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtc2xhdmUt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJjaHJvbWl1bS13aW4tc2xhdmUtMSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bSIgfSwK KyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjaHJvbWl1bS1tYWMtc2xhdmUtMSIsICJw bGF0Zm9ybSI6ICJjaHJvbWl1bSIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJj aHJvbWl1bS1saW51eC1zbGF2ZS0xIiwgInBsYXRmb3JtIjogImNocm9taXVtIiB9CiAgICAgICAg ICAgICAgICAgICBdLAogCiAgICAgImJ1aWxkZXJzIjogICBbIHsgIm5hbWUiOiAiVGlnZXIgSW50 ZWwgUmVsZWFzZSIsICJ0eXBlIjogIkJ1aWxkQW5kVGVzdCIsICJidWlsZGRpciI6ICJ0aWdlci1p bnRlbC1yZWxlYXNlIiwKQEAgLTk4LDkgKzEwMCwyMiBAQAogICAgICAgICAgICAgICAgICAgICAg ICJzbGF2ZW5hbWVzIjogWyJzemVnZWQtbGludXgtMSJdCiAgICAgICAgICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJD aHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0eXBlIjogIkNocm9taXVtQnVpbGQiLCAiYnVpbGRkaXIi OiAiY2hyb21pdW0td2luLXJlbGVhc2UiLAotICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9y bSI6ICJjaHJvbWl1bS13aW4iLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVj dHVyZXMiOiBbImkzODYiXSwKLSAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsi Z29vZ2xlLXNsYXZlLTEiXQorICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVt IFdpbiBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2lu LXJlbGVhc2UiLAorICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bSIs ICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4NiJdLAor ICAgICAgICAgICAgICAgICAgICAgICJ0cmlnZ2VycyI6IFsiY2hyb21pdW0td2luLXJlbGVhc2Ui XSwKKyAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiY2hyb21pdW0td2luLXNs YXZlLTEiXQorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21pdW0gTWFjIFJlbGVhc2UiLCAidHlw ZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS1tYWMtcmVsZWFzZSIsCisgICAgICAg ICAgICAgICAgICAgICAgInBsYXRmb3JtIjogImNocm9taXVtIiwgImNvbmZpZ3VyYXRpb24iOiAi cmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCisgICAgICAgICAgICAgICAgICAg ICAgInRyaWdnZXJzIjogWyJjaHJvbWl1bS1tYWMtcmVsZWFzZSJdLAorICAgICAgICAgICAgICAg ICAgICAgICJzbGF2ZW5hbWVzIjogWyJjaHJvbWl1bS1tYWMtc2xhdmUtMSJdCisgICAgICAgICAg ICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAg ICAibmFtZSI6ICJDaHJvbWl1bSBMaW51eCBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVp bGRkaXIiOiAiY2hyb21pdW0tbGludXgtcmVsZWFzZSIsCisgICAgICAgICAgICAgICAgICAgICAg InBsYXRmb3JtIjogImNocm9taXVtIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNo aXRlY3R1cmVzIjogWyJpMzg2Il0sCisgICAgICAgICAgICAgICAgICAgICAgInRyaWdnZXJzIjog WyJjaHJvbWl1bS1saW51eC1yZWxlYXNlIl0sCisgICAgICAgICAgICAgICAgICAgICAgInNsYXZl bmFtZXMiOiBbImNocm9taXVtLWxpbnV4LXNsYXZlLTEiXQogICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgICBdLAogCkBAIC0xMDgsOCArMTIzLDggQEAKICAgICAgICAgICAg ICAgICAgICAgICAiYnVpbGRlck5hbWVzIjogWyJUaWdlciBJbnRlbCBSZWxlYXNlIiwgIkxlb3Bh cmQgSW50ZWwgUmVsZWFzZSAoQnVpbGQpIiwgIkxlb3BhcmQgSW50ZWwgRGVidWcgKEJ1aWxkKSIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiU25vd0xlb3BhcmQgSW50 ZWwgUmVsZWFzZSAoQnVpbGQpIiwgIlNub3dMZW9wYXJkIEludGVsIExlYWtzIiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXaW5kb3dzIFJlbGVhc2UgKEJ1aWxkKSIs ICJXaW5kb3dzIERlYnVnIChCdWlsZCkiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIkdUSyBMaW51eCBSZWxlYXNlIiwgIlF0IExpbnV4IFJlbGVhc2UiLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNocm9taXVtIFdpbiBSZWxlYXNlIl0K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJHVEsgTGludXggUmVsZWFz ZSIsICJRdCBMaW51eCBSZWxlYXNlIiwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiQ2hyb21pdW0gV2luIFJlbGVhc2UiLCAiQ2hyb21pdW0gTWFjIFJlbGVhc2UiLCAi Q2hyb21pdW0gTGludXggUmVsZWFzZSJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAg ICAgICAgICAgICAgIHsgInR5cGUiOiAiVHJpZ2dlcmFibGUiLCAibmFtZSI6ICJsZW9wYXJkLWlu dGVsLXJlbGVhc2UtdGVzdHMiLAogICAgICAgICAgICAgICAgICAgICAgICJidWlsZGVyTmFtZXMi OiBbIkxlb3BhcmQgSW50ZWwgUmVsZWFzZSAoVGVzdHMpIl0KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcg Yi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9t YXN0ZXIuY2ZnCmluZGV4IGQyZGExOTIuLmViODgzYmMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKKysr IGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv bWFzdGVyLmNmZwpAQCAtNDgsNjEgKzQ4LDIwIEBAIGNsYXNzIENoZWNrT3V0U291cmNlKHNvdXJj ZS5TVk4pOgogICAgICAgICBzb3VyY2UuU1ZOLl9faW5pdF9fKHNlbGYsIGJhc2VVUkw9c2VsZi5i YXNlVVJMLCBkZWZhdWx0QnJhbmNoPSJ0cnVuayIsIG1vZGU9c2VsZi5tb2RlLCAqYXJncywgKipr d2FyZ3MpCiAKIAotIyBGSVhNRTogUmVtb3ZlIHRoaXMgc3RlcCBvbmNlIENocm9taXVtIFdlYktp dCBwb3J0IGJ1aWxkIHN5c3RlbSBpcyBkZWNvdXBsZWQgZnJvbQotIyBDaHJvbWl1bSAoaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4Mzk2KQotY2xhc3MgVXBkYXRlQ2hy b21pdW1Tb3VyY2Uoc2hlbGwuU2hlbGxDb21tYW5kKToKLSAgICBjb21tYW5kID0gWyJnY2xpZW50 IiwgInN5bmMiXQotICAgIG5hbWUgPSAidXBkYXRlLWNocm9taXVtIgotICAgIGRlc2NyaXB0aW9u ID0gWyJ1cGRhdGluZyBjaHJvbWl1bSBzb3VyY2UiXQotICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsi dXBkYXRlZCJdCi0gICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKLQotICAgIGRlZiBjcmVhdGVTdW1t YXJ5KHNlbGYsIGxvZyk6Ci0gICAgICAgIHNjcmFwZXIgPSByZS5jb21waWxlKHIiXl9fX19fX19f IHJ1bm5pbmcgJ1teXG5dK3RoaXJkX3BhcnR5Wy9cXF1XZWJLaXRbXlxuXSskXG4oPzpeW1VBXVxX K1teXG5dKyRcbikqXig/OlVwZGF0ZWQgdG98QXQpIHJldmlzaW9uIChcZCspIiwgcmUuRE9UQUxM IHwgcmUuTVVMVElMSU5FKQotICAgICAgICByZXZpc2lvbnMgPSBzY3JhcGVyLmZpbmRhbGwobG9n LmdldFRleHQoKSkKLSAgICAgICAgZ290UmV2aXNpb24gPSAiPz8iICMgVGhpcyBtYXRjaGVzIFNW TiB1bmtub3duIHJldmlzaW9uIHJlc3BvbnNlLgotICAgICAgICBpZiBsZW4ocmV2aXNpb25zKToK LSAgICAgICAgICAgIGdvdFJldmlzaW9uID0gInIlcyIgJSByZXZpc2lvbnNbLTFdCi0gICAgICAg IHNlbGYuZGVzY3JpcHRpb25Eb25lID0gWyJ1cGRhdGVkIiwgZ290UmV2aXNpb25dCi0KLSAgICBk ZWYgc3RhcnQoc2VsZik6Ci0gICAgICAgIG9zID0gc2VsZi5nZXRQcm9wZXJ0eSgiZnVsbFBsYXRm b3JtIikuc3BsaXQoJy0nKVsxXQotICAgICAgICBpZiBvcyA9PSAid2luIjoKLSAgICAgICAgICAg IHNlbGYuc2V0Q29tbWFuZChbImdjbGllbnQuYmF0IiwgInN5bmMiXSkKLSAgICAgICAgcmV2aXNp b24gPSBzZWxmLmdldFByb3BlcnR5KCJyZXZpc2lvbiIpCi0gICAgICAgIGlmIHJldmlzaW9uOgot ICAgICAgICAgICAgY29tbWFuZCA9IHNlbGYuY29tbWFuZFs6XQotICAgICAgICAgICAgY29tbWFu ZC5hcHBlbmQoIi0tcmV2aXNpb249c3JjL3RoaXJkX3BhcnR5L1dlYktpdEAlZCIgJSByZXZpc2lv bikKLSAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChjb21tYW5kKQotICAgICAgICByZXR1cm4g c2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCi0KLQotIyBGSVhNRTogUmVtb3ZlIHRoaXMg c3RlcCBvbmNlIENocm9taXVtIFdlYktpdCBwb3J0IGJ1aWxkIHN5c3RlbSBpcyBkZWNvdXBsZWQg ZnJvbQotIyBDaHJvbWl1bSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI4Mzk2KQotY2xhc3MgQ29tcGlsZUNocm9taXVtV2ViS2l0KHNoZWxsLlNoZWxsQ29tbWFuZCk6 Ci0gICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4uLy4uLy4uL3NjcmlwdHMvc2xhdmUvY29tcGls ZS5weSJdCi0gICAgbmFtZSA9ICJidWlsZC1jaHJvbWl1bSIKLSAgICBkZXNjcmlwdGlvbiA9IFsi Y29tcGlsaW5nIl0KLSAgICBkZXNjcmlwdGlvbkRvbmUgPSBbImNvbXBpbGVkIl0KLSAgICBoYWx0 T25GYWlsdXJlID0gVHJ1ZQotCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAgICAgICBvcyA9IHNl bGYuZ2V0UHJvcGVydHkoImZ1bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KLSAgICAgICAgY29t bWFuZCA9IHNlbGYuY29tbWFuZFs6XQotICAgICAgICBpZiBvcyA9PSAid2luIjoKLSAgICAgICAg ICAgIGNvbW1hbmQuZXh0ZW5kKFsiLS1zb2x1dGlvbj13ZWJraXQuc2xuIiwgIi0tYnVpbGQtZGly PXNyY1xcd2Via2l0IiwgIi0tIiwgIi9wcm9qZWN0IiwgIndlYmNvcmUiXSkKLSAgICAgICAgZWxp ZiBvcyA9PSAibWFjIjoKLSAgICAgICAgICAgIGNvbW1hbmQuZXh0ZW5kKFsiLS1zb2x1dGlvbj1f X3NvbHV0aW9uX18iLCAiLS1idWlsZC1kaXI9c3JjL2J1aWxkIiwgIi0tIiwgIi1wcm9qZWN0Iiwg Ii4uL3dlYmtpdC93ZWJraXQueGNvZGVwcm9qIiwgIi10YXJnZXQiLCAid2ViY29yZSJdKQotICAg ICAgICBzZWxmLnNldENvbW1hbmQoY29tbWFuZCkKLSAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxs Q29tbWFuZC5zdGFydChzZWxmKQotCi0KIGNsYXNzIEluc3RhbGxXaW4zMkRlcGVuZGVuY2llcyhz aGVsbC5Db21waWxlKToKICAgICBkZXNjcmlwdGlvbiA9IFsiaW5zdGFsbGluZyBkZXBlbmRlbmNp ZXMiXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsiaW5zdGFsbGVkIGRlcGVuZGVuY2llcyJdCiAg ICAgY29tbWFuZCA9IFsicGVybCIsICIuL1dlYktpdFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dC1hdXhpbGlhcnktbGlicyJdCiAKIAorY2xhc3MgSW5zdGFsbENocm9taXVtRGVwZW5kZW5jaWVz KHNoZWxsLlNoZWxsQ29tbWFuZCk6CisgICAgbmFtZSA9ICJnY2xpZW50IgorICAgIGRlc2NyaXB0 aW9uID0gWyJ1cGRhdGluZyBjaHJvbWl1bSBkZXBlbmRlbmNpZXMiXQorICAgIGRlc2NyaXB0aW9u RG9uZSA9IFsidXBkYXRlZCBjaHJvbWl1bSBkZXBlbmRlbmNpZXMiXQorICAgIGNvbW1hbmQgPSBb InBlcmwiLCAiLi9XZWJLaXRUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0iXQor ICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCisKKwogZGVmIGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Mo c3RlcCwgcGxhdGZvcm0pOgogICAgIGlmIHBsYXRmb3JtIGluICgnZ3RrJywgJ3d4JywgJ3F0Jyk6 CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1hbmQgKyBbJy0tJyArIHBsYXRmb3Jt XSkKQEAgLTExOSw2ICs3OCw4IEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6 CiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuZ2V0UHJvcGVy dHkoJ3BsYXRmb3JtJykKICAgICAgICAgYnVpbGRPbmx5ID0gc2VsZi5nZXRQcm9wZXJ0eSgnYnVp bGRPbmx5JykKKyAgICAgICAgaWYgcGxhdGZvcm0gPT0gJ2Nocm9taXVtJzoKKyAgICAgICAgICAg IHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJy0tY2hyb21pdW0nXSkKICAgICAgICAg aWYgcGxhdGZvcm0gPT0gJ21hYycgYW5kIGJ1aWxkT25seToKICAgICAgICAgICAgIHNlbGYuc2V0 Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJ0RFQlVHX0lORk9STUFUSU9OX0ZPUk1BVD1kd2FyZi13 aXRoLWRzeW0nXSkKIApAQCAtMzIwLDIwICsyODEsMTYgQEAgY2xhc3MgRmFjdG9yeShmYWN0b3J5 LkJ1aWxkRmFjdG9yeSk6CiAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja091dFNvdXJjZSkKICAg ICAgICAgaWYgcGxhdGZvcm0gPT0gIndpbiI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoSW5z dGFsbFdpbjMyRGVwZW5kZW5jaWVzKQotCi0jIEZJWE1FOiBSZW1vdmUgdGhpcyBmYWN0b3J5IG9u Y2UgQ2hyb21pdW0gV2ViS2l0IHBvcnQgYnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCi0j IENocm9taXVtIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYp Ci1jbGFzcyBDaHJvbWl1bUJ1aWxkRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz KToKLSAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKLSAgICAgICAg c2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmlndXJh dGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmU9IiAiLmpvaW4oYXJjaGl0ZWN0dXJlcyks IGJ1aWxkT25seT1UcnVlKQotICAgICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlQ2hyb21pdW1Tb3Vy Y2UpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlQ2hyb21pdW1XZWJLaXQpCisgICAgICAg IGlmIHBsYXRmb3JtID09ICJjaHJvbWl1bSI6CisgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoSW5z dGFsbENocm9taXVtRGVwZW5kZW5jaWVzKQogCiBjbGFzcyBCdWlsZEZhY3RvcnkoRmFjdG9yeSk6 CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRl Y3R1cmVzLCB0cmlnZ2Vycyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIFRydWUpCiAgICAgICAgIHNlbGYuYWRk U3RlcChDb21waWxlV2ViS2l0KQorICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiY2hyb21pdW0iOgor ICAgICAgICAgICAgIyBGSVhNRTogY2hyb21pdW0gc2hvdWxkIGFyY2hpdmUgYW5kIHRyaWdnZXIK KyAgICAgICAgICAgIHJldHVybgogICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZUJ1aWx0UHJv ZHVjdCkKICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkKICAgICAgICAg c2VsZi5hZGRTdGVwKHRyaWdnZXIuVHJpZ2dlciwgc2NoZWR1bGVyTmFtZXM9dHJpZ2dlcnMp 43115 2009-11-12 16:40:08 -0800 2009-11-12 17:38:48 -0800 buildbot configuration changes bug-31442-20091112164007.patch text/plain 8319 yaar ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL2NvbmZpZy5qc29uIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMmI4ZmFmNi4uOGI1Yjk3YiAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KKysrIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTI1LDcgKzI1LDkgQEAKIAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC1saW51eC0xIiwgInBsYXRmb3Jt IjogInF0In0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtc2xhdmUt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJnb29nbGUtd2luLTEiLCAicGxhdGZvcm0iOiAiY2hyb21pdW0iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZ29vZ2xlLW1hYy0xIiwgInBsYXRmb3JtIjogImNocm9t aXVtIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS1saW51eC0xIiwg InBsYXRmb3JtIjogImNocm9taXVtIiB9CiAgICAgICAgICAgICAgICAgICBdLAogCiAgICAgImJ1 aWxkZXJzIjogICBbIHsgIm5hbWUiOiAiVGlnZXIgSW50ZWwgUmVsZWFzZSIsICJ0eXBlIjogIkJ1 aWxkQW5kVGVzdCIsICJidWlsZGRpciI6ICJ0aWdlci1pbnRlbC1yZWxlYXNlIiwKQEAgLTk4LDkg KzEwMCwyMiBAQAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJzemVnZWQt bGludXgtMSJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0 eXBlIjogIkNocm9taXVtQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2Ui LAotICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iLCAiY29u ZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKLSAgICAg ICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXNsYXZlLTEiXQorICAgICAg ICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIFdpbiBSZWxlYXNlIiwgInR5cGUiOiAi QnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2UiLAorICAgICAgICAgICAg ICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bSIsICJjb25maWd1cmF0aW9uIjogInJlbGVh c2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4NiJdLAorICAgICAgICAgICAgICAgICAgICAgICJ0 cmlnZ2VycyI6IFsiY2hyb21pdW0td2luLXJlbGVhc2UiXSwKKyAgICAgICAgICAgICAgICAgICAg ICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXdpbi0xIl0KKyAgICAgICAgICAgICAgICAgICAgfSwK KyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkNo cm9taXVtIE1hYyBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21p dW0tbWFjLXJlbGVhc2UiLAorICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJv bWl1bSIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4 NiJdLAorICAgICAgICAgICAgICAgICAgICAgICJ0cmlnZ2VycyI6IFsiY2hyb21pdW0tbWFjLXJl bGVhc2UiXSwKKyAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLW1h Yy0xIl0KKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIExpbnV4IFJlbGVhc2UiLCAidHlw ZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS1saW51eC1yZWxlYXNlIiwKKyAgICAg ICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6 ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAgICAgICAg ICAgICAidHJpZ2dlcnMiOiBbImNocm9taXVtLWxpbnV4LXJlbGVhc2UiXSwKKyAgICAgICAgICAg ICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLWxpbnV4LTEiXQogICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICBdLAogCkBAIC0xMDksNyArMTI0LDcgQEAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTbm93TGVvcGFyZCBJbnRlbCBS ZWxlYXNlIChCdWlsZCkiLCAiU25vd0xlb3BhcmQgSW50ZWwgTGVha3MiLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIldpbmRvd3MgUmVsZWFzZSAoQnVpbGQpIiwgIldp bmRvd3MgRGVidWcgKEJ1aWxkKSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiR1RLIExpbnV4IFJlbGVhc2UiLCAiUXQgTGludXggUmVsZWFzZSIsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ2hyb21pdW0gV2luIFJlbGVhc2UiXQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNocm9taXVtIFdpbiBSZWxlYXNl IiwgIkNocm9taXVtIE1hYyBSZWxlYXNlIiwgIkNocm9taXVtIExpbnV4IFJlbGVhc2UiXQogICAg ICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgICB7ICJ0eXBlIjogIlRyaWdn ZXJhYmxlIiwgIm5hbWUiOiAibGVvcGFyZC1pbnRlbC1yZWxlYXNlLXRlc3RzIiwKICAgICAgICAg ICAgICAgICAgICAgICAiYnVpbGRlck5hbWVzIjogWyJMZW9wYXJkIEludGVsIFJlbGVhc2UgKFRl c3RzKSJdCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCBkMmRhMTkyLi45ZTNi NDE2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTQ4LDYzICs0OCwyMiBA QCBjbGFzcyBDaGVja091dFNvdXJjZShzb3VyY2UuU1ZOKToKICAgICAgICAgc291cmNlLlNWTi5f X2luaXRfXyhzZWxmLCBiYXNlVVJMPXNlbGYuYmFzZVVSTCwgZGVmYXVsdEJyYW5jaD0idHJ1bmsi LCBtb2RlPXNlbGYubW9kZSwgKmFyZ3MsICoqa3dhcmdzKQogCiAKLSMgRklYTUU6IFJlbW92ZSB0 aGlzIHN0ZXAgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMgZGVjb3Vw bGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yODM5NikKLWNsYXNzIFVwZGF0ZUNocm9taXVtU291cmNlKHNoZWxsLlNoZWxsQ29tbWFu ZCk6Ci0gICAgY29tbWFuZCA9IFsiZ2NsaWVudCIsICJzeW5jIl0KLSAgICBuYW1lID0gInVwZGF0 ZS1jaHJvbWl1bSIKLSAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgY2hyb21pdW0gc291cmNl Il0KLSAgICBkZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQiXQotICAgIGhhbHRPbkZhaWx1cmUg PSBUcnVlCi0KLSAgICBkZWYgY3JlYXRlU3VtbWFyeShzZWxmLCBsb2cpOgotICAgICAgICBzY3Jh cGVyID0gcmUuY29tcGlsZShyIl5fX19fX19fXyBydW5uaW5nICdbXlxuXSt0aGlyZF9wYXJ0eVsv XFxdV2ViS2l0W15cbl0rJFxuKD86XltVQV1cVytbXlxuXSskXG4pKl4oPzpVcGRhdGVkIHRvfEF0 KSByZXZpc2lvbiAoXGQrKSIsIHJlLkRPVEFMTCB8IHJlLk1VTFRJTElORSkKLSAgICAgICAgcmV2 aXNpb25zID0gc2NyYXBlci5maW5kYWxsKGxvZy5nZXRUZXh0KCkpCi0gICAgICAgIGdvdFJldmlz aW9uID0gIj8/IiAjIFRoaXMgbWF0Y2hlcyBTVk4gdW5rbm93biByZXZpc2lvbiByZXNwb25zZS4K LSAgICAgICAgaWYgbGVuKHJldmlzaW9ucyk6Ci0gICAgICAgICAgICBnb3RSZXZpc2lvbiA9ICJy JXMiICUgcmV2aXNpb25zWy0xXQotICAgICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9IFsidXBk YXRlZCIsIGdvdFJldmlzaW9uXQotCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAgICAgICBvcyA9 IHNlbGYuZ2V0UHJvcGVydHkoImZ1bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KLSAgICAgICAg aWYgb3MgPT0gIndpbiI6Ci0gICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoWyJnY2xpZW50LmJh dCIsICJzeW5jIl0pCi0gICAgICAgIHJldmlzaW9uID0gc2VsZi5nZXRQcm9wZXJ0eSgicmV2aXNp b24iKQotICAgICAgICBpZiByZXZpc2lvbjoKLSAgICAgICAgICAgIGNvbW1hbmQgPSBzZWxmLmNv bW1hbmRbOl0KLSAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXJldmlzaW9uPXNyYy90aGly ZF9wYXJ0eS9XZWJLaXRAJWQiICUgcmV2aXNpb24pCi0gICAgICAgICAgICBzZWxmLnNldENvbW1h bmQoY29tbWFuZCkKLSAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5zdGFydChzZWxm KQotCi0KLSMgRklYTUU6IFJlbW92ZSB0aGlzIHN0ZXAgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9y dCBidWlsZCBzeXN0ZW0gaXMgZGVjb3VwbGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODM5NikKLWNsYXNzIENvbXBpbGVDaHJvbWl1 bVdlYktpdChzaGVsbC5TaGVsbENvbW1hbmQpOgotICAgIGNvbW1hbmQgPSBbInB5dGhvbiIsICIu Li8uLi8uLi9zY3JpcHRzL3NsYXZlL2NvbXBpbGUucHkiXQotICAgIG5hbWUgPSAiYnVpbGQtY2hy b21pdW0iCi0gICAgZGVzY3JpcHRpb24gPSBbImNvbXBpbGluZyJdCi0gICAgZGVzY3JpcHRpb25E b25lID0gWyJjb21waWxlZCJdCi0gICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKLQotICAgIGRlZiBz dGFydChzZWxmKToKLSAgICAgICAgb3MgPSBzZWxmLmdldFByb3BlcnR5KCJmdWxsUGxhdGZvcm0i KS5zcGxpdCgnLScpWzFdCi0gICAgICAgIGNvbW1hbmQgPSBzZWxmLmNvbW1hbmRbOl0KLSAgICAg ICAgaWYgb3MgPT0gIndpbiI6Ci0gICAgICAgICAgICBjb21tYW5kLmV4dGVuZChbIi0tc29sdXRp b249d2Via2l0LnNsbiIsICItLWJ1aWxkLWRpcj1zcmNcXHdlYmtpdCIsICItLSIsICIvcHJvamVj dCIsICJ3ZWJjb3JlIl0pCi0gICAgICAgIGVsaWYgb3MgPT0gIm1hYyI6Ci0gICAgICAgICAgICBj b21tYW5kLmV4dGVuZChbIi0tc29sdXRpb249X19zb2x1dGlvbl9fIiwgIi0tYnVpbGQtZGlyPXNy Yy9idWlsZCIsICItLSIsICItcHJvamVjdCIsICIuLi93ZWJraXQvd2Via2l0Lnhjb2RlcHJvaiIs ICItdGFyZ2V0IiwgIndlYmNvcmUiXSkKLSAgICAgICAgc2VsZi5zZXRDb21tYW5kKGNvbW1hbmQp Ci0gICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKLQotCiBjbGFz cyBJbnN0YWxsV2luMzJEZXBlbmRlbmNpZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgZGVzY3JpcHRp b24gPSBbImluc3RhbGxpbmcgZGVwZW5kZW5jaWVzIl0KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBb Imluc3RhbGxlZCBkZXBlbmRlbmNpZXMiXQogICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9XZWJL aXRUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtYXV4aWxpYXJ5LWxpYnMiXQogCiAKK2NsYXNz IEluc3RhbGxDaHJvbWl1bURlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIG5h bWUgPSAiZ2NsaWVudCIKKyAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgY2hyb21pdW0gZGVw ZW5kZW5jaWVzIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQgY2hyb21pdW0gZGVw ZW5kZW5jaWVzIl0KKyAgICBjb21tYW5kID0gWyJwZXJsIiwgIi4vV2ViS2l0VG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0LWNocm9taXVtIl0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorCisK IGRlZiBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHN0ZXAsIHBsYXRmb3JtKToKLSAgICBpZiBwbGF0 Zm9ybSBpbiAoJ2d0aycsICd3eCcsICdxdCcpOgorICAgIGlmIHBsYXRmb3JtIGluICgnZ3RrJywg J3d4JywgJ3F0JywgJ2Nocm9taXVtJyk6CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNv bW1hbmQgKyBbJy0tJyArIHBsYXRmb3JtXSkKIAogCkBAIC0zMjAsMjAgKzI3OSwxNiBAQCBjbGFz cyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKENo ZWNrT3V0U291cmNlKQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAid2luIjoKICAgICAgICAgICAg IHNlbGYuYWRkU3RlcChJbnN0YWxsV2luMzJEZXBlbmRlbmNpZXMpCi0KLSMgRklYTUU6IFJlbW92 ZSB0aGlzIGZhY3Rvcnkgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMg ZGVjb3VwbGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODM5NikKLWNsYXNzIENocm9taXVtQnVpbGRGYWN0b3J5KGZhY3RvcnkuQnVp bGRGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMpOgotICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRf XyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBs YXRmb3JtLCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9p bihhcmNoaXRlY3R1cmVzKSwgYnVpbGRPbmx5PVRydWUpCi0gICAgICAgIHNlbGYuYWRkU3RlcChV cGRhdGVDaHJvbWl1bVNvdXJjZSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVDaHJvbWl1 bVdlYktpdCkKKyAgICAgICAgaWYgcGxhdGZvcm0gPT0gImNocm9taXVtIjoKKyAgICAgICAgICAg IHNlbGYuYWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRlbmNpZXMpCiAKIGNsYXNzIEJ1aWxk RmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzKToKICAgICAgICAgRmFjdG9yeS5fX2lu aXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgVHJ1ZSkK ICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQpCisgICAgICAgIGlmIHBsYXRmb3Jt ID09ICJjaHJvbWl1bSI6CisgICAgICAgICAgICAjIEZJWE1FOiBDaHJvbWl1bSBzaG91bGQgYXJj aGl2ZSBhbmQgdHJpZ2dlciB0ZXN0cyB0b28uCisgICAgICAgICAgICByZXR1cm4KICAgICAgICAg c2VsZi5hZGRTdGVwKEFyY2hpdmVCdWlsdFByb2R1Y3QpCiAgICAgICAgIHNlbGYuYWRkU3RlcChV cGxvYWRCdWlsdFByb2R1Y3QpCiAgICAgICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2VyLlRyaWdnZXIs IHNjaGVkdWxlck5hbWVzPXRyaWdnZXJzKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGJlYTI4MzEuLjAxOGVmMzIgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNCBAQAorMjAwOS0xMS0xMiAgWWFhciBTY2huaXRtYW4gIDx5YWFyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb25maWd1cmF0aW9uIGZvciBDaHJvbWl1bSBCdWlsZCBTbGF2ZXMuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNDQyCisKKyAgICAgICAgKiBC dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIu Y2ZnOgorCiAyMDA5LTExLTExICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9u aGFAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbiBBbG9uem8u 43118 2009-11-12 17:38:52 -0800 2009-11-12 18:20:05 -0800 buildbot configuration changes bug-31442-20091112173850.patch text/plain 8400 yaar ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL2NvbmZpZy5qc29uIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMmI4ZmFmNi4uNDFkNTY3NSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KKysrIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTI1LDcgKzI1LDkgQEAKIAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC1saW51eC0xIiwgInBsYXRmb3Jt IjogInF0In0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtc2xhdmUt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJnb29nbGUtd2luLTEiLCAicGxhdGZvcm0iOiAiY2hyb21pdW0iIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiZ29vZ2xlLW1hYy0xIiwgInBsYXRmb3JtIjogImNocm9t aXVtIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS1saW51eC0xIiwg InBsYXRmb3JtIjogImNocm9taXVtIiB9CiAgICAgICAgICAgICAgICAgICBdLAogCiAgICAgImJ1 aWxkZXJzIjogICBbIHsgIm5hbWUiOiAiVGlnZXIgSW50ZWwgUmVsZWFzZSIsICJ0eXBlIjogIkJ1 aWxkQW5kVGVzdCIsICJidWlsZGRpciI6ICJ0aWdlci1pbnRlbC1yZWxlYXNlIiwKQEAgLTk4LDkg KzEwMCwxOSBAQAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJzemVnZWQt bGludXgtMSJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0 eXBlIjogIkNocm9taXVtQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2Ui LAotICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iLCAiY29u ZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKLSAgICAg ICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXNsYXZlLTEiXQorICAgICAg ICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIFdpbiBSZWxlYXNlIiwgInR5cGUiOiAi QnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2UiLAorICAgICAgICAgICAg ICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bSIsICJjb25maWd1cmF0aW9uIjogInJlbGVh c2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4NiJdLAorICAgICAgICAgICAgICAgICAgICAgICJz bGF2ZW5hbWVzIjogWyJnb29nbGUtd2luLTEiXQorICAgICAgICAgICAgICAgICAgICB9LAorICAg ICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21p dW0gTWFjIFJlbGVhc2UiLCAidHlwZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS1t YWMtcmVsZWFzZSIsCisgICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogImNocm9taXVt IiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0s CisgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS1tYWMtMSJdCisg ICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBMaW51eCBSZWxlYXNlIiwgInR5cGUiOiAiQnVp bGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0tbGludXgtcmVsZWFzZSIsCisgICAgICAgICAgICAg ICAgICAgICAgInBsYXRmb3JtIjogImNocm9taXVtIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFz ZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCisgICAgICAgICAgICAgICAgICAgICAgInNs YXZlbmFtZXMiOiBbImdvb2dsZS1saW51eC0xIl0KICAgICAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgICAgXSwKIApAQCAtMTA5LDcgKzEyMSw3IEBACiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiU25vd0xlb3BhcmQgSW50ZWwgUmVsZWFzZSAoQnVpbGQp IiwgIlNub3dMZW9wYXJkIEludGVsIExlYWtzIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJXaW5kb3dzIFJlbGVhc2UgKEJ1aWxkKSIsICJXaW5kb3dzIERlYnVnIChC dWlsZCkiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkdUSyBMaW51 eCBSZWxlYXNlIiwgIlF0IExpbnV4IFJlbGVhc2UiLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIkNocm9taXVtIFdpbiBSZWxlYXNlIl0KKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJDaHJvbWl1bSBN YWMgUmVsZWFzZSIsICJDaHJvbWl1bSBMaW51eCBSZWxlYXNlIl0KICAgICAgICAgICAgICAgICAg ICAgfSwKICAgICAgICAgICAgICAgICAgICAgeyAidHlwZSI6ICJUcmlnZ2VyYWJsZSIsICJuYW1l IjogImxlb3BhcmQtaW50ZWwtcmVsZWFzZS10ZXN0cyIsCiAgICAgICAgICAgICAgICAgICAgICAg ImJ1aWxkZXJOYW1lcyI6IFsiTGVvcGFyZCBJbnRlbCBSZWxlYXNlIChUZXN0cykiXQpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvbWFzdGVyLmNmZyBiL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL21hc3Rlci5jZmcKaW5kZXggZDJkYTE5Mi4uOTQ0OGJkYiAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv bWFzdGVyLmNmZworKysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCkBAIC00OCw2MyArNDgsMjIgQEAgY2xhc3MgQ2hlY2tP dXRTb3VyY2Uoc291cmNlLlNWTik6CiAgICAgICAgIHNvdXJjZS5TVk4uX19pbml0X18oc2VsZiwg YmFzZVVSTD1zZWxmLmJhc2VVUkwsIGRlZmF1bHRCcmFuY2g9InRydW5rIiwgbW9kZT1zZWxmLm1v ZGUsICphcmdzLCAqKmt3YXJncykKIAogCi0jIEZJWE1FOiBSZW1vdmUgdGhpcyBzdGVwIG9uY2Ug Q2hyb21pdW0gV2ViS2l0IHBvcnQgYnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCi0jIENo cm9taXVtIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCi1j bGFzcyBVcGRhdGVDaHJvbWl1bVNvdXJjZShzaGVsbC5TaGVsbENvbW1hbmQpOgotICAgIGNvbW1h bmQgPSBbImdjbGllbnQiLCAic3luYyJdCi0gICAgbmFtZSA9ICJ1cGRhdGUtY2hyb21pdW0iCi0g ICAgZGVzY3JpcHRpb24gPSBbInVwZGF0aW5nIGNocm9taXVtIHNvdXJjZSJdCi0gICAgZGVzY3Jp cHRpb25Eb25lID0gWyJ1cGRhdGVkIl0KLSAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQotCi0gICAg ZGVmIGNyZWF0ZVN1bW1hcnkoc2VsZiwgbG9nKToKLSAgICAgICAgc2NyYXBlciA9IHJlLmNvbXBp bGUociJeX19fX19fX18gcnVubmluZyAnW15cbl0rdGhpcmRfcGFydHlbL1xcXVdlYktpdFteXG5d KyRcbig/Ol5bVUFdXFcrW15cbl0rJFxuKSpeKD86VXBkYXRlZCB0b3xBdCkgcmV2aXNpb24gKFxk KykiLCByZS5ET1RBTEwgfCByZS5NVUxUSUxJTkUpCi0gICAgICAgIHJldmlzaW9ucyA9IHNjcmFw ZXIuZmluZGFsbChsb2cuZ2V0VGV4dCgpKQotICAgICAgICBnb3RSZXZpc2lvbiA9ICI/PyIgIyBU aGlzIG1hdGNoZXMgU1ZOIHVua25vd24gcmV2aXNpb24gcmVzcG9uc2UuCi0gICAgICAgIGlmIGxl bihyZXZpc2lvbnMpOgotICAgICAgICAgICAgZ290UmV2aXNpb24gPSAiciVzIiAlIHJldmlzaW9u c1stMV0KLSAgICAgICAgc2VsZi5kZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQiLCBnb3RSZXZp c2lvbl0KLQotICAgIGRlZiBzdGFydChzZWxmKToKLSAgICAgICAgb3MgPSBzZWxmLmdldFByb3Bl cnR5KCJmdWxsUGxhdGZvcm0iKS5zcGxpdCgnLScpWzFdCi0gICAgICAgIGlmIG9zID09ICJ3aW4i OgotICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKFsiZ2NsaWVudC5iYXQiLCAic3luYyJdKQot ICAgICAgICByZXZpc2lvbiA9IHNlbGYuZ2V0UHJvcGVydHkoInJldmlzaW9uIikKLSAgICAgICAg aWYgcmV2aXNpb246Ci0gICAgICAgICAgICBjb21tYW5kID0gc2VsZi5jb21tYW5kWzpdCi0gICAg ICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1yZXZpc2lvbj1zcmMvdGhpcmRfcGFydHkvV2ViS2l0 QCVkIiAlIHJldmlzaW9uKQotICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKGNvbW1hbmQpCi0g ICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKLQotCi0jIEZJWE1F OiBSZW1vdmUgdGhpcyBzdGVwIG9uY2UgQ2hyb21pdW0gV2ViS2l0IHBvcnQgYnVpbGQgc3lzdGVt IGlzIGRlY291cGxlZCBmcm9tCi0jIENocm9taXVtIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCi1jbGFzcyBDb21waWxlQ2hyb21pdW1XZWJLaXQoc2hlbGwu U2hlbGxDb21tYW5kKToKLSAgICBjb21tYW5kID0gWyJweXRob24iLCAiLi4vLi4vLi4vc2NyaXB0 cy9zbGF2ZS9jb21waWxlLnB5Il0KLSAgICBuYW1lID0gImJ1aWxkLWNocm9taXVtIgotICAgIGRl c2NyaXB0aW9uID0gWyJjb21waWxpbmciXQotICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsiY29tcGls ZWQiXQotICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCi0KLSAgICBkZWYgc3RhcnQoc2VsZik6Ci0g ICAgICAgIG9zID0gc2VsZi5nZXRQcm9wZXJ0eSgiZnVsbFBsYXRmb3JtIikuc3BsaXQoJy0nKVsx XQotICAgICAgICBjb21tYW5kID0gc2VsZi5jb21tYW5kWzpdCi0gICAgICAgIGlmIG9zID09ICJ3 aW4iOgotICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoWyItLXNvbHV0aW9uPXdlYmtpdC5zbG4i LCAiLS1idWlsZC1kaXI9c3JjXFx3ZWJraXQiLCAiLS0iLCAiL3Byb2plY3QiLCAid2ViY29yZSJd KQotICAgICAgICBlbGlmIG9zID09ICJtYWMiOgotICAgICAgICAgICAgY29tbWFuZC5leHRlbmQo WyItLXNvbHV0aW9uPV9fc29sdXRpb25fXyIsICItLWJ1aWxkLWRpcj1zcmMvYnVpbGQiLCAiLS0i LCAiLXByb2plY3QiLCAiLi4vd2Via2l0L3dlYmtpdC54Y29kZXByb2oiLCAiLXRhcmdldCIsICJ3 ZWJjb3JlIl0pCi0gICAgICAgIHNlbGYuc2V0Q29tbWFuZChjb21tYW5kKQotICAgICAgICByZXR1 cm4gc2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCi0KLQogY2xhc3MgSW5zdGFsbFdpbjMy RGVwZW5kZW5jaWVzKHNoZWxsLkNvbXBpbGUpOgogICAgIGRlc2NyaXB0aW9uID0gWyJpbnN0YWxs aW5nIGRlcGVuZGVuY2llcyJdCiAgICAgZGVzY3JpcHRpb25Eb25lID0gWyJpbnN0YWxsZWQgZGVw ZW5kZW5jaWVzIl0KICAgICBjb21tYW5kID0gWyJwZXJsIiwgIi4vV2ViS2l0VG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0LWF1eGlsaWFyeS1saWJzIl0KIAogCitjbGFzcyBJbnN0YWxsQ2hyb21p dW1EZXBlbmRlbmNpZXMoc2hlbGwuU2hlbGxDb21tYW5kKToKKyAgICBuYW1lID0gImdjbGllbnQi CisgICAgZGVzY3JpcHRpb24gPSBbInVwZGF0aW5nIGNocm9taXVtIGRlcGVuZGVuY2llcyJdCisg ICAgZGVzY3JpcHRpb25Eb25lID0gWyJ1cGRhdGVkIGNocm9taXVtIGRlcGVuZGVuY2llcyJdCisg ICAgY29tbWFuZCA9IFsicGVybCIsICIuL1dlYktpdFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dC1jaHJvbWl1bSJdCisgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKKworCiBkZWYgYXBwZW5kQ3Vz dG9tQnVpbGRGbGFncyhzdGVwLCBwbGF0Zm9ybSk6Ci0gICAgaWYgcGxhdGZvcm0gaW4gKCdndGsn LCAnd3gnLCAncXQnKToKKyAgICBpZiBwbGF0Zm9ybSBpbiAoJ2d0aycsICd3eCcsICdxdCcsICdj aHJvbWl1bScpOgogICAgICAgICBzdGVwLnNldENvbW1hbmQoc3RlcC5jb21tYW5kICsgWyctLScg KyBwbGF0Zm9ybV0pCiAKIApAQCAtMzIwLDIzICsyNzksMjAgQEAgY2xhc3MgRmFjdG9yeShmYWN0 b3J5LkJ1aWxkRmFjdG9yeSk6CiAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja091dFNvdXJjZSkK ICAgICAgICAgaWYgcGxhdGZvcm0gPT0gIndpbiI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAo SW5zdGFsbFdpbjMyRGVwZW5kZW5jaWVzKQotCi0jIEZJWE1FOiBSZW1vdmUgdGhpcyBmYWN0b3J5 IG9uY2UgQ2hyb21pdW0gV2ViS2l0IHBvcnQgYnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9t Ci0jIENocm9taXVtIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjgz OTYpCi1jbGFzcyBDaHJvbWl1bUJ1aWxkRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0g ICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1 cmVzKToKLSAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKLSAgICAg ICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmln dXJhdGlvbj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmU9IiAiLmpvaW4oYXJjaGl0ZWN0dXJl cyksIGJ1aWxkT25seT1UcnVlKQotICAgICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlQ2hyb21pdW1T b3VyY2UpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlQ2hyb21pdW1XZWJLaXQpCisgICAg ICAgIGlmIHBsYXRmb3JtID09ICJjaHJvbWl1bSI6CisgICAgICAgICAgICBzZWxmLmFkZFN0ZXAo SW5zdGFsbENocm9taXVtRGVwZW5kZW5jaWVzKQogCiBjbGFzcyBCdWlsZEZhY3RvcnkoRmFjdG9y eSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNo aXRlY3R1cmVzLCB0cmlnZ2Vycyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBj b25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCB0cmlnZ2Vycz1Ob25lKToKICAgICAgICAgRmFj dG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJl cywgVHJ1ZSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVXZWJLaXQpCisgICAgICAgIGlm IHBsYXRmb3JtID09ICJjaHJvbWl1bSI6CisgICAgICAgICAgICAjIEZJWE1FOiBDaHJvbWl1bSBz aG91bGQgYXJjaGl2ZSBhbmQgdHJpZ2dlciB0ZXN0cyB0b28uCisgICAgICAgICAgICByZXR1cm4K ICAgICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVCdWlsdFByb2R1Y3QpCiAgICAgICAgIHNlbGYu YWRkU3RlcChVcGxvYWRCdWlsdFByb2R1Y3QpCi0gICAgICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2Vy LlRyaWdnZXIsIHNjaGVkdWxlck5hbWVzPXRyaWdnZXJzKQorICAgICAgICBpZiB0cmlnZ2VyczoK KyAgICAgICAgICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2VyLlRyaWdnZXIsIHNjaGVkdWxlck5hbWVz PXRyaWdnZXJzKQogCiBjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMpOgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGJlYTI4MzEuLjAxOGVmMzIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysg Yi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0xMS0xMiAgWWFh ciBTY2huaXRtYW4gIDx5YWFyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb25maWd1cmF0aW9uIGZvciBDaHJvbWl1bSBCdWls ZCBTbGF2ZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTMxNDQyCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9jb25maWcuanNvbjoKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorCiAyMDA5LTExLTExICBHdXN0YXZvIE5vcm9u aGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEphbiBBbG9uem8u 43120 2009-11-12 18:20:10 -0800 2009-11-18 14:57:14 -0800 buildbot configuration changes bug-31442-20091112182008.patch text/plain 8408 yaar ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL2NvbmZpZy5qc29uIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMmI4ZmFmNi4uNDc1MWZlOSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KKysrIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTI1LDcgKzI1LDkgQEAKIAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC1saW51eC0xIiwgInBsYXRmb3Jt IjogInF0In0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtc2xhdmUt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJnb29nbGUtd2luZG93cy0xIiwgInBsYXRmb3JtIjogImNocm9taXVtIiB9LAorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS1tYWMtMSIsICJwbGF0Zm9ybSI6ICJj aHJvbWl1bSIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtbGludXgt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bSIgfQogICAgICAgICAgICAgICAgICAgXSwKIAogICAg ICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlRpZ2VyIEludGVsIFJlbGVhc2UiLCAidHlwZSI6 ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIiOiAidGlnZXItaW50ZWwtcmVsZWFzZSIsCkBAIC05 OCw5ICsxMDAsMTkgQEAKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsic3pl Z2VkLWxpbnV4LTEiXQogICAgICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAg ICB7Ci0gICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21pdW0gV2luIFJlbGVhc2Ui LCAidHlwZSI6ICJDaHJvbWl1bUJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLXdpbi1yZWxl YXNlIiwKLSAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0td2luIiwg ImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCi0g ICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS1zbGF2ZS0xIl0KKyAg ICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0eXBl IjogIkJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLXdpbi1yZWxlYXNlIiwKKyAgICAgICAg ICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6ICJy ZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAgICAgICAgICAg ICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXdpbmRvd3MtMSJdCisgICAgICAgICAgICAgICAgICAg IH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6 ICJDaHJvbWl1bSBNYWMgUmVsZWFzZSIsICJ0eXBlIjogIkJ1aWxkIiwgImJ1aWxkZGlyIjogImNo cm9taXVtLW1hYy1yZWxlYXNlIiwKKyAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAi Y2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBb ImkzODYiXSwKKyAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLW1h Yy0xIl0KKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIExpbnV4IFJlbGVhc2UiLCAidHlw ZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS1saW51eC1yZWxlYXNlIiwKKyAgICAg ICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6 ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAgICAgICAg ICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLWxpbnV4LTEiXQogICAgICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgICBdLAogCkBAIC0xMDksNyArMTIxLDcgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTbm93TGVvcGFyZCBJbnRlbCBSZWxlYXNl IChCdWlsZCkiLCAiU25vd0xlb3BhcmQgSW50ZWwgTGVha3MiLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIldpbmRvd3MgUmVsZWFzZSAoQnVpbGQpIiwgIldpbmRvd3Mg RGVidWcgKEJ1aWxkKSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi R1RLIExpbnV4IFJlbGVhc2UiLCAiUXQgTGludXggUmVsZWFzZSIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiQ2hyb21pdW0gV2luIFJlbGVhc2UiXQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNocm9taXVtIFdpbiBSZWxlYXNlIiwgIkNo cm9taXVtIE1hYyBSZWxlYXNlIiwgIkNocm9taXVtIExpbnV4IFJlbGVhc2UiXQogICAgICAgICAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgICB7ICJ0eXBlIjogIlRyaWdnZXJhYmxl IiwgIm5hbWUiOiAibGVvcGFyZC1pbnRlbC1yZWxlYXNlLXRlc3RzIiwKICAgICAgICAgICAgICAg ICAgICAgICAiYnVpbGRlck5hbWVzIjogWyJMZW9wYXJkIEludGVsIFJlbGVhc2UgKFRlc3RzKSJd CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCBkMmRhMTkyLi45NDQ4YmRiIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTQ4LDYzICs0OCwyMiBAQCBjbGFz cyBDaGVja091dFNvdXJjZShzb3VyY2UuU1ZOKToKICAgICAgICAgc291cmNlLlNWTi5fX2luaXRf XyhzZWxmLCBiYXNlVVJMPXNlbGYuYmFzZVVSTCwgZGVmYXVsdEJyYW5jaD0idHJ1bmsiLCBtb2Rl PXNlbGYubW9kZSwgKmFyZ3MsICoqa3dhcmdzKQogCiAKLSMgRklYTUU6IFJlbW92ZSB0aGlzIHN0 ZXAgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMgZGVjb3VwbGVkIGZy b20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y ODM5NikKLWNsYXNzIFVwZGF0ZUNocm9taXVtU291cmNlKHNoZWxsLlNoZWxsQ29tbWFuZCk6Ci0g ICAgY29tbWFuZCA9IFsiZ2NsaWVudCIsICJzeW5jIl0KLSAgICBuYW1lID0gInVwZGF0ZS1jaHJv bWl1bSIKLSAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgY2hyb21pdW0gc291cmNlIl0KLSAg ICBkZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQiXQotICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVl Ci0KLSAgICBkZWYgY3JlYXRlU3VtbWFyeShzZWxmLCBsb2cpOgotICAgICAgICBzY3JhcGVyID0g cmUuY29tcGlsZShyIl5fX19fX19fXyBydW5uaW5nICdbXlxuXSt0aGlyZF9wYXJ0eVsvXFxdV2Vi S2l0W15cbl0rJFxuKD86XltVQV1cVytbXlxuXSskXG4pKl4oPzpVcGRhdGVkIHRvfEF0KSByZXZp c2lvbiAoXGQrKSIsIHJlLkRPVEFMTCB8IHJlLk1VTFRJTElORSkKLSAgICAgICAgcmV2aXNpb25z ID0gc2NyYXBlci5maW5kYWxsKGxvZy5nZXRUZXh0KCkpCi0gICAgICAgIGdvdFJldmlzaW9uID0g Ij8/IiAjIFRoaXMgbWF0Y2hlcyBTVk4gdW5rbm93biByZXZpc2lvbiByZXNwb25zZS4KLSAgICAg ICAgaWYgbGVuKHJldmlzaW9ucyk6Ci0gICAgICAgICAgICBnb3RSZXZpc2lvbiA9ICJyJXMiICUg cmV2aXNpb25zWy0xXQotICAgICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9IFsidXBkYXRlZCIs IGdvdFJldmlzaW9uXQotCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAgICAgICBvcyA9IHNlbGYu Z2V0UHJvcGVydHkoImZ1bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KLSAgICAgICAgaWYgb3Mg PT0gIndpbiI6Ci0gICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoWyJnY2xpZW50LmJhdCIsICJz eW5jIl0pCi0gICAgICAgIHJldmlzaW9uID0gc2VsZi5nZXRQcm9wZXJ0eSgicmV2aXNpb24iKQot ICAgICAgICBpZiByZXZpc2lvbjoKLSAgICAgICAgICAgIGNvbW1hbmQgPSBzZWxmLmNvbW1hbmRb Ol0KLSAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXJldmlzaW9uPXNyYy90aGlyZF9wYXJ0 eS9XZWJLaXRAJWQiICUgcmV2aXNpb24pCi0gICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoY29t bWFuZCkKLSAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5zdGFydChzZWxmKQotCi0K LSMgRklYTUU6IFJlbW92ZSB0aGlzIHN0ZXAgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWls ZCBzeXN0ZW0gaXMgZGVjb3VwbGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODM5NikKLWNsYXNzIENvbXBpbGVDaHJvbWl1bVdlYktp dChzaGVsbC5TaGVsbENvbW1hbmQpOgotICAgIGNvbW1hbmQgPSBbInB5dGhvbiIsICIuLi8uLi8u Li9zY3JpcHRzL3NsYXZlL2NvbXBpbGUucHkiXQotICAgIG5hbWUgPSAiYnVpbGQtY2hyb21pdW0i Ci0gICAgZGVzY3JpcHRpb24gPSBbImNvbXBpbGluZyJdCi0gICAgZGVzY3JpcHRpb25Eb25lID0g WyJjb21waWxlZCJdCi0gICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKLQotICAgIGRlZiBzdGFydChz ZWxmKToKLSAgICAgICAgb3MgPSBzZWxmLmdldFByb3BlcnR5KCJmdWxsUGxhdGZvcm0iKS5zcGxp dCgnLScpWzFdCi0gICAgICAgIGNvbW1hbmQgPSBzZWxmLmNvbW1hbmRbOl0KLSAgICAgICAgaWYg b3MgPT0gIndpbiI6Ci0gICAgICAgICAgICBjb21tYW5kLmV4dGVuZChbIi0tc29sdXRpb249d2Vi a2l0LnNsbiIsICItLWJ1aWxkLWRpcj1zcmNcXHdlYmtpdCIsICItLSIsICIvcHJvamVjdCIsICJ3 ZWJjb3JlIl0pCi0gICAgICAgIGVsaWYgb3MgPT0gIm1hYyI6Ci0gICAgICAgICAgICBjb21tYW5k LmV4dGVuZChbIi0tc29sdXRpb249X19zb2x1dGlvbl9fIiwgIi0tYnVpbGQtZGlyPXNyYy9idWls ZCIsICItLSIsICItcHJvamVjdCIsICIuLi93ZWJraXQvd2Via2l0Lnhjb2RlcHJvaiIsICItdGFy Z2V0IiwgIndlYmNvcmUiXSkKLSAgICAgICAgc2VsZi5zZXRDb21tYW5kKGNvbW1hbmQpCi0gICAg ICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKLQotCiBjbGFzcyBJbnN0 YWxsV2luMzJEZXBlbmRlbmNpZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgZGVzY3JpcHRpb24gPSBb Imluc3RhbGxpbmcgZGVwZW5kZW5jaWVzIl0KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbImluc3Rh bGxlZCBkZXBlbmRlbmNpZXMiXQogICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9XZWJLaXRUb29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtYXV4aWxpYXJ5LWxpYnMiXQogCiAKK2NsYXNzIEluc3Rh bGxDaHJvbWl1bURlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIG5hbWUgPSAi Z2NsaWVudCIKKyAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgY2hyb21pdW0gZGVwZW5kZW5j aWVzIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQgY2hyb21pdW0gZGVwZW5kZW5j aWVzIl0KKyAgICBjb21tYW5kID0gWyJwZXJsIiwgIi4vV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0LWNocm9taXVtIl0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorCisKIGRlZiBh cHBlbmRDdXN0b21CdWlsZEZsYWdzKHN0ZXAsIHBsYXRmb3JtKToKLSAgICBpZiBwbGF0Zm9ybSBp biAoJ2d0aycsICd3eCcsICdxdCcpOgorICAgIGlmIHBsYXRmb3JtIGluICgnZ3RrJywgJ3d4Jywg J3F0JywgJ2Nocm9taXVtJyk6CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1hbmQg KyBbJy0tJyArIHBsYXRmb3JtXSkKIAogCkBAIC0zMjAsMjMgKzI3OSwyMCBAQCBjbGFzcyBGYWN0 b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0 U291cmNlKQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAid2luIjoKICAgICAgICAgICAgIHNlbGYu YWRkU3RlcChJbnN0YWxsV2luMzJEZXBlbmRlbmNpZXMpCi0KLSMgRklYTUU6IFJlbW92ZSB0aGlz IGZhY3Rvcnkgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMgZGVjb3Vw bGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yODM5NikKLWNsYXNzIENocm9taXVtQnVpbGRGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0 b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMpOgotICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxm KQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBsYXRmb3Jt LCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9pbihhcmNo aXRlY3R1cmVzKSwgYnVpbGRPbmx5PVRydWUpCi0gICAgICAgIHNlbGYuYWRkU3RlcChVcGRhdGVD aHJvbWl1bVNvdXJjZSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVDaHJvbWl1bVdlYktp dCkKKyAgICAgICAgaWYgcGxhdGZvcm0gPT0gImNocm9taXVtIjoKKyAgICAgICAgICAgIHNlbGYu YWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRlbmNpZXMpCiAKIGNsYXNzIEJ1aWxkRmFjdG9y eShGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxh dGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzPU5vbmUpOgogICAg ICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNo aXRlY3R1cmVzLCBUcnVlKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdlYktpdCkKKyAg ICAgICAgaWYgcGxhdGZvcm0gPT0gImNocm9taXVtIjoKKyAgICAgICAgICAgICMgRklYTUU6IENo cm9taXVtIHNob3VsZCBhcmNoaXZlIGFuZCB0cmlnZ2VyIHRlc3RzIHRvby4KKyAgICAgICAgICAg IHJldHVybgogICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2ZUJ1aWx0UHJvZHVjdCkKICAgICAg ICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkKLSAgICAgICAgc2VsZi5hZGRTdGVw KHRyaWdnZXIuVHJpZ2dlciwgc2NoZWR1bGVyTmFtZXM9dHJpZ2dlcnMpCisgICAgICAgIGlmIHRy aWdnZXJzOgorICAgICAgICAgICAgc2VsZi5hZGRTdGVwKHRyaWdnZXIuVHJpZ2dlciwgc2NoZWR1 bGVyTmFtZXM9dHJpZ2dlcnMpCiAKIGNsYXNzIFRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcyk6 CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VM b2cKaW5kZXggYmVhMjgzMS4uMDE4ZWYzMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA5LTEx LTEyICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbmZpZ3VyYXRpb24gZm9yIENocm9t aXVtIEJ1aWxkIFNsYXZlcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE0NDIKKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisKIDIwMDktMTEtMTEgIEd1c3Rh dm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgSmFuIEFsb256by4= 43464 2009-11-18 14:57:21 -0800 2009-11-18 18:54:03 -0800 buildbot configuration changes bug-31442-20091118145719.patch text/plain 8358 yaar ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL2NvbmZpZy5qc29uIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KaW5kZXggMmI4ZmFmNi4uNDc1MWZlOSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvY29uZmlnLmpzb24KKysrIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmlnLmpzb24KQEAgLTI1LDcgKzI1LDkgQEAKIAog ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN6ZWdlZC1saW51eC0xIiwgInBsYXRmb3Jt IjogInF0In0sCiAKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtc2xhdmUt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iIH0KKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJnb29nbGUtd2luZG93cy0xIiwgInBsYXRmb3JtIjogImNocm9taXVtIiB9LAorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS1tYWMtMSIsICJwbGF0Zm9ybSI6ICJj aHJvbWl1bSIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtbGludXgt MSIsICJwbGF0Zm9ybSI6ICJjaHJvbWl1bSIgfQogICAgICAgICAgICAgICAgICAgXSwKIAogICAg ICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlRpZ2VyIEludGVsIFJlbGVhc2UiLCAidHlwZSI6 ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIiOiAidGlnZXItaW50ZWwtcmVsZWFzZSIsCkBAIC05 OCw5ICsxMDAsMTkgQEAKICAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsic3pl Z2VkLWxpbnV4LTEiXQogICAgICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAg ICB7Ci0gICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21pdW0gV2luIFJlbGVhc2Ui LCAidHlwZSI6ICJDaHJvbWl1bUJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLXdpbi1yZWxl YXNlIiwKLSAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0td2luIiwg ImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCi0g ICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS1zbGF2ZS0xIl0KKyAg ICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0eXBl IjogIkJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLXdpbi1yZWxlYXNlIiwKKyAgICAgICAg ICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6ICJy ZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAgICAgICAgICAg ICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXdpbmRvd3MtMSJdCisgICAgICAgICAgICAgICAgICAg IH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAibmFtZSI6 ICJDaHJvbWl1bSBNYWMgUmVsZWFzZSIsICJ0eXBlIjogIkJ1aWxkIiwgImJ1aWxkZGlyIjogImNo cm9taXVtLW1hYy1yZWxlYXNlIiwKKyAgICAgICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAi Y2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBb ImkzODYiXSwKKyAgICAgICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLW1h Yy0xIl0KKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIExpbnV4IFJlbGVhc2UiLCAidHlw ZSI6ICJCdWlsZCIsICJidWlsZGRpciI6ICJjaHJvbWl1bS1saW51eC1yZWxlYXNlIiwKKyAgICAg ICAgICAgICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0iLCAiY29uZmlndXJhdGlvbiI6 ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAgICAgICAg ICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLWxpbnV4LTEiXQogICAgICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgICBdLAogCkBAIC0xMDksNyArMTIxLDcgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTbm93TGVvcGFyZCBJbnRlbCBSZWxlYXNl IChCdWlsZCkiLCAiU25vd0xlb3BhcmQgSW50ZWwgTGVha3MiLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIldpbmRvd3MgUmVsZWFzZSAoQnVpbGQpIiwgIldpbmRvd3Mg RGVidWcgKEJ1aWxkKSIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi R1RLIExpbnV4IFJlbGVhc2UiLCAiUXQgTGludXggUmVsZWFzZSIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiQ2hyb21pdW0gV2luIFJlbGVhc2UiXQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNocm9taXVtIFdpbiBSZWxlYXNlIiwgIkNo cm9taXVtIE1hYyBSZWxlYXNlIiwgIkNocm9taXVtIExpbnV4IFJlbGVhc2UiXQogICAgICAgICAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgICB7ICJ0eXBlIjogIlRyaWdnZXJhYmxl IiwgIm5hbWUiOiAibGVvcGFyZC1pbnRlbC1yZWxlYXNlLXRlc3RzIiwKICAgICAgICAgICAgICAg ICAgICAgICAiYnVpbGRlck5hbWVzIjogWyJMZW9wYXJkIEludGVsIFJlbGVhc2UgKFRlc3RzKSJd CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvV2ViS2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCBkMmRhMTkyLi5jZDgxMTA4IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTQ4LDYzICs0OCwyMiBAQCBjbGFz cyBDaGVja091dFNvdXJjZShzb3VyY2UuU1ZOKToKICAgICAgICAgc291cmNlLlNWTi5fX2luaXRf XyhzZWxmLCBiYXNlVVJMPXNlbGYuYmFzZVVSTCwgZGVmYXVsdEJyYW5jaD0idHJ1bmsiLCBtb2Rl PXNlbGYubW9kZSwgKmFyZ3MsICoqa3dhcmdzKQogCiAKLSMgRklYTUU6IFJlbW92ZSB0aGlzIHN0 ZXAgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMgZGVjb3VwbGVkIGZy b20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y ODM5NikKLWNsYXNzIFVwZGF0ZUNocm9taXVtU291cmNlKHNoZWxsLlNoZWxsQ29tbWFuZCk6Ci0g ICAgY29tbWFuZCA9IFsiZ2NsaWVudCIsICJzeW5jIl0KLSAgICBuYW1lID0gInVwZGF0ZS1jaHJv bWl1bSIKLSAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgY2hyb21pdW0gc291cmNlIl0KLSAg ICBkZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQiXQotICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVl Ci0KLSAgICBkZWYgY3JlYXRlU3VtbWFyeShzZWxmLCBsb2cpOgotICAgICAgICBzY3JhcGVyID0g cmUuY29tcGlsZShyIl5fX19fX19fXyBydW5uaW5nICdbXlxuXSt0aGlyZF9wYXJ0eVsvXFxdV2Vi S2l0W15cbl0rJFxuKD86XltVQV1cVytbXlxuXSskXG4pKl4oPzpVcGRhdGVkIHRvfEF0KSByZXZp c2lvbiAoXGQrKSIsIHJlLkRPVEFMTCB8IHJlLk1VTFRJTElORSkKLSAgICAgICAgcmV2aXNpb25z ID0gc2NyYXBlci5maW5kYWxsKGxvZy5nZXRUZXh0KCkpCi0gICAgICAgIGdvdFJldmlzaW9uID0g Ij8/IiAjIFRoaXMgbWF0Y2hlcyBTVk4gdW5rbm93biByZXZpc2lvbiByZXNwb25zZS4KLSAgICAg ICAgaWYgbGVuKHJldmlzaW9ucyk6Ci0gICAgICAgICAgICBnb3RSZXZpc2lvbiA9ICJyJXMiICUg cmV2aXNpb25zWy0xXQotICAgICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9IFsidXBkYXRlZCIs IGdvdFJldmlzaW9uXQotCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAgICAgICBvcyA9IHNlbGYu Z2V0UHJvcGVydHkoImZ1bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KLSAgICAgICAgaWYgb3Mg PT0gIndpbiI6Ci0gICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoWyJnY2xpZW50LmJhdCIsICJz eW5jIl0pCi0gICAgICAgIHJldmlzaW9uID0gc2VsZi5nZXRQcm9wZXJ0eSgicmV2aXNpb24iKQot ICAgICAgICBpZiByZXZpc2lvbjoKLSAgICAgICAgICAgIGNvbW1hbmQgPSBzZWxmLmNvbW1hbmRb Ol0KLSAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXJldmlzaW9uPXNyYy90aGlyZF9wYXJ0 eS9XZWJLaXRAJWQiICUgcmV2aXNpb24pCi0gICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoY29t bWFuZCkKLSAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5zdGFydChzZWxmKQotCi0K LSMgRklYTUU6IFJlbW92ZSB0aGlzIHN0ZXAgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWls ZCBzeXN0ZW0gaXMgZGVjb3VwbGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODM5NikKLWNsYXNzIENvbXBpbGVDaHJvbWl1bVdlYktp dChzaGVsbC5TaGVsbENvbW1hbmQpOgotICAgIGNvbW1hbmQgPSBbInB5dGhvbiIsICIuLi8uLi8u Li9zY3JpcHRzL3NsYXZlL2NvbXBpbGUucHkiXQotICAgIG5hbWUgPSAiYnVpbGQtY2hyb21pdW0i Ci0gICAgZGVzY3JpcHRpb24gPSBbImNvbXBpbGluZyJdCi0gICAgZGVzY3JpcHRpb25Eb25lID0g WyJjb21waWxlZCJdCi0gICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKLQotICAgIGRlZiBzdGFydChz ZWxmKToKLSAgICAgICAgb3MgPSBzZWxmLmdldFByb3BlcnR5KCJmdWxsUGxhdGZvcm0iKS5zcGxp dCgnLScpWzFdCi0gICAgICAgIGNvbW1hbmQgPSBzZWxmLmNvbW1hbmRbOl0KLSAgICAgICAgaWYg b3MgPT0gIndpbiI6Ci0gICAgICAgICAgICBjb21tYW5kLmV4dGVuZChbIi0tc29sdXRpb249d2Vi a2l0LnNsbiIsICItLWJ1aWxkLWRpcj1zcmNcXHdlYmtpdCIsICItLSIsICIvcHJvamVjdCIsICJ3 ZWJjb3JlIl0pCi0gICAgICAgIGVsaWYgb3MgPT0gIm1hYyI6Ci0gICAgICAgICAgICBjb21tYW5k LmV4dGVuZChbIi0tc29sdXRpb249X19zb2x1dGlvbl9fIiwgIi0tYnVpbGQtZGlyPXNyYy9idWls ZCIsICItLSIsICItcHJvamVjdCIsICIuLi93ZWJraXQvd2Via2l0Lnhjb2RlcHJvaiIsICItdGFy Z2V0IiwgIndlYmNvcmUiXSkKLSAgICAgICAgc2VsZi5zZXRDb21tYW5kKGNvbW1hbmQpCi0gICAg ICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKLQotCiBjbGFzcyBJbnN0 YWxsV2luMzJEZXBlbmRlbmNpZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgZGVzY3JpcHRpb24gPSBb Imluc3RhbGxpbmcgZGVwZW5kZW5jaWVzIl0KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbImluc3Rh bGxlZCBkZXBlbmRlbmNpZXMiXQogICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9XZWJLaXRUb29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtYXV4aWxpYXJ5LWxpYnMiXQogCiAKK2NsYXNzIEluc3Rh bGxDaHJvbWl1bURlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIG5hbWUgPSAi Z2NsaWVudCIKKyAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgY2hyb21pdW0gZGVwZW5kZW5j aWVzIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbInVwZGF0ZWQgY2hyb21pdW0gZGVwZW5kZW5j aWVzIl0KKyAgICBjb21tYW5kID0gWyJwZXJsIiwgIi4vV2ViS2l0VG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0LWNocm9taXVtIl0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorCisKIGRlZiBh cHBlbmRDdXN0b21CdWlsZEZsYWdzKHN0ZXAsIHBsYXRmb3JtKToKLSAgICBpZiBwbGF0Zm9ybSBp biAoJ2d0aycsICd3eCcsICdxdCcpOgorICAgIGlmIHBsYXRmb3JtIGluICgnZ3RrJywgJ3d4Jywg J3F0JywgJ2Nocm9taXVtJyk6CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1hbmQg KyBbJy0tJyArIHBsYXRmb3JtXSkKIAogCkBAIC0zMjAsMjMgKzI3OSwxNyBAQCBjbGFzcyBGYWN0 b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0 U291cmNlKQogICAgICAgICBpZiBwbGF0Zm9ybSA9PSAid2luIjoKICAgICAgICAgICAgIHNlbGYu YWRkU3RlcChJbnN0YWxsV2luMzJEZXBlbmRlbmNpZXMpCi0KLSMgRklYTUU6IFJlbW92ZSB0aGlz IGZhY3Rvcnkgb25jZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMgZGVjb3Vw bGVkIGZyb20KLSMgQ2hyb21pdW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yODM5NikKLWNsYXNzIENocm9taXVtQnVpbGRGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0 b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMpOgotICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxm KQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQsIHBsYXRmb3JtPXBsYXRmb3Jt LCBjb25maWd1cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZT0iICIuam9pbihhcmNo aXRlY3R1cmVzKSwgYnVpbGRPbmx5PVRydWUpCi0gICAgICAgIHNlbGYuYWRkU3RlcChVcGRhdGVD aHJvbWl1bVNvdXJjZSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVDaHJvbWl1bVdlYktp dCkKKyAgICAgICAgaWYgcGxhdGZvcm0gPT0gImNocm9taXVtIjoKKyAgICAgICAgICAgIHNlbGYu YWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRlbmNpZXMpCiAKIGNsYXNzIEJ1aWxkRmFjdG9y eShGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxh dGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzPU5vbmUpOgogICAg ICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNo aXRlY3R1cmVzLCBUcnVlKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdlYktpdCkKLSAg ICAgICAgc2VsZi5hZGRTdGVwKEFyY2hpdmVCdWlsdFByb2R1Y3QpCi0gICAgICAgIHNlbGYuYWRk U3RlcChVcGxvYWRCdWlsdFByb2R1Y3QpCi0gICAgICAgIHNlbGYuYWRkU3RlcCh0cmlnZ2VyLlRy aWdnZXIsIHNjaGVkdWxlck5hbWVzPXRyaWdnZXJzKQorICAgICAgICBpZiB0cmlnZ2VyczoKKyAg ICAgICAgICAgIHNlbGYuYWRkU3RlcChBcmNoaXZlQnVpbHRQcm9kdWN0KQorICAgICAgICAgICAg c2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkKKyAgICAgICAgICAgIHNlbGYuYWRkU3Rl cCh0cmlnZ2VyLlRyaWdnZXIsIHNjaGVkdWxlck5hbWVzPXRyaWdnZXJzKQogCiBjbGFzcyBUZXN0 RmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb24sIGFyY2hpdGVjdHVyZXMpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDUwMGFhNWEuLmQxODE4MzUgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNCBAQAorMjAwOS0xMS0xMiAgWWFhciBTY2huaXRtYW4gIDx5YWFyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDb25maWd1cmF0aW9uIGZvciBDaHJvbWl1bSBCdWlsZCBTbGF2ZXMuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNDQyCisKKyAgICAgICAgKiBC dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNvbjoKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIu Y2ZnOgorCiAyMDA5LTExLTE3ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4K