169171 2017-03-04 10:24:41 -0800 Perf and layout test results should report using correct scm revision 2017-03-07 19:46:30 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Minor --- 1 kocsen_chung webkit-unassigned ap cdumez commit-queue glenn kocsen_chung lforschler mcatanzaro rniwa youennf oldest_to_newest 1283445 0 kocsen_chung 2017-03-04 10:24:41 -0800 Perf test and layout test results should report using the correct scm native revision as an identifier; for more accurate record keeping. 1283446 1 303399 kocsen_chung 2017-03-04 10:26:15 -0800 Created attachment 303399 Patch 1284018 2 303399 rniwa 2017-03-06 15:37:41 -0800 Comment on attachment 303399 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303399&action=review > Tools/Scripts/webkitpy/common/checkout/scm/git.py:279 > + # If `revision` is composed of 0-6 digits, assume SVN revision. Else, assume git hash > + svn_revision_regex = re.compile('^[1-9]\d{0,5}$') This is a rather dangerous assumption. A git hash especially not the full length one could entirely consist of digits. > Tools/Scripts/webkitpy/common/checkout/scm/git.py:-289 > def timestamp_of_revision(self, path, revision): > - git_log = self._most_recent_log_matching('git-svn-id:.*@%s' % revision, path) I think it's better to add a new version of this function which gets the timestamp for the "native" revision. > Tools/Scripts/webkitpy/common/checkout/scm/scm.py:72 > + cwd=cwd, Nit: This is wrong indentation. Per WebKit's style guideline, these text should be exactly 4 spaces on the right of the beginning of "return self._executive..." 1284373 3 303669 kocsen_chung 2017-03-07 09:52:19 -0800 Created attachment 303669 Patch 1284374 4 kocsen_chung 2017-03-07 09:53:34 -0800 Take 2: incorporating Ryosuke's comments. 1284711 5 303669 commit-queue 2017-03-07 19:46:23 -0800 Comment on attachment 303669 Patch Clearing flags on attachment: 303669 Committed r213562: <http://trac.webkit.org/changeset/213562> 1284712 6 commit-queue 2017-03-07 19:46:30 -0800 All reviewed patches have been landed. Closing bug. 303399 2017-03-04 10:26:15 -0800 2017-03-07 09:52:13 -0800 Patch bug-169171-20170304102614.patch text/plain 13687 kocsen_chung U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMzE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzcyM2M0NDA3ZjdlZjBkYmU2ODBiMmUxMDdhZjZiZmNj ZDk0MmY2NC4uNTRkNDQzMmVjZWM3MDEyNmVhNjBjODBlZTU0MGQzNjNmNWVlMmFiMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc0 IEBACisyMDE3LTAzLTAzICBLb2NzZW4gQ2h1bmcgIDxrb2NzZW5fY2h1bmdAYXBwbGUuY29tPgor CisgICAgICAgIFBlcmYgYW5kIGxheW91dCB0ZXN0IHJlc3VsdHMgc2hvdWxkIHJlcG9ydCB1c2lu ZyBjb3JyZWN0IHNjbSByZXZpc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2OTE3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFBlcmYgdGVzdCBhbmQgbGF5b3V0IHRlc3QgcmVzdWx0cyBzaG91bGQg cmVwb3J0IHVzaW5nIHRoZSBjb3JyZWN0IHNjbSBuYXRpdmUKKyAgICAgICAgcmV2aXNpb24gYXMg YW4gaWRlbnRpZmllciBmb3IgYWNjdXJhdGUgcmVjb3JkIGtlZXBpbmcuCisgICAgICAgIFRvIGRv IHNvIHdlIGludHJvZHVjZSBhIG5ldyBzY20gZnVuY3Rpb246IGBuYXRpdmVfcmV2aXNpb24oKWAu CisgICAgICAgIFRoaXMgbmV3IGZ1bmN0aW9uIGlzIHJlc3BvbnNpYmxlIGZvciByZXR1cm5pbmcg YSBnaXQgaGFzaCBpZiBzY20uZ2l0IG9yIGFuCisgICAgICAgIHN2biByZXZpc2lvbiBpZiBzY20u c3ZuLiBXZSBhbHNvIGFkZCB0aGUgY29ycmVzcG9uZGluZyB0ZXN0cyBhbmQgYSBjb3VwbGUKKyAg ICAgICAgaGVscGVyIGZ1bmN0aW9ucyB0byBoZWxwIGRpc3Rpbmd1aXNoIGJldHdlZW4gc3ZuIHJl dmlzaW9ucyBhbmQgZ2l0IGhhc2hlcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAgIChTQ00ucnVuKToKKyAgICAgICAgRHJp dmUtYnkgaW5kZW50YXRpb24gZml4IHRvIGFkaGVyZSB0byBQRVA4LgorICAgICAgICAoU0NNLnN2 bl9yZXZpc2lvbik6CisgICAgICAgIFJlbW92ZSBzdXBlcmZsdW91cyBjb21tZW50LgorICAgICAg ICAoU0NNLm5hdGl2ZV9yZXZpc2lvbik6CisgICAgICAgIEFkZCBuZXcgYWJzdHJhY3QgZnVuY3Rp b24gYG5hdGl2ZV9yZXZpc2lvbmAgYW5kIG1ha2UgaXQgYSBgX3N1YmNsYXNzX211c3RfaW1wbGVt ZW50KClgCisgICAgICAgIGFzIHdlIHdhbnQgdG8gY2xvc2VseSBtaW1pYyBzdm5fcmV2aXNpb24o KSBmdW5jdGlvbiBkdWUgdG8gdGhlaXIgc2ltaWxhciBiZWhhdmlvci4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6CisgICAgICAgIChHaXQu X21vc3RfcmVjZW50X2xvZ19mb3JfcmV2aXNpb24pOgorICAgICAgICBOZXcgaGVscGVyIGZ1bmN0 aW9uIHNpbWlsYXIgdG8gYF9tb3N0X3JlY2VudF9sb2dfbWF0Y2hpbmdgIHRoYXQgaXMgZ2l0IGhh c2ggZnJpZW5kbHkuCisgICAgICAgIFVzZWQgYnkgYHRpbWVzdGFtcF9vZl9yZXZpc2lvbigpYCBp biB0aGlzIHBhdGNoLgorICAgICAgICAoR2l0Ll9pc19zdm5fcmV2aXNpb24pOgorICAgICAgICBT aW5jZSB3ZSBub3cgY2FuIHVzZSBuYXRpdmUgcmV2aXNpb25zLCBhZGQgaGVscGVyIGZ1bmN0aW9u IHRvIGRldGVybWluZSBpZiBpdCdzIGFuIFNWTiByZXZpc2lvbgorICAgICAgICBvciBhIGdpdCBo YXNoLiBUaGUgaGV1cmlzdGljIGFzc3VtZXMgYW55IDEtNiBkaWdpdCBudW1iZXIgaXMgYW4gU1ZO IHJldmlzaW9uLgorICAgICAgICAoR2l0Lm5hdGl2ZV9yZXZpc2lvbik6CisgICAgICAgIEltcGxl bWVudCBuZXcgZnVuY3Rpb24gYG5hdGl2ZV9yZXZpc2lvbigpYC4KKyAgICAgICAgR2V0IHRoZSBu YXRpdmVfcmV2aXNpb24gYnkgcnVubmluZzoKKworICAgICAgICAgICAgYGdpdCBsb2cgLTEgLS1w cmV0dHk9Zm9ybWF0OiVIYAorCisgICAgICAgIGFuZCB0aHVzIHJldHVybmluZyB0aGUgbGF0ZXN0 IGdpdCBoYXNoLgorICAgICAgICAoR2l0LnRpbWVzdGFtcF9vZl9yZXZpc2lvbik6CisgICAgICAg IFNpbmNlIHBlcmZ0ZXN0cnVubmVyIGFuZCBsYXlvdXRfdGVzdC5jb250cm9sbGVycy5tYW5hZ2Vy IHVzZSB0aGUgbmV3IG5hdGl2ZV9yZXZpc2lvbgorICAgICAgICBmdW5jdGlvbiwgcmV0cmlldmUg dGhlIGxvZyBhcHByb3ByaWF0ZWx5IGRlcGVuZGluZyBvbiBzdm4gcmV2aXNpb24gb3IgZ2l0IGhh c2guCisgICAgICAgIFRoaXMgaW50cm9kdWNlcyBhIGNhdXRpb25hcnkgYmVoYXZpb3IgdGhhdCBz aG91bGQgYmUgYWRkcmVzc2VkIGJ5OgorICAgICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2OTE0MworCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5uYXRpdmVfcmV2aXNpb24p OgorICAgICAgICBJbXBsZW1lbnQgbmF0aXZlX3JldmlzaW9uIGZvciBTVk46IHNpbXBseSByZXR1 cm4gc2VsZi5zdm5fcmV2aXNpb24oKQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfbmF0aXZlX3Jl dmlzaW9uKToKKyAgICAgICAgW1NWTl0gQ29uZmlybSB0aGF0IHN2bl9yZXZpc2lvbiA9PSBuYXRp dmVfcmV2aXNpb24uIEFuZCB0aGF0IG5hdGl2ZV9yZXZpc2lvbiByZXR1cm5zIDUuCisgICAgICAg IFVzZSAnLicgYXMgdGhlIHBhdGggcGFyYW1ldGVyIGluc3RlYWQgb2Ygc3ZuX2NoZWNrb3V0X3Bh dGggdG8gYXZvaWQgdmlvbGF0aW5nIHB5bGludC9FMTEwMQorICAgICAgICBhbmQgc2luY2Ugd2Ug YXJlIGd1YXJhbnRlZWQgYnkgdGVzdCBzZXRVcCB0byBiZSBpbiB0aGUgY29ycmVjdCBTVk4gZGly LgorICAgICAgICAoR2l0VGVzdC50ZXN0X25hdGl2ZV9yZXZpc2lvbik6CisgICAgICAgIFtHaXRd IENvbmZpcm0gdGhhdCBgZ2l0IHJldi1wYXJzZSBIRUFEYCBpcyBlcXVhbCB0byBuZXdseSBpbXBs ZW1lbnRlZCBuYXRpdmVfcmV2aXNpb24oKS4KKyAgICAgICAgKEdpdFNWTlRlc3QudGVzdF9uYXRp dmVfcmV2aXNpb24pOgorICAgICAgICBbR2l0XSBDb25maXJtIHRoYXQgYGdpdCByZXYtcGFyc2Ug SEVBRGAgaXMgZXF1YWwgdG8gbmV3bHkgaW1wbGVtZW50ZWQgbmF0aXZlX3JldmlzaW9uKCkuCisg ICAgICAgICh0ZXN0X3RpbWVzdGFtcF9vZl9yZXZpc2lvbik6CisgICAgICAgIEFkZCBhbiBleHRy YSB0ZXN0IGNhc2UgYXMgdGVzdF90aW1lc3RhbXBfb2ZfcmV2aXNpb24gc2hvdWxkIGhhbmRsZSBn aXQgaGFzaGVzIGFzIHdlbGwuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX21vY2sucHk6CisgICAgICAgIChNb2NrU0NNLm5hdGl2ZV9yZXZpc2lv bik6CisgICAgICAgIEFkZCBNb2NrU0NNLm5hdGl2ZV9yZXZpc2lvbiB0byBiZWhhdmUgbGlrZSBz dm4ucHkgKGRlZmF1bHQpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIudXBsb2FkX3Jlc3Vs dHMpOgorICAgICAgICBXaGVuIGl0ZXJhdGluZyB0aHJvdWdoIGEgbGlzdCBvZiBwcm9qZWN0cywg bWFrZSBzdXJlIHdlIHVzZSB0aGUgcHJvamVjdCdzIG5ldyBuYXRpdmUgcmV2aXNpb24uCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIu cHk6CisgICAgICAgIChfZ2VuZXJhdGVfcmVzdWx0c19kaWN0KToKKyAgICAgICAgQXMgcGVyIHRo ZSBGSVhNRSBpbiBtYW5hZ2VyLnB5LCB3ZSBoYXZlIGR1cGxpY2F0ZSBjb2RlIGluIHBlcmZ0ZXN0 c3J1bm5lci5weS4KKyAgICAgICAgU28gbWFrZSB0aGUgc2FtZSBleGFjdCBjaGFuZ2UgaGVyZS4K KwogMjAxNy0wMi0yOCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAg TWVkaWE6IHNlbmQgImRpZCBpbnRlcmZlcmUgd2l0aCBwbGF5YmFjayIgZXZlbnRzIHdoZW4gdGhl IHVzZXIgcGF1c2VzIGFuIGF1dG9wbGF5aW5nIGVsZW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CmluZGV4IDRmYzEyZmRhYjhkZWNj NmQ0N2NkNmYzMWVmY2ZjZGUzODQwYjAzZGMuLjQwOTY4YzVjZmIzMmUyYTg5M2IyNjE5OThjNjg3 MGExMDdhZmFlNTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL2dpdC5weQpAQCAtMjcwLDYgKzI3MCwxNSBAQCBjbGFzcyBHaXQoU0NNLCBTVk5S ZXBvc2l0b3J5KToKICAgICAgICAgIyBnaXQgMS43LjAuNCAoYW5kIGVhcmxpZXIpIGRpZG4ndCBz dXBwb3J0IHRoZSBzZXBhcmF0ZSBhcmcuCiAgICAgICAgIHJldHVybiBzZWxmLl9ydW5fZ2l0KFsn bG9nJywgJy0xJywgJy0tZ3JlcD0nICsgZ3JlcF9zdHIsICctLWRhdGU9aXNvJywgc2VsZi5maW5k X2NoZWNrb3V0X3Jvb3QocGF0aCldKQogCisgICAgZGVmIF9tb3N0X3JlY2VudF9sb2dfZm9yX3Jl dmlzaW9uKHNlbGYsIHJldmlzaW9uLCBwYXRoKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9n aXQoWydsb2cnLCAnLTEnLCByZXZpc2lvbiwgJy0tZGF0ZT1pc28nLCBzZWxmLmZpbmRfY2hlY2tv dXRfcm9vdChwYXRoKV0pCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9pc19zdm5fcmV2 aXNpb24ocmV2aXNpb24pOgorICAgICAgICAjIElmIGByZXZpc2lvbmAgaXMgY29tcG9zZWQgb2Yg MC02IGRpZ2l0cywgYXNzdW1lIFNWTiByZXZpc2lvbi4gRWxzZSwgYXNzdW1lIGdpdCBoYXNoCisg ICAgICAgIHN2bl9yZXZpc2lvbl9yZWdleCA9IHJlLmNvbXBpbGUoJ15bMS05XVxkezAsNX0kJykK KyAgICAgICAgcmV0dXJuIHN2bl9yZXZpc2lvbl9yZWdleC5tYXRjaChyZXZpc2lvbikKKwogICAg IGRlZiBzdm5fcmV2aXNpb24oc2VsZiwgcGF0aCk6CiAgICAgICAgIGdpdF9sb2cgPSBzZWxmLl9t b3N0X3JlY2VudF9sb2dfbWF0Y2hpbmcoJ2dpdC1zdm4taWQ6JywgcGF0aCkKICAgICAgICAgbWF0 Y2ggPSByZS5zZWFyY2goIl5ccypnaXQtc3ZuLWlkOi4qQCg/UDxzdm5fcmV2aXNpb24+XGQrKVwg IiwgZ2l0X2xvZywgcmUuTVVMVElMSU5FKQpAQCAtMjc3LDYgKzI4Niw5IEBAIGNsYXNzIEdpdChT Q00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICAgICAgcmV0dXJuICIiCiAgICAgICAgIHJldHVy biBzdHIobWF0Y2guZ3JvdXAoJ3N2bl9yZXZpc2lvbicpKQogCisgICAgZGVmIG5hdGl2ZV9yZXZp c2lvbihzZWxmLCBwYXRoKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9naXQoWydsb2cnLCAn LTEnLCAnLS1wcmV0dHk9Zm9ybWF0OiVIJywgc2VsZi5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aCld KQorCiAgICAgZGVmIHN2bl91cmwoc2VsZik6CiAgICAgICAgIGdpdF9jb21tYW5kID0gWydzdm4n LCAnaW5mbyddCiAgICAgICAgIHN0YXR1cyA9IHNlbGYuX3J1bl9naXQoZ2l0X2NvbW1hbmQpCkBA IC0yODYsNyArMjk4LDExIEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAg ICByZXR1cm4gbWF0Y2guZ3JvdXAoJ3VybCcpCiAKICAgICBkZWYgdGltZXN0YW1wX29mX3Jldmlz aW9uKHNlbGYsIHBhdGgsIHJldmlzaW9uKToKLSAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX21vc3Rf cmVjZW50X2xvZ19tYXRjaGluZygnZ2l0LXN2bi1pZDouKkAlcycgJSByZXZpc2lvbiwgcGF0aCkK KyAgICAgICAgaWYgc2VsZi5faXNfc3ZuX3JldmlzaW9uKHJldmlzaW9uKToKKyAgICAgICAgICAg IGdpdF9sb2cgPSBzZWxmLl9tb3N0X3JlY2VudF9sb2dfbWF0Y2hpbmcocmV2aXNpb24sIHBhdGgp CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBnaXRfbG9nID0gc2VsZi5fbW9zdF9yZWNlbnRf bG9nX2Zvcl9yZXZpc2lvbihyZXZpc2lvbiwgcGF0aCkKKwogICAgICAgICBtYXRjaCA9IHJlLnNl YXJjaCgiXkRhdGU6XHMqKFxkezR9KS0oXGR7Mn0pLShcZHsyfSkgKFxkezJ9KTooXGR7Mn0pOihc ZHsyfSkgKFsrLV0pKFxkezJ9KShcZHsyfSkkIiwgZ2l0X2xvZywgcmUuTVVMVElMSU5FKQogICAg ICAgICBpZiBub3QgbWF0Y2g6CiAgICAgICAgICAgICByZXR1cm4gIiIKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CmluZGV4IDRlM2NmMTRl NmQ5ZGQ5MjY3NzZhNGU4NzA1ZDgzNjAyZDQ3NjllMjIuLjUwYWNlMDYzYzQzMTM5YTE1OWUyMTBl NWI5N2VhNDE1Y2Y1ZTliMjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3NjbS5weQpAQCAtNjksMTIgKzY5LDEyIEBAIGNsYXNzIFNDTToKICAg ICBkZWYgcnVuKHNlbGYsIGFyZ3MsIGN3ZD1Ob25lLCBpbnB1dD1Ob25lLCBlcnJvcl9oYW5kbGVy PU5vbmUsIHJldHVybl9leGl0X2NvZGU9RmFsc2UsIHJldHVybl9zdGRlcnI9VHJ1ZSwgZGVjb2Rl X291dHB1dD1UcnVlKToKICAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIHNldCBjd2QgYXBwcm9w cmlhdGVseS4KICAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChhcmdz LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWN3ZCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlucHV0PWlucHV0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3Jf aGFuZGxlcj1lcnJvcl9oYW5kbGVyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu X2V4aXRfY29kZT1yZXR1cm5fZXhpdF9jb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuX3N0ZGVycj1yZXR1cm5fc3RkZXJyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGVjb2RlX291dHB1dD1kZWNvZGVfb3V0cHV0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGN3ZD1jd2QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW5wdXQ9aW5wdXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZXJyb3JfaGFuZGxlcj1lcnJvcl9oYW5kbGVyLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybl9leGl0X2NvZGU9cmV0dXJuX2V4aXRf Y29kZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm5f c3RkZXJyPXJldHVybl9zdGRlcnIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZGVjb2RlX291dHB1dD1kZWNvZGVfb3V0cHV0KQogCiAgICAgIyBTQ00gYWx3YXlz IHJldHVybnMgcmVwb3NpdG9yeSByZWxhdGl2ZSBwYXRoLCBidXQgc29tZXRpbWVzIHdlIG5lZWQK ICAgICAjIGFic29sdXRlIHBhdGhzIHRvIHBhc3MgdG8gcm0sIGV0Yy4KQEAgLTE1OCw3ICsxNTgs OSBAQCBjbGFzcyBTQ006CiAgICAgICAgIHJldHVybiBzZWxmLnN2bl9yZXZpc2lvbihzZWxmLmNo ZWNrb3V0X3Jvb3QpCiAKICAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgotICAgICAg ICAiIiJSZXR1cm5zIHRoZSBsYXRlc3Qgc3ZuIHJldmlzaW9uIGZvdW5kIGluIHRoZSBjaGVja291 dC4iIiIKKyAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQorCisgICAgZGVm IG5hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVz dF9pbXBsZW1lbnQoKQogCiAgICAgZGVmIHRpbWVzdGFtcF9vZl9yZXZpc2lvbihzZWxmLCBwYXRo LCByZXZpc2lvbik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX21vY2sucHkKaW5kZXggOTc3NGVjOGFlODczYTFiMGI4Mzc2MDcxODA2 Njc5MjE1ODA5ZWVlYy4uN2ZkZjU1MTA4MTJjNmI4MjdkODE5OTlkMTliMDRmNDM4YzA5NmJhZSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bV9tb2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zY21fbW9jay5weQpAQCAtODQsNiArODQsOSBAQCBjbGFzcyBNb2NrU0NNKG9iamVjdCk6CiAg ICAgZGVmIHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuICc1Njc4Jwog CisgICAgZGVmIG5hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoKToKKyAgICAgICAgcmV0dXJuIHNl bGYuc3ZuX3JldmlzaW9uKHBhdGgpCisKICAgICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNl bGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAgICAgcmV0dXJuICcyMDEzLTAyLTAxIDA4OjQ4OjA1 ICswMDAwJwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc2NtX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQppbmRleCBlYzRkMWU4ZmRhYTczMTQ2OGZkN2Qx ODUzYTQzZDQwMDVhMWYzYzg1Li40M2Q3YTgyMzY4NjNjNjY5MmE2NmQ3NGIwNGViNGYyMjBhMjRl ZTQ4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKQEAgLTkwMiw2ICs5MDIsMTAgQEAgRU5ECiAgICAg ZGVmIHRlc3RfaGVhZF9zdm5fcmV2aXNpb24oc2VsZik6CiAgICAgICAgIHNlbGYuX3NoYXJlZF90 ZXN0X2hlYWRfc3ZuX3JldmlzaW9uKCkKIAorICAgIGRlZiB0ZXN0X25hdGl2ZV9yZXZpc2lvbihz ZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnNjbS5oZWFkX3N2bl9yZXZpc2lv bigpLCBzZWxmLnNjbS5uYXRpdmVfcmV2aXNpb24oJy4nKSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChzZWxmLnNjbS5uYXRpdmVfcmV2aXNpb24oJy4nKSwgJzUnKQorCiAgICAgZGVmIHRlc3Rf cHJvcHNldF9wcm9wZ2V0KHNlbGYpOgogICAgICAgICBmaWxlcGF0aCA9IG9zLnBhdGguam9pbihz ZWxmLnN2bl9jaGVja291dF9wYXRoLCAidGVzdF9maWxlIikKICAgICAgICAgZXhwZWN0ZWRfbWlt ZV90eXBlID0gIngtYXBwbGljYXRpb24vZm9vLWJhciIKQEAgLTEwODAsNiArMTA4NCwxMSBAQCBj bGFzcyBHaXRUZXN0KFNDTVRlc3QpOgogICAgICAgICAjIHNlbGYuX3NoYXJlZF90ZXN0X2hlYWRf c3ZuX3JldmlzaW9uKCkuCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NtLmhlYWRfc3ZuX3Jl dmlzaW9uKCksICcnKQogCisgICAgZGVmIHRlc3RfbmF0aXZlX3JldmlzaW9uKHNlbGYpOgorICAg ICAgICBzY20gPSBzZWxmLnRyYWNraW5nX3NjbQorICAgICAgICBjb21tYW5kID0gWydnaXQnLCAn LUMnLCBzY20uY2hlY2tvdXRfcm9vdCwgJ3Jldi1wYXJzZScsICdIRUFEJ10KKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzY20ubmF0aXZlX3JldmlzaW9uKHNjbS5jaGVja291dF9yb290KSwgcnVu X2NvbW1hbmQoY29tbWFuZCkuc3RyaXAoKSkKKwogICAgIGRlZiB0ZXN0X3JlbmFtZV9maWxlcyhz ZWxmKToKICAgICAgICAgc2NtID0gc2VsZi50cmFja2luZ19zY20KIApAQCAtMTU5MSw2ICsxNjAw LDEwIEBAIGNsYXNzIEdpdFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgZGVmIHRlc3RfaGVhZF9zdm5f cmV2aXNpb24oc2VsZik6CiAgICAgICAgIHNlbGYuX3NoYXJlZF90ZXN0X2hlYWRfc3ZuX3Jldmlz aW9uKCkKIAorICAgIGRlZiB0ZXN0X25hdGl2ZV9yZXZpc2lvbihzZWxmKToKKyAgICAgICAgY29t bWFuZCA9IFsnZ2l0JywgJy1DJywgc2VsZi5naXRfY2hlY2tvdXRfcGF0aCwgJ3Jldi1wYXJzZScs ICdIRUFEJ10KKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnNjbS5uYXRpdmVfcmV2aXNp b24oc2VsZi5naXRfY2hlY2tvdXRfcGF0aCksIHJ1bl9jb21tYW5kKGNvbW1hbmQpLnN0cmlwKCkp CisKICAgICBkZWYgdGVzdF90b19vYmplY3RfbmFtZShzZWxmKToKICAgICAgICAgcmVscGF0aCA9 ICd0ZXN0X2ZpbGVfY29tbWl0MScKICAgICAgICAgZnVsbHBhdGggPSBvcy5wYXRoLnJlYWxwYXRo KG9zLnBhdGguam9pbihzZWxmLmdpdF9jaGVja291dF9wYXRoLCByZWxwYXRoKSkKQEAgLTE2NzIs MyArMTY4NSw2IEBAIE1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2xvZycsICctMScsICctLWdy ZXA9Z2l0LXN2bi1pZDonLCAnLS1kYXRlPWlzbycsICcuL01PCiAKICAgICAgICAgc2NtLl9ydW5f Z2l0ID0gbGFtYmRhIGFyZ3M6ICdEYXRlOiAyMDEzLTAyLTA4IDAxOjU1OjIxIC0wODAwJwogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24oJ3NvbWUtcGF0 aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwOTo1NToyMVonKQorCisgICAgICAgIHNjbS5fcnVu X2dpdCA9IGxhbWJkYSBhcmdzOiAnRGF0ZTogMjAxMy0wMi0wOCAwMTo1NToyMSAtMDgwMCcKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGltZXN0YW1wX29mX3JldmlzaW9uKCdzb21lLXBh dGgnLCAnMmEzZTA1OTc5MmQxNmNkZTg2ZjI2M2UyNzk3OGNmNjQwYmYxYWM3YycpLCAnMjAxMy0w Mi0wOFQwOTo1NToyMVonKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggMjA4ZTllZmViNzM1ZGY5Y2IyYTk3MTQ4YzIxNDQ4Yzc1 N2EzYjE0YS4uOTJkMjAzOGVhODM1NmY2YjljMWQ2ZWVhY2IyOGM0ZDkwM2NlYWJmMSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CkBA IC0yNjgsNiArMjY4LDkgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVm IHN2bl9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHNlbGYudmFsdWVfZnJv bV9zdm5faW5mbyhwYXRoLCAnUmV2aXNpb24nKQogCisgICAgZGVmIG5hdGl2ZV9yZXZpc2lvbihz ZWxmLCBwYXRoKToKKyAgICAgICAgcmV0dXJuIHNlbGYuc3ZuX3JldmlzaW9uKHBhdGgpCisKICAg ICBkZWYgdGltZXN0YW1wX29mX3JldmlzaW9uKHNlbGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAg ICAgIyBXZSB1c2UgLS14bWwgdG8gZ2V0IHRpbWVzdGFtcHMgbGlrZSAyMDEzLTAyLTA4VDA4OjE4 OjA0Ljk2NDQwOVoKICAgICAgICAgcmVwb3NpdG9yeV9yb290ID0gc2VsZi52YWx1ZV9mcm9tX3N2 bl9pbmZvKHNlbGYuY2hlY2tvdXRfcm9vdCwgJ1JlcG9zaXRvcnkgUm9vdCcpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu YWdlci5weQppbmRleCA5ZTQxMmY0NDU1NWYyNDlkNDM4MmVhMmYwMjllOTJlOGRkZTA1N2RkLi5k NjFkZmVkYjk0ODhhNjAyMzcxMjJkZTI3NjcxODVjZmQyNzk2ODU5IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXIucHkKQEAgLTQ3MSw3ICs0NzEsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAg ICMgRklYTUU6IFRoaXMgY29kZSBpcyBkdXBsaWNhdGVkIGluIFBlcmZUZXN0UnVubmVyLl9nZW5l cmF0ZV9yZXN1bHRzX2RpY3QKICAgICAgICAgZm9yIChuYW1lLCBwYXRoKSBpbiBzZWxmLl9wb3J0 LnJlcG9zaXRvcnlfcGF0aHMoKToKICAgICAgICAgICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYu X3BvcnQuaG9zdC5maWxlc3lzdGVtLCBzZWxmLl9wb3J0Lmhvc3QuZXhlY3V0aXZlKS5kZXRlY3Rf c2NtX3N5c3RlbShwYXRoKSBvciBzZWxmLl9wb3J0Lmhvc3Quc2NtKCkKLSAgICAgICAgICAgIHJl dmlzaW9uID0gc2NtLnN2bl9yZXZpc2lvbihwYXRoKQorICAgICAgICAgICAgcmV2aXNpb24gPSBz Y20ubmF0aXZlX3JldmlzaW9uKHBhdGgpCiAgICAgICAgICAgICByZXZpc2lvbnNbbmFtZV0gPSB7 J3JldmlzaW9uJzogcmV2aXNpb24sICd0aW1lc3RhbXAnOiBzY20udGltZXN0YW1wX29mX3Jldmlz aW9uKHBhdGgsIHJldmlzaW9uKX0KIAogICAgICAgICBfbG9nLmluZm8oIlVwbG9hZGluZyBKU09O IGZpbGVzIGZvciBtYXN0ZXI6ICVzIGJ1aWxkZXI6ICVzIGJ1aWxkOiAlcyBzbGF2ZTogJXMgdG8g JXMiLCBtYXN0ZXJfbmFtZSwgYnVpbGRlcl9uYW1lLCBidWlsZF9udW1iZXIsIGJ1aWxkX3NsYXZl LCBob3N0bmFtZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFu Y2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJm b3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKaW5kZXggNGNmNThjNTdlM2U0Y2Y0YTIy ODQzNTYwYmI3MzMwOTNjYTc4OTZlNS4uZGUxOTdmNTk0MDc1YjNiMzZmYzQ4MzIzMDBmMjMzMDg0 ZWU3MTI4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90 ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJm b3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKQEAgLTI3MCw3ICsyNzAsNyBAQCBjbGFz cyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgcmV2aXNpb25zID0ge30KICAgICAg ICAgZm9yIChuYW1lLCBwYXRoKSBpbiBzZWxmLl9wb3J0LnJlcG9zaXRvcnlfcGF0aHMoKToKICAg ICAgICAgICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwgc2VsZi5f aG9zdC5leGVjdXRpdmUpLmRldGVjdF9zY21fc3lzdGVtKHBhdGgpIG9yIHNlbGYuX2hvc3Quc2Nt KCkKLSAgICAgICAgICAgIHJldmlzaW9uID0gc2NtLnN2bl9yZXZpc2lvbihwYXRoKQorICAgICAg ICAgICAgcmV2aXNpb24gPSBzY20ubmF0aXZlX3JldmlzaW9uKHBhdGgpCiAgICAgICAgICAgICBy ZXZpc2lvbnNbbmFtZV0gPSB7J3JldmlzaW9uJzogcmV2aXNpb24sICd0aW1lc3RhbXAnOiBzY20u dGltZXN0YW1wX29mX3JldmlzaW9uKHBhdGgsIHJldmlzaW9uKX0KIAogICAgICAgICBtZXRhX2lu Zm8gPSB7Cg== 303669 2017-03-07 09:52:19 -0800 2017-03-07 19:46:23 -0800 Patch bug-169171-20170307095218.patch text/plain 15321 kocsen_chung U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNDgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGMzYjQwZjMyOTkyMjFkNWE1ZDVmMzc4ZjcyMTliNTJj MjdiYmUyZS4uNzE1ZjMyM2U3OGNjOGRhZjM0OTczNzgzMzQwMDY5N2UwZGE3MWUyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc2 IEBACisyMDE3LTAzLTAzICBLb2NzZW4gQ2h1bmcgIDxrb2NzZW5fY2h1bmdAYXBwbGUuY29tPgor CisgICAgICAgIFBlcmYgYW5kIGxheW91dCB0ZXN0IHJlc3VsdHMgc2hvdWxkIHJlcG9ydCB1c2lu ZyBjb3JyZWN0IHNjbSByZXZpc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2OTE3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZvciBhY2N1cmF0ZSByZWNvcmQga2VlcGluZywgcGVyZiB0ZXN0IGFu ZCBsYXlvdXQgdGVzdCByZXN1bHRzIHNob3VsZAorICAgICAgICByZXBvcnQgdXNpbmcgdGhlIG5h dGl2ZSBzY20gcmV2aXNpb24gYXMgYW4gaWRlbnRpZmllci4KKyAgICAgICAgVG8gZG8gc28gd2Ug aW50cm9kdWNlIGEgbmV3IHNjbSBmdW5jdGlvbnM6CisgICAgICAgICAgICBgbmF0aXZlX3Jldmlz aW9uKClgIGFuZCBgdGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbigpYC4KKyAgICAgICAgVGhl IGZvcm1lciBpcyByZXNwb25zaWJsZSBmb3IgcmV0dXJuaW5nIGEgZ2l0IGhhc2ggaWYgc2NtLmdp dCBvciBhbgorICAgICAgICBzdm4gcmV2aXNpb24gaWYgc2NtLnN2bi4gVGhlIGxhdHRlciBpcyBy ZXNwb25zaWJsZSBmb3IgcmV0cmlldmluZyB0aGUgY29ycmVjdCB0aW1lc3RhbXAuCisgICAgICAg IFdlIGFsc28gYWRkIHRoZSBjb3JyZXNwb25kaW5nIHRlc3RzIGFuZCBhIGhlbHBlciBmdW5jdGlv biBgX21vc3RfcmVjZW50X2xvZ19mb3JfcmV2aXNpb25gLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToKKyAgICAgICAgKFNDTS5ydW4pOgor ICAgICAgICBEcml2ZS1ieSBpbmRlbnRhdGlvbiBmaXggdG8gYWRoZXJlIHRvIFdlYktpdCBzdHls ZSBjb252ZW50aW9ucy4KKyAgICAgICAgKFNDTS5zdm5fcmV2aXNpb24pOgorICAgICAgICBSZW1v dmUgc3VwZXJmbHVvdXMgY29tbWVudC4KKyAgICAgICAgKFNDTS5uYXRpdmVfcmV2aXNpb24pOgor ICAgICAgICBBZGQgbmV3IGFic3RyYWN0IGZ1bmN0aW9uIGBuYXRpdmVfcmV2aXNpb25gIGFuZCBt YWtlIGl0IGEgYF9zdWJjbGFzc19tdXN0X2ltcGxlbWVudCgpYAorICAgICAgICBhcyB3ZSB3YW50 IHRvIGNsb3NlbHkgbWltaWMgYHN2bl9yZXZpc2lvbigpYCBmdW5jdGlvbiBkdWUgdG8gdGhlaXIg c2ltaWxhciBiZWhhdmlvci4KKyAgICAgICAgKFNDTS50aW1lc3RhbXBfb2ZfbmF0aXZlX3Jldmlz aW9uKToKKyAgICAgICAgQWRkIG5ldyBhYnN0cmFjdCBmdW5jdGlvbiBgdGltZXN0YW1wX29mX25h dGl2ZV9yZXZpc2lvbmAgdG8gY2xvc2VseSBtaW1pYyBgdGltZXN0YW1wX29mX3JldmlzaW9uYC4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6 CisgICAgICAgIChHaXQuX21vc3RfcmVjZW50X2xvZ19mb3JfcmV2aXNpb24pOgorICAgICAgICBO ZXcgaGVscGVyIGZ1bmN0aW9uIHNpbWlsYXIgdG8gYF9tb3N0X3JlY2VudF9sb2dfbWF0Y2hpbmdg IHRoYXQgaXMgZ2l0IGhhc2ggZnJpZW5kbHkuCisgICAgICAgIChHaXQubmF0aXZlX3JldmlzaW9u KToKKyAgICAgICAgSW1wbGVtZW50IG5ldyBmdW5jdGlvbiBgbmF0aXZlX3JldmlzaW9uKClgLiBH ZXQgdGhlIG5hdGl2ZV9yZXZpc2lvbiBieSBydW5uaW5nOgorCisgICAgICAgICAgICBgZ2l0IGxv ZyAtMSAtLXByZXR0eT1mb3JtYXQ6JUhgCisKKyAgICAgICAgYW5kIHRodXMgcmV0dXJuaW5nIHRo ZSBsYXRlc3QgZ2l0IGhhc2ggKGluIGxvbmcgZm9ybWF0KS4KKyAgICAgICAgKEdpdC50aW1lc3Rh bXBfb2ZfbmF0aXZlX3JldmlzaW9uKToKKyAgICAgICAgU2luY2UgcGVyZnRlc3RydW5uZXIgYW5k IGxheW91dF90ZXN0LmNvbnRyb2xsZXJzLm1hbmFnZXIgdXNlIHRoZSBuZXcgbmF0aXZlX3Jldmlz aW9uCisgICAgICAgIGZ1bmN0aW9uLCB3ZSBjcmVhdGUgYSBuZXcgbmF0aXZlX3JldmlzaW9uIHRp bWVzdGFtcCByZXRyaWV2ZXIuCisgICAgICAgIFlvdSB3aWxsIG5vdGljZSB0aGlzIHVzZXMgYSBm YXIgbW9yZSBzaW1wbGlmaWVkIHdheSB0byByZXRyaWV2ZSBVVEMgc3RyaWN0LUlTTyB0aW1lc3Rh bXAKKyAgICAgICAgdGhhbiBpdHMgbm9uLW5hdGl2ZSBjb3VudGVycGFydDogYHRpbWVzdGFtcF9v Zl9yZXZpc2lvbigpYC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc3ZuLnB5OgorICAgICAgICAoU1ZOLm5hdGl2ZV9yZXZpc2lvbik6CisgICAgICAgIElt cGxlbWVudCBuYXRpdmVfcmV2aXNpb24gZm9yIFNWTjogc2ltcGx5IHJldHVybiBzZWxmLnN2bl9y ZXZpc2lvbigpCisgICAgICAgIChTVk4udGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbik6Cisg ICAgICAgIEltcGxlbWVudCB0aW1lc3RhbXBfb2ZfbmF0aXZlX3JldmlzaW9uIGZvciBTVk46IHNp bXBseSByZXR1cm4gc2VsZi50aW1lc3RhbXBfb2ZfcmV2aXNpb24oKQorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weToKKyAgICAg ICAgKHRlc3RfbmF0aXZlX3JldmlzaW9uKToKKyAgICAgICAgW1NWTl0gQ29uZmlybSB0aGF0IHN2 bl9yZXZpc2lvbiA9PSBuYXRpdmVfcmV2aXNpb24uIEFuZCB0aGF0IG5hdGl2ZV9yZXZpc2lvbiBy ZXR1cm5zIDUuCisgICAgICAgIFVzZSAnLicgYXMgdGhlIHBhdGggcGFyYW1ldGVyIGluc3RlYWQg b2Ygc3ZuX2NoZWNrb3V0X3BhdGggdG8gYXZvaWQgdmlvbGF0aW5nIHB5bGludC9FMTEwMQorICAg ICAgICBhbmQgc2luY2Ugd2UgYXJlIGd1YXJhbnRlZWQgYnkgdGVzdCBzZXRVcCB0byBiZSBpbiB0 aGUgY29ycmVjdCBTVk4gZGlyLgorICAgICAgICAoR2l0VGVzdC50ZXN0X25hdGl2ZV9yZXZpc2lv bik6CisgICAgICAgIFtHaXRdIENvbmZpcm0gdGhhdCBgZ2l0IHJldi1wYXJzZSBIRUFEYCBpcyBl cXVhbCB0byBuZXdseSBpbXBsZW1lbnRlZCBuYXRpdmVfcmV2aXNpb24oKS4KKyAgICAgICAgKEdp dFNWTlRlc3QudGVzdF9uYXRpdmVfcmV2aXNpb24pOgorICAgICAgICBbR2l0XSBDb25maXJtIHRo YXQgYGdpdCByZXYtcGFyc2UgSEVBRGAgaXMgZXF1YWwgdG8gbmV3bHkgaW1wbGVtZW50ZWQgbmF0 aXZlX3JldmlzaW9uKCkuCisgICAgICAgICh0ZXN0X3RpbWVzdGFtcF9vZl9uYXRpdmVfcmV2aXNp b24pOgorICAgICAgICBUZXN0IG5ldyBmdW5jdGlvbiBgdGltZXN0YW1wX29mX25hdGl2ZV9yZXZp c2lvbmAuIFZlcnkgc2ltaWxhciBmYXNoaW9uIHRvCisgICAgICAgIGB0ZXN0X3RpbWVzdGFtcF9v Zl9yZXZpc2lvbmAuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc2NtX21vY2sucHk6CisgICAgICAgIChNb2NrU0NNLm5hdGl2ZV9yZXZpc2lvbik6Cisg ICAgICAgIEFkZCBNb2NrU0NNLm5hdGl2ZV9yZXZpc2lvbiB0byBiZWhhdmUgbGlrZSBzdm4ucHkg KGRlZmF1bHQpLgorICAgICAgICAoTW9ja1NDTS50ZXN0X25hdGl2ZV9yZXZpc2lvbik6CisgICAg ICAgIEFkZCBNb2NrU0NNLnRlc3RfbmF0aXZlX3JldmlzaW9uIHRvIGJlaGF2ZSBsaWtlIGl0cyBu b24tbmF0aXZlIGNvdW50ZXJwYXJ0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIudXBsb2Fk X3Jlc3VsdHMpOgorICAgICAgICBXaGVuIGl0ZXJhdGluZyB0aHJvdWdoIGEgbGlzdCBvZiBwcm9q ZWN0cywgbWFrZSBzdXJlIHdlIHVzZSB0aGUgcHJvamVjdCdzIG5ldyBuYXRpdmUgcmV2aXNpb24u CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNy dW5uZXIucHk6CisgICAgICAgIChfZ2VuZXJhdGVfcmVzdWx0c19kaWN0KToKKyAgICAgICAgQXMg cGVyIHRoZSBGSVhNRSBpbiBtYW5hZ2VyLnB5LCB3ZSBoYXZlIGR1cGxpY2F0ZSBjb2RlIGluIHBl cmZ0ZXN0c3J1bm5lci5weS4KKyAgICAgICAgU28gbWFrZSB0aGUgc2FtZSBleGFjdCBjaGFuZ2Ug aGVyZS4KKwogMjAxNy0wMy0wNiAgTHVjYXMgRm9yc2NobGVyICA8bGZvcnNjaGxlckBhcHBsZS5j b20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 OTIzNApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9n aXQucHkKaW5kZXggNGZjMTJmZGFiOGRlY2M2ZDQ3Y2Q2ZjMxZWZjZmNkZTM4NDBiMDNkYy4uNTBk OWQyMWZhMDQzNDIwZDQwOGRmYWIzMzViZDQ3N2Y3MGQxZmMzNSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0yNzAsNiArMjcw LDkgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgICMgZ2l0IDEuNy4w LjQgKGFuZCBlYXJsaWVyKSBkaWRuJ3Qgc3VwcG9ydCB0aGUgc2VwYXJhdGUgYXJnLgogICAgICAg ICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ2xvZycsICctMScsICctLWdyZXA9JyArIGdyZXBfc3Ry LCAnLS1kYXRlPWlzbycsIHNlbGYuZmluZF9jaGVja291dF9yb290KHBhdGgpXSkKIAorICAgIGRl ZiBfbW9zdF9yZWNlbnRfbG9nX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZpc2lvbiwgcGF0aCk6Cisg ICAgICAgIHJldHVybiBzZWxmLl9ydW5fZ2l0KFsnbG9nJywgJy0xJywgcmV2aXNpb24sICctLWRh dGU9aXNvJywgc2VsZi5maW5kX2NoZWNrb3V0X3Jvb3QocGF0aCldKQorCiAgICAgZGVmIHN2bl9y ZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgZ2l0X2xvZyA9IHNlbGYuX21vc3RfcmVjZW50 X2xvZ19tYXRjaGluZygnZ2l0LXN2bi1pZDonLCBwYXRoKQogICAgICAgICBtYXRjaCA9IHJlLnNl YXJjaCgiXlxzKmdpdC1zdm4taWQ6LipAKD9QPHN2bl9yZXZpc2lvbj5cZCspXCAiLCBnaXRfbG9n LCByZS5NVUxUSUxJTkUpCkBAIC0yNzcsNiArMjgwLDkgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVw b3NpdG9yeSk6CiAgICAgICAgICAgICByZXR1cm4gIiIKICAgICAgICAgcmV0dXJuIHN0cihtYXRj aC5ncm91cCgnc3ZuX3JldmlzaW9uJykpCiAKKyAgICBkZWYgbmF0aXZlX3JldmlzaW9uKHNlbGYs IHBhdGgpOgorICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ2xvZycsICctMScsICctLXBy ZXR0eT1mb3JtYXQ6JUgnLCBzZWxmLmZpbmRfY2hlY2tvdXRfcm9vdChwYXRoKV0pCisKICAgICBk ZWYgc3ZuX3VybChzZWxmKToKICAgICAgICAgZ2l0X2NvbW1hbmQgPSBbJ3N2bicsICdpbmZvJ10K ICAgICAgICAgc3RhdHVzID0gc2VsZi5fcnVuX2dpdChnaXRfY29tbWFuZCkKQEAgLTMwMCw2ICsz MDYsMTEgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIHRpbWVfd2l0 aG91dF90aW1lem9uZSA9IHRpbWVfd2l0aF90aW1lem9uZSAtIGRhdGV0aW1lLnRpbWVkZWx0YSho b3Vycz1zaWduICogaW50KG1hdGNoLmdyb3VwKDgpKSwgbWludXRlcz1pbnQobWF0Y2guZ3JvdXAo OSkpKQogICAgICAgICByZXR1cm4gdGltZV93aXRob3V0X3RpbWV6b25lLnN0cmZ0aW1lKCclWS0l bS0lZFQlSDolTTolU1onKQogCisgICAgZGVmIHRpbWVzdGFtcF9vZl9uYXRpdmVfcmV2aXNpb24o c2VsZiwgcGF0aCwgc2hhKToKKyAgICAgICAgdW5peF90aW1lc3RhbXAgPSBzZWxmLl9ydW5fZ2l0 KFsnbG9nJywgJy0xJywgc2hhLCAnLS1wcmV0dHk9ImZvcm1hdDolY3QiJywgc2VsZi5maW5kX2No ZWNrb3V0X3Jvb3QocGF0aCldKS5yc3RyaXAoKQorICAgICAgICBjb21taXRfdGltZXN0YW1wID0g ZGF0ZXRpbWUuZGF0ZXRpbWUudXRjZnJvbXRpbWVzdGFtcChmbG9hdCh1bml4X3RpbWVzdGFtcCkp CisgICAgICAgIHJldHVybiBjb21taXRfdGltZXN0YW1wLnN0cmZ0aW1lKCclWS0lbS0lZFQlSDol TTolU1onKQorCiAgICAgZGVmIHByZXBlbmRfc3ZuX3JldmlzaW9uKHNlbGYsIGRpZmYpOgogICAg ICAgICByZXZpc2lvbiA9IHNlbGYuaGVhZF9zdm5fcmV2aXNpb24oKQogICAgICAgICBpZiBub3Qg cmV2aXNpb246CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3NjbS5weQppbmRleCA0ZTNjZjE0ZTZkOWRkOTI2Nzc2YTRlODcwNWQ4MzYwMmQ0NzY5ZTIy Li5iY2FiN2U3MTVlMjY3OGNkY2IyM2JkMTNmNTFkMTYxZjZmODhiNDAyIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTY5LDEy ICs2OSwxMiBAQCBjbGFzcyBTQ006CiAgICAgZGVmIHJ1bihzZWxmLCBhcmdzLCBjd2Q9Tm9uZSwg aW5wdXQ9Tm9uZSwgZXJyb3JfaGFuZGxlcj1Ob25lLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlLCBy ZXR1cm5fc3RkZXJyPVRydWUsIGRlY29kZV9vdXRwdXQ9VHJ1ZSk6CiAgICAgICAgICMgRklYTUU6 IFdlIHNob3VsZCBzZXQgY3dkIGFwcHJvcHJpYXRlbHkuCiAgICAgICAgIHJldHVybiBzZWxmLl9l eGVjdXRpdmUucnVuX2NvbW1hbmQoYXJncywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGN3 ZD1jd2QsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dD1pbnB1dCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgIGVycm9yX2hhbmRsZXI9ZXJyb3JfaGFuZGxlciwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybl9leGl0X2NvZGU9cmV0dXJuX2V4aXRfY29kZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybl9zdGRlcnI9cmV0dXJuX3N0ZGVyciwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9ZGVjb2RlX291dHB1dCkKKyAg ICAgICAgICAgIGN3ZD1jd2QsCisgICAgICAgICAgICBpbnB1dD1pbnB1dCwKKyAgICAgICAgICAg IGVycm9yX2hhbmRsZXI9ZXJyb3JfaGFuZGxlciwKKyAgICAgICAgICAgIHJldHVybl9leGl0X2Nv ZGU9cmV0dXJuX2V4aXRfY29kZSwKKyAgICAgICAgICAgIHJldHVybl9zdGRlcnI9cmV0dXJuX3N0 ZGVyciwKKyAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9ZGVjb2RlX291dHB1dCkKIAogICAgICMg U0NNIGFsd2F5cyByZXR1cm5zIHJlcG9zaXRvcnkgcmVsYXRpdmUgcGF0aCwgYnV0IHNvbWV0aW1l cyB3ZSBuZWVkCiAgICAgIyBhYnNvbHV0ZSBwYXRocyB0byBwYXNzIHRvIHJtLCBldGMuCkBAIC0x NTgsMTIgKzE1OCwxNyBAQCBjbGFzcyBTQ006CiAgICAgICAgIHJldHVybiBzZWxmLnN2bl9yZXZp c2lvbihzZWxmLmNoZWNrb3V0X3Jvb3QpCiAKICAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBh dGgpOgotICAgICAgICAiIiJSZXR1cm5zIHRoZSBsYXRlc3Qgc3ZuIHJldmlzaW9uIGZvdW5kIGlu IHRoZSBjaGVja291dC4iIiIKKyAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQo KQorCisgICAgZGVmIG5hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoKToKICAgICAgICAgc2VsZi5f c3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCiAgICAgZGVmIHRpbWVzdGFtcF9vZl9yZXZpc2lv bihzZWxmLCBwYXRoLCByZXZpc2lvbik6CiAgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1w bGVtZW50KCkKIAorICAgIGRlZiB0aW1lc3RhbXBfb2ZfbmF0aXZlX3JldmlzaW9uKHNlbGYsIHBh dGgsIHJldmlzaW9uKToKKyAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQor CiAgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0PU5vbmUsIGNoYW5nZWRfZmls ZXM9Tm9uZSk6CiAgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1wbGVtZW50KCkKIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9t b2NrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9t b2NrLnB5CmluZGV4IDk3NzRlYzhhZTg3M2ExYjBiODM3NjA3MTgwNjY3OTIxNTgwOWVlZWMuLjQ0 ZDA0NDk1MjY5MzM5OTk3OTI1YTkzOGJkZDAxMGM4ODU1ZGU5ZTYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fbW9jay5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkKQEAg LTg0LDkgKzg0LDE1IEBAIGNsYXNzIE1vY2tTQ00ob2JqZWN0KToKICAgICBkZWYgc3ZuX3Jldmlz aW9uKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gJzU2NzgnCiAKKyAgICBkZWYgbmF0aXZl X3JldmlzaW9uKHNlbGYsIHBhdGgpOgorICAgICAgICByZXR1cm4gc2VsZi5zdm5fcmV2aXNpb24o cGF0aCkKKwogICAgIGRlZiB0aW1lc3RhbXBfb2ZfcmV2aXNpb24oc2VsZiwgcGF0aCwgcmV2aXNp b24pOgogICAgICAgICByZXR1cm4gJzIwMTMtMDItMDEgMDg6NDg6MDUgKzAwMDAnCiAKKyAgICBk ZWYgdGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6Cisg ICAgICAgIHJldHVybiAnMjAxMy0wMi0wMSAwODo0ODowNSArMDAwMCcKKwogICAgIGRlZiBjcmVh dGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdCwgY2hhbmdlZF9maWxlcz1Ob25lKToKICAgICAgICAg cmV0dXJuICJQYXRjaDEiCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CmluZGV4IGVjNGQxZThmZGFhNzMx NDY4ZmQ3ZDE4NTNhNDNkNDAwNWExZjNjODUuLmM5OTNjN2Y1OGFmMjk1NDk1YWI5ZDFjNjkxMmJi ZGQ0MTAwYjAyYmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQpAQCAtOTAyLDYgKzkwMiwxMCBAQCBF TkQKICAgICBkZWYgdGVzdF9oZWFkX3N2bl9yZXZpc2lvbihzZWxmKToKICAgICAgICAgc2VsZi5f c2hhcmVkX3Rlc3RfaGVhZF9zdm5fcmV2aXNpb24oKQogCisgICAgZGVmIHRlc3RfbmF0aXZlX3Jl dmlzaW9uKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuc2NtLmhlYWRfc3Zu X3JldmlzaW9uKCksIHNlbGYuc2NtLm5hdGl2ZV9yZXZpc2lvbignLicpKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNlbGYuc2NtLm5hdGl2ZV9yZXZpc2lvbignLicpLCAnNScpCisKICAgICBk ZWYgdGVzdF9wcm9wc2V0X3Byb3BnZXQoc2VsZik6CiAgICAgICAgIGZpbGVwYXRoID0gb3MucGF0 aC5qb2luKHNlbGYuc3ZuX2NoZWNrb3V0X3BhdGgsICJ0ZXN0X2ZpbGUiKQogICAgICAgICBleHBl Y3RlZF9taW1lX3R5cGUgPSAieC1hcHBsaWNhdGlvbi9mb28tYmFyIgpAQCAtMTA4MCw2ICsxMDg0 LDExIEBAIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAgICAgICAgICMgc2VsZi5fc2hhcmVkX3Rl c3RfaGVhZF9zdm5fcmV2aXNpb24oKS4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20uaGVh ZF9zdm5fcmV2aXNpb24oKSwgJycpCiAKKyAgICBkZWYgdGVzdF9uYXRpdmVfcmV2aXNpb24oc2Vs Zik6CisgICAgICAgIHNjbSA9IHNlbGYudHJhY2tpbmdfc2NtCisgICAgICAgIGNvbW1hbmQgPSBb J2dpdCcsICctQycsIHNjbS5jaGVja291dF9yb290LCAncmV2LXBhcnNlJywgJ0hFQUQnXQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS5uYXRpdmVfcmV2aXNpb24oc2NtLmNoZWNrb3V0X3Jv b3QpLCBydW5fY29tbWFuZChjb21tYW5kKS5zdHJpcCgpKQorCiAgICAgZGVmIHRlc3RfcmVuYW1l X2ZpbGVzKHNlbGYpOgogICAgICAgICBzY20gPSBzZWxmLnRyYWNraW5nX3NjbQogCkBAIC0xNTkx LDYgKzE2MDAsMTAgQEAgY2xhc3MgR2l0U1ZOVGVzdChTQ01UZXN0KToKICAgICBkZWYgdGVzdF9o ZWFkX3N2bl9yZXZpc2lvbihzZWxmKToKICAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfaGVhZF9z dm5fcmV2aXNpb24oKQogCisgICAgZGVmIHRlc3RfbmF0aXZlX3JldmlzaW9uKHNlbGYpOgorICAg ICAgICBjb21tYW5kID0gWydnaXQnLCAnLUMnLCBzZWxmLmdpdF9jaGVja291dF9wYXRoLCAncmV2 LXBhcnNlJywgJ0hFQUQnXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuc2NtLm5hdGl2 ZV9yZXZpc2lvbihzZWxmLmdpdF9jaGVja291dF9wYXRoKSwgcnVuX2NvbW1hbmQoY29tbWFuZCku c3RyaXAoKSkKKwogICAgIGRlZiB0ZXN0X3RvX29iamVjdF9uYW1lKHNlbGYpOgogICAgICAgICBy ZWxwYXRoID0gJ3Rlc3RfZmlsZV9jb21taXQxJwogICAgICAgICBmdWxscGF0aCA9IG9zLnBhdGgu cmVhbHBhdGgob3MucGF0aC5qb2luKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgsIHJlbHBhdGgpKQpA QCAtMTY3MiwzICsxNjg1LDE1IEBAIE1PQ0sgcnVuX2NvbW1hbmQ6IFsnZ2l0JywgJ2xvZycsICct MScsICctLWdyZXA9Z2l0LXN2bi1pZDonLCAnLS1kYXRlPWlzbycsICcuL01PCiAKICAgICAgICAg c2NtLl9ydW5fZ2l0ID0gbGFtYmRhIGFyZ3M6ICdEYXRlOiAyMDEzLTAyLTA4IDAxOjU1OjIxIC0w ODAwJwogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24o J3NvbWUtcGF0aCcsICcxMjM0NScpLCAnMjAxMy0wMi0wOFQwOTo1NToyMVonKQorCisgICAgZGVm IHRlc3RfdGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbihzZWxmKToKKyAgICAgICAgc2NtID0g c2VsZi5tYWtlX3NjbSgpCisgICAgICAgIHNjbS5maW5kX2NoZWNrb3V0X3Jvb3QgPSBsYW1iZGEg cGF0aDogJycKKyAgICAgICAgc2NtLl9ydW5fZ2l0ID0gbGFtYmRhIGFyZ3M6ICcxMzYwMzEwNzQ5 JworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS50aW1lc3RhbXBfb2ZfbmF0aXZlX3Jldmlz aW9uKCdzb21lLXBhdGgnLCAnMWExYzNiMDg4MTRiYzJhOGMxNWIwZjZkYjYzY2RjZTY4ZjJhYWE3 YScpLCAnMjAxMy0wMi0wOFQwODowNTo0OVonKQorCisgICAgICAgIHNjbS5fcnVuX2dpdCA9IGxh bWJkYSBhcmdzOiAnMTM2MDI3OTkyMycKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udGlt ZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbignc29tZS1wYXRoJywgJzFhMWMzYjA4ODE0YmMyYThj MTViMGY2ZGI2M2NkY2U2OGYyYWFhN2EnKSwgJzIwMTMtMDItMDdUMjM6MzI6MDNaJykKKworICAg ICAgICBzY20uX3J1bl9naXQgPSBsYW1iZGEgYXJnczogJzEzNjAzMTczMjEnCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoc2NtLnRpbWVzdGFtcF9vZl9uYXRpdmVfcmV2aXNpb24oJ3NvbWUtcGF0 aCcsICcxYTFjM2IwODgxNGJjMmE4YzE1YjBmNmRiNjNjZGNlNjhmMmFhYTdhJyksICcyMDEzLTAy LTA4VDA5OjU1OjIxWicpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3N2bi5weQppbmRleCAyMDhlOWVmZWI3MzVkZjljYjJhOTcxNDhjMjE0NDhjNzU3 YTNiMTRhLi42YWM4NTM0ODY4NmU1OTgxMDBhNzk4YmI5OTFhNmRmZDdhZjRmOWYzIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAg LTI2OCw2ICsyNjgsOSBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYg c3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gc2VsZi52YWx1ZV9mcm9t X3N2bl9pbmZvKHBhdGgsICdSZXZpc2lvbicpCiAKKyAgICBkZWYgbmF0aXZlX3JldmlzaW9uKHNl bGYsIHBhdGgpOgorICAgICAgICByZXR1cm4gc2VsZi5zdm5fcmV2aXNpb24ocGF0aCkKKwogICAg IGRlZiB0aW1lc3RhbXBfb2ZfcmV2aXNpb24oc2VsZiwgcGF0aCwgcmV2aXNpb24pOgogICAgICAg ICAjIFdlIHVzZSAtLXhtbCB0byBnZXQgdGltZXN0YW1wcyBsaWtlIDIwMTMtMDItMDhUMDg6MTg6 MDQuOTY0NDA5WgogICAgICAgICByZXBvc2l0b3J5X3Jvb3QgPSBzZWxmLnZhbHVlX2Zyb21fc3Zu X2luZm8oc2VsZi5jaGVja291dF9yb290LCAnUmVwb3NpdG9yeSBSb290JykKQEAgLTI3NSw2ICsy NzgsOSBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgbWF0Y2ggPSBy ZS5zZWFyY2gociJePGRhdGU+KD9QPHZhbHVlPi4rKTwvZGF0ZT5ccj8kIiwgaW5mb19vdXRwdXQs IHJlLk1VTFRJTElORSkKICAgICAgICAgcmV0dXJuIG1hdGNoLmdyb3VwKCd2YWx1ZScpCiAKKyAg ICBkZWYgdGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6 CisgICAgICAgIHJldHVybiBzZWxmLnRpbWVzdGFtcF9vZl9yZXZpc2lvbihwYXRoLCByZXZpc2lv bikKKwogICAgICMgRklYTUU6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSBvbiBDaGVja291dC4KICAg ICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hhbmdlZF9maWxlcz1O b25lLCBnaXRfaW5kZXg9Tm9uZSk6CiAgICAgICAgICIiIlJldHVybnMgYSBieXRlIGFycmF5IChz dHIoKSkgcmVwcmVzZW50aW5nIHRoZSBwYXRjaCBmaWxlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKaW5k ZXggOWU0MTJmNDQ1NTVmMjQ5ZDQzODJlYTJmMDI5ZTkyZThkZGUwNTdkZC4uYTc3NjE5ZWE4YjAx MGYyMzQ3YzY0Zjg4ODZlOGQzNGU5NjJlYTM4NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CkBAIC00 NzEsOCArNDcxLDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIEZJWE1FOiBU aGlzIGNvZGUgaXMgZHVwbGljYXRlZCBpbiBQZXJmVGVzdFJ1bm5lci5fZ2VuZXJhdGVfcmVzdWx0 c19kaWN0CiAgICAgICAgIGZvciAobmFtZSwgcGF0aCkgaW4gc2VsZi5fcG9ydC5yZXBvc2l0b3J5 X3BhdGhzKCk6CiAgICAgICAgICAgICBzY20gPSBTQ01EZXRlY3RvcihzZWxmLl9wb3J0Lmhvc3Qu ZmlsZXN5c3RlbSwgc2VsZi5fcG9ydC5ob3N0LmV4ZWN1dGl2ZSkuZGV0ZWN0X3NjbV9zeXN0ZW0o cGF0aCkgb3Igc2VsZi5fcG9ydC5ob3N0LnNjbSgpCi0gICAgICAgICAgICByZXZpc2lvbiA9IHNj bS5zdm5fcmV2aXNpb24ocGF0aCkKLSAgICAgICAgICAgIHJldmlzaW9uc1tuYW1lXSA9IHsncmV2 aXNpb24nOiByZXZpc2lvbiwgJ3RpbWVzdGFtcCc6IHNjbS50aW1lc3RhbXBfb2ZfcmV2aXNpb24o cGF0aCwgcmV2aXNpb24pfQorICAgICAgICAgICAgcmV2aXNpb24gPSBzY20ubmF0aXZlX3Jldmlz aW9uKHBhdGgpCisgICAgICAgICAgICByZXZpc2lvbnNbbmFtZV0gPSB7J3JldmlzaW9uJzogcmV2 aXNpb24sICd0aW1lc3RhbXAnOiBzY20udGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbihwYXRo LCByZXZpc2lvbil9CiAKICAgICAgICAgX2xvZy5pbmZvKCJVcGxvYWRpbmcgSlNPTiBmaWxlcyBm b3IgbWFzdGVyOiAlcyBidWlsZGVyOiAlcyBidWlsZDogJXMgc2xhdmU6ICVzIHRvICVzIiwgbWFz dGVyX25hbWUsIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbnVtYmVyLCBidWlsZF9zbGF2ZSwgaG9zdG5h bWUpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVz dHMvcGVyZnRlc3RzcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5j ZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKaW5kZXggNGNmNThjNTdlM2U0Y2Y0YTIyODQzNTYw YmI3MzMwOTNjYTc4OTZlNS4uZWIwNDU3MTcwMzVlMGQ2M2VhNDllMTYzYjUzZTMxZGY1NGFiZjgz ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9w ZXJmdGVzdHNydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5j ZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkKQEAgLTI3MCw4ICsyNzAsOCBAQCBjbGFzcyBQZXJm VGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgcmV2aXNpb25zID0ge30KICAgICAgICAgZm9y IChuYW1lLCBwYXRoKSBpbiBzZWxmLl9wb3J0LnJlcG9zaXRvcnlfcGF0aHMoKToKICAgICAgICAg ICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwgc2VsZi5faG9zdC5l eGVjdXRpdmUpLmRldGVjdF9zY21fc3lzdGVtKHBhdGgpIG9yIHNlbGYuX2hvc3Quc2NtKCkKLSAg ICAgICAgICAgIHJldmlzaW9uID0gc2NtLnN2bl9yZXZpc2lvbihwYXRoKQotICAgICAgICAgICAg cmV2aXNpb25zW25hbWVdID0geydyZXZpc2lvbic6IHJldmlzaW9uLCAndGltZXN0YW1wJzogc2Nt LnRpbWVzdGFtcF9vZl9yZXZpc2lvbihwYXRoLCByZXZpc2lvbil9CisgICAgICAgICAgICByZXZp c2lvbiA9IHNjbS5uYXRpdmVfcmV2aXNpb24ocGF0aCkKKyAgICAgICAgICAgIHJldmlzaW9uc1tu YW1lXSA9IHsncmV2aXNpb24nOiByZXZpc2lvbiwgJ3RpbWVzdGFtcCc6IHNjbS50aW1lc3RhbXBf b2ZfbmF0aXZlX3JldmlzaW9uKHBhdGgsIHJldmlzaW9uKX0KIAogICAgICAgICBtZXRhX2luZm8g PSB7CiAgICAgICAgICAgICAnZGVzY3JpcHRpb24nOiBkZXNjcmlwdGlvbiwK