146210 2015-06-22 12:10:06 -0700 Allow other projects to display on the dashboard 2015-08-27 17:17:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID https://bugs.webkit.org/show_bug.cgi?id=147796 P2 Normal --- 1 jmarcell webkit-unassigned adele ap dbates ddkilzer oldest_to_newest 1103890 0 jmarcell 2015-06-22 12:10:06 -0700 Currently on projects with an opensource or internal SVN revision are able to be displayed on the bot watcher's dashboard. There are other projects that do not exist in either of those two repositories (iOS git projects, in particular) which should be allowed to have an entry on the bot-watcher's dashboard. 1105294 1 255728 jmarcell 2015-06-28 11:59:53 -0700 Created attachment 255728 Patch to allow for projects other than open source and internal on the dashboard. 1105601 2 255728 dbates 2015-06-29 18:33:20 -0700 Comment on attachment 255728 Patch to allow for projects other than open source and internal on the dashboard. View in context: https://bugs.webkit.org/attachment.cgi?id=255728&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:116 > + if (isGitGotRevisonProperty(property, value)) > + return value; > + else > + return parseInt(value); We should have this function return a string and make it the caller's responsibility to parse the string for a number if needed. Then we can remove the function isGitGotRevisonProperty(). > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:212 > + for (project in this.queue.branch) { This code is assuming that this.queue.branch represents a dictionary of (project, branch name)-pairs. Currently, this.queue.branch represents a dictionary of (repository, branch name)-pairs. Is this acceptable? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:215 > + var revisionProperty = data.properties.findFirst(function(property) { > + return isMultiCodebaseGotRevisionProperty(property) || property[0] === "got_revision"; > + }); Notice that we compute this on each iteraiton. I suggest we move this out of the loop. Also, the first disjunct is unnecessary by definition of isMultiCodebaseGotRevisionProperty(). > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:222 > + this.otherRevision = parseRevisionProperty(revisionProperty, project, "Tools"); Is it correct to fallback to using key Tools? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:211 > + if (iteration.otherRevision) > + content.textContent = iteration.otherRevision.substring(0, 8); This code assumes that iteration.otherRevision is always a Git revision. Is this correct? How did you choose 8? Did you mean to use String.substring() which takes a from and to argument for the indices? > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:267 > + return this._revisionContentWithPopoverForIteration(iteration, previousDisplayedIteration, true); How does this work if previousDisplayedIteration is non-null? 1109284 3 256746 jmarcell 2015-07-13 16:49:08 -0700 Created attachment 256746 Patch to allow for projects other than open source and internal on the dashboard. Dan, I think I've addressed most of your concerns. One that I'm not sure how to address is this question: This code is assuming that this.queue.branch represents a dictionary of (project, branch name)-pairs. Currently, this.queue.branch represents a dictionary of (repository, branch name)-pairs. Is this acceptable? I'm not sure whether this is an issue, but it might be worth discussing. 1109922 4 256746 dbates 2015-07-16 11:25:04 -0700 Comment on attachment 256746 Patch to allow for projects other than open source and internal on the dashboard. View in context: https://bugs.webkit.org/attachment.cgi?id=256746&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:74 > - var status = new StatusLineView(message, StatusLineView.Status.Good, "all tests passed", null, null); > + var statusMessagePassed = "all " + (queue.builder ? "builds" : "tests") + " passed" > + var status = new StatusLineView(message, StatusLineView.Status.Good, statusMessagePassed, null, null); I'm unclear how this change relates to the purpose of this bug. Although this change is straightforward, we may want to consider making this change in a separate bug/patch. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:202 > // revision. Therefore, we only look at got_revision to extract the Internal revision when it's > // a dictionary. The last paragraph of comment block above is out-of-date with the proposed code change. Either we should update the comment or remove the last paragraph from the comment block above. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:213 > + for (project in this.queue.branch) { > + if (project === "openSource") > + this.openSourceRevision = parseInt(parseRevisionProperty(revisionProperty, "WebKit", "opensource")); > + else if (project === "internal") > + this.internalRevision = parseInt(parseRevisionProperty(revisionProperty, "Internal", "internal")); > + else > + this.otherRevision = parseRevisionProperty(revisionProperty, project, "Internal"); This does not seem correct. Assume this.queue.branch := {openSource: "trunk, internal: "trunk"} (which it is for all WebKit OpenSource Project queues by (*) and (**). Suppose revisionProperty = "2468". Then this.openSourceRevision, this.internalRevision = 2468. How does the dashboard behave? (*) Tthere is no WebKit OpenSource Project queues that explicitly specify the property branch in <http://trac.webkit.org/browser/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js?rev=184879>. (**) <http://trac.webkit.org/browser/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js#L105> > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:212 > + // Using substr for Git Short-SHA Either elaborate further on the non-obviousness of using String.substr() to truncate a SHA or remove this coment. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:215 > + content.textContent = content.textContent.substr(0, 8); How did you choose 8? I mean, did you compute the collision probability as part of coming up with 8. Throughout <http://git-scm.com/book/ca/v1/Git-Tools-Revision-Selection#Short-SHA> and in various Git literature and tool output I see SHAs of length 7. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:271 > + return this._revisionContentWithPopoverForIteration(iteration, previousDisplayedIteration, true); It is not clear here what the purpose of the boolean true is in the last argument. I suggest we define a local variable, say isInternalRevision, defined to be true and pass this named local variable instead of using the keyword true directly in the call to BuildbotQueueView.prototype._revisionContentWithPopoverForIteration(). > Tools/ChangeLog:3 > + https://bugs.webkit.org/show_bug.cgi?id=146210 Missing bug title, which should be above this line. 255728 2015-06-28 11:59:53 -0700 2015-07-13 16:49:08 -0700 Patch to allow for projects other than open source and internal on the dashboard. 0001-Work-towards-Add-status-of-Safari-projects-on-iOS-Da.patch text/plain 9337 jmarcell RnJvbSAxOTdlOWMwYTVlYzkzZWQyODVkNTA4OWEzMjQwZDNiMzlmZTJiY2EyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IE1vbiwgMjIgSnVuIDIwMTUgMTI6MTE6NDkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBXb3Jr IHRvd2FyZHM6IEFkZCBzdGF0dXMgb2YgU2FmYXJpIHByb2plY3RzIG9uIGlPUyBEYXNoYm9hcmQK IG9uIGJ1aWxkLXNhZmFyaSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2MjEwCiA8cmRhcjovL3Byb2JsZW0vMTgyMjYyOTE+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCiogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5qczoKKEJ1 aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcucHJvdG90eXBlLnVwZGF0ZSk6ClNob3VsZCBzYXkgImFs bCBidWlsZHMgcGFzc2VkIiBpZiBpdCdzIGEgYnVpbGRlciBjb21iaW5lZCBxdWV1ZS4KKiBCdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9h cmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qczoKKEJ1aWxkYm90SXRlcmF0aW9uKToKQWRk aW5nIG90aGVyUmV2aXNpb24gcHJvcGVydHkgZm9yIG90aGVyIHByb2plY3RzIGJlc2lkZXMgb3Bl bnNvdXJjZSBhbmQgaW50ZXJuYWwuCihpc0dpdEdvdFJldmlzb25Qcm9wZXJ0eSk6CkFkZGluZyBh YmlsaXR5IHRvIHBhcnNlIGdpdCByZXZpc2lvbiBwcm9wZXJ0aWVzCihwYXJzZVJldmlzaW9uUHJv cGVydHkpOgpBZGRpbmcgYWJpbGl0eSB0byBwYXJzZSBnaXQgcmV2aXNpb24gcHJvcGVydGllcwoq IEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rh c2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzOgooQnVpbGRib3RRdWV1ZVZpZXcu cHJvdG90eXBlLl9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJhdGlvbik6CkRpc3Bs YXkgZ2l0IGhhc2guCihCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUucmV2aXNpb25Db250ZW50 Rm9ySXRlcmF0aW9uKToKRGlzcGxheSBnaXQgaGFzaC4KCiMgQ29uZmxpY3RzOgojCVRvb2xzL0No YW5nZUxvZwotLS0KIC4uLi9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVldWVW aWV3LmpzIHwgIDMgKystCiAuLi4vZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24u anMgICAgICAgICB8IDMwICsrKysrKysrKysrKysrKysrLS0tLS0KIC4uLi9kYXNoYm9hcmQvU2Ny aXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcyAgICAgICAgIHwgIDggKysrKy0tCiBUb29scy9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDI0ICsrKysrKysrKysr KysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1 ZVZpZXcuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3 LmpzCmluZGV4IDJmZjcxODMuLjA3OTJlZmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5qcwpAQCAtNzAsNyArNzAsOCBAQCBCdWlsZGJv dENvbWJpbmVkUXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2FwcGVu ZFBlbmRpbmdSZXZpc2lvbkNvdW50KHNsb3dlc3RRdWV1ZSk7CiAKICAgICAgICAgICAgIHZhciBt ZXNzYWdlID0gdGhpcy5yZXZpc2lvbkNvbnRlbnRGb3JJdGVyYXRpb24oc2xvd2VzdFF1ZXVlLm1v c3RSZWNlbnRTdWNjZXNzZnVsSXRlcmF0aW9uKTsKLSAgICAgICAgICAgIHZhciBzdGF0dXMgPSBu ZXcgU3RhdHVzTGluZVZpZXcobWVzc2FnZSwgU3RhdHVzTGluZVZpZXcuU3RhdHVzLkdvb2QsICJh bGwgdGVzdHMgcGFzc2VkIiwgbnVsbCwgbnVsbCk7CisgICAgICAgICAgICB2YXIgc3RhdHVzTWVz c2FnZVBhc3NlZCA9ICJhbGwgIiArIChxdWV1ZS5idWlsZGVyID8gImJ1aWxkcyIgOiAidGVzdHMi KSArICIgcGFzc2VkIgorICAgICAgICAgICAgdmFyIHN0YXR1cyA9IG5ldyBTdGF0dXNMaW5lVmll dyhtZXNzYWdlLCBTdGF0dXNMaW5lVmlldy5TdGF0dXMuR29vZCwgc3RhdHVzTWVzc2FnZVBhc3Nl ZCwgbnVsbCwgbnVsbCk7CiAgICAgICAgICAgICBuZXcgUG9wb3ZlclRyYWNrZXIoc3RhdHVzLnN0 YXR1c0J1YmJsZUVsZW1lbnQsIHRoaXMuX3ByZXNlbnRQb3BvdmVyRm9yQ29tYmluZWRHcmVlbkJ1 YmJsZS5iaW5kKHRoaXMpKTsKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChz dGF0dXMuZWxlbWVudCk7CiAgICAgICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9h cmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1 aWxkYm90SXRlcmF0aW9uLmpzCmluZGV4IDJiOWNmMGEuLjFhMDFhNGUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1s L2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzCisrKyBiL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzCkBAIC00NSw2ICs0NSw3IEBAIEJ1aWxkYm90 SXRlcmF0aW9uID0gZnVuY3Rpb24ocXVldWUsIGRhdGFPcklELCBmaW5pc2hlZCkKIAogICAgIHRo aXMub3BlblNvdXJjZVJldmlzaW9uID0gbnVsbDsKICAgICB0aGlzLmludGVybmFsUmV2aXNpb24g PSBudWxsOworICAgIHRoaXMub3RoZXJSZXZpc2lvbiA9IG51bGw7CiAKICAgICB0aGlzLmxheW91 dFRlc3RSZXN1bHRzID0gbnVsbDsgLy8gTGF5b3V0IHRlc3QgcmVzdWx0cyBjYW4gYmUgbmVlZGVk IGV2ZW4gaWYgYWxsIHRlc3RzIHBhc3NlZCwgZS5nLiBmb3IgdGhlIGxlYWtzIGJvdC4KIApAQCAt OTcsNiArOTgsMTEgQEAgZnVuY3Rpb24gaXNNdWx0aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0 eShwcm9wZXJ0eSkKICAgICByZXR1cm4gcHJvcGVydHlbMF0gPT09ICJnb3RfcmV2aXNpb24iICYm IHR5cGVvZiBwcm9wZXJ0eVsxXSA9PT0gIm9iamVjdCI7CiB9CiAKK2Z1bmN0aW9uIGlzR2l0R290 UmV2aXNvblByb3BlcnR5KHByb3BlcnR5LCB2YWx1ZSkKK3sKKyAgICByZXR1cm4gcHJvcGVydHlb Ml0gPT09ICJHaXQiIHx8IGlzTmFOKHZhbHVlKTsKK30KKwogZnVuY3Rpb24gcGFyc2VSZXZpc2lv blByb3BlcnR5KHByb3BlcnR5LCBrZXksIGZhbGxiYWNrS2V5KQogewogICAgIGlmICghcHJvcGVy dHkpCkBAIC0xMDQsNyArMTEwLDEwIEBAIGZ1bmN0aW9uIHBhcnNlUmV2aXNpb25Qcm9wZXJ0eShw cm9wZXJ0eSwga2V5LCBmYWxsYmFja0tleSkKICAgICB2YXIgdmFsdWUgPSBwcm9wZXJ0eVsxXTsK ICAgICBpZiAoaXNNdWx0aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSkpCiAg ICAgICAgIHZhbHVlID0gKGtleSBpbiB2YWx1ZSkgPyB2YWx1ZVtrZXldIDogdmFsdWVbZmFsbGJh Y2tLZXldOwotICAgIHJldHVybiBwYXJzZUludCh2YWx1ZSk7CisgICAgaWYgKGlzR2l0R290UmV2 aXNvblByb3BlcnR5KHByb3BlcnR5LCB2YWx1ZSkpCisgICAgICAgIHJldHVybiB2YWx1ZTsKKyAg ICBlbHNlCisgICAgICAgIHJldHVybiBwYXJzZUludCh2YWx1ZSk7CiB9CiAKIEJ1aWxkYm90SXRl cmF0aW9uLnByb3RvdHlwZSA9IHsKQEAgLTE5MCw3ICsxOTksNyBAQCBCdWlsZGJvdEl0ZXJhdGlv bi5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgLy8gVGhlIHByb3BlcnR5IGdvdF9yZXZpc2lvbiBt YXkgaGF2ZSB0aGUgZm9sbG93aW5nIGZvcm1zOgogICAgICAgICAvLwotICAgICAgICAvLyBbImdv dF9yZXZpc2lvbiIseyJJbnRlcm5hbCI6IjEzNTciLCJXZWJLaXRPcGVuU291cmNlIjoiMjQ2OCJ9 LCJTb3VyY2UiXQorICAgICAgICAvLyBbImdvdF9yZXZpc2lvbiIseyJJbnRlcm5hbCI6IjEzNTci LCJXZWJLaXRPcGVuU291cmNlIjoiMjQ2OCIsIk90aGVyUHJvamVjdCI6IjxnaXQtaGFzaD4ifSwi U291cmNlIl0KICAgICAgICAgLy8gT1IKICAgICAgICAgLy8gWyJnb3RfcmV2aXNpb24iLCIyNDY4 IiwiU291cmNlIl0KICAgICAgICAgLy8KQEAgLTIwMCwxMSArMjA5LDE4IEBAIEJ1aWxkYm90SXRl cmF0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gcmV2aXNpb24uIFRoZXJlZm9yZSwgd2Ug b25seSBsb29rIGF0IGdvdF9yZXZpc2lvbiB0byBleHRyYWN0IHRoZSBJbnRlcm5hbCByZXZpc2lv biB3aGVuIGl0J3MKICAgICAgICAgLy8gYSBkaWN0aW9uYXJ5LgogCi0gICAgICAgIHZhciBvcGVu U291cmNlUmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEucHJvcGVydGllcy5maW5kRmlyc3QoZnVuY3Rp b24ocHJvcGVydHkpIHsgcmV0dXJuIHByb3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIjsgfSk7 Ci0gICAgICAgIHRoaXMub3BlblNvdXJjZVJldmlzaW9uID0gcGFyc2VSZXZpc2lvblByb3BlcnR5 KG9wZW5Tb3VyY2VSZXZpc2lvblByb3BlcnR5LCAiV2ViS2l0IiwgIm9wZW5zb3VyY2UiKTsKLQot ICAgICAgICB2YXIgaW50ZXJuYWxSZXZpc2lvblByb3BlcnR5ID0gZGF0YS5wcm9wZXJ0aWVzLmZp bmRGaXJzdChmdW5jdGlvbihwcm9wZXJ0eSkgeyByZXR1cm4gaXNNdWx0aUNvZGViYXNlR290UmV2 aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSk7IH0pOwotICAgICAgICB0aGlzLmludGVybmFsUmV2aXNp b24gPSBwYXJzZVJldmlzaW9uUHJvcGVydHkoaW50ZXJuYWxSZXZpc2lvblByb3BlcnR5LCAiSW50 ZXJuYWwiLCAiaW50ZXJuYWwiKTsKKyAgICAgICAgZm9yIChwcm9qZWN0IGluIHRoaXMucXVldWUu YnJhbmNoKSB7CisgICAgICAgICAgICB2YXIgcmV2aXNpb25Qcm9wZXJ0eSA9IGRhdGEucHJvcGVy dGllcy5maW5kRmlyc3QoZnVuY3Rpb24ocHJvcGVydHkpIHsKKyAgICAgICAgICAgICAgICByZXR1 cm4gaXNNdWx0aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0eShwcm9wZXJ0eSkgfHwgcHJvcGVy dHlbMF0gPT09ICJnb3RfcmV2aXNpb24iOworICAgICAgICAgICAgfSk7CisKKyAgICAgICAgICAg IGlmIChwcm9qZWN0ID09PSAib3BlblNvdXJjZSIpCisgICAgICAgICAgICAgICAgdGhpcy5vcGVu U291cmNlUmV2aXNpb24gPSBwYXJzZVJldmlzaW9uUHJvcGVydHkocmV2aXNpb25Qcm9wZXJ0eSwg IldlYktpdCIsICJvcGVuc291cmNlIik7CisgICAgICAgICAgICBlbHNlIGlmIChwcm9qZWN0ID09 PSAiaW50ZXJuYWwiKQorICAgICAgICAgICAgICAgIHRoaXMuaW50ZXJuYWxSZXZpc2lvbiA9IHBh cnNlUmV2aXNpb25Qcm9wZXJ0eShyZXZpc2lvblByb3BlcnR5LCAiSW50ZXJuYWwiLCAiaW50ZXJu YWwiKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB0aGlzLm90aGVyUmV2aXNp b24gPSBwYXJzZVJldmlzaW9uUHJvcGVydHkocmV2aXNpb25Qcm9wZXJ0eSwgcHJvamVjdCwgIlRv b2xzIik7CisgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBzb3VyY2VTdGFtcENoYW5nZXMo c291cmNlU3RhbXApIHsKICAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsKZGlmZiAtLWdpdCBh L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKaW5kZXggYWM3ZjY3Ny4uZDkzZGNmOCAxMDA2 NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKKysrIGIv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKQEAgLTIwNyw3ICsyMDcs MTAgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgIF9yZXZpc2lvbkNvbnRl bnRXaXRoUG9wb3ZlckZvckl0ZXJhdGlvbjogZnVuY3Rpb24oaXRlcmF0aW9uLCBwcmV2aW91c0l0 ZXJhdGlvbiwgaW50ZXJuYWwpCiAgICAgewogICAgICAgICB2YXIgY29udGVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9ICJy IiArIChpbnRlcm5hbCA/IGl0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uIDogaXRlcmF0aW9uLm9w ZW5Tb3VyY2VSZXZpc2lvbik7CisgICAgICAgIGlmIChpdGVyYXRpb24ub3RoZXJSZXZpc2lvbikK KyAgICAgICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSBpdGVyYXRpb24ub3RoZXJSZXZpc2lv bi5zdWJzdHJpbmcoMCwgOCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvbnRlbnQudGV4 dENvbnRlbnQgPSAiciIgKyAoaW50ZXJuYWwgPyBpdGVyYXRpb24uaW50ZXJuYWxSZXZpc2lvbiA6 IGl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb24pOwogICAgICAgICBjb250ZW50LmNsYXNzTGlz dC5hZGQoInJldmlzaW9uLW51bWJlciIpOwogCiAgICAgICAgIGlmIChwcmV2aW91c0l0ZXJhdGlv bikgewpAQCAtMjYwLDcgKzI2Myw4IEBAIEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsK IAogICAgIHJldmlzaW9uQ29udGVudEZvckl0ZXJhdGlvbjogZnVuY3Rpb24oaXRlcmF0aW9uLCBw cmV2aW91c0Rpc3BsYXllZEl0ZXJhdGlvbikKICAgICB7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0 KGl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb24pOworICAgICAgICBpZiAoaXRlcmF0aW9uLm90 aGVyUmV2aXNpb24pCisgICAgICAgICAgICByZXR1cm4gdGhpcy5fcmV2aXNpb25Db250ZW50V2l0 aFBvcG92ZXJGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2aW91c0Rpc3BsYXllZEl0ZXJhdGlv biwgdHJ1ZSk7CiAKICAgICAgICAgdmFyIG9wZW5Tb3VyY2VDb250ZW50ID0gdGhpcy5fcmV2aXNp b25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBwcmV2aW91c0Rpc3Bs YXllZEl0ZXJhdGlvbik7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBlNGRhM2MzLi5lMWNhYTE2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDYgKzEsMzAgQEAKIDIwMTUtMDYtMjQgIEph c29uIE1hcmNlbGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+CiAKICAgICAgICAgV29yayB0b3dhcmRz OiBBZGQgc3RhdHVzIG9mIFNhZmFyaSBwcm9qZWN0cyBvbiBpT1MgRGFzaGJvYXJkIG9uIGJ1aWxk LXNhZmFyaQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2MjEwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODIyNjI5MT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxk Ym90Q29tYmluZWRRdWV1ZVZpZXcuanM6CisgICAgICAgIChCdWlsZGJvdENvbWJpbmVkUXVldWVW aWV3LnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICBTaG91bGQgc2F5ICJhbGwgYnVpbGRzIHBh c3NlZCIgaWYgaXQncyBhIGJ1aWxkZXIgY29tYmluZWQgcXVldWUuCisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanM6CisgICAgICAgIChCdWlsZGJvdEl0ZXJhdGlv bik6CisgICAgICAgIEFkZGluZyBvdGhlclJldmlzaW9uIHByb3BlcnR5IGZvciBvdGhlciBwcm9q ZWN0cyBiZXNpZGVzIG9wZW5zb3VyY2UgYW5kIGludGVybmFsLgorICAgICAgICAoaXNHaXRHb3RS ZXZpc29uUHJvcGVydHkpOgorICAgICAgICBBZGRpbmcgYWJpbGl0eSB0byBwYXJzZSBnaXQgcmV2 aXNpb24gcHJvcGVydGllcworICAgICAgICAocGFyc2VSZXZpc2lvblByb3BlcnR5KToKKyAgICAg ICAgQWRkaW5nIGFiaWxpdHkgdG8gcGFyc2UgZ2l0IHJldmlzaW9uIHByb3BlcnRpZXMKKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qczoKKyAgICAgICAgKEJ1aWxk Ym90UXVldWVWaWV3LnByb3RvdHlwZS5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVy YXRpb24pOgorICAgICAgICBEaXNwbGF5IGdpdCBoYXNoLgorICAgICAgICAoQnVpbGRib3RRdWV1 ZVZpZXcucHJvdG90eXBlLnJldmlzaW9uQ29udGVudEZvckl0ZXJhdGlvbik6CisgICAgICAgIERp c3BsYXkgZ2l0IGhhc2guCisKKzIwMTUtMDYtMjIgIEphc29uIE1hcmNlbGwgIDxqbWFyY2VsbEBh cHBsZS5jb20+CisKKyAgICAgICAgV29yayB0b3dhcmRzOiBBZGQgc3RhdHVzIG9mIFNhZmFyaSBw cm9qZWN0cyBvbiBpT1MgRGFzaGJvYXJkIG9uIGJ1aWxkLXNhZmFyaQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MTI2CiAgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xODIyNjI5MT4KIAotLSAKMi4zLjcgKEFwcGxlIEdpdC01NykKCg== 256746 2015-07-13 16:49:08 -0700 2015-07-16 11:25:04 -0700 Patch to allow for projects other than open source and internal on the dashboard. 0001-https-bugs.webkit.org-show_bug.cgi-id-146210.patch text/plain 8667 jmarcell RnJvbSA2NWU3MzYyMThiM2ZlNThkYWZmMTVkNzJjYjAzMzBhNDViOTA4MDdlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXNvbiBNYXJjZWxsIDxqbWFyY2VsbEBhcHBsZS5jb20+CkRh dGU6IE1vbiwgMTMgSnVsIDIwMTUgMTY6NDQ6MjQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjEwCiA8cmRhcjovL3Byb2Js ZW0vMTgyMjYyOTE+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5qczoKKEJ1aWxkYm90Q29tYmluZWRRdWV1ZVZp ZXcucHJvdG90eXBlLnVwZGF0ZSk6ClNob3VsZCBzYXkgImFsbCBidWlsZHMgcGFzc2VkIiBpZiBp dCdzIGEgYnVpbGRlciBjb21iaW5lZCBxdWV1ZS4KKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0 ZXJhdGlvbi5qczoKKEJ1aWxkYm90SXRlcmF0aW9uKToKQWRkaW5nIG90aGVyUmV2aXNpb24gcHJv cGVydHkgZm9yIG90aGVyIHByb2plY3RzIGJlc2lkZXMgb3BlbnNvdXJjZSBhbmQgaW50ZXJuYWwu CihwYXJzZVJldmlzaW9uUHJvcGVydHkpOgpBZGRpbmcgYWJpbGl0eSB0byBwYXJzZSBnaXQgcmV2 aXNpb24gcHJvcGVydGllcwoqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzOgoo QnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlLl9yZXZpc2lvbkNvbnRlbnRXaXRoUG9wb3ZlckZv ckl0ZXJhdGlvbik6CkRpc3BsYXkgZ2l0IGhhc2guCihCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5 cGUucmV2aXNpb25Db250ZW50Rm9ySXRlcmF0aW9uKToKRGlzcGxheSBnaXQgaGFzaC4KLS0tCiAu Li4vZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5qcyAgfCAgMyAr Ky0KIC4uLi9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEl0ZXJhdGlvbi5qcyAgICAgICAgICB8 IDIxICsrKysrKysrKysrKysrLS0tLS0tLQogLi4uL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 UXVldWVWaWV3LmpzICAgICAgICAgIHwgMTIgKysrKysrKysrKy0tCiBUb29scy9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMSArKysrKysrKysrKysrKysr KysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RDb21iaW5lZFF1ZXVl Vmlldy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90Q29tYmluZWRRdWV1ZVZpZXcu anMKaW5kZXggMmZmNzE4My4uMDc5MmVmZCAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9CdWlsZGJvdENvbWJpbmVkUXVldWVWaWV3LmpzCkBAIC03MCw3ICs3MCw4IEBAIEJ1aWxkYm90 Q29tYmluZWRRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fYXBwZW5k UGVuZGluZ1JldmlzaW9uQ291bnQoc2xvd2VzdFF1ZXVlKTsKIAogICAgICAgICAgICAgdmFyIG1l c3NhZ2UgPSB0aGlzLnJldmlzaW9uQ29udGVudEZvckl0ZXJhdGlvbihzbG93ZXN0UXVldWUubW9z dFJlY2VudFN1Y2Nlc3NmdWxJdGVyYXRpb24pOwotICAgICAgICAgICAgdmFyIHN0YXR1cyA9IG5l dyBTdGF0dXNMaW5lVmlldyhtZXNzYWdlLCBTdGF0dXNMaW5lVmlldy5TdGF0dXMuR29vZCwgImFs bCB0ZXN0cyBwYXNzZWQiLCBudWxsLCBudWxsKTsKKyAgICAgICAgICAgIHZhciBzdGF0dXNNZXNz YWdlUGFzc2VkID0gImFsbCAiICsgKHF1ZXVlLmJ1aWxkZXIgPyAiYnVpbGRzIiA6ICJ0ZXN0cyIp ICsgIiBwYXNzZWQiCisgICAgICAgICAgICB2YXIgc3RhdHVzID0gbmV3IFN0YXR1c0xpbmVWaWV3 KG1lc3NhZ2UsIFN0YXR1c0xpbmVWaWV3LlN0YXR1cy5Hb29kLCBzdGF0dXNNZXNzYWdlUGFzc2Vk LCBudWxsLCBudWxsKTsKICAgICAgICAgICAgIG5ldyBQb3BvdmVyVHJhY2tlcihzdGF0dXMuc3Rh dHVzQnViYmxlRWxlbWVudCwgdGhpcy5fcHJlc2VudFBvcG92ZXJGb3JDb21iaW5lZEdyZWVuQnVi YmxlLmJpbmQodGhpcykpOwogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHN0 YXR1cy5lbGVtZW50KTsKICAgICAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RJdGVyYXRpb24uanMKaW5kZXggMmI5Y2YwYS4uYWE5ODAzMSAxMDA2NDQKLS0tIGEvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKKysrIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJk L1NjcmlwdHMvQnVpbGRib3RJdGVyYXRpb24uanMKQEAgLTQ1LDYgKzQ1LDcgQEAgQnVpbGRib3RJ dGVyYXRpb24gPSBmdW5jdGlvbihxdWV1ZSwgZGF0YU9ySUQsIGZpbmlzaGVkKQogCiAgICAgdGhp cy5vcGVuU291cmNlUmV2aXNpb24gPSBudWxsOwogICAgIHRoaXMuaW50ZXJuYWxSZXZpc2lvbiA9 IG51bGw7CisgICAgdGhpcy5vdGhlclJldmlzaW9uID0gbnVsbDsgLy8gTWF5IGJlIGEgR2l0IFNI QSBvciBTVk4gcmV2aXNpb24KIAogICAgIHRoaXMubGF5b3V0VGVzdFJlc3VsdHMgPSBudWxsOyAv LyBMYXlvdXQgdGVzdCByZXN1bHRzIGNhbiBiZSBuZWVkZWQgZXZlbiBpZiBhbGwgdGVzdHMgcGFz c2VkLCBlLmcuIGZvciB0aGUgbGVha3MgYm90LgogCkBAIC0xMDQsNyArMTA1LDcgQEAgZnVuY3Rp b24gcGFyc2VSZXZpc2lvblByb3BlcnR5KHByb3BlcnR5LCBrZXksIGZhbGxiYWNrS2V5KQogICAg IHZhciB2YWx1ZSA9IHByb3BlcnR5WzFdOwogICAgIGlmIChpc011bHRpQ29kZWJhc2VHb3RSZXZp c2lvblByb3BlcnR5KHByb3BlcnR5KSkKICAgICAgICAgdmFsdWUgPSAoa2V5IGluIHZhbHVlKSA/ IHZhbHVlW2tleV0gOiB2YWx1ZVtmYWxsYmFja0tleV07Ci0gICAgcmV0dXJuIHBhcnNlSW50KHZh bHVlKTsKKyAgICByZXR1cm4gdmFsdWU7CiB9CiAKIEJ1aWxkYm90SXRlcmF0aW9uLnByb3RvdHlw ZSA9IHsKQEAgLTE5MCw3ICsxOTEsNyBAQCBCdWlsZGJvdEl0ZXJhdGlvbi5wcm90b3R5cGUgPSB7 CiAKICAgICAgICAgLy8gVGhlIHByb3BlcnR5IGdvdF9yZXZpc2lvbiBtYXkgaGF2ZSB0aGUgZm9s bG93aW5nIGZvcm1zOgogICAgICAgICAvLwotICAgICAgICAvLyBbImdvdF9yZXZpc2lvbiIseyJJ bnRlcm5hbCI6IjEzNTciLCJXZWJLaXRPcGVuU291cmNlIjoiMjQ2OCJ9LCJTb3VyY2UiXQorICAg ICAgICAvLyBbImdvdF9yZXZpc2lvbiIseyJJbnRlcm5hbCI6IjEzNTciLCJXZWJLaXRPcGVuU291 cmNlIjoiMjQ2OCIsIk90aGVyUHJvamVjdCI6IjxnaXQtaGFzaD4ifSwiU291cmNlIl0KICAgICAg ICAgLy8gT1IKICAgICAgICAgLy8gWyJnb3RfcmV2aXNpb24iLCIyNDY4IiwiU291cmNlIl0KICAg ICAgICAgLy8KQEAgLTIwMCwxMSArMjAxLDE3IEBAIEJ1aWxkYm90SXRlcmF0aW9uLnByb3RvdHlw ZSA9IHsKICAgICAgICAgLy8gcmV2aXNpb24uIFRoZXJlZm9yZSwgd2Ugb25seSBsb29rIGF0IGdv dF9yZXZpc2lvbiB0byBleHRyYWN0IHRoZSBJbnRlcm5hbCByZXZpc2lvbiB3aGVuIGl0J3MKICAg ICAgICAgLy8gYSBkaWN0aW9uYXJ5LgogCi0gICAgICAgIHZhciBvcGVuU291cmNlUmV2aXNpb25Q cm9wZXJ0eSA9IGRhdGEucHJvcGVydGllcy5maW5kRmlyc3QoZnVuY3Rpb24ocHJvcGVydHkpIHsg cmV0dXJuIHByb3BlcnR5WzBdID09PSAiZ290X3JldmlzaW9uIjsgfSk7Ci0gICAgICAgIHRoaXMu b3BlblNvdXJjZVJldmlzaW9uID0gcGFyc2VSZXZpc2lvblByb3BlcnR5KG9wZW5Tb3VyY2VSZXZp c2lvblByb3BlcnR5LCAiV2ViS2l0IiwgIm9wZW5zb3VyY2UiKTsKLQotICAgICAgICB2YXIgaW50 ZXJuYWxSZXZpc2lvblByb3BlcnR5ID0gZGF0YS5wcm9wZXJ0aWVzLmZpbmRGaXJzdChmdW5jdGlv bihwcm9wZXJ0eSkgeyByZXR1cm4gaXNNdWx0aUNvZGViYXNlR290UmV2aXNpb25Qcm9wZXJ0eShw cm9wZXJ0eSk7IH0pOwotICAgICAgICB0aGlzLmludGVybmFsUmV2aXNpb24gPSBwYXJzZVJldmlz aW9uUHJvcGVydHkoaW50ZXJuYWxSZXZpc2lvblByb3BlcnR5LCAiSW50ZXJuYWwiLCAiaW50ZXJu YWwiKTsKKyAgICAgICAgdmFyIHJldmlzaW9uUHJvcGVydHkgPSBkYXRhLnByb3BlcnRpZXMuZmlu ZEZpcnN0KGZ1bmN0aW9uKHByb3BlcnR5KSB7CisgICAgICAgICAgICByZXR1cm4gcHJvcGVydHlb MF0gPT09ICJnb3RfcmV2aXNpb24iOworICAgICAgICB9KTsKKyAgICAgICAgZm9yIChwcm9qZWN0 IGluIHRoaXMucXVldWUuYnJhbmNoKSB7CisgICAgICAgICAgICBpZiAocHJvamVjdCA9PT0gIm9w ZW5Tb3VyY2UiKQorICAgICAgICAgICAgICAgIHRoaXMub3BlblNvdXJjZVJldmlzaW9uID0gcGFy c2VJbnQocGFyc2VSZXZpc2lvblByb3BlcnR5KHJldmlzaW9uUHJvcGVydHksICJXZWJLaXQiLCAi b3BlbnNvdXJjZSIpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHByb2plY3QgPT09ICJpbnRlcm5h bCIpCisgICAgICAgICAgICAgICAgdGhpcy5pbnRlcm5hbFJldmlzaW9uID0gcGFyc2VJbnQocGFy c2VSZXZpc2lvblByb3BlcnR5KHJldmlzaW9uUHJvcGVydHksICJJbnRlcm5hbCIsICJpbnRlcm5h bCIpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB0aGlzLm90aGVyUmV2aXNp b24gPSBwYXJzZVJldmlzaW9uUHJvcGVydHkocmV2aXNpb25Qcm9wZXJ0eSwgcHJvamVjdCwgIklu dGVybmFsIik7CisgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBzb3VyY2VTdGFtcENoYW5n ZXMoc291cmNlU3RhbXApIHsKICAgICAgICAgICAgIHZhciByZXN1bHQgPSBbXTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzIGIvVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJv YXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKaW5kZXggYWM3ZjY3Ny4uMmVlNWNlNyAx MDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKKysr IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMKQEAgLTIwNyw3ICsy MDcsMTQgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogICAgIF9yZXZpc2lvbkNv bnRlbnRXaXRoUG9wb3ZlckZvckl0ZXJhdGlvbjogZnVuY3Rpb24oaXRlcmF0aW9uLCBwcmV2aW91 c0l0ZXJhdGlvbiwgaW50ZXJuYWwpCiAgICAgewogICAgICAgICB2YXIgY29udGVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9 ICJyIiArIChpbnRlcm5hbCA/IGl0ZXJhdGlvbi5pbnRlcm5hbFJldmlzaW9uIDogaXRlcmF0aW9u Lm9wZW5Tb3VyY2VSZXZpc2lvbik7CisgICAgICAgIGlmIChpdGVyYXRpb24ub3RoZXJSZXZpc2lv bikgeworICAgICAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9IGl0ZXJhdGlvbi5vdGhlclJl dmlzaW9uOworICAgICAgICAgICAgLy8gVXNpbmcgc3Vic3RyIGZvciBHaXQgU2hvcnQtU0hBCisg ICAgICAgICAgICAvLyBTZWU6IGh0dHA6Ly9naXQtc2NtLmNvbS9ib29rL2NhL3YxL0dpdC1Ub29s cy1SZXZpc2lvbi1TZWxlY3Rpb24jU2hvcnQtU0hBCisgICAgICAgICAgICBpZiAoY29udGVudC50 ZXh0Q29udGVudC5sZW5ndGggPT0gNDApCisgICAgICAgICAgICAgICAgY29udGVudC50ZXh0Q29u dGVudCA9IGNvbnRlbnQudGV4dENvbnRlbnQuc3Vic3RyKDAsIDgpOworICAgICAgICB9IGVsc2UK KyAgICAgICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSAiciIgKyAoaW50ZXJuYWwgPyBpdGVy YXRpb24uaW50ZXJuYWxSZXZpc2lvbiA6IGl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb24pOwog ICAgICAgICBjb250ZW50LmNsYXNzTGlzdC5hZGQoInJldmlzaW9uLW51bWJlciIpOwogCiAgICAg ICAgIGlmIChwcmV2aW91c0l0ZXJhdGlvbikgewpAQCAtMjYwLDcgKzI2Nyw4IEBAIEJ1aWxkYm90 UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIHJldmlzaW9uQ29udGVudEZvckl0ZXJhdGlv bjogZnVuY3Rpb24oaXRlcmF0aW9uLCBwcmV2aW91c0Rpc3BsYXllZEl0ZXJhdGlvbikKICAgICB7 Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KGl0ZXJhdGlvbi5vcGVuU291cmNlUmV2aXNpb24pOwor ICAgICAgICBpZiAoaXRlcmF0aW9uLm90aGVyUmV2aXNpb24pCisgICAgICAgICAgICByZXR1cm4g dGhpcy5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24oaXRlcmF0aW9uLCBw cmV2aW91c0Rpc3BsYXllZEl0ZXJhdGlvbiwgdHJ1ZSk7CiAKICAgICAgICAgdmFyIG9wZW5Tb3Vy Y2VDb250ZW50ID0gdGhpcy5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24o aXRlcmF0aW9uLCBwcmV2aW91c0Rpc3BsYXllZEl0ZXJhdGlvbik7CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMGM5NzVjLi4zMzlmMDQ2IDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjQgQEAKKzIwMTUtMDctMTMgIEphc29uIE1hcmNlbGwgIDxqbWFyY2VsbEBhcHBsZS5jb20+ CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjIx MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTgyMjYyOTE+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdENv bWJpbmVkUXVldWVWaWV3LmpzOgorICAgICAgICAoQnVpbGRib3RDb21iaW5lZFF1ZXVlVmlldy5w cm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgU2hvdWxkIHNheSAiYWxsIGJ1aWxkcyBwYXNzZWQi IGlmIGl0J3MgYSBidWlsZGVyIGNvbWJpbmVkIHF1ZXVlLgorICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL0J1aWxkYm90SXRlcmF0aW9uLmpzOgorICAgICAgICAoQnVpbGRib3RJdGVyYXRpb24pOgor ICAgICAgICBBZGRpbmcgb3RoZXJSZXZpc2lvbiBwcm9wZXJ0eSBmb3Igb3RoZXIgcHJvamVjdHMg YmVzaWRlcyBvcGVuc291cmNlIGFuZCBpbnRlcm5hbC4KKyAgICAgICAgKHBhcnNlUmV2aXNpb25Q cm9wZXJ0eSk6CisgICAgICAgIEFkZGluZyBhYmlsaXR5IHRvIHBhcnNlIGdpdCByZXZpc2lvbiBw cm9wZXJ0aWVzCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanM6 CisgICAgICAgIChCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUuX3JldmlzaW9uQ29udGVudFdp dGhQb3BvdmVyRm9ySXRlcmF0aW9uKToKKyAgICAgICAgRGlzcGxheSBnaXQgaGFzaC4KKyAgICAg ICAgKEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5yZXZpc2lvbkNvbnRlbnRGb3JJdGVyYXRp b24pOgorICAgICAgICBEaXNwbGF5IGdpdCBoYXNoLgorCiAyMDE1LTA3LTEwICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFVuYWJsZSB0byBkaXNt aXNzIGNvbnRleHQgbWVudSBkdXJpbmcgdGVzdCBydW5zCi0tIAoyLjMuOCAoQXBwbGUgR2l0LTU4 KQoK