222426 2021-02-25 10:36:41 -0800 REGRESSION(r273488): Landed before necessary buildbot change. 2021-02-25 10:38:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222393 1 commit-queue commit-queue ap jbedard webkit-bug-importer oldest_to_newest 1733395 0 commit-queue 2021-02-25 10:36:41 -0800 https://trac.webkit.org/changeset/273488 broke the build: Landed before necessary buildbot change. This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1733397 1 421540 commit-queue 2021-02-25 10:36:47 -0800 Created attachment 421540 REVERT of r273488 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1733398 2 421540 ryanhaddad 2021-02-25 10:37:57 -0800 Comment on attachment 421540 REVERT of r273488 Clearing flags on attachment: 421540 Committed r273495 (234572@main): <https://commits.webkit.org/234572@main> 1733399 3 ryanhaddad 2021-02-25 10:37:59 -0800 All reviewed patches have been landed. Closing bug. 1733401 4 webkit-bug-importer 2021-02-25 10:38:21 -0800 <rdar://problem/74750546> 421540 2021-02-25 10:36:47 -0800 2021-02-25 10:37:57 -0800 REVERT of r273488 bug-222426-20210225183646.patch text/plain 27989 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNDk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTA2YjBiOTQxNTNkYWQxNzQ5MmUwMzc3YTk0NDRjYWVk OWQ4YjkwYi4uOWVlNzgxNTBhNDE0YzNkOGNkMDBmNjAyNGY1NTg2Zjk2ZWU3ZmJjMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTAyLTI1ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4K KworICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3MzQ4OC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjQyNgorCisgICAgICAgIExhbmRl ZCBiZWZvcmUgbmVjZXNzYXJ5IGJ1aWxkYm90IGNoYW5nZS4KKworICAgICAgICBSZXZlcnRlZCBj aGFuZ2VzZXQ6CisKKyAgICAgICAgIltydW4td2Via2l0LXRlc3RzXSBEZWxldGUgb2xkIHJlc3Vs dHMgc2VydmVyIGNvZGUiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjIzOTMKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0 LzI3MzQ4OAorCiAyMDIxLTAyLTI1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KIAogICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gRGVsZXRlIG9sZCByZXN1bHRzIHNlcnZl ciBjb2RlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlci5weQppbmRleCA1Yzg1ZTZlYmRkZjEyNDkyODQ4MmIyNTdm NmJlMjZiOTA0ZjZhNzU4Li5jMTk1ZTMxOTIyMzJhZGRkNTQyZGZhZTVjZGQ4OGU2MzllZjJiMDFl IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAgLTM3OCwxMyArMzc4LDE2IEBAIGNsYXNzIE1hbmFn ZXIob2JqZWN0KToKIAogICAgICAgICBfbG9nLmRlYnVnKCJzdW1tYXJpemluZyByZXN1bHRzIikK ICAgICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gdGVzdF9ydW5fcmVzdWx0cy5zdW1tYXJpemVf cmVzdWx0cyhzZWxmLl9wb3J0LCBzZWxmLl9leHBlY3RhdGlvbnMsIGluaXRpYWxfcmVzdWx0cywg cmV0cnlfcmVzdWx0cywgZW5hYmxlZF9waXhlbF90ZXN0c19pbl9yZXRyeSkKKyAgICAgICAgcmVz dWx0c19pbmNsdWRpbmdfcGFzc2VzID0gTm9uZQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJl c3VsdHNfc2VydmVyX2hvc3Q6CisgICAgICAgICAgICByZXN1bHRzX2luY2x1ZGluZ19wYXNzZXMg PSB0ZXN0X3J1bl9yZXN1bHRzLnN1bW1hcml6ZV9yZXN1bHRzKHNlbGYuX3BvcnQsIHNlbGYuX2V4 cGVjdGF0aW9ucywgaW5pdGlhbF9yZXN1bHRzLCByZXRyeV9yZXN1bHRzLCBlbmFibGVkX3BpeGVs X3Rlc3RzX2luX3JldHJ5LCBpbmNsdWRlX3Bhc3Nlcz1UcnVlLCBpbmNsdWRlX3RpbWVfYW5kX21v ZGlmaWVycz1UcnVlKQogICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3Jlc3VsdHMoZW5kX3Rp bWUgLSBzdGFydF90aW1lLCBpbml0aWFsX3Jlc3VsdHMsIHN1bW1hcml6ZWRfcmVzdWx0cykKIAog ICAgICAgICBleGl0X2NvZGUgPSAtMQogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5kcnlf cnVuOgogICAgICAgICAgICAgc2VsZi5fcG9ydC5wcmludF9sZWFrc19zdW1tYXJ5KCkKICAgICAg ICAgICAgIHNlbGYuX291dHB1dF9wZXJmX21ldHJpY3MoZW5kX3RpbWUgLSBzdGFydF90aW1lLCBp bml0aWFsX3Jlc3VsdHMpCi0gICAgICAgICAgICBzZWxmLl9zYXZlX2pzb25fZmlsZXMoc3VtbWFy aXplZF9yZXN1bHRzLCBpbml0aWFsX3Jlc3VsdHMpCisgICAgICAgICAgICBzZWxmLl91cGxvYWRf anNvbl9maWxlcyhzdW1tYXJpemVkX3Jlc3VsdHMsIGluaXRpYWxfcmVzdWx0cywgcmVzdWx0c19p bmNsdWRpbmdfcGFzc2VzLCBzdGFydF90aW1lLCBlbmRfdGltZSkKIAogICAgICAgICAgICAgcmVz dWx0c19wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5 LCAicmVzdWx0cy5odG1sIikKICAgICAgICAgICAgIHNlbGYuX2NvcHlfcmVzdWx0c19odG1sX2Zp bGUocmVzdWx0c19wYXRoKQpAQCAtNTEwLDcgKzUxMyw3IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0 KToKICAgICAgICAgICAgICAgICApLCByZXN1bHRzX3RyaWUpCiAgICAgICAgIHJldHVybiByZXN1 bHRzX3RyaWUKIAotICAgIGRlZiBfc2F2ZV9qc29uX2ZpbGVzKHNlbGYsIHN1bW1hcml6ZWRfcmVz dWx0cywgaW5pdGlhbF9yZXN1bHRzKToKKyAgICBkZWYgX3VwbG9hZF9qc29uX2ZpbGVzKHNlbGYs IHN1bW1hcml6ZWRfcmVzdWx0cywgaW5pdGlhbF9yZXN1bHRzLCByZXN1bHRzX2luY2x1ZGluZ19w YXNzZXM9Tm9uZSwgc3RhcnRfdGltZT1Ob25lLCBlbmRfdGltZT1Ob25lKToKICAgICAgICAgIiIi V3JpdGVzIHRoZSByZXN1bHRzIG9mIHRoZSB0ZXN0IHJ1biBhcyBKU09OIGZpbGVzIGludG8gdGhl IHJlc3VsdHMKICAgICAgICAgZGlyIGFuZCB1cGxvYWQgdGhlIGZpbGVzIHRvIHRoZSBhcHBlbmdp bmUgc2VydmVyLgogCkBAIC01MzMsMTAgKzUzNiwxNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6 CiAgICAgICAgICMgV2Ugd3JpdGUgZnVsbF9yZXN1bHRzLmpzb24gb3V0IGFzIGpzb25wIGJlY2F1 c2Ugd2UgbmVlZCB0byBsb2FkIGl0IGZyb20gYSBmaWxlIHVybCBhbmQgQ2hyb21pdW0gZG9lc24n dCBhbGxvdyB0aGF0LgogICAgICAgICBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLndyaXRlX2pzb24o c2VsZi5fZmlsZXN5c3RlbSwgc3VtbWFyaXplZF9yZXN1bHRzLCBmdWxsX3Jlc3VsdHNfcGF0aCwg Y2FsbGJhY2s9IkFERF9SRVNVTFRTIikKIAorICAgICAgICByZXN1bHRzX2pzb25fcGF0aCA9IHNl bGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgInJlc3VsdHNfaW5j bHVkaW5nX3Bhc3Nlcy5qc29uIikKKyAgICAgICAgaWYgcmVzdWx0c19pbmNsdWRpbmdfcGFzc2Vz OgorICAgICAgICAgICAganNvbl9yZXN1bHRzX2dlbmVyYXRvci53cml0ZV9qc29uKHNlbGYuX2Zp bGVzeXN0ZW0sIHJlc3VsdHNfaW5jbHVkaW5nX3Bhc3NlcywgcmVzdWx0c19qc29uX3BhdGgpCisK ICAgICAgICAgZ2VuZXJhdG9yID0ganNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IuSlNPTkxh eW91dFJlc3VsdHNHZW5lcmF0b3IoCi0gICAgICAgICAgICBzZWxmLl9wb3J0LCBzZWxmLl9yZXN1 bHRzX2RpcmVjdG9yeSwKKyAgICAgICAgICAgIHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMuYnVp bGRlcl9uYW1lLCBzZWxmLl9vcHRpb25zLmJ1aWxkX25hbWUsCisgICAgICAgICAgICBzZWxmLl9v cHRpb25zLmJ1aWxkX251bWJlciwgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksCiAgICAgICAgICAg ICBzZWxmLl9leHBlY3RhdGlvbnMsIGluaXRpYWxfcmVzdWx0cywKLSAgICAgICAgICAgICJsYXlv dXQtdGVzdHMiKQorICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy50ZXN0X3Jlc3VsdHNfc2VydmVy LAorICAgICAgICAgICAgImxheW91dC10ZXN0cyIsCisgICAgICAgICAgICBzZWxmLl9vcHRpb25z Lm1hc3Rlcl9uYW1lKQogCiAgICAgICAgIGlmIGdlbmVyYXRvci5nZW5lcmF0ZV9qc29uX291dHB1 dCgpOgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiRmluaXNoZWQgd3JpdGluZyBKU09OIGZpbGUg Zm9yIHRoZSB0ZXN0IHJlc3VsdHMgc2VydmVyLiIpCkBAIC01NDQsMTIgKzU1NCw3OCBAQCBjbGFz cyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCJGYWlsZWQgdG8gZ2Vu ZXJhdGUgSlNPTiBmaWxlIGZvciB0aGUgdGVzdCByZXN1bHRzIHNlcnZlci4iKQogICAgICAgICAg ICAgcmV0dXJuCiAKKyAgICAgICAganNvbl9maWxlcyA9IFsiaW5jcmVtZW50YWxfcmVzdWx0cy5q c29uIiwgImZ1bGxfcmVzdWx0cy5qc29uIiwgInRpbWVzX21zLmpzb24iXQorCisgICAgICAgIGdl bmVyYXRvci51cGxvYWRfanNvbl9maWxlcyhqc29uX2ZpbGVzKQorICAgICAgICBpZiByZXN1bHRz X2luY2x1ZGluZ19wYXNzZXM6CisgICAgICAgICAgICBzZWxmLnVwbG9hZF9yZXN1bHRzKHJlc3Vs dHNfanNvbl9wYXRoLCBzdGFydF90aW1lLCBlbmRfdGltZSkKKwogICAgICAgICBpbmNyZW1lbnRh bF9yZXN1bHRzX3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJl Y3RvcnksICJpbmNyZW1lbnRhbF9yZXN1bHRzLmpzb24iKQogCiAgICAgICAgICMgUmVtb3ZlIHRo ZXNlIGZpbGVzIGZyb20gdGhlIHJlc3VsdHMgZGlyZWN0b3J5IHNvIHRoZXkgZG9uJ3QgdGFrZSB1 cCB0b28gbXVjaCBzcGFjZSBvbiB0aGUgYnVpbGRib3QuCiAgICAgICAgICMgVGhlIHRvb2xzIHVz ZSB0aGUgdmVyc2lvbiB3ZSB1cGxvYWRlZCB0byB0aGUgcmVzdWx0cyBzZXJ2ZXIgYW55d2F5Lgog ICAgICAgICBzZWxmLl9maWxlc3lzdGVtLnJlbW92ZSh0aW1lc19qc29uX3BhdGgpCiAgICAgICAg IHNlbGYuX2ZpbGVzeXN0ZW0ucmVtb3ZlKGluY3JlbWVudGFsX3Jlc3VsdHNfcGF0aCkKKyAgICAg ICAgaWYgcmVzdWx0c19pbmNsdWRpbmdfcGFzc2VzOgorICAgICAgICAgICAgc2VsZi5fZmlsZXN5 c3RlbS5yZW1vdmUocmVzdWx0c19qc29uX3BhdGgpCisKKyAgICBkZWYgdXBsb2FkX3Jlc3VsdHMo c2VsZiwgcmVzdWx0c19qc29uX3BhdGgsIHN0YXJ0X3RpbWUsIGVuZF90aW1lKToKKyAgICAgICAg aWYgbm90IHNlbGYuX29wdGlvbnMucmVzdWx0c19zZXJ2ZXJfaG9zdDoKKyAgICAgICAgICAgIHJl dHVybgorICAgICAgICBtYXN0ZXJfbmFtZSA9IHNlbGYuX29wdGlvbnMubWFzdGVyX25hbWUKKyAg ICAgICAgYnVpbGRlcl9uYW1lID0gc2VsZi5fb3B0aW9ucy5idWlsZGVyX25hbWUKKyAgICAgICAg YnVpbGRfbnVtYmVyID0gc2VsZi5fb3B0aW9ucy5idWlsZF9udW1iZXIKKyAgICAgICAgYnVpbGRf d29ya2VyID0gc2VsZi5fb3B0aW9ucy5idWlsZF9zbGF2ZQorICAgICAgICBpZiBub3QgbWFzdGVy X25hbWUgb3Igbm90IGJ1aWxkZXJfbmFtZSBvciBub3QgYnVpbGRfbnVtYmVyIG9yIG5vdCBidWls ZF93b3JrZXI6CisgICAgICAgICAgICBfbG9nLmVycm9yKCItLXJlc3VsdHMtc2VydmVyLWhvc3Qg d2FzIHNldCwgYnV0IC0tbWFzdGVyLW5hbWUsIC0tYnVpbGRlci1uYW1lLCAtLWJ1aWxkLW51bWJl ciwgb3IgLS1idWlsZC1zbGF2ZSB3YXMgbm90LiBOb3QgdXBsb2FkaW5nIEpTT04gZmlsZXMuIikK KyAgICAgICAgICAgIHJldHVybgorCisgICAgICAgIHJldmlzaW9ucyA9IHt9CisgICAgICAgICMg RklYTUU6IFRoaXMgY29kZSBpcyBkdXBsaWNhdGVkIGluIFBlcmZUZXN0UnVubmVyLl9nZW5lcmF0 ZV9yZXN1bHRzX2RpY3QKKyAgICAgICAgZm9yIChuYW1lLCBwYXRoKSBpbiBzZWxmLl9wb3J0LnJl cG9zaXRvcnlfcGF0aHMoKToKKyAgICAgICAgICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX3Bv cnQuaG9zdC5maWxlc3lzdGVtLCBzZWxmLl9wb3J0Lmhvc3QuZXhlY3V0aXZlKS5kZXRlY3Rfc2Nt X3N5c3RlbShwYXRoKSBvciBzZWxmLl9wb3J0Lmhvc3Quc2NtKCkKKyAgICAgICAgICAgIHJldmlz aW9uID0gc2NtLm5hdGl2ZV9yZXZpc2lvbihwYXRoKQorICAgICAgICAgICAgcmV2aXNpb25zW25h bWVdID0geydyZXZpc2lvbic6IHJldmlzaW9uLCAndGltZXN0YW1wJzogc2NtLnRpbWVzdGFtcF9v Zl9uYXRpdmVfcmV2aXNpb24ocGF0aCwgcmV2aXNpb24pfQorCisgICAgICAgIGZvciBob3N0bmFt ZSBpbiBzZWxmLl9vcHRpb25zLnJlc3VsdHNfc2VydmVyX2hvc3Q6CisgICAgICAgICAgICBfbG9n LmluZm8oIlVwbG9hZGluZyBKU09OIGZpbGVzIGZvciBtYXN0ZXI6IHt9IGJ1aWxkZXI6IHt9IGJ1 aWxkOiB7fSB3b3JrZXI6IHt9IHRvIHt9Ii5mb3JtYXQobWFzdGVyX25hbWUsIGJ1aWxkZXJfbmFt ZSwgYnVpbGRfbnVtYmVyLCBidWlsZF93b3JrZXIsIGhvc3RuYW1lKSkKKworICAgICAgICAgICAg YXR0cnMgPSBbCisgICAgICAgICAgICAgICAgKCdtYXN0ZXInLCAnYnVpbGQud2Via2l0Lm9yZycg aWYgbWFzdGVyX25hbWUgPT0gJ3dlYmtpdC5vcmcnIGVsc2UgbWFzdGVyX25hbWUpLCAgIyBGSVhN RTogUGFzcyBpbiBidWlsZC53ZWJraXQub3JnLgorICAgICAgICAgICAgICAgICgnYnVpbGRlcl9u YW1lJywgYnVpbGRlcl9uYW1lKSwKKyAgICAgICAgICAgICAgICAoJ2J1aWxkX251bWJlcicsIGJ1 aWxkX251bWJlciksCisgICAgICAgICAgICAgICAgKCdidWlsZF9zbGF2ZScsIGJ1aWxkX3dvcmtl ciksCisgICAgICAgICAgICAgICAgKCdyZXZpc2lvbnMnLCBqc29uLmR1bXBzKHJldmlzaW9ucykp LAorICAgICAgICAgICAgICAgICgnc3RhcnRfdGltZScsIHN0cihzdGFydF90aW1lKSksCisgICAg ICAgICAgICAgICAgKCdlbmRfdGltZScsIHN0cihlbmRfdGltZSkpLAorICAgICAgICAgICAgXQor CisgICAgICAgICAgICB1cGxvYWRlciA9IEZpbGVVcGxvYWRlcigiaHR0cDovLyVzL2FwaS9yZXBv cnQiICUgaG9zdG5hbWUsIDM2MCkKKyAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICBy ZXNwb25zZSA9IHVwbG9hZGVyLnVwbG9hZF9hc19tdWx0aXBhcnRfZm9ybV9kYXRhKHNlbGYuX2Zp bGVzeXN0ZW0sIFsoJ3Jlc3VsdHMuanNvbicsIHJlc3VsdHNfanNvbl9wYXRoKV0sIGF0dHJzKQor ICAgICAgICAgICAgICAgIGlmIG5vdCByZXNwb25zZToKKyAgICAgICAgICAgICAgICAgICAgX2xv Zy5lcnJvcigiSlNPTiB1cGxvYWQgZmFpbGVkOyBubyByZXNwb25zZSByZXR1cm5lZCIpCisgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgICAgICAgICBpZiByZXNwb25zZS5j b2RlICE9IDIwMDoKKyAgICAgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiSlNPTiB1cGxvYWQg ZmFpbGVkLCAlZDogJyVzJyIgJSAocmVzcG9uc2UuY29kZSwgcmVzcG9uc2UucmVhZCgpKSkKKyAg ICAgICAgICAgICAgICAgICAgY29udGludWUKKworICAgICAgICAgICAgICAgIHJlc3BvbnNlX3Rl eHQgPSByZXNwb25zZS5yZWFkKCkKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAg ICAgICAgIHJlc3BvbnNlX2pzb24gPSBqc29uLmxvYWRzKHJlc3BvbnNlX3RleHQpCisgICAgICAg ICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3I6CisgICAgICAgICAgICAgICAgICAgIF9sb2cuZXJy b3IoIkpTT04gdXBsb2FkIGZhaWxlZDsgZmFpbGVkIHRvIHBhcnNlIHRoZSByZXNwb25zZTogJXMi LCByZXNwb25zZV90ZXh0KQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorCisgICAgICAg ICAgICAgICAgaWYgcmVzcG9uc2VfanNvblsnc3RhdHVzJ10gIT0gJ09LJzoKKyAgICAgICAgICAg ICAgICAgICAgX2xvZy5lcnJvcigiSlNPTiB1cGxvYWQgZmFpbGVkLCAlczogJXMiLCByZXNwb25z ZV9qc29uWydzdGF0dXMnXSwgcmVzcG9uc2VfdGV4dCkKKyAgICAgICAgICAgICAgICAgICAgY29u dGludWUKKworICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiSlNPTiB1cGxvYWRlZC4iKQorICAg ICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlcnJvcjoKKyAgICAgICAgICAgICAgICBfbG9n LmVycm9yKCJVcGxvYWQgZmFpbGVkOiAlcyIgJSBlcnJvcikKKyAgICAgICAgICAgICAgICBjb250 aW51ZQogCiAgICAgZGVmIF9jb3B5X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYsIGRlc3RpbmF0aW9u X3BhdGgpOgogICAgICAgICBiYXNlX2RpciA9IHNlbGYuX3BvcnQucGF0aF9mcm9tX3dlYmtpdF9i YXNlKCdMYXlvdXRUZXN0cycsICdmYXN0JywgJ2hhcm5lc3MnKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRf cmVzdWx0c19nZW5lcmF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5weQppbmRleCBm ZGRjYWY0ZGQyMzVmNDc2NmQ0N2YxNDcyNTI1N2E2ZTM4ODdiODQzLi45YjkzYmUyYTNkNTNjMTg3 OTBmMmZkMzkwZWQwZjVhZTEyZWQ0NTkyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVy YXRvci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5weQpAQCAtNTMsMTAgKzUzLDEw IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yKGpzb25fcmVzdWx0c19nZW5lcmF0 b3IuSlNPTlJlc3VsdHNHZW5lcmF0b3IpOgogICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2V4 cGVjdGF0aW9ucy5MRUFLOiAiTCIsCiAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RfZXhwZWN0 YXRpb25zLklNQUdFX1BMVVNfVEVYVDogIloifQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBv cnQsCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFt ZSwgYnVpbGRfbnVtYmVyLAogICAgICAgICByZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLAogICAgICAg ICBleHBlY3RhdGlvbnNfYnlfdHlwZSwgcnVuX3Jlc3VsdHMsCi0gICAgICAgIHRlc3RfdHlwZT0i Iik6CisgICAgICAgIHRlc3RfcmVzdWx0c19zZXJ2ZXJzPVtdLCB0ZXN0X3R5cGU9IiIsIG1hc3Rl cl9uYW1lPSIiKToKICAgICAgICAgIiIiTW9kaWZpZXMgdGhlIHJlc3VsdHMuanNvbiBmaWxlLiBH cmFicyBpdCBvZmYgdGhlIGFyY2hpdmUgZGlyZWN0b3J5CiAgICAgICAgIGlmIGl0IGlzIG5vdCBm b3VuZCBsb2NhbGx5LgogCkBAIC02NCw5ICs2NCw5IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRz R2VuZXJhdG9yKGpzb25fcmVzdWx0c19nZW5lcmF0b3IuSlNPTlJlc3VsdHNHZW5lcmF0b3IpOgog ICAgICAgICAgIHJ1bl9yZXN1bHRzOiBUZXN0UnVuUmVzdWx0cyBvYmplY3Qgc3RvcmluZyB0aGUg ZGV0YWlscyBvZiB0aGUgdGVzdCBydW4uCiAgICAgICAgICIiIgogICAgICAgICBzdXBlcihKU09O TGF5b3V0UmVzdWx0c0dlbmVyYXRvciwgc2VsZikuX19pbml0X18oCi0gICAgICAgICAgICBwb3J0 LCByZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLAorICAgICAgICAgICAgcG9ydCwgYnVpbGRlcl9uYW1l LCBidWlsZF9uYW1lLCBidWlsZF9udW1iZXIsIHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgsCiAgICAg ICAgICAgICB7fSwgcG9ydC5yZXBvc2l0b3J5X3BhdGhzKCksCi0gICAgICAgICAgICB0ZXN0X3R5 cGUpCisgICAgICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVycywgdGVzdF90eXBlLCBtYXN0ZXJf bmFtZSkKIAogICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSBleHBlY3RhdGlvbnNfYnlfdHlw ZQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5w eQppbmRleCBlYzk1ZjM0MGVkOTAwYTYwOTBmMDNkYjMxMTkxNmJmODkyZGM2NGM4Li5kODU4ZDM4 YzYyZTQ4ZGU4MjRjMTc3YjEyMDU3NWE1MjcwZjI5ZDkzIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2Vu ZXJhdG9yLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91 dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkKQEAgLTI0MSw4ICsyNDEsMTEgQEAg Y2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3Iob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAg ICAgIFRlc3RSZXN1bHQuRkFJTFM6IEZBSUxfUkVTVUxULAogICAgICAgICAgICAgICAgICAgICAg ICAgVGVzdFJlc3VsdC5GTEFLWTogRkxBS1lfUkVTVUxUfQogCisgICAgVkVSU0lPTiA9IDQKKyAg ICBWRVJTSU9OX0tFWSA9ICJ2ZXJzaW9uIgogICAgIFJFU1VMVFMgPSAicmVzdWx0cyIKICAgICBU SU1FUyA9ICJ0aW1lcyIKKyAgICBCVUlMRF9OVU1CRVJTID0gImJ1aWxkTnVtYmVycyIKICAgICBU SU1FID0gInNlY29uZHNTaW5jZUVwb2NoIgogICAgIFRFU1RTID0gInRlc3RzIgogCkBAIC0yNTYs MjYgKzI1OSwzNiBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvcihvYmplY3QpOgogCiAgICAg VVJMX0ZPUl9URVNUX0xJU1RfSlNPTiA9ICJodHRwOi8vJXMvdGVzdGZpbGU/YnVpbGRlcj0lcyZu YW1lPSVzJnRlc3RsaXN0anNvbj0xJnRlc3R0eXBlPSVzJm1hc3Rlcj0lcyIKIAotICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwb3J0LAorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBidWlsZGVy X25hbWUsIGJ1aWxkX25hbWUsIGJ1aWxkX251bWJlciwKICAgICAgICAgcmVzdWx0c19maWxlX2Jh c2VfcGF0aCwKICAgICAgICAgdGVzdF9yZXN1bHRzX21hcCwgc3ZuX3JlcG9zaXRvcmllcz1Ob25l LAotICAgICAgICB0ZXN0X3R5cGU9IiIpOgorICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyPVtd LAorICAgICAgICB0ZXN0X3R5cGU9IiIsCisgICAgICAgIG1hc3Rlcl9uYW1lPSIiKToKICAgICAg ICAgIiIiTW9kaWZpZXMgdGhlIHJlc3VsdHMuanNvbiBmaWxlLiBHcmFicyBpdCBvZmYgdGhlIGFy Y2hpdmUgZGlyZWN0b3J5CiAgICAgICAgIGlmIGl0IGlzIG5vdCBmb3VuZCBsb2NhbGx5LgogCiAg ICAgICAgIEFyZ3MKICAgICAgICAgICBwb3J0OiBwb3J0LXNwZWNpZmljIHdyYXBwZXIKKyAgICAg ICAgICBidWlsZGVyX25hbWU6IHRoZSBidWlsZGVyIG5hbWUgKGUuZy4gV2Via2l0KS4KKyAgICAg ICAgICBidWlsZF9uYW1lOiB0aGUgYnVpbGQgbmFtZSAoZS5nLiB3ZWJraXQtcmVsKS4KKyAgICAg ICAgICBidWlsZF9udW1iZXI6IHRoZSBidWlsZCBudW1iZXIuCiAgICAgICAgICAgcmVzdWx0c19m aWxlX2Jhc2VfcGF0aDogQWJzb2x1dGUgcGF0aCB0byB0aGUgZGlyZWN0b3J5IGNvbnRhaW5pbmcg dGhlCiAgICAgICAgICAgICAgIHJlc3VsdHMganNvbiBmaWxlLgogICAgICAgICAgIHRlc3RfcmVz dWx0c19tYXA6IEEgZGljdGlvbmFyeSB0aGF0IG1hcHMgdGVzdF9uYW1lIHRvIFRlc3RSZXN1bHQu CiAgICAgICAgICAgc3ZuX3JlcG9zaXRvcmllczogQSAoanNvbl9maWVsZF9uYW1lLCBzdm5fcGF0 aCkgcGFpciBmb3IgU1ZOCiAgICAgICAgICAgICAgIHJlcG9zaXRvcmllcyB0aGF0IHRlc3RzIHJl bHkgb24uICBUaGUgU1ZOIHJldmlzaW9uIHdpbGwgYmUKICAgICAgICAgICAgICAgaW5jbHVkZWQg aW4gdGhlIEpTT04gd2l0aCB0aGUgZ2l2ZW4ganNvbl9maWVsZF9uYW1lLgorICAgICAgICAgIHRl c3RfcmVzdWx0c19zZXJ2ZXI6IHNlcnZlciB0aGF0IGhvc3RzIHRlc3QgcmVzdWx0cyBqc29uLgog ICAgICAgICAgIHRlc3RfdHlwZTogdGVzdCB0eXBlIHN0cmluZyAoZS5nLiAnbGF5b3V0LXRlc3Rz JykuCisgICAgICAgICAgbWFzdGVyX25hbWU6IHRoZSBuYW1lIG9mIHRoZSBidWlsZGJvdCBtYXN0 ZXIuCiAgICAgICAgICIiIgogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAogICAgICAgICBzZWxm Ll9maWxlc3lzdGVtID0gcG9ydC5fZmlsZXN5c3RlbQogICAgICAgICBzZWxmLl9leGVjdXRpdmUg PSBwb3J0Ll9leGVjdXRpdmUKKyAgICAgICAgc2VsZi5fYnVpbGRlcl9uYW1lID0gYnVpbGRlcl9u YW1lCisgICAgICAgIHNlbGYuX2J1aWxkX25hbWUgPSBidWlsZF9uYW1lCisgICAgICAgIHNlbGYu X2J1aWxkX251bWJlciA9IGJ1aWxkX251bWJlcgogICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVj dG9yeSA9IHJlc3VsdHNfZmlsZV9iYXNlX3BhdGgKIAogICAgICAgICBzZWxmLl90ZXN0X3Jlc3Vs dHNfbWFwID0gdGVzdF9yZXN1bHRzX21hcApAQCAtMjg1LDcgKzI5OCw5IEBAIGNsYXNzIEpTT05S ZXN1bHRzR2VuZXJhdG9yKG9iamVjdCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9zdm5fcmVwb3Np dG9yaWVzOgogICAgICAgICAgICAgc2VsZi5fc3ZuX3JlcG9zaXRvcmllcyA9IHt9CiAKKyAgICAg ICAgc2VsZi5fdGVzdF9yZXN1bHRzX3NlcnZlcnMgPSB0ZXN0X3Jlc3VsdHNfc2VydmVyCiAgICAg ICAgIHNlbGYuX3Rlc3RfdHlwZSA9IHRlc3RfdHlwZQorICAgICAgICBzZWxmLl9tYXN0ZXJfbmFt ZSA9IG1hc3Rlcl9uYW1lCiAKICAgICAgICAgc2VsZi5fYXJjaGl2ZWRfcmVzdWx0cyA9IE5vbmUK IApAQCAtMzA0LDkgKzMxOSwzNyBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvcihvYmplY3Qp OgogICAgICAgICBmaWxlX3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0 c19kaXJlY3RvcnksIHNlbGYuVElNRVNfTVNfRklMRU5BTUUpCiAgICAgICAgIHdyaXRlX2pzb24o c2VsZi5fZmlsZXN5c3RlbSwgdGltZXMsIGZpbGVfcGF0aCkKIAotICAgIGRlZiBnZXRfanNvbihz ZWxmKToKKyAgICBkZWYgZ2V0X2pzb24oc2VsZiwgc2VydmVyX2luZGV4PTApOgogICAgICAgICAi IiJHZXRzIHRoZSByZXN1bHRzIGZvciB0aGUgcmVzdWx0cy5qc29uIGZpbGUuIiIiCi0gICAgICAg IHJlc3VsdHNfZm9yX2J1aWxkZXIgPSBzZWxmLl9jcmVhdGVfcmVzdWx0c19mb3JfYnVpbGRlcl9q c29uKCkKKyAgICAgICAgcmVzdWx0c19qc29uID0ge30KKworICAgICAgICBpZiBub3QgcmVzdWx0 c19qc29uOgorICAgICAgICAgICAgcmVzdWx0c19qc29uLCBlcnJvciA9IHNlbGYuX2dldF9hcmNo aXZlZF9qc29uX3Jlc3VsdHMoc2VydmVyX2luZGV4PXNlcnZlcl9pbmRleCkKKyAgICAgICAgICAg IGlmIGVycm9yOgorICAgICAgICAgICAgICAgICMgSWYgdGhlcmUgd2FzIGFuIGVycm9yIGRvbid0 IHdyaXRlIGEgcmVzdWx0cy5qc29uCisgICAgICAgICAgICAgICAgIyBmaWxlIGF0IGFsbCBhcyBp dCB3b3VsZCBsb3NlIGFsbCB0aGUgaW5mb3JtYXRpb24gb24gdGhlCisgICAgICAgICAgICAgICAg IyBib3QuCisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiQXJjaGl2ZSBkaXJlY3RvcnkgaXMg aW5hY2Nlc3NpYmxlLiBOb3QgIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1vZGlmeWlu ZyBvciBjbG9iYmVyaW5nIHRoZSByZXN1bHRzLmpzb24gIgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgImZpbGU6ICIgKyBzdHIoZXJyb3IpKQorICAgICAgICAgICAgICAgIHJldHVybiBOb25l CisKKyAgICAgICAgYnVpbGRlcl9uYW1lID0gc2VsZi5fYnVpbGRlcl9uYW1lCisgICAgICAgIGlm IHJlc3VsdHNfanNvbiBhbmQgYnVpbGRlcl9uYW1lIG5vdCBpbiByZXN1bHRzX2pzb246CisgICAg ICAgICAgICBfbG9nLmRlYnVnKCJCdWlsZGVyIG5hbWUgKCVzKSBpcyBub3QgaW4gdGhlIHJlc3Vs dHMuanNvbiBmaWxlLiIKKyAgICAgICAgICAgICAgICAgICAgICAgJSBidWlsZGVyX25hbWUpCisK KyAgICAgICAgc2VsZi5fY29udmVydF9qc29uX3RvX2N1cnJlbnRfdmVyc2lvbihyZXN1bHRzX2pz b24pCisKKyAgICAgICAgaWYgYnVpbGRlcl9uYW1lIG5vdCBpbiByZXN1bHRzX2pzb246CisgICAg ICAgICAgICByZXN1bHRzX2pzb25bYnVpbGRlcl9uYW1lXSA9ICgKKyAgICAgICAgICAgICAgICBz ZWxmLl9jcmVhdGVfcmVzdWx0c19mb3JfYnVpbGRlcl9qc29uKCkpCisKKyAgICAgICAgcmVzdWx0 c19mb3JfYnVpbGRlciA9IHJlc3VsdHNfanNvbltidWlsZGVyX25hbWVdCisKKyAgICAgICAgaWYg YnVpbGRlcl9uYW1lOgorICAgICAgICAgICAgc2VsZi5faW5zZXJ0X2dlbmVyaWNfbWV0YWRhdGEo cmVzdWx0c19mb3JfYnVpbGRlcikKKwogICAgICAgICBzZWxmLl9pbnNlcnRfZmFpbHVyZV9zdW1t YXJpZXMocmVzdWx0c19mb3JfYnVpbGRlcikKIAogICAgICAgICAjIFVwZGF0ZSB0aGUgYWxsIGZh aWxpbmcgdGVzdHMgd2l0aCByZXN1bHQgdHlwZSBhbmQgdGltZS4KQEAgLTMxNywxMyArMzYwLDQ3 IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yKG9iamVjdCk6CiAgICAgICAgIGZvciB0ZXN0 IGluIGFsbF9mYWlsaW5nX3Rlc3RzOgogICAgICAgICAgICAgc2VsZi5faW5zZXJ0X3Rlc3RfdGlt ZV9hbmRfcmVzdWx0KHRlc3QsIHRlc3RzKQogCi0gICAgICAgIHJldHVybiBkaWN0KAotICAgICAg ICAgICAgcmVzdWx0cz1yZXN1bHRzX2Zvcl9idWlsZGVyLAotICAgICAgICApCisgICAgICAgIHJl dHVybiByZXN1bHRzX2pzb24KIAogICAgIGRlZiBzZXRfYXJjaGl2ZWRfcmVzdWx0cyhzZWxmLCBh cmNoaXZlZF9yZXN1bHRzKToKICAgICAgICAgc2VsZi5fYXJjaGl2ZWRfcmVzdWx0cyA9IGFyY2hp dmVkX3Jlc3VsdHMKIAorICAgIGRlZiB1cGxvYWRfanNvbl9maWxlcyhzZWxmLCBqc29uX2ZpbGVz KToKKyAgICAgICAgIiIiVXBsb2FkcyB0aGUgZ2l2ZW4ganNvbl9maWxlcyB0byB0aGUgdGVzdF9y ZXN1bHRzX3NlcnZlciAoaWYgdGhlCisgICAgICAgIHRlc3RfcmVzdWx0c19zZXJ2ZXIgaXMgZ2l2 ZW4pLiIiIgorICAgICAgICBpZiBub3Qgc2VsZi5fdGVzdF9yZXN1bHRzX3NlcnZlcnM6CisgICAg ICAgICAgICByZXR1cm4KKworICAgICAgICBpZiBub3Qgc2VsZi5fbWFzdGVyX25hbWU6CisgICAg ICAgICAgICBfbG9nLmVycm9yKCItLXRlc3QtcmVzdWx0cy1zZXJ2ZXIgd2FzIHNldCwgYnV0IC0t bWFzdGVyLW5hbWUgd2FzIG5vdC4gIE5vdCB1cGxvYWRpbmcgSlNPTiBmaWxlcy4iKQorICAgICAg ICAgICAgcmV0dXJuCisKKyAgICAgICAgX2xvZy5pbmZvKCJVcGxvYWRpbmcgSlNPTiBmaWxlcyBm b3IgYnVpbGRlcjogJXMiLCBzZWxmLl9idWlsZGVyX25hbWUpCisgICAgICAgIGF0dHJzID0gWygi YnVpbGRlciIsIHNlbGYuX2J1aWxkZXJfbmFtZSksCisgICAgICAgICAgICAgICAgICgidGVzdHR5 cGUiLCBzZWxmLl90ZXN0X3R5cGUpLAorICAgICAgICAgICAgICAgICAoIm1hc3RlciIsIHNlbGYu X21hc3Rlcl9uYW1lKV0KKworICAgICAgICBmaWxlcyA9IFsoZmlsZSwgc2VsZi5fZmlsZXN5c3Rl bS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBmaWxlKSkKKyAgICAgICAgICAgIGZvciBm aWxlIGluIGpzb25fZmlsZXNdCisKKyAgICAgICAgZm9yIHRlc3RfcmVzdWx0c19zZXJ2ZXIgaW4g c2VsZi5fdGVzdF9yZXN1bHRzX3NlcnZlcnM6CisgICAgICAgICAgICB1cmwgPSAiaHR0cDovLyVz L3Rlc3RmaWxlL3VwbG9hZCIgJSB0ZXN0X3Jlc3VsdHNfc2VydmVyCisgICAgICAgICAgICAjIFNl dCB1cGxvYWRpbmcgdGltZW91dCBpbiBjYXNlIGFwcGVuZ2luZSBzZXJ2ZXIgaXMgaGF2aW5nIHBy b2JsZW1zLgorICAgICAgICAgICAgIyAxMjAgc2Vjb25kcyBhcmUgbW9yZSB0aGFuIGVub3VnaCB0 byB1cGxvYWQgdGVzdCByZXN1bHRzLgorICAgICAgICAgICAgdXBsb2FkZXIgPSBGaWxlVXBsb2Fk ZXIodXJsLCAxMjApCisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgcmVzcG9uc2Ug PSB1cGxvYWRlci51cGxvYWRfYXNfbXVsdGlwYXJ0X2Zvcm1fZGF0YShzZWxmLl9maWxlc3lzdGVt LCBmaWxlcywgYXR0cnMpCisgICAgICAgICAgICAgICAgaWYgcmVzcG9uc2U6CisgICAgICAgICAg ICAgICAgICAgIGlmIHJlc3BvbnNlLmNvZGUgPT0gMjAwOgorICAgICAgICAgICAgICAgICAgICAg ICAgX2xvZy5pbmZvKCJKU09OIHVwbG9hZGVkLiIpCisgICAgICAgICAgICAgICAgICAgIGVsc2U6 CisgICAgICAgICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJKU09OIHVwbG9hZCBmYWlsZWQs ICVkOiAnJXMnIiAlIChyZXNwb25zZS5jb2RlLCByZXNwb25zZS5yZWFkKCkpKQorICAgICAgICAg ICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkpTT04gdXBsb2Fk IGZhaWxlZDsgbm8gcmVzcG9uc2UgcmV0dXJuZWQiKQorICAgICAgICAgICAgZXhjZXB0IEV4Y2Vw dGlvbiBhcyBlcnI6CisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiVXBsb2FkIGZhaWxlZDog JXMiICUgZXJyKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKICAgICBkZWYgX2dldF90ZXN0 X3RpbWluZyhzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICAiIiJSZXR1cm5zIHRlc3QgdGltaW5n IGRhdGEgKGVsYXBzZWQgdGltZSkgaW4gc2Vjb25kCiAgICAgICAgIGZvciB0aGUgZ2l2ZW4gdGVz dF9uYW1lLiIiIgpAQCAtMzY3LDYgKzQ0NCw2OSBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRv cihvYmplY3QpOgogCiAgICAgICAgIHJldHVybiBzZWxmLl9fY2xhc3NfXy5QQVNTX1JFU1VMVAog CisgICAgZGVmIF9nZXRfc3ZuX3JldmlzaW9uKHNlbGYsIGluX2RpcmVjdG9yeSk6CisgICAgICAg ICIiIlJldHVybnMgdGhlIHN2biByZXZpc2lvbiBmb3IgdGhlIGdpdmVuIGRpcmVjdG9yeS4KKwor ICAgICAgICBBcmdzOgorICAgICAgICAgIGluX2RpcmVjdG9yeTogVGhlIGRpcmVjdG9yeSB3aGVy ZSBzdm4gaXMgdG8gYmUgcnVuLgorICAgICAgICAiIiIKKyAgICAgICAgc2NtID0gU0NNRGV0ZWN0 b3Ioc2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5fZXhlY3V0aXZlKS5kZXRlY3Rfc2NtX3N5c3RlbShp bl9kaXJlY3RvcnkpCisgICAgICAgIGlmIHNjbToKKyAgICAgICAgICAgIHJldHVybiBzY20uc3Zu X3JldmlzaW9uKGluX2RpcmVjdG9yeSkKKyAgICAgICAgcmV0dXJuICIiCisKKyAgICBkZWYgX2dl dF9hcmNoaXZlZF9qc29uX3Jlc3VsdHMoc2VsZiwgc2VydmVyX2luZGV4PTApOgorICAgICAgICAi IiJEb3dubG9hZCBKU09OIGZpbGUgdGhhdCBvbmx5IGNvbnRhaW5zIHRlc3QKKyAgICAgICAgbmFt ZSBsaXN0IGZyb20gdGVzdC1yZXN1bHRzIHNlcnZlci4gVGhpcyBpcyBmb3IgZ2VuZXJhdGluZyBp bmNyZW1lbnRhbAorICAgICAgICBKU09OIHNvIHRoZSBmaWxlIGdlbmVyYXRlZCBoYXMgaW5mbyBm b3IgdGVzdHMgdGhhdCBmYWlsZWQgYmVmb3JlIGJ1dAorICAgICAgICBwYXNzIG9yIGFyZSBza2lw cGVkIGZyb20gY3VycmVudCBydW4uCisKKyAgICAgICAgUmV0dXJucyAoYXJjaGl2ZWRfcmVzdWx0 cywgZXJyb3IpIHR1cGxlIHdoZXJlIGVycm9yIGlzIE5vbmUgaWYgcmVzdWx0cworICAgICAgICB3 ZXJlIHN1Y2Nlc3NmdWxseSByZWFkLgorICAgICAgICAiIiIKKyAgICAgICAgcmVzdWx0c19qc29u ID0ge30KKyAgICAgICAgb2xkX3Jlc3VsdHMgPSBOb25lCisgICAgICAgIGVycm9yID0gTm9uZQor CisgICAgICAgIGlmIGxlbihzZWxmLl90ZXN0X3Jlc3VsdHNfc2VydmVycykgPD0gc2VydmVyX2lu ZGV4OgorICAgICAgICAgICAgcmV0dXJuIHt9LCBOb25lCisKKyAgICAgICAgcmVzdWx0c19maWxl X3VybCA9IChzZWxmLlVSTF9GT1JfVEVTVF9MSVNUX0pTT04gJQorICAgICAgICAgICAgKHF1b3Rl KHNlbGYuX3Rlc3RfcmVzdWx0c19zZXJ2ZXJzW3NlcnZlcl9pbmRleF0pLAorICAgICAgICAgICAg IHF1b3RlKHNlbGYuX2J1aWxkZXJfbmFtZSksCisgICAgICAgICAgICAgc2VsZi5SRVNVTFRTX0ZJ TEVOQU1FLAorICAgICAgICAgICAgIHF1b3RlKHNlbGYuX3Rlc3RfdHlwZSksCisgICAgICAgICAg ICAgcXVvdGUoc2VsZi5fbWFzdGVyX25hbWUpKSkKKworICAgICAgICB0cnk6CisgICAgICAgICAg ICAjIEZJWE1FOiBXZSBzaG91bGQgdGFsayB0byB0aGUgbmV0d29yayB2aWEgYSBIb3N0IG9iamVj dC4KKyAgICAgICAgICAgIHJlc3VsdHNfZmlsZSA9IHVybG9wZW4ocmVzdWx0c19maWxlX3VybCkK KyAgICAgICAgICAgIGluZm8gPSByZXN1bHRzX2ZpbGUuaW5mbygpCisgICAgICAgICAgICBvbGRf cmVzdWx0cyA9IHJlc3VsdHNfZmlsZS5yZWFkKCkKKyAgICAgICAgZXhjZXB0IEhUVFBFcnJvciBh cyBodHRwX2Vycm9yOgorICAgICAgICAgICAgIyBBIG5vbi00eHggc3RhdHVzIGNvZGUgbWVhbnMg dGhlIGJvdCBpcyBob3NlZCBmb3Igc29tZSByZWFzb24KKyAgICAgICAgICAgICMgYW5kIHdlIGNh bid0IGdyYWIgdGhlIHJlc3VsdHMuanNvbiBmaWxlIG9mZiBvZiBpdC4KKyAgICAgICAgICAgIGlm IChodHRwX2Vycm9yLmNvZGUgPCA0MDAgYW5kIGh0dHBfZXJyb3IuY29kZSA+PSA1MDApOgorICAg ICAgICAgICAgICAgIGVycm9yID0gaHR0cF9lcnJvcgorICAgICAgICBleGNlcHQgVVJMRXJyb3Ig YXMgdXJsX2Vycm9yOgorICAgICAgICAgICAgZXJyb3IgPSB1cmxfZXJyb3IKKworICAgICAgICBp ZiBvbGRfcmVzdWx0czoKKyAgICAgICAgICAgICMgU3RyaXAgdGhlIHByZWZpeCBhbmQgc3VmZml4 IHNvIHdlIGNhbiBnZXQgdGhlIGFjdHVhbCBKU09OIG9iamVjdC4KKyAgICAgICAgICAgIG9sZF9y ZXN1bHRzID0gc3RyaXBfanNvbl93cmFwcGVyKG9sZF9yZXN1bHRzKQorCisgICAgICAgICAgICB0 cnk6CisgICAgICAgICAgICAgICAgcmVzdWx0c19qc29uID0ganNvbi5sb2FkcyhvbGRfcmVzdWx0 cykKKyAgICAgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJyZXN1 bHRzLmpzb24gd2FzIG5vdCB2YWxpZCBKU09OLiBDbG9iYmVyaW5nLiIpCisgICAgICAgICAgICAg ICAgIyBUaGUgSlNPTiBmaWxlIGlzIG5vdCB2YWxpZCBKU09OLiBKdXN0IGNsb2JiZXIgdGhlIHJl c3VsdHMuCisgICAgICAgICAgICAgICAgcmVzdWx0c19qc29uID0ge30KKyAgICAgICAgZWxzZToK KyAgICAgICAgICAgIF9sb2cuZGVidWcoJ09sZCBKU09OIHJlc3VsdHMgZG8gbm90IGV4aXN0LiBT dGFydGluZyBmcmVzaC4nKQorICAgICAgICAgICAgcmVzdWx0c19qc29uID0ge30KKworICAgICAg ICByZXR1cm4gcmVzdWx0c19qc29uLCBlcnJvcgorCiAgICAgZGVmIF9pbnNlcnRfZmFpbHVyZV9z dW1tYXJpZXMoc2VsZiwgcmVzdWx0c19mb3JfYnVpbGRlcik6CiAgICAgICAgICIiIkluc2VydHMg YWdncmVnYXRlIHBhc3MvZmFpbHVyZSBzdGF0aXN0aWNzIGludG8gdGhlIEpTT04uCiAgICAgICAg IFRoaXMgbWV0aG9kIHJlYWRzIHNlbGYuX3Rlc3RfcmVzdWx0cyBhbmQgZ2VuZXJhdGVzCkBAIC00 MzIsNiArNTcyLDIzIEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yKG9iamVjdCk6CiAgICAg ICAgICAgICAjIHdlIHdhbnQgdGhlIHNlcmlhbGl6ZWQgZm9ybSB0byBiZSBjb25jaXNlLgogICAg ICAgICAgICAgZW5jb2RlZF9yZXN1bHRzLmluc2VydCgwLCBbMSwgaXRlbV0pCiAKKyAgICBkZWYg X2luc2VydF9nZW5lcmljX21ldGFkYXRhKHNlbGYsIHJlc3VsdHNfZm9yX2J1aWxkZXIpOgorICAg ICAgICAiIiIgSW5zZXJ0cyBnZW5lcmljIG1ldGFkYXRhIChzdWNoIGFzIHZlcnNpb24gbnVtYmVy LCBjdXJyZW50IHRpbWUgZXRjKQorICAgICAgICBpbnRvIHRoZSBKU09OLgorCisgICAgICAgIEFy Z3M6CisgICAgICAgICAgcmVzdWx0c19mb3JfYnVpbGRlcjogRGljdGlvbmFyeSBjb250YWluaW5n IHRoZSB0ZXN0IHJlc3VsdHMgZm9yCisgICAgICAgICAgICAgIGEgc2luZ2xlIGJ1aWxkZXIuCisg ICAgICAgICIiIgorICAgICAgICBzZWxmLl9pbnNlcnRfaXRlbV9pbnRvX3Jhd19saXN0KHJlc3Vs dHNfZm9yX2J1aWxkZXIsCisgICAgICAgICAgICBzZWxmLl9idWlsZF9udW1iZXIsIHNlbGYuQlVJ TERfTlVNQkVSUykKKworICAgICAgICAjIEluY2x1ZGUgU1ZOIHJldmlzaW9ucyBmb3IgdGhlIGdp dmVuIHJlcG9zaXRvcmllcy4KKyAgICAgICAgZm9yIChuYW1lLCBwYXRoKSBpbiBzZWxmLl9zdm5f cmVwb3NpdG9yaWVzOgorICAgICAgICAgICAgc2VsZi5faW5zZXJ0X2l0ZW1faW50b19yYXdfbGlz dChyZXN1bHRzX2Zvcl9idWlsZGVyLCBzZWxmLl9nZXRfc3ZuX3JldmlzaW9uKHBhdGgpLCBuYW1l Lmxvd2VyKCkgKyAnUmV2aXNpb24nKQorCisgICAgICAgIHNlbGYuX2luc2VydF9pdGVtX2ludG9f cmF3X2xpc3QocmVzdWx0c19mb3JfYnVpbGRlciwgaW50KHRpbWUudGltZSgpKSwgc2VsZi5USU1F KQorCiAgICAgZGVmIF9pbnNlcnRfdGVzdF90aW1lX2FuZF9yZXN1bHQoc2VsZiwgdGVzdF9uYW1l LCB0ZXN0cyk6CiAgICAgICAgICIiIiBJbnNlcnQgYSB0ZXN0IGl0ZW0gd2l0aCBpdHMgcmVzdWx0 cyB0byB0aGUgZ2l2ZW4gdGVzdHMgZGljdGlvbmFyeS4KIApAQCAtNDYxLDYgKzYxOCwzNyBAQCBj bGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvcihvYmplY3QpOgogICAgICAgICBlbHNlOgogICAgICAg ICAgICAgdGhpc190ZXN0W3NlbGYuVElNRVNdID0gW1sxLCB0aW1lXV0KIAorICAgIGRlZiBfY29u dmVydF9qc29uX3RvX2N1cnJlbnRfdmVyc2lvbihzZWxmLCByZXN1bHRzX2pzb24pOgorICAgICAg ICAiIiJJZiB0aGUgSlNPTiBkb2VzIG5vdCBtYXRjaCB0aGUgY3VycmVudCB2ZXJzaW9uLCBjb252 ZXJ0cyBpdCB0byB0aGUKKyAgICAgICAgY3VycmVudCB2ZXJzaW9uIGFuZCBhZGRzIGluIHRoZSBu ZXcgdmVyc2lvbiBudW1iZXIuCisgICAgICAgICIiIgorICAgICAgICBpZiBzZWxmLlZFUlNJT05f S0VZIGluIHJlc3VsdHNfanNvbjoKKyAgICAgICAgICAgIGFyY2hpdmVfdmVyc2lvbiA9IHJlc3Vs dHNfanNvbltzZWxmLlZFUlNJT05fS0VZXQorICAgICAgICAgICAgaWYgYXJjaGl2ZV92ZXJzaW9u ID09IHNlbGYuVkVSU0lPTjoKKyAgICAgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgZWxzZToK KyAgICAgICAgICAgIGFyY2hpdmVfdmVyc2lvbiA9IDMKKworICAgICAgICAjIHZlcnNpb24gMy0+ NAorICAgICAgICBpZiBhcmNoaXZlX3ZlcnNpb24gPT0gMzoKKyAgICAgICAgICAgIG51bV9yZXN1 bHRzID0gbGVuKHJlc3VsdHNfanNvbi52YWx1ZXMoKSkKKyAgICAgICAgICAgIGZvciBidWlsZGVy LCByZXN1bHRzIGluIGl0ZXJpdGVtcyhyZXN1bHRzX2pzb24pOgorICAgICAgICAgICAgICAgIHNl bGYuX2NvbnZlcnRfdGVzdHNfdG9fdHJpZShyZXN1bHRzKQorCisgICAgICAgIHJlc3VsdHNfanNv bltzZWxmLlZFUlNJT05fS0VZXSA9IHNlbGYuVkVSU0lPTgorCisgICAgZGVmIF9jb252ZXJ0X3Rl c3RzX3RvX3RyaWUoc2VsZiwgcmVzdWx0cyk6CisgICAgICAgIGlmIG5vdCBzZWxmLlRFU1RTIGlu IHJlc3VsdHM6CisgICAgICAgICAgICByZXR1cm4KKworICAgICAgICB0ZXN0X3Jlc3VsdHMgPSBy ZXN1bHRzW3NlbGYuVEVTVFNdCisgICAgICAgIHRlc3RfcmVzdWx0c190cmllID0ge30KKyAgICAg ICAgZm9yIHRlc3QgaW4gaXRlcmtleXModGVzdF9yZXN1bHRzKToKKyAgICAgICAgICAgIHNpbmds ZV90ZXN0X3Jlc3VsdCA9IHRlc3RfcmVzdWx0c1t0ZXN0XQorICAgICAgICAgICAgYWRkX3BhdGhf dG9fdHJpZSh0ZXN0LCBzaW5nbGVfdGVzdF9yZXN1bHQsIHRlc3RfcmVzdWx0c190cmllKQorCisg ICAgICAgIHJlc3VsdHNbc2VsZi5URVNUU10gPSB0ZXN0X3Jlc3VsdHNfdHJpZQorCiAgICAgZGVm IF9wb3B1bGF0ZV9yZXN1bHRzX2FuZF90aW1lc19qc29uKHNlbGYsIHJlc3VsdHNfYW5kX3RpbWVz KToKICAgICAgICAgcmVzdWx0c19hbmRfdGltZXNbc2VsZi5SRVNVTFRTXSA9IFtdCiAgICAgICAg IHJlc3VsdHNfYW5kX3RpbWVzW3NlbGYuVElNRVNdID0gW10KQEAgLTQ3MCwzICs2NTgsNTEgQEAg Y2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3Iob2JqZWN0KToKICAgICAgICAgcmVzdWx0c19mb3Jf YnVpbGRlciA9IHt9CiAgICAgICAgIHJlc3VsdHNfZm9yX2J1aWxkZXJbc2VsZi5URVNUU10gPSB7 fQogICAgICAgICByZXR1cm4gcmVzdWx0c19mb3JfYnVpbGRlcgorCisgICAgZGVmIF9yZW1vdmVf aXRlbXNfb3Zlcl9tYXhfbnVtYmVyX29mX2J1aWxkcyhzZWxmLCBlbmNvZGVkX2xpc3QpOgorICAg ICAgICAiIiJSZW1vdmVzIGl0ZW1zIGZyb20gdGhlIHJ1bi1sZW5ndGggZW5jb2RlZCBsaXN0IGFm dGVyIHRoZSBmaW5hbAorICAgICAgICBpdGVtIHRoYXQgZXhjZWVkcyB0aGUgbWF4IG51bWJlciBv ZiBidWlsZHMgdG8gdHJhY2suCisKKyAgICAgICAgQXJnczoKKyAgICAgICAgICBlbmNvZGVkX3Jl c3VsdHM6IHJ1bi1sZW5ndGggZW5jb2RlZCByZXN1bHRzLiBBbiBhcnJheSBvZiBhcnJheXMsIGUu Zy4KKyAgICAgICAgICAgICAgW1szLCdBJ10sWzEsJ1EnXV0gZW5jb2RlcyBBQUFRLgorICAgICAg ICAiIiIKKyAgICAgICAgbnVtX2J1aWxkcyA9IDAKKyAgICAgICAgaW5kZXggPSAwCisgICAgICAg IGZvciByZXN1bHQgaW4gZW5jb2RlZF9saXN0OgorICAgICAgICAgICAgbnVtX2J1aWxkcyA9IG51 bV9idWlsZHMgKyByZXN1bHRbMF0KKyAgICAgICAgICAgIGluZGV4ID0gaW5kZXggKyAxCisgICAg ICAgICAgICBpZiBudW1fYnVpbGRzID4gc2VsZi5NQVhfTlVNQkVSX09GX0JVSUxEX1JFU1VMVFNf VE9fTE9HOgorICAgICAgICAgICAgICAgIHJldHVybiBlbmNvZGVkX2xpc3RbOmluZGV4XQorICAg ICAgICByZXR1cm4gZW5jb2RlZF9saXN0CisKKyAgICBkZWYgX25vcm1hbGl6ZV9yZXN1bHRzX2pz b24oc2VsZiwgdGVzdCwgdGVzdF9uYW1lLCB0ZXN0cyk6CisgICAgICAgICIiIiBQcnVuZSB0ZXN0 cyB3aGVyZSBhbGwgcnVucyBwYXNzIG9yIHRlc3RzIHRoYXQgbm8gbG9uZ2VyIGV4aXN0IGFuZAor ICAgICAgICB0cnVuY2F0ZSBhbGwgcmVzdWx0cyB0byBtYXhOdW1iZXJPZkJ1aWxkcy4KKworICAg ICAgICBBcmdzOgorICAgICAgICAgIHRlc3Q6IFJlc3VsdHNBbmRUaW1lcyBvYmplY3QgZm9yIHRo aXMgdGVzdC4KKyAgICAgICAgICB0ZXN0X25hbWU6IE5hbWUgb2YgdGhlIHRlc3QuCisgICAgICAg ICAgdGVzdHM6IFRoZSBKU09OIG9iamVjdCB3aXRoIGFsbCB0aGUgdGVzdCByZXN1bHRzIGZvciB0 aGlzIGJ1aWxkZXIuCisgICAgICAgICIiIgorICAgICAgICB0ZXN0W3NlbGYuUkVTVUxUU10gPSBz ZWxmLl9yZW1vdmVfaXRlbXNfb3Zlcl9tYXhfbnVtYmVyX29mX2J1aWxkcygKKyAgICAgICAgICAg IHRlc3Rbc2VsZi5SRVNVTFRTXSkKKyAgICAgICAgdGVzdFtzZWxmLlRJTUVTXSA9IHNlbGYuX3Jl bW92ZV9pdGVtc19vdmVyX21heF9udW1iZXJfb2ZfYnVpbGRzKAorICAgICAgICAgICAgdGVzdFtz ZWxmLlRJTUVTXSkKKworICAgICAgICBpc19hbGxfcGFzcyA9IHNlbGYuX2lzX3Jlc3VsdHNfYWxs X29mX3R5cGUodGVzdFtzZWxmLlJFU1VMVFNdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5QQVNTX1JFU1VMVCkKKyAgICAgICAgaXNfYWxs X25vX2RhdGEgPSBzZWxmLl9pc19yZXN1bHRzX2FsbF9vZl90eXBlKHRlc3Rbc2VsZi5SRVNVTFRT XSwKKyAgICAgICAgICAgIHNlbGYuTk9fREFUQV9SRVNVTFQpCisgICAgICAgIG1heF90aW1lID0g bWF4KFt0aW1lWzFdIGZvciB0aW1lIGluIHRlc3Rbc2VsZi5USU1FU11dKQorCisgICAgICAgICMg UmVtb3ZlIGFsbCBwYXNzZXMvbm8tZGF0YSBmcm9tIHRoZSByZXN1bHRzIHRvIHJlZHVjZSBub2lz ZSBhbmQKKyAgICAgICAgIyBmaWxlc2l6ZS4gSWYgYSB0ZXN0IHBhc3NlcyBldmVyeSBydW4sIGJ1 dCB0YWtlcyA+IE1JTl9USU1FIHRvIHJ1biwKKyAgICAgICAgIyBkb24ndCB0aHJvdyBhd2F5IHRo ZSBkYXRhLgorICAgICAgICBpZiBpc19hbGxfbm9fZGF0YSBvciAoaXNfYWxsX3Bhc3MgYW5kIG1h eF90aW1lIDw9IHNlbGYuTUlOX1RJTUUpOgorICAgICAgICAgICAgZGVsIHRlc3RzW3Rlc3RfbmFt ZV0KKworICAgIGRlZiBfaXNfcmVzdWx0c19hbGxfb2ZfdHlwZShzZWxmLCByZXN1bHRzLCB0eXBl KToKKyAgICAgICAgIiIiUmV0dXJucyB3aGV0aGVyIGFsbCB0aGUgcmVzdWx0cyBhcmUgb2YgdGhl IGdpdmVuIHR5cGUKKyAgICAgICAgKGUuZy4gYWxsIHBhc3NlcykuIiIiCisgICAgICAgIHJldHVy biBsZW4ocmVzdWx0cykgPT0gMSBhbmQgcmVzdWx0c1swXVsxXSA9PSB0eXBlCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29u X3Jlc3VsdHNfZ2VuZXJhdG9yX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvcl91bml0dGVz dC5weQppbmRleCA5MTk0ZTg0ODUwYmYxMWU4M2YwMDVkNjE3Mzc3ZDdlZDBjY2NhN2E0Li4zY2Rk ZGYxYzMxY2IzOTZmZmFlNTliNmIyOTkzYzQ5ZTNlY2Y5ZjRlIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNf Z2VuZXJhdG9yX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3JfdW5pdHRlc3QucHkK QEAgLTQwLDYgKzQwLDEwIEBAIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGltcG9ydCBN b2NrCiAKIGNsYXNzIEpTT05HZW5lcmF0b3JUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBk ZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYuYnVpbGRlcl9uYW1lID0gJ0RVTU1ZX0JVSUxE RVJfTkFNRScKKyAgICAgICAgc2VsZi5idWlsZF9uYW1lID0gJ0RVTU1ZX0JVSUxEX05BTUUnCisg ICAgICAgIHNlbGYuYnVpbGRfbnVtYmVyID0gJ0RVTU1ZX0JVSUxERVJfTlVNQkVSJworCiAgICAg ICAgICMgRm9yIGFyY2hpdmVkIHJlc3VsdHMuCiAgICAgICAgIHNlbGYuX2pzb24gPSBOb25lCiAg ICAgICAgIHNlbGYuX251bV9ydW5zID0gMApAQCAtODcsNyArOTEsOCBAQCBjbGFzcyBKU09OR2Vu ZXJhdG9yVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgp CiAgICAgICAgIHBvcnQgPSBNb2NrKCkKICAgICAgICAgcG9ydC5fZmlsZXN5c3RlbSA9IGhvc3Qu ZmlsZXN5c3RlbQotICAgICAgICBnZW5lcmF0b3IgPSBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLkpT T05SZXN1bHRzR2VuZXJhdG9yKHBvcnQsICcnLCB0ZXN0X3Jlc3VsdHNfbWFwKQorICAgICAgICBn ZW5lcmF0b3IgPSBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLkpTT05SZXN1bHRzR2VuZXJhdG9yKHBv cnQsCisgICAgICAgICAgICBzZWxmLmJ1aWxkZXJfbmFtZSwgc2VsZi5idWlsZF9uYW1lLCBzZWxm LmJ1aWxkX251bWJlciwgJycsIHRlc3RfcmVzdWx0c19tYXApCiAKICAgICAgICAgZmFpbGVkX2Nv dW50X21hcCA9IGRpY3QoWyh0LCAxKSBmb3IgdCBpbiBmYWlsZWRfdGVzdHNdKQogCkBAIC0xMTUs OSArMTIwLDE0IEBAIGNsYXNzIEpTT05HZW5lcmF0b3JUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgIyBBbGlhc2luZyB0byBhIHNob3J0IG5hbWUgZm9yIGJldHRlciBhY2Nlc3MgdG8g aXRzIGNvbnN0YW50cy4KICAgICAgICAgSlJHID0ganNvbl9yZXN1bHRzX2dlbmVyYXRvci5KU09O UmVzdWx0c0dlbmVyYXRvcgogCi0gICAgICAgIGJ1aWxkaW5mbyA9IGpzb25bJ3Jlc3VsdHMnXQor ICAgICAgICBzZWxmLmFzc2VydEluKEpSRy5WRVJTSU9OX0tFWSwganNvbikKKyAgICAgICAgc2Vs Zi5hc3NlcnRJbihzZWxmLmJ1aWxkZXJfbmFtZSwganNvbikKKworICAgICAgICBidWlsZGluZm8g PSBqc29uW3NlbGYuYnVpbGRlcl9uYW1lXQogICAgICAgICBzZWxmLmFzc2VydEluKEpSRy5GSVhB QkxFLCBidWlsZGluZm8pCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oSlJHLlRFU1RTLCBidWlsZGlu Zm8pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGJ1aWxkaW5mb1tKUkcuQlVJTERfTlVN QkVSU10pLCBudW1fcnVucykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWlsZGluZm9bSlJH LkJVSUxEX05VTUJFUlNdWzBdLCBzZWxmLmJ1aWxkX251bWJlcikKIAogICAgICAgICBpZiB0ZXN0 c19zZXQgb3IgRElTQUJMRURfY291bnQ6CiAgICAgICAgICAgICBmaXhhYmxlID0ge30KZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzLnB5CmluZGV4IDA4MzI1YjRhNjY1Zjg4MDQ3YTIzYTg5ZDA0YjFjMzkwOTA0Y2U4M2QuLjFl ZjlkYjJhNjE2ODdiNWRjYTVjNWVlMzJjNjNmYjk5OTY5MmU4ODMgMTAwNzU1Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpA QCAtMzQ0LDYgKzM0NCwyNSBAQCBkZWYgcGFyc2VfYXJncyhhcmdzKToKICAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oIi0td3B0c2VydmVyLWRvYy1yb290IiwgdHlwZT0ic3RyaW5nIiwgaGVs cD0oIlNldCB3ZWIgcGxhdGZvcm0gc2VydmVyIGRvY3VtZW50IHJvb3QsIHJlbGF0aXZlIHRvIExh eW91dFRlc3RzIGRpcmVjdG9yeSIpKSwKICAgICBdKSkKIAorICAgICMgRklYTUU6IFJlbW92ZSB0 aGlzIGdyb3VwIG9uY2UgdGhlIG9sZCByZXN1bHRzIGRhc2hib2FyZHMgYXJlIGRlcHJlY2F0ZWQu CisgICAgb3B0aW9uX2dyb3VwX2RlZmluaXRpb25zLmFwcGVuZCgoIkxlZ2FjeSBSZXN1bHQgT3B0 aW9ucyIsIFsKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbWFzdGVyLW5hbWUiLCBo ZWxwPSJUaGUgbmFtZSBvZiB0aGUgYnVpbGRib3QgbWFzdGVyLiIpLAorICAgICAgICBvcHRwYXJz ZS5tYWtlX29wdGlvbigiLS1idWlsZC1uYW1lIiwgZGVmYXVsdD0iRFVNTVlfQlVJTERfTkFNRSIs CisgICAgICAgICAgICBoZWxwPSgiVGhlIG5hbWUgb2YgdGhlIGJ1aWxkZXIgdXNlZCBpbiBpdHMg cGF0aCwgZS5nLiB3ZWJraXQtcmVsLiIpKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24o Ii0tYnVpbGQtc2xhdmUiLCBkZWZhdWx0PSJEVU1NWV9CVUlMRF9TTEFWRSIsCisgICAgICAgICAg ICBoZWxwPSgiVGhlIG5hbWUgb2YgdGhlIHdvcmtlciB1c2VkLiBlLmcuIGFwcGxlLW1hY3Byby02 LiIpKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tdGVzdC1yZXN1bHRzLXNlcnZl ciIsIGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKKyAgICAgICAgICAgIGhlbHA9KCJJZiBz cGVjaWZpZWQsIHVwbG9hZCByZXN1bHRzIGpzb24gZmlsZXMgdG8gdGhpcyBhcHBlbmdpbmUgc2Vy dmVyLiIpKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVzdWx0cy1zZXJ2ZXIt aG9zdCIsIGFjdGlvbj0iYXBwZW5kIiwgZGVmYXVsdD1bXSwKKyAgICAgICAgICAgIGhlbHA9KCJJ ZiBzcGVjaWZpZWQsIHVwbG9hZCByZXN1bHRzIEpTT04gZmlsZSB0byB0aGlzIHJlc3VsdHMgc2Vy dmVyLiIpKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tYWRkaXRpb25hbC1yZXBv c2l0b3J5LW5hbWUiLAorICAgICAgICAgICAgaGVscD0oIlRoZSBuYW1lIG9mIGFuIGFkZGl0aW9u YWwgc3VidmVyc2lvbiBvciBnaXQgY2hlY2tvdXQiKSksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vf b3B0aW9uKCItLWFkZGl0aW9uYWwtcmVwb3NpdG9yeS1wYXRoIiwKKyAgICAgICAgICAgIGhlbHA9 KCJUaGUgcGF0aCB0byBhbiBhZGRpdGlvbmFsIHN1YnZlcnNpb24gb3IgZ2l0IGNoZWNrb3V0IChy ZXF1aXJlcyAtLWFkZGl0aW9uYWwtcmVwb3NpdG9yeS1uYW1lKSIpKSwKKyAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oIi0tYWxsb3dlZC1ob3N0IiwgdHlwZT0ic3RyaW5nIiwgYWN0aW9uPSJh cHBlbmQiLCBkZWZhdWx0PVtdLAorICAgICAgICAgICAgaGVscD0oIklmIHNwZWNpZmllZCwgdGVz dHMgYXJlIGFsbG93ZWQgdG8gbWFrZSByZXF1ZXN0cyB0byB0aGUgc3BlY2lmaWVkIGhvc3RuYW1l LiIpKQorICAgIF0pKQorCiAgICAgb3B0aW9uX2dyb3VwX2RlZmluaXRpb25zLmFwcGVuZCgoJ1Vw bG9hZCBPcHRpb25zJywgdXBsb2FkX29wdGlvbnMoKSkpCiAKICAgICBvcHRpb25fcGFyc2VyID0g b3B0cGFyc2UuT3B0aW9uUGFyc2VyKHVzYWdlPSIlcHJvZyBbb3B0aW9uc10gWzxwYXRoPi4uLl0i KQo=