111785 2013-03-07 15:36:18 -0800 Dashboard cleanup: Create ui.Errors 2013-03-11 18:09:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jparent jparent abarth dpranke ojan tony webkit.review.bot oldest_to_newest 850546 0 jparent 2013-03-07 15:36:18 -0800 Dashboard cleanup: Create ui.Errors 850574 1 192099 jparent 2013-03-07 15:52:39 -0800 Created attachment 192099 Patch 850649 2 192110 jparent 2013-03-07 16:58:44 -0800 Created attachment 192110 Removed some dead code, this is ready for review. 852686 3 192110 ojan 2013-03-11 13:55:57 -0700 Comment on attachment 192110 Removed some dead code, this is ready for review. View in context: https://bugs.webkit.org/attachment.cgi?id=192110&action=review Just a bunch of style nits. > Tools/TestResultServer/static-dashboards/ui.js:201 > + // String of error messages to display to the user. This comments aren't terribly useful. > Tools/TestResultServer/static-dashboards/ui.js:202 > + this._errorMsgs = ''; s/Msgs/Messages or, even better, this._messages? > Tools/TestResultServer/static-dashboards/ui.js:204 > + this._errorElt = null; s/Elt/Element or, even better, this._containerElement? > Tools/TestResultServer/static-dashboards/ui.js:208 > + // If there are errors, show big and red UI for errors so as to be noticed. This comment doesn't really add value. > Tools/TestResultServer/static-dashboards/ui.js:219 > + Nit: extra newline > Tools/TestResultServer/static-dashboards/ui.js:222 > + // Record a new error message. > + // @param {string} errorMsg The message to show to the user. I know this comment was in the old code, but it's pretty useless. > Tools/TestResultServer/static-dashboards/ui.js:223 > + addError: function(errorMsg) s/Msg/Message...or, even better, just "message" 852739 4 192562 jparent 2013-03-11 14:40:15 -0700 Created attachment 192562 Patch for landing 852740 5 192110 jparent 2013-03-11 14:40:29 -0700 Comment on attachment 192110 Removed some dead code, this is ready for review. View in context: https://bugs.webkit.org/attachment.cgi?id=192110&action=review >> Tools/TestResultServer/static-dashboards/ui.js:201 >> + // String of error messages to display to the user. > > This comments aren't terribly useful. removed >> Tools/TestResultServer/static-dashboards/ui.js:202 >> + this._errorMsgs = ''; > > s/Msgs/Messages > > or, even better, this._messages? done >> Tools/TestResultServer/static-dashboards/ui.js:204 >> + this._errorElt = null; > > s/Elt/Element > > or, even better, this._containerElement? done >> Tools/TestResultServer/static-dashboards/ui.js:208 >> + // If there are errors, show big and red UI for errors so as to be noticed. > > This comment doesn't really add value. removed >> Tools/TestResultServer/static-dashboards/ui.js:219 >> + > > Nit: extra newline removed >> Tools/TestResultServer/static-dashboards/ui.js:222 >> + // @param {string} errorMsg The message to show to the user. > > I know this comment was in the old code, but it's pretty useless. removed >> Tools/TestResultServer/static-dashboards/ui.js:223 >> + addError: function(errorMsg) > > s/Msg/Message...or, even better, just "message" done 852936 6 192562 webkit.review.bot 2013-03-11 18:09:21 -0700 Comment on attachment 192562 Patch for landing Clearing flags on attachment: 192562 Committed r145447: <http://trac.webkit.org/changeset/145447> 852937 7 webkit.review.bot 2013-03-11 18:09:25 -0700 All reviewed patches have been landed. Closing bug. 192099 2013-03-07 15:52:39 -0800 2013-03-07 16:58:42 -0800 Patch bug-111785-20130307154843.patch text/plain 8549 jparent U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MTI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmQ1YzRjMjNkN2I5MWM2NjFiNjhkYjJlZGI0ZTI5Mzkw MDNhY2JkYy4uNmZkOTkzNzNlYjdmOWFhNzFlMTM4YTY1MWQzZjI5ZmFiM2Y0Mzc3YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEzLTAzLTA3ICBKdWxpZSBQYXJlbnQgIDxqcGFyZW50QGNocm9taXVtLm9yZz4KKwor ICAgICAgICBEYXNoYm9hcmQgY2xlYW51cDogQ3JlYXRlIHVpLkVycm9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBDcmVhdGUgdWkuRXJy b3JzIGZvciBoYW5kbGluZyBlcnJvcnMgdGhlIGRhc2hib2FyZHMKKyAgICAgICAgZW5jb3VudGVy LiBMb2FkZXIgbm93IGhhcyBhIEVycm9yIG9iamVjdCB0aGF0IGl0IGNhbiBhZGQgdG8sCisgICAg ICAgIGFuZCBpbmRpdmlkdWFsIGRhc2hib2FyZHMgY2FuIHNob3cgZXJyb3JzIHdoZW4gZGVzaXJl ZC4KKyAgICAgICAgQ3VycmVudGx5LCBvbmx5IGZsYWtpbmVzc19kYiBzaG93cyBlcnJvcnMsIGJ1 dCB0aGlzIGlzIAorICAgICAgICBnZW5lcmljIGFuZCB0aGVyZSBpcyBubyByZWFzb24gd2h5IG90 aGVyIGRicyB3b3VsZG4ndCB3YW50IHRvCisgICAgICAgIHNob3cgZXJyb3JzLgorCisgICAgICAg ICogVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9kYXNoYm9hcmRfYmFzZS5qczoK KyAgICAgICAgKHJlc291cmNlTG9hZGluZ0NvbXBsZXRlKToKKyAgICAgICAgKiBUZXN0UmVzdWx0 U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9hcmQuanM6CisgICAgICAg IChnZW5lcmF0ZVBhZ2UpOgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hi b2FyZHMvbG9hZGVyLmpzOgorICAgICAgICAoLik6CisgICAgICAgICogVGVzdFJlc3VsdFNlcnZl ci9zdGF0aWMtZGFzaGJvYXJkcy91aS5qczoKKyAgICAgICAgKC4pOgorCiAyMDEzLTAzLTA3ICBS b2dlciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmUtZW5hYmxlIFdp biBFV1MgdGVzdHMuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1k YXNoYm9hcmRzL2Rhc2hib2FyZF9iYXNlLmpzIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0 aWMtZGFzaGJvYXJkcy9kYXNoYm9hcmRfYmFzZS5qcwppbmRleCA1NTcyZTdkOWMxNjAxNDQwMDI3 YTI4YzlhZDNiYmQyMDZlNjZhZTdmLi44NmZlMDllN2NhMjA2MDFiYTU1MmNmOWQxYjU0NzA2NWJl ZjVlMmVjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9h cmRzL2Rhc2hib2FyZF9iYXNlLmpzCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGlj LWRhc2hib2FyZHMvZGFzaGJvYXJkX2Jhc2UuanMKQEAgLTQ0MCw0MyArNDQwLDggQEAgZnVuY3Rp b24gaXNGbGFraW5lc3NEYXNoYm9hcmQoKQogICAgIHJldHVybiBzdHJpbmcuZW5kc1dpdGgod2lu ZG93LmxvY2F0aW9uLnBhdGhuYW1lLCAnZmxha2luZXNzX2Rhc2hib2FyZC5odG1sJyk7CiB9CiAK LS8vIFN0cmluZyBvZiBlcnJvciBtZXNzYWdlcyB0byBkaXNwbGF5IHRvIHRoZSB1c2VyLgotdmFy IGdfZXJyb3JNZXNzYWdlcyA9ICcnOwotCi0vLyBSZWNvcmQgYSBuZXcgZXJyb3IgbWVzc2FnZS4K LS8vIEBwYXJhbSB7c3RyaW5nfSBlcnJvck1zZyBUaGUgbWVzc2FnZSB0byBzaG93IHRvIHRoZSB1 c2VyLgotZnVuY3Rpb24gYWRkRXJyb3IoZXJyb3JNc2cpCi17Ci0gICAgZ19lcnJvck1lc3NhZ2Vz ICs9IGVycm9yTXNnICsgJzxicj4nOwotfQotCi0KLS8vIElmIHRoZXJlIGFyZSBlcnJvcnMsIHNo b3cgYmlnIGFuZCByZWQgVUkgZm9yIGVycm9ycyBzbyBhcyB0byBiZSBub3RpY2VkLgotZnVuY3Rp b24gc2hvd0Vycm9ycygpCitmdW5jdGlvbiByZXNvdXJjZUxvYWRpbmdDb21wbGV0ZSgpCiB7Ci0g ICAgdmFyIGVycm9ycyA9ICQoJ2Vycm9ycycpOwotCi0gICAgaWYgKCFnX2Vycm9yTWVzc2FnZXMp IHsKLSAgICAgICAgaWYgKGVycm9ycykKLSAgICAgICAgICAgIGVycm9ycy5wYXJlbnROb2RlLnJl bW92ZUNoaWxkKGVycm9ycyk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBpZiAoIWVy cm9ycykgewotICAgICAgICBlcnJvcnMgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdIMicpOwot ICAgICAgICBlcnJvcnMuc3R5bGUuY29sb3IgPSAncmVkJzsKLSAgICAgICAgZXJyb3JzLmlkID0g J2Vycm9ycyc7Ci0gICAgICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZXJyb3JzKTsKLSAg ICB9Ci0KLSAgICBlcnJvcnMuaW5uZXJIVE1MID0gZ19lcnJvck1lc3NhZ2VzOwotfQotCi1mdW5j dGlvbiByZXNvdXJjZUxvYWRpbmdDb21wbGV0ZShlcnJvck1zZ3MpCi17Ci0gICAgaWYgKGVycm9y TXNncykKLSAgICAgICAgYWRkRXJyb3IoZXJyb3JNc2dzKQotCiAgICAgaGFuZGxlTG9jYXRpb25D aGFuZ2UoKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMt ZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkLmpzIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZl ci9zdGF0aWMtZGFzaGJvYXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkLmpzCmluZGV4IGQyOGFiNzk4 YjMyZWQxMTY4M2VmNTY5ZWNiY2I0OGViYWVhMDM0ZWYuLjRjZTYzM2UxYTYxY2Q5ZmJjY2RhNDQ2 OGE3ZDcwMjVlZTY0NGQ4MDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3Rh dGljLWRhc2hib2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZC5qcworKysgYi9Ub29scy9UZXN0UmVz dWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9hcmQuanMKQEAgLTE0 Myw3ICsxNDMsNyBAQCBmdW5jdGlvbiBnZW5lcmF0ZVBhZ2UoKQogICAgICAgICByZXR1cm47CiAK ICAgICBkb2N1bWVudC5ib2R5LmlubmVySFRNTCA9ICc8ZGl2IGlkPSJsb2FkaW5nLXVpIj5MT0FE SU5HLi4uPC9kaXY+JzsKLSAgICBzaG93RXJyb3JzKCk7CisgICAgZ19yZXNvdXJjZUxvYWRlci5z aG93RXJyb3JzKCk7CiAKICAgICAvLyB0ZXN0cyBleHBhbmRzIHRvIGFsbCB0ZXN0cyB0aGF0IG1h dGNoIHRoZSBDU1YgbGlzdC4KICAgICAvLyByZXN1bHQgZXhwYW5kcyB0byBhbGwgdGVzdHMgdGhh dCBldmVyIGhhdmUgdGhlIGdpdmVuIHJlc3VsdApAQCAtMTE1Myw3ICsxMTUzLDcgQEAgZnVuY3Rp b24gbGlua0hUTUxUb09wZW5XaW5kb3codXJsLCB0ZXh0KQogICAgIHJldHVybiAnPGEgaHJlZj0i JyArIHVybCArICciIHRhcmdldD0iX2JsYW5rIj4nICsgdGV4dCArICc8L2E+JzsKIH0KIAotLy8g RklYTUU6IHJlcGxhY2VkIHdpdGggdWkuY2hyb21pdW1SZXZpc2lvbkxpbmsvdWkud2ViS2l0UmV2 aXNpb25MaW5rCisvLyBGSVhNRTogcmVwbGFjZWQgd2l0aCB1aS5odG1sLmNocm9taXVtUmV2aXNp b25MaW5rL3VpLmh0bWwud2ViS2l0UmV2aXNpb25MaW5rCiBmdW5jdGlvbiBjcmVhdGVCbGFtZUxp c3RIVE1MKHJldmlzaW9ucywgaW5kZXgsIHVybEJhc2UsIHNlcGFyYXRvciwgcmVwbykKIHsKICAg ICB2YXIgdGhpc1JldmlzaW9uID0gcmV2aXNpb25zW2luZGV4XTsKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVyLmpzIGIvVG9vbHMvVGVz dFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9sb2FkZXIuanMKaW5kZXggMmJlOTY3NDJi NzRhMGZjOTIzNzM0YTAwNDIzMGI3MDY1ZjczYjlkYS4uMWJiN2E4NjlmNTQzOTkwN2Y1OGI0YThh MGM0OWNhM2M2YTM5OTQ4NyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0 aWMtZGFzaGJvYXJkcy9sb2FkZXIuanMKKysrIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0 aWMtZGFzaGJvYXJkcy9sb2FkZXIuanMKQEAgLTY4LDYgKzY4LDggQEAgbG9hZGVyLkxvYWRlciA9 IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9idWlsZGVyc1RoYXRGYWlsZWRUb0xvYWQgPSBbXTsKICAg ICB0aGlzLl9zdGFsZUJ1aWxkZXJzID0gW107CiAgICAgdGhpcy5fbG9hZGluZ0NvbXBsZXRlID0g ZmFsc2U7CisgICAgdGhpcy5fZXJyb3JzID0gbmV3IHVpLkVycm9ycygpOworCiB9CiAKIGxvYWRl ci5Mb2FkZXIucHJvdG90eXBlID0gewpAQCAtNzksMTUgKzgxLDIwIEBAIGxvYWRlci5Mb2FkZXIu cHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2xvYWRpbmdDb21wbGV0 ZTsKICAgICB9LAorICAgIHNob3dFcnJvcnM6IGZ1bmN0aW9uKCkgCisgICAgeworICAgICAgICB0 aGlzLl9lcnJvcnMuc2hvdygpOworICAgIH0sCiAgICAgX2xvYWROZXh0OiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICB2YXIgbG9hZGluZ1N0ZXAgPSB0aGlzLl9sb2FkaW5nU3RlcHMuc2hpZnQo KTsKICAgICAgICAgaWYgKCFsb2FkaW5nU3RlcCkgewogICAgICAgICAgICAgdGhpcy5fbG9hZGlu Z0NvbXBsZXRlID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX2FkZEVycm9ycygpOwogICAgICAg ICAgICAgLy8gRklYTUUoanBhcmVudCk6IExvYWRlciBzaG91bGQgbm90IGtub3cgYWJvdXQgZ2xv YmFsCiAgICAgICAgICAgICAvLyBmdW5jdGlvbnMsIHNob3VsZCB1c2UgYSBjYWxsYmFjayBvciBk aXNwYXRjaCBsb2FkCiAgICAgICAgICAgICAvLyBldmVudCBpbnN0ZWFkLgotICAgICAgICAgICAg cmVzb3VyY2VMb2FkaW5nQ29tcGxldGUodGhpcy5fZ2V0TG9hZGluZ0Vycm9yTWVzc2FnZXMoKSk7 CisgICAgICAgICAgICByZXNvdXJjZUxvYWRpbmdDb21wbGV0ZSgpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgICAgIGxvYWRpbmdTdGVwLmFwcGx5KHRoaXMpOwpAQCAtMjI5 LDE2ICsyMzYsMTMgQEAgbG9hZGVyLkxvYWRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zb2xlLmVycm9yKCdDb3VsZCBub3QgbG9hZCBleHBlY3RhdGlvbnMgZmls ZSBmb3IgJyArIHBsYXRmb3JtTmFtZSk7CiAgICAgICAgICAgICAgICAgICAgIH0sIHBsYXRmb3Jt V2l0aEV4cGVjdGF0aW9ucykpOwogICAgIH0sCi0gICAgX2dldExvYWRpbmdFcnJvck1lc3NhZ2Vz OiBmdW5jdGlvbigpCisgICAgX2FkZEVycm9yczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg dmFyIGVycm9yTXNncyA9ICcnOwogICAgICAgICBpZiAodGhpcy5fYnVpbGRlcnNUaGF0RmFpbGVk VG9Mb2FkLmxlbmd0aCkKLSAgICAgICAgICAgIGVycm9yTXNncyArPSAnRVJST1I6IEZhaWxlZCB0 byBnZXQgZGF0YSBmcm9tICcgKyB0aGlzLl9idWlsZGVyc1RoYXRGYWlsZWRUb0xvYWQudG9TdHJp bmcoKSArICcuPGJyPic7CisgICAgICAgICAgICB0aGlzLl9lcnJvcnMuYWRkRXJyb3IoJ0VSUk9S OiBGYWlsZWQgdG8gZ2V0IGRhdGEgZnJvbSAnICsgdGhpcy5fYnVpbGRlcnNUaGF0RmFpbGVkVG9M b2FkLnRvU3RyaW5nKCkgKycuJyk7CiAKICAgICAgICAgaWYgKHRoaXMuX3N0YWxlQnVpbGRlcnMu bGVuZ3RoKQotICAgICAgICAgICAgZXJyb3JNc2dzICs9J0VSUk9SOiBEYXRhIGZyb20gJyArIHRo aXMuX3N0YWxlQnVpbGRlcnMudG9TdHJpbmcoKSArICcgaXMgbW9yZSB0aGFuIDEgZGF5IHN0YWxl Ljxicj4nOwotCi0gICAgICAgIHJldHVybiBlcnJvck1zZ3M7CisgICAgICAgICAgICB0aGlzLl9l cnJvcnMuYWRkRXJyb3IoJ0VSUk9SOiBEYXRhIGZyb20gJyArIHRoaXMuX3N0YWxlQnVpbGRlcnMu dG9TdHJpbmcoKSArICcgaXMgbW9yZSB0aGFuIDEgZGF5IHN0YWxlLicpOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9sb2Fk ZXJfdW5pdHRlc3RzLmpzIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJk cy9sb2FkZXJfdW5pdHRlc3RzLmpzCmluZGV4IGMxOTM4NDU0MzVhODBhZTE0NjViMzAyOTg0YTQ4 MmFjYjlmNGM1NDguLjk1NTc5ZjExOTdiYWJlMTg4NThmZmUwNzExMzBhMjBhZDk4OGY5NDggMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVy X3VuaXR0ZXN0cy5qcworKysgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9h cmRzL2xvYWRlcl91bml0dGVzdHMuanMKQEAgLTE1Miw3ICsxNTIsOCBAQCB0ZXN0KCdhZGRCdWls ZGVyTG9hZEVycm9ycycsIDEsIGZ1bmN0aW9uKCkgewogICAgIHZhciByZXNvdXJjZUxvYWRlciA9 IG5ldyBsb2FkZXIuTG9hZGVyKCk7CiAgICAgcmVzb3VyY2VMb2FkZXIuX2J1aWxkZXJzVGhhdEZh aWxlZFRvTG9hZCA9IFsnYnVpbGRlcjEnLCAnYnVpbGRlcjInXTsKICAgICByZXNvdXJjZUxvYWRl ci5fc3RhbGVCdWlsZGVycyA9IFsnc3RhbGVCdWlsZGVyMSddOwotICAgIGVxdWFsKHJlc291cmNl TG9hZGVyLl9nZXRMb2FkaW5nRXJyb3JNZXNzYWdlcygpLCAnRVJST1I6IEZhaWxlZCB0byBnZXQg ZGF0YSBmcm9tIGJ1aWxkZXIxLGJ1aWxkZXIyLjxicj5FUlJPUjogRGF0YSBmcm9tIHN0YWxlQnVp bGRlcjEgaXMgbW9yZSB0aGFuIDEgZGF5IHN0YWxlLjxicj4nKTsKKyAgICByZXNvdXJjZUxvYWRl ci5fYWRkRXJyb3JzKCk7CisgICAgZXF1YWwocmVzb3VyY2VMb2FkZXIuX2Vycm9ycy5fZXJyb3JN c2dzLCAnRVJST1I6IEZhaWxlZCB0byBnZXQgZGF0YSBmcm9tIGJ1aWxkZXIxLGJ1aWxkZXIyLjxi cj5FUlJPUjogRGF0YSBmcm9tIHN0YWxlQnVpbGRlcjEgaXMgbW9yZSB0aGFuIDEgZGF5IHN0YWxl Ljxicj4nKTsKIH0pOwogCiB0ZXN0KCdMb2FkZWQgc3RhdGUgc2V0JywgMiwgZnVuY3Rpb24oKSB7 CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL3Vp LmpzIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy91aS5qcwppbmRl eCBjYjRlYmE5MTlhZWMzMmI4NmE1YWJkMjFkZWM3OGRmZWI4NDZjZjRkLi5kYjE3ODYyYjJhYTAw YzE3ZWZkNDI3ODUxM2I1MDgzMTk1ODJlNzdlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UmVzdWx0 U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL3VpLmpzCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2 ZXIvc3RhdGljLWRhc2hib2FyZHMvdWkuanMKQEAgLTE5Niw0ICsxOTYsNDIgQEAgdWkuaHRtbC53 ZWJLaXRSZXZpc2lvbkxpbmsgPSBmdW5jdGlvbihyZXN1bHRzLCBpbmRleCkKICAgICAgICAgJ2h0 dHA6Ly90cmFjLndlYmtpdC5vcmcvbG9nL3RydW5rLz9yZXY9PHJldjE+JnN0b3BfcmV2PTxyZXYy PiZsaW1pdD0xMDAmdmVyYm9zZT1vbicpOwogfQogCisKK3VpLkVycm9ycyA9IGZ1bmN0aW9uKCkg eworICAgIC8vIFN0cmluZyBvZiBlcnJvciBtZXNzYWdlcyB0byBkaXNwbGF5IHRvIHRoZSB1c2Vy LgorICAgIHRoaXMuX2Vycm9yTXNncyA9ICcnOworICAgIC8vIEVsZW1lbnQgdG8gZGlzcGxheSB0 aGUgZXJyb3JzIHdpdGhpbi4KKyAgICB0aGlzLl9lcnJvckVsdCA9IG51bGw7Cit9CisKK3VpLkVy cm9ycy5wcm90b3R5cGUgPSB7CisgICAgLy8gSWYgdGhlcmUgYXJlIGVycm9ycywgc2hvdyBiaWcg YW5kIHJlZCBVSSBmb3IgZXJyb3JzIHNvIGFzIHRvIGJlIG5vdGljZWQuCisgICAgc2hvdzogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9lcnJvck1zZ3MpIHsKKyAgICAgICAg ICAgIGlmICh0aGlzLl9lcnJvckVsdCkgeworICAgICAgICAgICAgICAgIHRoaXMuX2Vycm9yRWx0 LnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQodGhpcy5fZXJyb3JFbHQpOworICAgICAgICAgICAgICAg IHRoaXMuX2Vycm9yRWx0ID0gbnVsbDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorCisgICAgICAgIGlmICghdGhpcy5fZXJyb3JFbHQpIHsKKyAgICAgICAg ICAgIHRoaXMuX2Vycm9yRWx0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnSDInKTsKKyAgICAg ICAgICAgIHRoaXMuX2Vycm9yRWx0LnN0eWxlLmNvbG9yID0gJ3JlZCc7CisgICAgICAgICAgICB0 aGlzLl9lcnJvckVsdC5pZCA9ICdlcnJvcnMnOworICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5h cHBlbmRDaGlsZCh0aGlzLl9lcnJvckVsdCk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9l cnJvckVsdC5pbm5lckhUTUwgPSB0aGlzLl9lcnJvck1zZ3M7CisKKyAgICB9LAorICAgIC8vIFJl Y29yZCBhIG5ldyBlcnJvciBtZXNzYWdlLgorICAgIC8vIEBwYXJhbSB7c3RyaW5nfSBlcnJvck1z ZyBUaGUgbWVzc2FnZSB0byBzaG93IHRvIHRoZSB1c2VyLgorICAgIGFkZEVycm9yOiBmdW5jdGlv bihlcnJvck1zZykKKyAgICB7CisgICAgICAgIHRoaXMuX2Vycm9yTXNncyArPSBlcnJvck1zZyAr ICc8YnI+JzsKKyAgICB9Cit9CisKIH0pKCk7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo= 192110 2013-03-07 16:58:44 -0800 2013-03-11 14:40:29 -0700 Removed some dead code, this is ready for review. bug-111785-20130307165448.patch text/plain 8415 jparent U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MTQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTBhMzM0YmRiZWRjMmUzZjU3NjYzZWRlMGQxMmQ5MmNi ZTQ1MjRkZi4uYzU3N2I1MDZhMmVmNGQ4MGUyY2E1ZDk4MjUyNDYxMDJhMDRjMzBkMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDEzLTAzLTA3ICBKdWxpZSBQYXJlbnQgIDxqcGFyZW50QGNocm9taXVtLm9yZz4KIAor ICAgICAgICBEYXNoYm9hcmQgY2xlYW51cDogQ3JlYXRlIHVpLkVycm9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBDcmVhdGUgdWkuRXJy b3JzIGZvciBoYW5kbGluZyBlcnJvcnMgdGhlIGRhc2hib2FyZHMKKyAgICAgICAgZW5jb3VudGVy LiBMb2FkZXIgbm93IGhhcyBhIEVycm9yIG9iamVjdCB0aGF0IGl0IGNhbiBhZGQgdG8sCisgICAg ICAgIGFuZCBpbmRpdmlkdWFsIGRhc2hib2FyZHMgY2FuIHNob3cgZXJyb3JzIHdoZW4gZGVzaXJl ZC4KKyAgICAgICAgQ3VycmVudGx5LCBvbmx5IGZsYWtpbmVzc19kYiBzaG93cyBlcnJvcnMsIGJ1 dCB0aGlzIGlzIAorICAgICAgICBnZW5lcmljIGFuZCB0aGVyZSBpcyBubyByZWFzb24gd2h5IG90 aGVyIGRicyB3b3VsZG4ndCB3YW50IHRvCisgICAgICAgIHNob3cgZXJyb3JzLgorCisgICAgICAg ICogVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9kYXNoYm9hcmRfYmFzZS5qczoK KyAgICAgICAgKHJlc291cmNlTG9hZGluZ0NvbXBsZXRlKToKKyAgICAgICAgKiBUZXN0UmVzdWx0 U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVzc19kYXNoYm9hcmQuanM6CisgICAgICAg IChnZW5lcmF0ZVBhZ2UpOgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hi b2FyZHMvbG9hZGVyLmpzOgorICAgICAgICAoLik6CisgICAgICAgICogVGVzdFJlc3VsdFNlcnZl ci9zdGF0aWMtZGFzaGJvYXJkcy91aS5qczoKKyAgICAgICAgKC4pOgorCisyMDEzLTAzLTA3ICBK dWxpZSBQYXJlbnQgIDxqcGFyZW50QGNocm9taXVtLm9yZz4KKwogICAgICAgICBzaG93QWxsUnVu cyBjaGVja2JveCBubyBsb25nZXIgd29ya3Mgb24gdGhlIHN0YXRzIGRhc2hib2FyZAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNjczCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZGFzaGJvYXJk X2Jhc2UuanMgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2Rhc2hi b2FyZF9iYXNlLmpzCmluZGV4IDk5MGZiMWI1MmU2YmMyMWExOTIyYjhjNjk0Y2E3OGMzYzI5YTI2 ZWIuLmQwNDZlMGIzZmZjNzUzZDkxYzVjMzI5N2NkYWM4ZTdhNzAxZDQ0ZjEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZGFzaGJvYXJkX2Jhc2Uu anMKKysrIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9kYXNoYm9h cmRfYmFzZS5qcwpAQCAtNDQwLDQzICs0NDAsOCBAQCBmdW5jdGlvbiBpc0ZsYWtpbmVzc0Rhc2hi b2FyZCgpCiAgICAgcmV0dXJuIHN0cmluZy5lbmRzV2l0aCh3aW5kb3cubG9jYXRpb24ucGF0aG5h bWUsICdmbGFraW5lc3NfZGFzaGJvYXJkLmh0bWwnKTsKIH0KIAotLy8gU3RyaW5nIG9mIGVycm9y IG1lc3NhZ2VzIHRvIGRpc3BsYXkgdG8gdGhlIHVzZXIuCi12YXIgZ19lcnJvck1lc3NhZ2VzID0g Jyc7Ci0KLS8vIFJlY29yZCBhIG5ldyBlcnJvciBtZXNzYWdlLgotLy8gQHBhcmFtIHtzdHJpbmd9 IGVycm9yTXNnIFRoZSBtZXNzYWdlIHRvIHNob3cgdG8gdGhlIHVzZXIuCi1mdW5jdGlvbiBhZGRF cnJvcihlcnJvck1zZykKLXsKLSAgICBnX2Vycm9yTWVzc2FnZXMgKz0gZXJyb3JNc2cgKyAnPGJy Pic7Ci19Ci0KLQotLy8gSWYgdGhlcmUgYXJlIGVycm9ycywgc2hvdyBiaWcgYW5kIHJlZCBVSSBm b3IgZXJyb3JzIHNvIGFzIHRvIGJlIG5vdGljZWQuCi1mdW5jdGlvbiBzaG93RXJyb3JzKCkKK2Z1 bmN0aW9uIHJlc291cmNlTG9hZGluZ0NvbXBsZXRlKCkKIHsKLSAgICB2YXIgZXJyb3JzID0gJCgn ZXJyb3JzJyk7Ci0KLSAgICBpZiAoIWdfZXJyb3JNZXNzYWdlcykgewotICAgICAgICBpZiAoZXJy b3JzKQotICAgICAgICAgICAgZXJyb3JzLnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQoZXJyb3JzKTsK LSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGlmICghZXJyb3JzKSB7Ci0gICAgICAgIGVy cm9ycyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ0gyJyk7Ci0gICAgICAgIGVycm9ycy5zdHls ZS5jb2xvciA9ICdyZWQnOwotICAgICAgICBlcnJvcnMuaWQgPSAnZXJyb3JzJzsKLSAgICAgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChlcnJvcnMpOwotICAgIH0KLQotICAgIGVycm9ycy5p bm5lckhUTUwgPSBnX2Vycm9yTWVzc2FnZXM7Ci19Ci0KLWZ1bmN0aW9uIHJlc291cmNlTG9hZGlu Z0NvbXBsZXRlKGVycm9yTXNncykKLXsKLSAgICBpZiAoZXJyb3JNc2dzKQotICAgICAgICBhZGRF cnJvcihlcnJvck1zZ3MpCi0KICAgICBoYW5kbGVMb2NhdGlvbkNoYW5nZSgpOwogfQogCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVz c19kYXNoYm9hcmQuanMgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRz L2ZsYWtpbmVzc19kYXNoYm9hcmQuanMKaW5kZXggZDI4YWI3OThiMzJlZDExNjgzZWY1NjllY2Jj YjQ4ZWJhZWEwMzRlZi4uNGNlNjMzZTFhNjFjZDlmYmNjZGE0NDY4YTdkNzAyNWVlNjQ0ZDgwMSAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9mbGFr aW5lc3NfZGFzaGJvYXJkLmpzCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRh c2hib2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZC5qcwpAQCAtMTQzLDcgKzE0Myw3IEBAIGZ1bmN0 aW9uIGdlbmVyYXRlUGFnZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRvY3VtZW50LmJvZHku aW5uZXJIVE1MID0gJzxkaXYgaWQ9ImxvYWRpbmctdWkiPkxPQURJTkcuLi48L2Rpdj4nOwotICAg IHNob3dFcnJvcnMoKTsKKyAgICBnX3Jlc291cmNlTG9hZGVyLnNob3dFcnJvcnMoKTsKIAogICAg IC8vIHRlc3RzIGV4cGFuZHMgdG8gYWxsIHRlc3RzIHRoYXQgbWF0Y2ggdGhlIENTViBsaXN0Lgog ICAgIC8vIHJlc3VsdCBleHBhbmRzIHRvIGFsbCB0ZXN0cyB0aGF0IGV2ZXIgaGF2ZSB0aGUgZ2l2 ZW4gcmVzdWx0CkBAIC0xMTUzLDcgKzExNTMsNyBAQCBmdW5jdGlvbiBsaW5rSFRNTFRvT3Blbldp bmRvdyh1cmwsIHRleHQpCiAgICAgcmV0dXJuICc8YSBocmVmPSInICsgdXJsICsgJyIgdGFyZ2V0 PSJfYmxhbmsiPicgKyB0ZXh0ICsgJzwvYT4nOwogfQogCi0vLyBGSVhNRTogcmVwbGFjZWQgd2l0 aCB1aS5jaHJvbWl1bVJldmlzaW9uTGluay91aS53ZWJLaXRSZXZpc2lvbkxpbmsKKy8vIEZJWE1F OiByZXBsYWNlZCB3aXRoIHVpLmh0bWwuY2hyb21pdW1SZXZpc2lvbkxpbmsvdWkuaHRtbC53ZWJL aXRSZXZpc2lvbkxpbmsKIGZ1bmN0aW9uIGNyZWF0ZUJsYW1lTGlzdEhUTUwocmV2aXNpb25zLCBp bmRleCwgdXJsQmFzZSwgc2VwYXJhdG9yLCByZXBvKQogewogICAgIHZhciB0aGlzUmV2aXNpb24g PSByZXZpc2lvbnNbaW5kZXhdOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9z dGF0aWMtZGFzaGJvYXJkcy9sb2FkZXIuanMgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRp Yy1kYXNoYm9hcmRzL2xvYWRlci5qcwppbmRleCAyYmU5Njc0MmI3NGEwZmM5MjM3MzRhMDA0MjMw YjcwNjVmNzNiOWRhLi4xYmI3YTg2OWY1NDM5OTA3ZjU4YjRhOGEwYzQ5Y2EzYzZhMzk5NDg3IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2xvYWRl ci5qcworKysgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2xvYWRl ci5qcwpAQCAtNjgsNiArNjgsOCBAQCBsb2FkZXIuTG9hZGVyID0gZnVuY3Rpb24oKQogICAgIHRo aXMuX2J1aWxkZXJzVGhhdEZhaWxlZFRvTG9hZCA9IFtdOwogICAgIHRoaXMuX3N0YWxlQnVpbGRl cnMgPSBbXTsKICAgICB0aGlzLl9sb2FkaW5nQ29tcGxldGUgPSBmYWxzZTsKKyAgICB0aGlzLl9l cnJvcnMgPSBuZXcgdWkuRXJyb3JzKCk7CisKIH0KIAogbG9hZGVyLkxvYWRlci5wcm90b3R5cGUg PSB7CkBAIC03OSwxNSArODEsMjAgQEAgbG9hZGVyLkxvYWRlci5wcm90b3R5cGUgPSB7CiAgICAg ewogICAgICAgICByZXR1cm4gdGhpcy5fbG9hZGluZ0NvbXBsZXRlOwogICAgIH0sCisgICAgc2hv d0Vycm9yczogZnVuY3Rpb24oKSAKKyAgICB7CisgICAgICAgIHRoaXMuX2Vycm9ycy5zaG93KCk7 CisgICAgfSwKICAgICBfbG9hZE5leHQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBs b2FkaW5nU3RlcCA9IHRoaXMuX2xvYWRpbmdTdGVwcy5zaGlmdCgpOwogICAgICAgICBpZiAoIWxv YWRpbmdTdGVwKSB7CiAgICAgICAgICAgICB0aGlzLl9sb2FkaW5nQ29tcGxldGUgPSB0cnVlOwor ICAgICAgICAgICAgdGhpcy5fYWRkRXJyb3JzKCk7CiAgICAgICAgICAgICAvLyBGSVhNRShqcGFy ZW50KTogTG9hZGVyIHNob3VsZCBub3Qga25vdyBhYm91dCBnbG9iYWwKICAgICAgICAgICAgIC8v IGZ1bmN0aW9ucywgc2hvdWxkIHVzZSBhIGNhbGxiYWNrIG9yIGRpc3BhdGNoIGxvYWQKICAgICAg ICAgICAgIC8vIGV2ZW50IGluc3RlYWQuCi0gICAgICAgICAgICByZXNvdXJjZUxvYWRpbmdDb21w bGV0ZSh0aGlzLl9nZXRMb2FkaW5nRXJyb3JNZXNzYWdlcygpKTsKKyAgICAgICAgICAgIHJlc291 cmNlTG9hZGluZ0NvbXBsZXRlKCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAg ICAgICAgbG9hZGluZ1N0ZXAuYXBwbHkodGhpcyk7CkBAIC0yMjksMTYgKzIzNiwxMyBAQCBsb2Fk ZXIuTG9hZGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUu ZXJyb3IoJ0NvdWxkIG5vdCBsb2FkIGV4cGVjdGF0aW9ucyBmaWxlIGZvciAnICsgcGxhdGZvcm1O YW1lKTsKICAgICAgICAgICAgICAgICAgICAgfSwgcGxhdGZvcm1XaXRoRXhwZWN0YXRpb25zKSk7 CiAgICAgfSwKLSAgICBfZ2V0TG9hZGluZ0Vycm9yTWVzc2FnZXM6IGZ1bmN0aW9uKCkKKyAgICBf YWRkRXJyb3JzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgZXJyb3JNc2dzID0gJyc7 CiAgICAgICAgIGlmICh0aGlzLl9idWlsZGVyc1RoYXRGYWlsZWRUb0xvYWQubGVuZ3RoKQotICAg ICAgICAgICAgZXJyb3JNc2dzICs9ICdFUlJPUjogRmFpbGVkIHRvIGdldCBkYXRhIGZyb20gJyAr IHRoaXMuX2J1aWxkZXJzVGhhdEZhaWxlZFRvTG9hZC50b1N0cmluZygpICsgJy48YnI+JzsKKyAg ICAgICAgICAgIHRoaXMuX2Vycm9ycy5hZGRFcnJvcignRVJST1I6IEZhaWxlZCB0byBnZXQgZGF0 YSBmcm9tICcgKyB0aGlzLl9idWlsZGVyc1RoYXRGYWlsZWRUb0xvYWQudG9TdHJpbmcoKSArJy4n KTsKIAogICAgICAgICBpZiAodGhpcy5fc3RhbGVCdWlsZGVycy5sZW5ndGgpCi0gICAgICAgICAg ICBlcnJvck1zZ3MgKz0nRVJST1I6IERhdGEgZnJvbSAnICsgdGhpcy5fc3RhbGVCdWlsZGVycy50 b1N0cmluZygpICsgJyBpcyBtb3JlIHRoYW4gMSBkYXkgc3RhbGUuPGJyPic7Ci0KLSAgICAgICAg cmV0dXJuIGVycm9yTXNnczsKKyAgICAgICAgICAgIHRoaXMuX2Vycm9ycy5hZGRFcnJvcignRVJS T1I6IERhdGEgZnJvbSAnICsgdGhpcy5fc3RhbGVCdWlsZGVycy50b1N0cmluZygpICsgJyBpcyBt b3JlIHRoYW4gMSBkYXkgc3RhbGUuJyk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2xvYWRlcl91bml0dGVzdHMuanMgYi9U b29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2xvYWRlcl91bml0dGVzdHMu anMKaW5kZXggYzE5Mzg0NTQzNWE4MGFlMTQ2NWIzMDI5ODRhNDgyYWNiOWY0YzU0OC4uOTU1Nzlm MTE5N2JhYmUxODg1OGZmZTA3MTEzMGEyMGFkOTg4Zjk0OCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9sb2FkZXJfdW5pdHRlc3RzLmpzCisrKyBi L1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVyX3VuaXR0ZXN0 cy5qcwpAQCAtMTUyLDcgKzE1Miw4IEBAIHRlc3QoJ2FkZEJ1aWxkZXJMb2FkRXJyb3JzJywgMSwg ZnVuY3Rpb24oKSB7CiAgICAgdmFyIHJlc291cmNlTG9hZGVyID0gbmV3IGxvYWRlci5Mb2FkZXIo KTsKICAgICByZXNvdXJjZUxvYWRlci5fYnVpbGRlcnNUaGF0RmFpbGVkVG9Mb2FkID0gWydidWls ZGVyMScsICdidWlsZGVyMiddOwogICAgIHJlc291cmNlTG9hZGVyLl9zdGFsZUJ1aWxkZXJzID0g WydzdGFsZUJ1aWxkZXIxJ107Ci0gICAgZXF1YWwocmVzb3VyY2VMb2FkZXIuX2dldExvYWRpbmdF cnJvck1lc3NhZ2VzKCksICdFUlJPUjogRmFpbGVkIHRvIGdldCBkYXRhIGZyb20gYnVpbGRlcjEs YnVpbGRlcjIuPGJyPkVSUk9SOiBEYXRhIGZyb20gc3RhbGVCdWlsZGVyMSBpcyBtb3JlIHRoYW4g MSBkYXkgc3RhbGUuPGJyPicpOworICAgIHJlc291cmNlTG9hZGVyLl9hZGRFcnJvcnMoKTsKKyAg ICBlcXVhbChyZXNvdXJjZUxvYWRlci5fZXJyb3JzLl9lcnJvck1zZ3MsICdFUlJPUjogRmFpbGVk IHRvIGdldCBkYXRhIGZyb20gYnVpbGRlcjEsYnVpbGRlcjIuPGJyPkVSUk9SOiBEYXRhIGZyb20g c3RhbGVCdWlsZGVyMSBpcyBtb3JlIHRoYW4gMSBkYXkgc3RhbGUuPGJyPicpOwogfSk7CiAKIHRl c3QoJ0xvYWRlZCBzdGF0ZSBzZXQnLCAyLCBmdW5jdGlvbigpIHsKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvdWkuanMgYi9Ub29scy9UZXN0UmVz dWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL3VpLmpzCmluZGV4IGNiNGViYTkxOWFlYzMyYjg2 YTVhYmQyMWRlYzc4ZGZlYjg0NmNmNGQuLjJiYTgwMzkxYmRlODFhZTAwNTZhZmQ5YTMyMTQ0M2E0 ZjhhYWY1NjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hi b2FyZHMvdWkuanMKKysrIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJk cy91aS5qcwpAQCAtMTk2LDQgKzE5NiwzNCBAQCB1aS5odG1sLndlYktpdFJldmlzaW9uTGluayA9 IGZ1bmN0aW9uKHJlc3VsdHMsIGluZGV4KQogICAgICAgICAnaHR0cDovL3RyYWMud2Via2l0Lm9y Zy9sb2cvdHJ1bmsvP3Jldj08cmV2MT4mc3RvcF9yZXY9PHJldjI+JmxpbWl0PTEwMCZ2ZXJib3Nl PW9uJyk7CiB9CiAKKwordWkuRXJyb3JzID0gZnVuY3Rpb24oKSB7CisgICAgLy8gU3RyaW5nIG9m IGVycm9yIG1lc3NhZ2VzIHRvIGRpc3BsYXkgdG8gdGhlIHVzZXIuCisgICAgdGhpcy5fZXJyb3JN c2dzID0gJyc7CisgICAgLy8gRWxlbWVudCB0byBkaXNwbGF5IHRoZSBlcnJvcnMgd2l0aGluLgor ICAgIHRoaXMuX2Vycm9yRWx0ID0gbnVsbDsKK30KKwordWkuRXJyb3JzLnByb3RvdHlwZSA9IHsK KyAgICAvLyBJZiB0aGVyZSBhcmUgZXJyb3JzLCBzaG93IGJpZyBhbmQgcmVkIFVJIGZvciBlcnJv cnMgc28gYXMgdG8gYmUgbm90aWNlZC4KKyAgICBzaG93OiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICBpZiAoIXRoaXMuX2Vycm9yRWx0KSB7CisgICAgICAgICAgICB0aGlzLl9lcnJvckVsdCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ0gyJyk7CisgICAgICAgICAgICB0aGlzLl9lcnJvckVs dC5zdHlsZS5jb2xvciA9ICdyZWQnOworICAgICAgICAgICAgdGhpcy5fZXJyb3JFbHQuaWQgPSAn ZXJyb3JzJzsKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodGhpcy5fZXJy b3JFbHQpOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fZXJyb3JFbHQuaW5uZXJIVE1MID0g dGhpcy5fZXJyb3JNc2dzOworCisgICAgfSwKKyAgICAvLyBSZWNvcmQgYSBuZXcgZXJyb3IgbWVz c2FnZS4KKyAgICAvLyBAcGFyYW0ge3N0cmluZ30gZXJyb3JNc2cgVGhlIG1lc3NhZ2UgdG8gc2hv dyB0byB0aGUgdXNlci4KKyAgICBhZGRFcnJvcjogZnVuY3Rpb24oZXJyb3JNc2cpCisgICAgewor ICAgICAgICB0aGlzLl9lcnJvck1zZ3MgKz0gZXJyb3JNc2cgKyAnPGJyPic7CisgICAgfQorfQor CiB9KSgpOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 192562 2013-03-11 14:40:15 -0700 2013-03-11 18:09:21 -0700 Patch for landing bug-111785-20130311143615.patch text/plain 8255 jparent U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MTQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTBhMzM0YmRiZWRjMmUzZjU3NjYzZWRlMGQxMmQ5MmNi ZTQ1MjRkZi4uNjNkZTJhNDFhNjQ1YzQzOGUwNWEyYmFiMzc3MDQwZmM3ZTA2MTNhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDEzLTAzLTA3ICBKdWxpZSBQYXJlbnQgIDxqcGFyZW50QGNocm9taXVtLm9yZz4KIAor ICAgICAgICBEYXNoYm9hcmQgY2xlYW51cDogQ3JlYXRlIHVpLkVycm9ycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgT2phbiBWYWZhaS4KKyAgICAgICAgCisgICAgICAgIENyZWF0ZSB1aS5FcnJvcnMg Zm9yIGhhbmRsaW5nIGVycm9ycyB0aGUgZGFzaGJvYXJkcworICAgICAgICBlbmNvdW50ZXIuIExv YWRlciBub3cgaGFzIGEgRXJyb3Igb2JqZWN0IHRoYXQgaXQgY2FuIGFkZCB0bywKKyAgICAgICAg YW5kIGluZGl2aWR1YWwgZGFzaGJvYXJkcyBjYW4gc2hvdyBlcnJvcnMgd2hlbiBkZXNpcmVkLgor ICAgICAgICBDdXJyZW50bHksIG9ubHkgZmxha2luZXNzX2RiIHNob3dzIGVycm9ycywgYnV0IHRo aXMgaXMgCisgICAgICAgIGdlbmVyaWMgYW5kIHRoZXJlIGlzIG5vIHJlYXNvbiB3aHkgb3RoZXIg ZGJzIHdvdWxkbid0IHdhbnQgdG8KKyAgICAgICAgc2hvdyBlcnJvcnMuCisKKyAgICAgICAgKiBU ZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2Rhc2hib2FyZF9iYXNlLmpzOgorICAg ICAgICAocmVzb3VyY2VMb2FkaW5nQ29tcGxldGUpOgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2 ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2luZXNzX2Rhc2hib2FyZC5qczoKKyAgICAgICAgKGdl bmVyYXRlUGFnZSk6CisgICAgICAgICogVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJk cy9sb2FkZXIuanM6CisgICAgICAgICguKToKKyAgICAgICAgKiBUZXN0UmVzdWx0U2VydmVyL3N0 YXRpYy1kYXNoYm9hcmRzL3VpLmpzOgorICAgICAgICAoLik6CisKKzIwMTMtMDMtMDcgIEp1bGll IFBhcmVudCAgPGpwYXJlbnRAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHNob3dBbGxSdW5zIGNo ZWNrYm94IG5vIGxvbmdlciB3b3JrcyBvbiB0aGUgc3RhdHMgZGFzaGJvYXJkCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NzMKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9kYXNoYm9hcmRfYmFz ZS5qcyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZGFzaGJvYXJk X2Jhc2UuanMKaW5kZXggOTkwZmIxYjUyZTZiYzIxYTE5MjJiOGM2OTRjYTc4YzNjMjlhMjZlYi4u ZDA0NmUwYjNmZmM3NTNkOTFjNWMzMjk3Y2RhYzhlN2E3MDFkNDRmMSAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9kYXNoYm9hcmRfYmFzZS5qcwor KysgYi9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2Rhc2hib2FyZF9i YXNlLmpzCkBAIC00NDAsNDMgKzQ0MCw4IEBAIGZ1bmN0aW9uIGlzRmxha2luZXNzRGFzaGJvYXJk KCkKICAgICByZXR1cm4gc3RyaW5nLmVuZHNXaXRoKHdpbmRvdy5sb2NhdGlvbi5wYXRobmFtZSwg J2ZsYWtpbmVzc19kYXNoYm9hcmQuaHRtbCcpOwogfQogCi0vLyBTdHJpbmcgb2YgZXJyb3IgbWVz c2FnZXMgdG8gZGlzcGxheSB0byB0aGUgdXNlci4KLXZhciBnX2Vycm9yTWVzc2FnZXMgPSAnJzsK LQotLy8gUmVjb3JkIGEgbmV3IGVycm9yIG1lc3NhZ2UuCi0vLyBAcGFyYW0ge3N0cmluZ30gZXJy b3JNc2cgVGhlIG1lc3NhZ2UgdG8gc2hvdyB0byB0aGUgdXNlci4KLWZ1bmN0aW9uIGFkZEVycm9y KGVycm9yTXNnKQotewotICAgIGdfZXJyb3JNZXNzYWdlcyArPSBlcnJvck1zZyArICc8YnI+JzsK LX0KLQotCi0vLyBJZiB0aGVyZSBhcmUgZXJyb3JzLCBzaG93IGJpZyBhbmQgcmVkIFVJIGZvciBl cnJvcnMgc28gYXMgdG8gYmUgbm90aWNlZC4KLWZ1bmN0aW9uIHNob3dFcnJvcnMoKQorZnVuY3Rp b24gcmVzb3VyY2VMb2FkaW5nQ29tcGxldGUoKQogewotICAgIHZhciBlcnJvcnMgPSAkKCdlcnJv cnMnKTsKLQotICAgIGlmICghZ19lcnJvck1lc3NhZ2VzKSB7Ci0gICAgICAgIGlmIChlcnJvcnMp Ci0gICAgICAgICAgICBlcnJvcnMucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChlcnJvcnMpOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKCFlcnJvcnMpIHsKLSAgICAgICAgZXJyb3Jz ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnSDInKTsKLSAgICAgICAgZXJyb3JzLnN0eWxlLmNv bG9yID0gJ3JlZCc7Ci0gICAgICAgIGVycm9ycy5pZCA9ICdlcnJvcnMnOwotICAgICAgICBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKGVycm9ycyk7Ci0gICAgfQotCi0gICAgZXJyb3JzLmlubmVy SFRNTCA9IGdfZXJyb3JNZXNzYWdlczsKLX0KLQotZnVuY3Rpb24gcmVzb3VyY2VMb2FkaW5nQ29t cGxldGUoZXJyb3JNc2dzKQotewotICAgIGlmIChlcnJvck1zZ3MpCi0gICAgICAgIGFkZEVycm9y KGVycm9yTXNncykKLQogICAgIGhhbmRsZUxvY2F0aW9uQ2hhbmdlKCk7CiB9CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxha2luZXNzX2Rh c2hib2FyZC5qcyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvZmxh a2luZXNzX2Rhc2hib2FyZC5qcwppbmRleCBkMjhhYjc5OGIzMmVkMTE2ODNlZjU2OWVjYmNiNDhl YmFlYTAzNGVmLi40Y2U2MzNlMWE2MWNkOWZiY2NkYTQ0NjhhN2Q3MDI1ZWU2NDRkODAxIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2ZsYWtpbmVz c19kYXNoYm9hcmQuanMKKysrIGIvVG9vbHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJv YXJkcy9mbGFraW5lc3NfZGFzaGJvYXJkLmpzCkBAIC0xNDMsNyArMTQzLDcgQEAgZnVuY3Rpb24g Z2VuZXJhdGVQYWdlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZG9jdW1lbnQuYm9keS5pbm5l ckhUTUwgPSAnPGRpdiBpZD0ibG9hZGluZy11aSI+TE9BRElORy4uLjwvZGl2Pic7Ci0gICAgc2hv d0Vycm9ycygpOworICAgIGdfcmVzb3VyY2VMb2FkZXIuc2hvd0Vycm9ycygpOwogCiAgICAgLy8g dGVzdHMgZXhwYW5kcyB0byBhbGwgdGVzdHMgdGhhdCBtYXRjaCB0aGUgQ1NWIGxpc3QuCiAgICAg Ly8gcmVzdWx0IGV4cGFuZHMgdG8gYWxsIHRlc3RzIHRoYXQgZXZlciBoYXZlIHRoZSBnaXZlbiBy ZXN1bHQKQEAgLTExNTMsNyArMTE1Myw3IEBAIGZ1bmN0aW9uIGxpbmtIVE1MVG9PcGVuV2luZG93 KHVybCwgdGV4dCkKICAgICByZXR1cm4gJzxhIGhyZWY9IicgKyB1cmwgKyAnIiB0YXJnZXQ9Il9i bGFuayI+JyArIHRleHQgKyAnPC9hPic7CiB9CiAKLS8vIEZJWE1FOiByZXBsYWNlZCB3aXRoIHVp LmNocm9taXVtUmV2aXNpb25MaW5rL3VpLndlYktpdFJldmlzaW9uTGluaworLy8gRklYTUU6IHJl cGxhY2VkIHdpdGggdWkuaHRtbC5jaHJvbWl1bVJldmlzaW9uTGluay91aS5odG1sLndlYktpdFJl dmlzaW9uTGluawogZnVuY3Rpb24gY3JlYXRlQmxhbWVMaXN0SFRNTChyZXZpc2lvbnMsIGluZGV4 LCB1cmxCYXNlLCBzZXBhcmF0b3IsIHJlcG8pCiB7CiAgICAgdmFyIHRoaXNSZXZpc2lvbiA9IHJl dmlzaW9uc1tpbmRleF07CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRp Yy1kYXNoYm9hcmRzL2xvYWRlci5qcyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRh c2hib2FyZHMvbG9hZGVyLmpzCmluZGV4IDJiZTk2NzQyYjc0YTBmYzkyMzczNGEwMDQyMzBiNzA2 NWY3M2I5ZGEuLjFiYjdhODY5ZjU0Mzk5MDdmNThiNGE4YTBjNDljYTNjNmEzOTk0ODcgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVyLmpz CisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVyLmpz CkBAIC02OCw2ICs2OCw4IEBAIGxvYWRlci5Mb2FkZXIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f YnVpbGRlcnNUaGF0RmFpbGVkVG9Mb2FkID0gW107CiAgICAgdGhpcy5fc3RhbGVCdWlsZGVycyA9 IFtdOwogICAgIHRoaXMuX2xvYWRpbmdDb21wbGV0ZSA9IGZhbHNlOworICAgIHRoaXMuX2Vycm9y cyA9IG5ldyB1aS5FcnJvcnMoKTsKKwogfQogCiBsb2FkZXIuTG9hZGVyLnByb3RvdHlwZSA9IHsK QEAgLTc5LDE1ICs4MSwyMCBAQCBsb2FkZXIuTG9hZGVyLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIHJldHVybiB0aGlzLl9sb2FkaW5nQ29tcGxldGU7CiAgICAgfSwKKyAgICBzaG93RXJy b3JzOiBmdW5jdGlvbigpIAorICAgIHsKKyAgICAgICAgdGhpcy5fZXJyb3JzLnNob3coKTsKKyAg ICB9LAogICAgIF9sb2FkTmV4dDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIGxvYWRp bmdTdGVwID0gdGhpcy5fbG9hZGluZ1N0ZXBzLnNoaWZ0KCk7CiAgICAgICAgIGlmICghbG9hZGlu Z1N0ZXApIHsKICAgICAgICAgICAgIHRoaXMuX2xvYWRpbmdDb21wbGV0ZSA9IHRydWU7CisgICAg ICAgICAgICB0aGlzLl9hZGRFcnJvcnMoKTsKICAgICAgICAgICAgIC8vIEZJWE1FKGpwYXJlbnQp OiBMb2FkZXIgc2hvdWxkIG5vdCBrbm93IGFib3V0IGdsb2JhbAogICAgICAgICAgICAgLy8gZnVu Y3Rpb25zLCBzaG91bGQgdXNlIGEgY2FsbGJhY2sgb3IgZGlzcGF0Y2ggbG9hZAogICAgICAgICAg ICAgLy8gZXZlbnQgaW5zdGVhZC4KLSAgICAgICAgICAgIHJlc291cmNlTG9hZGluZ0NvbXBsZXRl KHRoaXMuX2dldExvYWRpbmdFcnJvck1lc3NhZ2VzKCkpOworICAgICAgICAgICAgcmVzb3VyY2VM b2FkaW5nQ29tcGxldGUoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAg ICBsb2FkaW5nU3RlcC5hcHBseSh0aGlzKTsKQEAgLTIyOSwxNiArMjM2LDEzIEBAIGxvYWRlci5M b2FkZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJv cignQ291bGQgbm90IGxvYWQgZXhwZWN0YXRpb25zIGZpbGUgZm9yICcgKyBwbGF0Zm9ybU5hbWUp OwogICAgICAgICAgICAgICAgICAgICB9LCBwbGF0Zm9ybVdpdGhFeHBlY3RhdGlvbnMpKTsKICAg ICB9LAotICAgIF9nZXRMb2FkaW5nRXJyb3JNZXNzYWdlczogZnVuY3Rpb24oKQorICAgIF9hZGRF cnJvcnM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciBlcnJvck1zZ3MgPSAnJzsKICAg ICAgICAgaWYgKHRoaXMuX2J1aWxkZXJzVGhhdEZhaWxlZFRvTG9hZC5sZW5ndGgpCi0gICAgICAg ICAgICBlcnJvck1zZ3MgKz0gJ0VSUk9SOiBGYWlsZWQgdG8gZ2V0IGRhdGEgZnJvbSAnICsgdGhp cy5fYnVpbGRlcnNUaGF0RmFpbGVkVG9Mb2FkLnRvU3RyaW5nKCkgKyAnLjxicj4nOworICAgICAg ICAgICAgdGhpcy5fZXJyb3JzLmFkZEVycm9yKCdFUlJPUjogRmFpbGVkIHRvIGdldCBkYXRhIGZy b20gJyArIHRoaXMuX2J1aWxkZXJzVGhhdEZhaWxlZFRvTG9hZC50b1N0cmluZygpICsnLicpOwog CiAgICAgICAgIGlmICh0aGlzLl9zdGFsZUJ1aWxkZXJzLmxlbmd0aCkKLSAgICAgICAgICAgIGVy cm9yTXNncyArPSdFUlJPUjogRGF0YSBmcm9tICcgKyB0aGlzLl9zdGFsZUJ1aWxkZXJzLnRvU3Ry aW5nKCkgKyAnIGlzIG1vcmUgdGhhbiAxIGRheSBzdGFsZS48YnI+JzsKLQotICAgICAgICByZXR1 cm4gZXJyb3JNc2dzOworICAgICAgICAgICAgdGhpcy5fZXJyb3JzLmFkZEVycm9yKCdFUlJPUjog RGF0YSBmcm9tICcgKyB0aGlzLl9zdGFsZUJ1aWxkZXJzLnRvU3RyaW5nKCkgKyAnIGlzIG1vcmUg dGhhbiAxIGRheSBzdGFsZS4nKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RS ZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVyX3VuaXR0ZXN0cy5qcyBiL1Rvb2xz L1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvbG9hZGVyX3VuaXR0ZXN0cy5qcwpp bmRleCBjMTkzODQ1NDM1YTgwYWUxNDY1YjMwMjk4NGE0ODJhY2I5ZjRjNTQ4Li4zZGI0YTQyNjNj M2ZlMjYwNjJhY2MzMWQwNDk5Y2I4NTZmMjFkYTliIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UmVz dWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL2xvYWRlcl91bml0dGVzdHMuanMKKysrIGIvVG9v bHMvVGVzdFJlc3VsdFNlcnZlci9zdGF0aWMtZGFzaGJvYXJkcy9sb2FkZXJfdW5pdHRlc3RzLmpz CkBAIC0xNTIsNyArMTUyLDggQEAgdGVzdCgnYWRkQnVpbGRlckxvYWRFcnJvcnMnLCAxLCBmdW5j dGlvbigpIHsKICAgICB2YXIgcmVzb3VyY2VMb2FkZXIgPSBuZXcgbG9hZGVyLkxvYWRlcigpOwog ICAgIHJlc291cmNlTG9hZGVyLl9idWlsZGVyc1RoYXRGYWlsZWRUb0xvYWQgPSBbJ2J1aWxkZXIx JywgJ2J1aWxkZXIyJ107CiAgICAgcmVzb3VyY2VMb2FkZXIuX3N0YWxlQnVpbGRlcnMgPSBbJ3N0 YWxlQnVpbGRlcjEnXTsKLSAgICBlcXVhbChyZXNvdXJjZUxvYWRlci5fZ2V0TG9hZGluZ0Vycm9y TWVzc2FnZXMoKSwgJ0VSUk9SOiBGYWlsZWQgdG8gZ2V0IGRhdGEgZnJvbSBidWlsZGVyMSxidWls ZGVyMi48YnI+RVJST1I6IERhdGEgZnJvbSBzdGFsZUJ1aWxkZXIxIGlzIG1vcmUgdGhhbiAxIGRh eSBzdGFsZS48YnI+Jyk7CisgICAgcmVzb3VyY2VMb2FkZXIuX2FkZEVycm9ycygpOworICAgIGVx dWFsKHJlc291cmNlTG9hZGVyLl9lcnJvcnMuX21lc3NhZ2VzLCAnRVJST1I6IEZhaWxlZCB0byBn ZXQgZGF0YSBmcm9tIGJ1aWxkZXIxLGJ1aWxkZXIyLjxicj5FUlJPUjogRGF0YSBmcm9tIHN0YWxl QnVpbGRlcjEgaXMgbW9yZSB0aGFuIDEgZGF5IHN0YWxlLjxicj4nKTsKIH0pOwogCiB0ZXN0KCdM b2FkZWQgc3RhdGUgc2V0JywgMiwgZnVuY3Rpb24oKSB7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRzL3VpLmpzIGIvVG9vbHMvVGVzdFJlc3VsdFNl cnZlci9zdGF0aWMtZGFzaGJvYXJkcy91aS5qcwppbmRleCBjYjRlYmE5MTlhZWMzMmI4NmE1YWJk MjFkZWM3OGRmZWI4NDZjZjRkLi4wMjk2MDcyM2ZmMTViYTIwNjkyNWRmYjJiZTczNjE3MWRkMjI5 MTY2IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0UmVzdWx0U2VydmVyL3N0YXRpYy1kYXNoYm9hcmRz L3VpLmpzCisrKyBiL1Rvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvc3RhdGljLWRhc2hib2FyZHMvdWku anMKQEAgLTE5Niw0ICsxOTYsMzAgQEAgdWkuaHRtbC53ZWJLaXRSZXZpc2lvbkxpbmsgPSBmdW5j dGlvbihyZXN1bHRzLCBpbmRleCkKICAgICAgICAgJ2h0dHA6Ly90cmFjLndlYmtpdC5vcmcvbG9n L3RydW5rLz9yZXY9PHJldjE+JnN0b3BfcmV2PTxyZXYyPiZsaW1pdD0xMDAmdmVyYm9zZT1vbicp OwogfQogCisKK3VpLkVycm9ycyA9IGZ1bmN0aW9uKCkgeworICAgIHRoaXMuX21lc3NhZ2VzID0g Jyc7CisgICAgLy8gRWxlbWVudCB0byBkaXNwbGF5IHRoZSBlcnJvcnMgd2l0aGluLgorICAgIHRo aXMuX2NvbnRhaW5lckVsZW1lbnQgPSBudWxsOworfQorCit1aS5FcnJvcnMucHJvdG90eXBlID0g eworICAgIHNob3c6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fY29udGFp bmVyRWxlbWVudCkgeworICAgICAgICAgICAgdGhpcy5fY29udGFpbmVyRWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoJ0gyJyk7CisgICAgICAgICAgICB0aGlzLl9jb250YWluZXJFbGVt ZW50LnN0eWxlLmNvbG9yID0gJ3JlZCc7CisgICAgICAgICAgICB0aGlzLl9jb250YWluZXJFbGVt ZW50LmlkID0gJ2Vycm9ycyc7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxk KHRoaXMuX2NvbnRhaW5lckVsZW1lbnQpOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fY29u dGFpbmVyRWxlbWVudC5pbm5lckhUTUwgPSB0aGlzLl9tZXNzYWdlczsKKyAgICB9LAorICAgIC8v IFJlY29yZCBhIG5ldyBlcnJvciBtZXNzYWdlLgorICAgIGFkZEVycm9yOiBmdW5jdGlvbihtZXNz YWdlKQorICAgIHsKKyAgICAgICAgdGhpcy5fbWVzc2FnZXMgKz0gbWVzc2FnZSArICc8YnI+JzsK KyAgICB9Cit9CisKIH0pKCk7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=