60086 2011-05-03 16:58:54 -0700 rebaseline_chromium_webkit_tests is not generating output diffs 2011-05-09 21:00:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sjl sjl abarth commit-queue dpranke mihaip ojan tony oldest_to_newest 397545 0 sjl 2011-05-03 16:58:54 -0700 The output html file is missing results and also missing image diffs. This is due to a non-relative path being passed to scn.exists() in _create_html_baseline_tests(). While fixing this I noticed we're not generating image diffs also. I have a fix in the works. Testing now. 397986 1 92260 sjl 2011-05-04 09:42:54 -0700 Created attachment 92260 Patch 397987 2 sjl 2011-05-04 09:43:40 -0700 Fixed. Adam - could you take a look? Thx. 398394 3 92260 dpranke 2011-05-04 16:38:07 -0700 Comment on attachment 92260 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92260&action=review > Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:546 > + baseline_relpath = self._filesystem.relpath(baseline_fullpath, self._filesystem.getcwd()) Argh. It looks like this is another case of us getting bitten by SCM not handling absolute paths. Assuming I'm right, this only works because of the filesystem.chdir() having already occurred on line 393. Can you move that chdir() and the corresponding # FIXME to somewhere near the beginning of the main() method (around line 968) so that we can make this an explicit invariant that rebaseline-chromium-webkit-tests operates from the top of the webkit tree? Then, just delete the second argument to this call (so we can use the default, which is IMO slightly less confusing). Note that we need to actually do the chdir() rather than just passing in the start dir, because Git is sufficiently broken on the Mac that it is confused by symlinks. Patch looks fine otherwise. 398565 4 92378 sjl 2011-05-04 23:04:14 -0700 Created attachment 92378 Patch 398566 5 92260 sjl 2011-05-04 23:05:33 -0700 Comment on attachment 92260 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92260&action=review >> Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:546 >> + baseline_relpath = self._filesystem.relpath(baseline_fullpath, self._filesystem.getcwd()) > > Argh. It looks like this is another case of us getting bitten by SCM not handling absolute paths. Assuming I'm right, this only works because of the filesystem.chdir() having already occurred on line 393. > > Can you move that chdir() and the corresponding # FIXME to somewhere near the beginning of the main() method (around line 968) so that we can make this an explicit invariant that rebaseline-chromium-webkit-tests operates from the top of the webkit tree? > > Then, just delete the second argument to this call (so we can use the default, which is IMO slightly less confusing). > > Note that we need to actually do the chdir() rather than just passing in the start dir, because Git is sufficiently broken on the Mac that it is confused by symlinks. > > Patch looks fine otherwise. All done! Also updated the unittest (oops...) 399112 6 dpranke 2011-05-05 15:37:26 -0700 Patch LGTM. Ojan, Tony, Mihai, could one of you review this? It'd be nice to get it landed. 399232 7 commit-queue 2011-05-05 17:27:05 -0700 The commit-queue encountered the following flaky tests while processing attachment 92378: http/tests/xmlhttprequest/cross-origin-no-authorization.html bug 33357 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 399234 8 92378 commit-queue 2011-05-05 17:28:31 -0700 Comment on attachment 92378 Patch Clearing flags on attachment: 92378 Committed r85905: <http://trac.webkit.org/changeset/85905> 399235 9 commit-queue 2011-05-05 17:28:36 -0700 All reviewed patches have been landed. Closing bug. 399268 10 commit-queue 2011-05-05 18:27:59 -0700 The commit-queue encountered the following flaky tests while processing attachment 92378: inspector/debugger/debugger-scripts.html bug 59921 (authors: pfeldman@chromium.org and podivilov@chromium.org) The commit-queue is continuing to process your patch. 401028 11 92260 eric 2011-05-09 21:00:26 -0700 Comment on attachment 92260 Patch Cleared review? from obsolete attachment 92260 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 92260 2011-05-04 09:42:54 -0700 2011-05-09 21:00:26 -0700 Patch bug-60086-20110504094253.patch text/plain 4493 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogODU3NTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZmJjNzBhNzJmNTQwN2RiZmUzMWRhNjllY2M3NzJiYmJj NmRlYzVjLi4wMjBlYjNmZDcxNzUxYjJmZDdiNzhkYWM2NjQ5N2RkNTQ2YTcxMzdjIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMDQgIFN0ZXZlIExhY2V5ICA8c2psQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZ2VuZXJhdGlvbiBv ZiByZXN1bHRzIGh0bWwgZmlsZSBieSBwYXNzaW5nIHJlbGF0aXZlIHBhdGggdG8gc2NtCisgICAg ICAgIG1ldGhvZHMuCisgICAgICAgIEdlbmVyYXRlIGRpZmYgaW1hZ2VzIGZvciByZXN1bHRzIGh0 bWwgZmlsZS4KKworICAgICAgICByZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cyBpcyBu b3QgZ2VuZXJhdGluZyBvdXRwdXQgZGlmZnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwMDg2CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weToKKwogMjAxMS0w NS0wNCAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtp dF90ZXN0cy5weQppbmRleCA1ZTczZmMxMzEyZmY2YWY0Mjc5MTU5MDEzMDA5YWY3MThiOTQ3MmE2 Li5kNTM2MGJiZmQwMTQ0YWY4ODM5YjhmODFiMjBjNDZlMGFjNjI3MzlkIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dl YmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y ZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQpAQCAtNTQzLDExICs1NDMsMTYgQEAg Y2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAgICAgICBiYXNlbGluZV9mdWxscGF0aDog ZnVsbCBwYXRoIG9mIHRoZSBleHBlY3RlZCBiYXNlbGluZSBmaWxlLgogICAgICAgICAiIiIKIAor ICAgICAgICBiYXNlbGluZV9yZWxwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5yZWxwYXRoKGJhc2Vs aW5lX2Z1bGxwYXRoLCBzZWxmLl9maWxlc3lzdGVtLmdldGN3ZCgpKQorICAgICAgICBfbG9nLmRl YnVnKCcgIEh0bWw6IGNyZWF0ZSBiYXNlbGluZXMgZm9yICIlcyInLCBiYXNlbGluZV9yZWxwYXRo KQorCiAgICAgICAgIGlmIChub3QgYmFzZWxpbmVfZnVsbHBhdGgKICAgICAgICAgICAgIG9yIG5v dCBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhiYXNlbGluZV9mdWxscGF0aCkpOgorICAgICAgICAg ICAgX2xvZy5kZWJ1ZygnICBIdG1sOiBEb2VzIG5vdCBleGlzdDogIiVzIicsIGJhc2VsaW5lX2Z1 bGxwYXRoKQogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgaWYgbm90IHNlbGYuX3NjbS5l eGlzdHMoYmFzZWxpbmVfZnVsbHBhdGgpOgorICAgICAgICBpZiBub3Qgc2VsZi5fc2NtLmV4aXN0 cyhiYXNlbGluZV9yZWxwYXRoKToKKyAgICAgICAgICAgIF9sb2cuZGVidWcoJyAgSHRtbDogRG9l cyBub3QgZXhpc3QgaW4gc2NtOiAiJXMiJywgYmFzZWxpbmVfcmVscGF0aCkKICAgICAgICAgICAg IHJldHVybgogCiAgICAgICAgICMgQ29weSB0aGUgbmV3IGJhc2VsaW5lIHRvIGh0bWwgZGlyZWN0 b3J5IGZvciByZXN1bHQgY29tcGFyaXNvbi4KQEAgLTU2MCw3ICs1NjUsNyBAQCBjbGFzcyBSZWJh c2VsaW5lcihvYmplY3QpOgogCiAgICAgICAgICMgR2V0IHRoZSBvbGQgYmFzZWxpbmUgZnJvbSB0 aGUgcmVwb3NpdG9yeSBhbmQgc2F2ZSB0byB0aGUgaHRtbCBkaXJlY3RvcnkuCiAgICAgICAgIHRy eToKLSAgICAgICAgICAgIG91dHB1dCA9IHNlbGYuX3NjbS5zaG93X2hlYWQoYmFzZWxpbmVfZnVs bHBhdGgpCisgICAgICAgICAgICBvdXRwdXQgPSBzZWxmLl9zY20uc2hvd19oZWFkKGJhc2VsaW5l X3JlbHBhdGgpCiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAgIF9s b2cud2FybmluZyhlKQogICAgICAgICAgICAgb3V0cHV0ID0gIiIKQEAgLTU3NywxNCArNTgyLDMy IEBAIGNsYXNzIFJlYmFzZWxpbmVyKG9iamVjdCk6CiAgICAgICAgIF9sb2cuZGVidWcoJyAgSHRt bDogY3JlYXRlZCBvbGQgYmFzZWxpbmUgZmlsZTogIiVzIi4nLCBiYXNlX2ZpbGUpCiAKICAgICAg ICAgIyBHZXQgdGhlIGRpZmYgYmV0d2VlbiBvbGQgYW5kIG5ldyBiYXNlbGluZXMgYW5kIHNhdmUg dG8gdGhlIGh0bWwgZGlyLgorICAgICAgICBkaWZmX2ZpbGUgPSBnZXRfcmVzdWx0X2ZpbGVfZnVs bHBhdGgoc2VsZi5fZmlsZXN5c3RlbSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuaHRtbF9kaXJlY3RvcnksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNlbGluZV9maWxlbmFtZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3BsYXRmb3JtLCAn ZGlmZicpCisgICAgICAgIGhhc19kaWZmID0gRmFsc2UKICAgICAgICAgaWYgYmFzZWxpbmVfZmls ZW5hbWUudXBwZXIoKS5lbmRzd2l0aCgnLlRYVCcpOgotICAgICAgICAgICAgb3V0cHV0ID0gc2Vs Zi5fc2NtLmRpZmZfZm9yX2ZpbGUoYmFzZWxpbmVfZnVsbHBhdGgsIGxvZz1fbG9nKQorICAgICAg ICAgICAgb3V0cHV0ID0gc2VsZi5fc2NtLmRpZmZfZm9yX2ZpbGUoYmFzZWxpbmVfcmVscGF0aCwg bG9nPV9sb2cpCiAgICAgICAgICAgICBpZiBvdXRwdXQ6Ci0gICAgICAgICAgICAgICAgZGlmZl9m aWxlID0gZ2V0X3Jlc3VsdF9maWxlX2Z1bGxwYXRoKHNlbGYuX2ZpbGVzeXN0ZW0sCi0gICAgICAg ICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuaHRtbF9kaXJlY3RvcnksIGJhc2VsaW5lX2ZpbGVu YW1lLAotICAgICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybSwgJ2RpZmYnKQogICAgICAg ICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKGRpZmZfZmlsZSwgb3V0 cHV0KQotICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJyAgSHRtbDogY3JlYXRlZCBiYXNlbGlu ZSBkaWZmIGZpbGU6ICIlcyIuJywgZGlmZl9maWxlKQorICAgICAgICAgICAgICAgIGhhc19kaWZm ID0gVHJ1ZQorICAgICAgICBlbGlmIGJhc2VsaW5lX2ZpbGVuYW1lLnVwcGVyKCkuZW5kc3dpdGgo Jy5QTkcnKToKKyAgICAgICAgICAgIG9sZF9maWxlID0gZ2V0X3Jlc3VsdF9maWxlX2Z1bGxwYXRo KHNlbGYuX2ZpbGVzeXN0ZW0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzZWxmLl9vcHRpb25zLmh0bWxfZGlyZWN0b3J5LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzZWxpbmVfZmlsZW5hbWUsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9y bSwgJ29sZCcpCisgICAgICAgICAgICBuZXdfZmlsZSA9IGdldF9yZXN1bHRfZmlsZV9mdWxscGF0 aChzZWxmLl9maWxlc3lzdGVtLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5odG1sX2RpcmVjdG9yeSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJhc2VsaW5lX2ZpbGVuYW1lLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcGxhdGZv cm0sICduZXcnKQorICAgICAgICAgICAgX2xvZy5kZWJ1ZygnIEh0bWw6IGRpZmZpbmcgIiVzIiBh bmQgIiVzIicsIG9sZF9maWxlLCBuZXdfZmlsZSkKKyAgICAgICAgICAgIG9sZF9vdXRwdXQgPSBz ZWxmLl9maWxlc3lzdGVtLnJlYWRfYmluYXJ5X2ZpbGUob2xkX2ZpbGUpCisgICAgICAgICAgICBu ZXdfb3V0cHV0ID0gc2VsZi5fZmlsZXN5c3RlbS5yZWFkX2JpbmFyeV9maWxlKG5ld19maWxlKQor ICAgICAgICAgICAgaGFzX2RpZmYgPSBzZWxmLl9wb3J0LmRpZmZfaW1hZ2Uob2xkX291dHB1dCwg bmV3X291dHB1dCwgZGlmZl9maWxlKQorCisgICAgICAgIGlmIGhhc19kaWZmOgorICAgICAgICAg ICAgX2xvZy5kZWJ1ZygnICBIdG1sOiBjcmVhdGVkIGJhc2VsaW5lIGRpZmYgZmlsZTogIiVzIi4n LCBkaWZmX2ZpbGUpCiAKIAogY2xhc3MgSHRtbEdlbmVyYXRvcihvYmplY3QpOgo= 92378 2011-05-04 23:04:14 -0700 2011-05-05 17:28:31 -0700 Patch bug-60086-20110504230413.patch text/plain 12596 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogODU3NTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZmJjNzBhNzJmNTQwN2RiZmUzMWRhNjllY2M3NzJiYmJj NmRlYzVjLi5lYTNlNmM2MmZlYzZiNTAxZDdhZDMwZjNiYTMyMThiNzNkZDNhNzc0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMDQgIFN0ZXZlIExhY2V5ICA8c2psQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZ2VuZXJhdGlvbiBv ZiByZXN1bHRzIGh0bWwgZmlsZSBieSBwYXNzaW5nIHJlbGF0aXZlIHBhdGggdG8gc2NtCisgICAg ICAgIG1ldGhvZHMuCisgICAgICAgIEdlbmVyYXRlIGRpZmYgaW1hZ2VzIGZvciByZXN1bHRzIGh0 bWwgZmlsZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjAwODYKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFz ZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0 LnB5OgorCiAyMDExLTA1LTA0ICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90 ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVf Y2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDVlNzNmYzEzMTJmZjZhZjQyNzkxNTkwMTMw MDlhZjcxOGI5NDcyYTYuLjY4YWNmNGJiMmRiNDM2YjMyYTViNDA0NjlkZWRhYTI2YzhhYjI0YmMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxp bmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5CkBAIC00MDUs OSArNDA1LDcgQEAgY2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYu X2ZpbGVzeXN0ZW0ubWF5YmVfbWFrZV9kaXJlY3Rvcnkoc2VsZi5fZmlsZXN5c3RlbS5kaXJuYW1l KGV4cGVjdGVkX2Z1bGxwYXRoKSkKICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ubW92ZSh0 ZW1wX25hbWUsIGV4cGVjdGVkX2Z1bGxwYXRoKQogCi0gICAgICAgICAgICAjIEZJWE1FOiBTQ00g bW9kdWxlIGRvZXNuJ3QgaGFuZGxlIHBhdGhzIHRoYXQgYXJlbid0IHJlbGF0aXZlIHRvIHRoZSBj aGVja291dF9yb290IGNvbnNpc3RlbnRseS4KLSAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0u Y2hkaXIoc2VsZi5fc2NtLmNoZWNrb3V0X3Jvb3QpCi0gICAgICAgICAgICBwYXRoX2Zyb21fYmFz ZSA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVscGF0aChleHBlY3RlZF9mdWxscGF0aCwgc2VsZi5fZmls ZXN5c3RlbS5nZXRjd2QoKSkKKyAgICAgICAgICAgIHBhdGhfZnJvbV9iYXNlID0gc2VsZi5fZmls ZXN5c3RlbS5yZWxwYXRoKGV4cGVjdGVkX2Z1bGxwYXRoKQogICAgICAgICAgICAgaWYgc2VsZi5f c2NtLmV4aXN0cyhwYXRoX2Zyb21fYmFzZSk6CiAgICAgICAgICAgICAgICAgX2xvZy5pbmZvKCcg IFVwZGF0aW5nICVzJyAlIHJlbHBhdGgpCiAgICAgICAgICAgICBlbHNlOgpAQCAtNTQzLDExICs1 NDEsMTYgQEAgY2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAgICAgICBiYXNlbGluZV9m dWxscGF0aDogZnVsbCBwYXRoIG9mIHRoZSBleHBlY3RlZCBiYXNlbGluZSBmaWxlLgogICAgICAg ICAiIiIKIAorICAgICAgICBiYXNlbGluZV9yZWxwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5yZWxw YXRoKGJhc2VsaW5lX2Z1bGxwYXRoKQorICAgICAgICBfbG9nLmRlYnVnKCcgIEh0bWw6IGNyZWF0 ZSBiYXNlbGluZXMgZm9yICIlcyInLCBiYXNlbGluZV9yZWxwYXRoKQorCiAgICAgICAgIGlmIChu b3QgYmFzZWxpbmVfZnVsbHBhdGgKICAgICAgICAgICAgIG9yIG5vdCBzZWxmLl9maWxlc3lzdGVt LmV4aXN0cyhiYXNlbGluZV9mdWxscGF0aCkpOgorICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICBI dG1sOiBEb2VzIG5vdCBleGlzdDogIiVzIicsIGJhc2VsaW5lX2Z1bGxwYXRoKQogICAgICAgICAg ICAgcmV0dXJuCiAKLSAgICAgICAgaWYgbm90IHNlbGYuX3NjbS5leGlzdHMoYmFzZWxpbmVfZnVs bHBhdGgpOgorICAgICAgICBpZiBub3Qgc2VsZi5fc2NtLmV4aXN0cyhiYXNlbGluZV9yZWxwYXRo KToKKyAgICAgICAgICAgIF9sb2cuZGVidWcoJyAgSHRtbDogRG9lcyBub3QgZXhpc3QgaW4gc2Nt OiAiJXMiJywgYmFzZWxpbmVfcmVscGF0aCkKICAgICAgICAgICAgIHJldHVybgogCiAgICAgICAg ICMgQ29weSB0aGUgbmV3IGJhc2VsaW5lIHRvIGh0bWwgZGlyZWN0b3J5IGZvciByZXN1bHQgY29t cGFyaXNvbi4KQEAgLTU2MCw3ICs1NjMsNyBAQCBjbGFzcyBSZWJhc2VsaW5lcihvYmplY3QpOgog CiAgICAgICAgICMgR2V0IHRoZSBvbGQgYmFzZWxpbmUgZnJvbSB0aGUgcmVwb3NpdG9yeSBhbmQg c2F2ZSB0byB0aGUgaHRtbCBkaXJlY3RvcnkuCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIG91 dHB1dCA9IHNlbGYuX3NjbS5zaG93X2hlYWQoYmFzZWxpbmVfZnVsbHBhdGgpCisgICAgICAgICAg ICBvdXRwdXQgPSBzZWxmLl9zY20uc2hvd19oZWFkKGJhc2VsaW5lX3JlbHBhdGgpCiAgICAgICAg IGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAgICAgIF9sb2cud2FybmluZyhlKQogICAg ICAgICAgICAgb3V0cHV0ID0gIiIKQEAgLTU3NywxNCArNTgwLDMyIEBAIGNsYXNzIFJlYmFzZWxp bmVyKG9iamVjdCk6CiAgICAgICAgIF9sb2cuZGVidWcoJyAgSHRtbDogY3JlYXRlZCBvbGQgYmFz ZWxpbmUgZmlsZTogIiVzIi4nLCBiYXNlX2ZpbGUpCiAKICAgICAgICAgIyBHZXQgdGhlIGRpZmYg YmV0d2VlbiBvbGQgYW5kIG5ldyBiYXNlbGluZXMgYW5kIHNhdmUgdG8gdGhlIGh0bWwgZGlyLgor ICAgICAgICBkaWZmX2ZpbGUgPSBnZXRfcmVzdWx0X2ZpbGVfZnVsbHBhdGgoc2VsZi5fZmlsZXN5 c3RlbSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYu X29wdGlvbnMuaHRtbF9kaXJlY3RvcnksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBiYXNlbGluZV9maWxlbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3BsYXRmb3JtLCAnZGlmZicpCisgICAgICAgIGhh c19kaWZmID0gRmFsc2UKICAgICAgICAgaWYgYmFzZWxpbmVfZmlsZW5hbWUudXBwZXIoKS5lbmRz d2l0aCgnLlRYVCcpOgotICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5fc2NtLmRpZmZfZm9yX2Zp bGUoYmFzZWxpbmVfZnVsbHBhdGgsIGxvZz1fbG9nKQorICAgICAgICAgICAgb3V0cHV0ID0gc2Vs Zi5fc2NtLmRpZmZfZm9yX2ZpbGUoYmFzZWxpbmVfcmVscGF0aCwgbG9nPV9sb2cpCiAgICAgICAg ICAgICBpZiBvdXRwdXQ6Ci0gICAgICAgICAgICAgICAgZGlmZl9maWxlID0gZ2V0X3Jlc3VsdF9m aWxlX2Z1bGxwYXRoKHNlbGYuX2ZpbGVzeXN0ZW0sCi0gICAgICAgICAgICAgICAgICAgIHNlbGYu X29wdGlvbnMuaHRtbF9kaXJlY3RvcnksIGJhc2VsaW5lX2ZpbGVuYW1lLAotICAgICAgICAgICAg ICAgICAgICBzZWxmLl9wbGF0Zm9ybSwgJ2RpZmYnKQogICAgICAgICAgICAgICAgIHNlbGYuX2Zp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKGRpZmZfZmlsZSwgb3V0cHV0KQotICAgICAgICAgICAg ICAgIF9sb2cuZGVidWcoJyAgSHRtbDogY3JlYXRlZCBiYXNlbGluZSBkaWZmIGZpbGU6ICIlcyIu JywgZGlmZl9maWxlKQorICAgICAgICAgICAgICAgIGhhc19kaWZmID0gVHJ1ZQorICAgICAgICBl bGlmIGJhc2VsaW5lX2ZpbGVuYW1lLnVwcGVyKCkuZW5kc3dpdGgoJy5QTkcnKToKKyAgICAgICAg ICAgIG9sZF9maWxlID0gZ2V0X3Jlc3VsdF9maWxlX2Z1bGxwYXRoKHNlbGYuX2ZpbGVzeXN0ZW0s CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9v cHRpb25zLmh0bWxfZGlyZWN0b3J5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYmFzZWxpbmVfZmlsZW5hbWUsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybSwgJ29sZCcpCisgICAgICAg ICAgICBuZXdfZmlsZSA9IGdldF9yZXN1bHRfZmlsZV9mdWxscGF0aChzZWxmLl9maWxlc3lzdGVt LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5f b3B0aW9ucy5odG1sX2RpcmVjdG9yeSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJhc2VsaW5lX2ZpbGVuYW1lLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcGxhdGZvcm0sICduZXcnKQorICAgICAg ICAgICAgX2xvZy5kZWJ1ZygnIEh0bWw6IGRpZmZpbmcgIiVzIiBhbmQgIiVzIicsIG9sZF9maWxl LCBuZXdfZmlsZSkKKyAgICAgICAgICAgIG9sZF9vdXRwdXQgPSBzZWxmLl9maWxlc3lzdGVtLnJl YWRfYmluYXJ5X2ZpbGUob2xkX2ZpbGUpCisgICAgICAgICAgICBuZXdfb3V0cHV0ID0gc2VsZi5f ZmlsZXN5c3RlbS5yZWFkX2JpbmFyeV9maWxlKG5ld19maWxlKQorICAgICAgICAgICAgaGFzX2Rp ZmYgPSBzZWxmLl9wb3J0LmRpZmZfaW1hZ2Uob2xkX291dHB1dCwgbmV3X291dHB1dCwgZGlmZl9m aWxlKQorCisgICAgICAgIGlmIGhhc19kaWZmOgorICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICBI dG1sOiBjcmVhdGVkIGJhc2VsaW5lIGRpZmYgZmlsZTogIiVzIi4nLCBkaWZmX2ZpbGUpCiAKIAog Y2xhc3MgSHRtbEdlbmVyYXRvcihvYmplY3QpOgpAQCAtOTMxLDYgKzk1Miw5IEBAIGRlZiBtYWlu KGFyZ3MpOgogICAgICMgV2UgdXNlIHRoZSBkZWZhdWx0IHppcCBmYWN0b3J5IG1ldGhvZC4KICAg ICB6aXBfZmFjdG9yeSA9IE5vbmUKIAorICAgICMgRklYTUU6IFNDTSBtb2R1bGUgZG9lc24ndCBo YW5kbGUgcGF0aHMgdGhhdCBhcmVuJ3QgcmVsYXRpdmUgdG8gdGhlIGNoZWNrb3V0X3Jvb3QgY29u c2lzdGVudGx5LgorICAgIGhvc3RfcG9ydF9vYmouX2ZpbGVzeXN0ZW0uY2hkaXIoc2NtX29iai5j aGVja291dF9yb290KQorCiAgICAgcmV0X2NvZGUgPSByZWFsX21haW4ob3B0aW9ucywgdGFyZ2V0 X29wdGlvbnMsIGhvc3RfcG9ydF9vYmosIHRhcmdldF9wb3J0X29iaiwgdXJsX2ZldGNoZXIsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgemlwX2ZhY3RvcnksIHNjbV9vYmopCiAgICAgaWYgbm90 IHJldF9jb2RlIGFuZCBsb2dfaGFuZGxlci5udW1fZmFpbHVyZXM6CmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtp dF90ZXN0c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CmluZGV4IGYzMWNi MDdlMTMwZWIzYmM0YWM3NzE4NjgxMmExYmY4OGZlZDNjOTguLjEyNDI3MWU5ZjE4Nzg1MjEyYWFm ZTYwNWMyMjY2ZWM5ZjNkZmI3ZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hy b21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC0yMDMsNiArMjAzLDEwIEBAIGNsYXNz IFRlc3RSZWJhc2VsaW5lcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHppcF9mYWN0b3J5 ID0gdGVzdF96aXBfZmFjdG9yeSgpCiAgICAgICAgIG1vY2tfc2NtID0gbW9ja3Rvb2wuTW9ja1ND TShmaWxlc3lzdGVtKQogICAgICAgICBmaWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KG1v Y2tfc2NtLmNoZWNrb3V0X3Jvb3QpCisKKyAgICAgICAgIyBGSVhNRTogU0NNIG1vZHVsZSBkb2Vz bid0IGhhbmRsZSBwYXRocyB0aGF0IGFyZW4ndCByZWxhdGl2ZSB0byB0aGUgY2hlY2tvdXRfcm9v dCBjb25zaXN0ZW50bHkuCisgICAgICAgIGZpbGVzeXN0ZW0uY2hkaXIoIi90ZXN0LmNoZWNrb3V0 IikKKwogICAgICAgICByZWJhc2VsaW5lciA9IHJlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rl c3RzLlJlYmFzZWxpbmVyKGhvc3RfcG9ydF9vYmosCiAgICAgICAgICAgICB0YXJnZXRfcG9ydF9v YmosIHBsYXRmb3JtLCBvcHRpb25zLCB1cmxfZmV0Y2hlciwgemlwX2ZhY3RvcnksIG1vY2tfc2Nt KQogICAgICAgICByZXR1cm4gcmViYXNlbGluZXIsIGZpbGVzeXN0ZW0KQEAgLTIzMSwxNiArMjM1 LDE3IEBAIGNsYXNzIFRlc3RSZWJhc2VsaW5lcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVm IHRlc3Rfb25lX3BsYXRmb3JtKHNlbGYpOgogICAgICAgICByZWJhc2VsaW5lciwgZmlsZXN5c3Rl bSA9IHNlbGYubWFrZV9yZWJhc2VsaW5lcigKICAgICAgICAgICAgICJCVUdYIFJFQkFTRUxJTkUg TUFDIDogZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2UuaHRtbCA9IElNQUdFIikKKwogICAgICAgICBy ZWJhc2VsaW5lci5ydW4oKQotICAgICAgICAjIFdlIGV4cGVjdCB0byBoYXZlIHdyaXR0ZW4gMTIg ZmlsZXMgb3ZlciB0aGUgY291cnNlIG9mIHRoaXMgcmViYXNlbGluZToKKyAgICAgICAgIyBXZSBl eHBlY3QgdG8gaGF2ZSB3cml0dGVuIDEzIGZpbGVzIG92ZXIgdGhlIGNvdXJzZSBvZiB0aGlzIHJl YmFzZWxpbmU6CiAgICAgICAgICMgKikgMyBmaWxlcyBpbiAvX19pbV90bXAgZm9yIHRoZSBleHRy YWN0ZWQgYXJjaGl2ZSBtZW1iZXJzCiAgICAgICAgICMgKikgMyBuZXcgYmFzZWxpbmVzIHVuZGVy ICcvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cycKICAgICAgICAgIyAqKSA0IGZpbGVzIGluIC90 bXAgZm9yIHRoZSBuZXcgYW5kIG9sZCBiYXNlbGluZXMgaW4gdGhlIHJlc3VsdCBmaWxlCiAgICAg ICAgICMgICAgKC17b2xkLG5ld30ue3R4dCxwbmd9Ci0gICAgICAgICMgKikgMSB0ZXh0IGRpZmYg aW4gL3RtcCBmb3IgdGhlIHJlc3VsdCBmaWxlICgtZGlmZi50eHQpLiBXZSBkb24ndAotICAgICAg ICAjICAgIGNyZWF0ZSBpbWFnZSBkaWZmcyAoRklYTUU/KSBhbmQgZG9uJ3QgZGlzcGxheSB0aGUg Y2hlY2tzdW1zLgorICAgICAgICAjICopIDEgdGV4dCBkaWZmIGluIC90bXAgZm9yIHRoZSByZXN1 bHQgZmlsZSAoLWRpZmYudHh0KS4KKyAgICAgICAgIyAqKSAxIGltYWdlIGRpZmYgaW4gL3RtcCBm b3IgdGhlIHJlc3VsdCBmaWxlICgtZGlmZi5wbmcpLgogICAgICAgICAjICopIDEgdXBkYXRlZCB0 ZXN0X2V4cGVjdGF0aW9ucyBmaWxlCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGZpbGVz eXN0ZW0ud3JpdHRlbl9maWxlcyksIDEyKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihm aWxlc3lzdGVtLndyaXR0ZW5fZmlsZXMpLCAxMykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChm aWxlc3lzdGVtLmZpbGVzWycvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90ZXN0 LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlLWV4cGVjdGVkLmNoZWNrc3VtJ10s ICduZXctaW1hZ2UtY2hlY2tzdW0nKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZpbGVzeXN0 ZW0uZmlsZXNbJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxl b3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2UtZXhwZWN0ZWQucG5nJ10sICduZXctaW1hZ2Ut cG5nJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmaWxlc3lzdGVtLmZpbGVzWycvdGVzdC5j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlLWV4cGVjdGVkLnR4dCddLCAnbmV3LWltYWdlLXR4dCcpCkBAIC0yNDksMTAg KzI1NCwxMCBAQCBjbGFzcyBUZXN0UmViYXNlbGluZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICByZWJhc2VsaW5lciwgZmlsZXN5c3RlbSA9IHNlbGYubWFrZV9yZWJhc2VsaW5lcigKICAg ICAgICAgICAgICJCVUdYIFJFQkFTRUxJTkUgOiBmYWlsdXJlcy9leHBlY3RlZC9pbWFnZS5odG1s ID0gSU1BR0UiKQogICAgICAgICByZWJhc2VsaW5lci5ydW4oKQotICAgICAgICAjIFNlZSBjb21t ZW50IGluIHRlc3Rfb25lX3BsYXRmb3JtIGZvciBhbiBleHBsYW5hdGlvbiBvZiB0aGUgMTIgd3Jp dHRlbiB0ZXN0cy4KKyAgICAgICAgIyBTZWUgY29tbWVudCBpbiB0ZXN0X29uZV9wbGF0Zm9ybSBm b3IgYW4gZXhwbGFuYXRpb24gb2YgdGhlIDEzIHdyaXR0ZW4gdGVzdHMuCiAgICAgICAgICMgTm90 ZSB0aGF0IGV2ZW4gdGhvdWdoIHRoZSByZWJhc2VsaW5lIGlzIG1hcmtlZCBmb3IgYWxsIHBsYXRm b3JtcywgZWFjaAogICAgICAgICAjIHJlYmFzZWxpbmVyIG9ubHkgZXZlciBkb2VzIG9uZS4KLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oZmlsZXN5c3RlbS53cml0dGVuX2ZpbGVzKSwgMTIp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGZpbGVzeXN0ZW0ud3JpdHRlbl9maWxlcyks IDEzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXNbJy90ZXN0LmNo ZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhw ZWN0ZWQvaW1hZ2UtZXhwZWN0ZWQuY2hlY2tzdW0nXSwgJ25ldy1pbWFnZS1jaGVja3N1bScpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZXN5c3RlbS5maWxlc1snL3Rlc3QuY2hlY2tvdXQv TGF5b3V0VGVzdHMvcGxhdGZvcm0vdGVzdC1tYWMtbGVvcGFyZC9mYWlsdXJlcy9leHBlY3RlZC9p bWFnZS1leHBlY3RlZC5wbmcnXSwgJ25ldy1pbWFnZS1wbmcnKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXNbJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2UtZXhwZWN0ZWQudHh0 J10sICduZXctaW1hZ2UtdHh0JykKQEAgLTI2Niw3ICsyNzEsNyBAQCBjbGFzcyBUZXN0UmViYXNl bGluZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICByZWJhc2VsaW5lci5ydW4oKQogICAg ICAgICAjIFRoZXJlIGlzIG9uZSBsZXNzIGZpbGUgd3JpdHRlbiB0aGFuIHx0ZXN0X29uZV9wbGF0 Zm9ybXwgYmVjYXVzZSB3ZSBvbmx5CiAgICAgICAgICMgd3JpdGUgMiBleHBlY3RhdGlvbnMgKHRo ZSBwbmcgYW5kIHRoZSB0eHQgZmlsZSkuCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGZp bGVzeXN0ZW0ud3JpdHRlbl9maWxlcyksIDExKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxl bihmaWxlc3lzdGVtLndyaXR0ZW5fZmlsZXMpLCAxMikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChmaWxlc3lzdGVtLmZpbGVzWycvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90 ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4cGVjdGVk LnBuZyddLCAndEVYdGNoZWNrc3VtXHgwMDAxMjM0NTY3ODknKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXNbJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhw ZWN0ZWQudHh0J10sICdwbmctY29tbWVudC10eHQnKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNl KGZpbGVzeXN0ZW0uZmlsZXMuZ2V0KCcvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9y bS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4cGVj dGVkLmNoZWNrc3VtJywgTm9uZSkpCkBAIC0yODQsNyArMjg5LDcgQEAgY2xhc3MgVGVzdFJlYmFz ZWxpbmVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcmViYXNlbGluZXIucnVuKCkKICAg ICAgICAgIyBUaGVyZSBpcyBvbmUgbW9yZSBmaWxlIHdyaXR0ZW4gdGhhbiB8dGVzdF9wbmdfZmls ZV93aXRoX2NvbW1lbnRfcmVtb3ZlX29sZF9jaGVja3N1bXwKICAgICAgICAgIyBiZWNhdXNlIHdl IGFsc28gZGVsZXRlIHRoZSBvbGQgY2hlY2tzdW0uCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo bGVuKGZpbGVzeXN0ZW0ud3JpdHRlbl9maWxlcyksIDEyKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGxlbihmaWxlc3lzdGVtLndyaXR0ZW5fZmlsZXMpLCAxMykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChmaWxlc3lzdGVtLmZpbGVzWycvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4 cGVjdGVkLnBuZyddLCAndEVYdGNoZWNrc3VtXHgwMDAxMjM0NTY3ODknKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXNbJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3Rz L3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tz dW0tZXhwZWN0ZWQudHh0J10sICdwbmctY29tbWVudC10eHQnKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXMuZ2V0KCcvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9w bGF0Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNrc3Vt LWV4cGVjdGVkLmNoZWNrc3VtJywgTm9uZSksIE5vbmUpCkBAIC0zMzgsMjEgKzM0MywyNiBAQCBj bGFzcyBUZXN0UmVhbE1haW4odW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICB6aXBfZmFjdG9y eSA9IHRlc3RfemlwX2ZhY3RvcnkoKQogICAgICAgICBtb2NrX3NjbSA9IG1vY2t0b29sLk1vY2tT Q00oKQogICAgICAgICBmaWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KG1vY2tfc2NtLmNo ZWNrb3V0X3Jvb3QpCisKKyAgICAgICAgIyBGSVhNRTogU0NNIG1vZHVsZSBkb2Vzbid0IGhhbmRs ZSBwYXRocyB0aGF0IGFyZW4ndCByZWxhdGl2ZSB0byB0aGUgY2hlY2tvdXRfcm9vdCBjb25zaXN0 ZW50bHkuCisgICAgICAgIGZpbGVzeXN0ZW0uY2hkaXIoIi90ZXN0LmNoZWNrb3V0IikKKwogICAg ICAgICBvYyA9IG91dHB1dGNhcHR1cmUuT3V0cHV0Q2FwdHVyZSgpCiAgICAgICAgIG9jLmNhcHR1 cmVfb3V0cHV0KCkKICAgICAgICAgcmVzID0gcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVz dHMucmVhbF9tYWluKG9wdGlvbnMsIG9wdGlvbnMsCiAgICAgICAgICAgICBob3N0X3BvcnRfb2Jq LCBob3N0X3BvcnRfb2JqLCB1cmxfZmV0Y2hlciwgemlwX2ZhY3RvcnksIG1vY2tfc2NtKQogICAg ICAgICBvYy5yZXN0b3JlX291dHB1dCgpCiAKLSAgICAgICAgIyBXZSBleHBlY3QgdG8gaGF2ZSB3 cml0dGVuIDM2IGZpbGVzIG92ZXIgdGhlIGNvdXJzZSBvZiB0aGlzIHJlYmFzZWxpbmU6CisgICAg ICAgICMgV2UgZXhwZWN0IHRvIGhhdmUgd3JpdHRlbiAzOCBmaWxlcyBvdmVyIHRoZSBjb3Vyc2Ug b2YgdGhpcyByZWJhc2VsaW5lOgogICAgICAgICAjICopIDYqMyBmaWxlcyBpbiAvX19pbV90bXAv IGZvciB0aGUgYXJjaGl2ZWQgbWVtYmVycyBvZiB0aGUgNiBwb3J0cwogICAgICAgICAjICopIDIq MyBmaWxlcyBpbiAvdGVzdC5jaGVja291dCBmb3IgYWN0dWFsbHkgZGlmZmVyaW5nIGJhc2VsaW5l cwogICAgICAgICAjICopIDEgZmlsZSBpbiAvdGVzdC5jaGVja291dCBmb3IgdGhlIHVwZGF0ZWQg dGVzdF9leHBlY3RhdGlvbnMgZmlsZQogICAgICAgICAjICopIDIqNCBmaWxlcyBpbiAvdG1wIGZv ciB0aGUgb2xkL25ldyBiYXNlbGluZXMgZm9yIHRoZSB0d28gYWN0dWFsIHBvcnRzCiAgICAgICAg ICMgKikgMiBmaWxlcyBpbiAvdG1wIGZvciB0aGUgdGV4dCBkaWZmcyBmb3IgdGhlIHR3byBwb3J0 cworICAgICAgICAjICopIDIgZmlsZXMgaW4gL3RtcCBmb3IgdGhlIGltYWdlIGRpZmZzIGZvciB0 aGUgdHdvIHBvcnRzCiAgICAgICAgICMgKikgMSBmaWxlIGluIC90bXAgZm9yIHRoZSByZWJhc2Vs aW5lIHJlc3VsdHMgaHRtbCBmaWxlCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVzLCAwKQot ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihmaWxlc3lzdGVtLndyaXR0ZW5fZmlsZXMpLCAz NikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oZmlsZXN5c3RlbS53cml0dGVuX2ZpbGVz KSwgMzgpCiAKIAogY2xhc3MgVGVzdEh0bWxHZW5lcmF0b3IodW5pdHRlc3QuVGVzdENhc2UpOgo=