57783 2011-04-04 13:26:59 -0700 [chromium] don't write .checksum files if a fallback platform has an embedded checksum 2011-04-04 16:31:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 56286 1 tony tony dpranke mihaip ojan podivilov oldest_to_newest 379011 0 tony 2011-04-04 13:26:59 -0700 [chromium] don't write .checksum files if a fallback platform has an embedded checksum 379013 1 88114 tony 2011-04-04 13:27:41 -0700 Created attachment 88114 Patch 379019 2 tony 2011-04-04 13:32:13 -0700 The bug is as follows: 1) The rebaseline tool writes a png results for win-xp 2) The rebaseline tool deletes the checksum result for win-xp, since it's not needed 3) The rebaseline tool tries to write a png result for win-vista. Since it matches the win-xp result, it does nothing. 4) The rebaseline tool writes a checksum result for win-vista, but since there's no win-xp checksum, it goes ahead and writes the file. The result is there's a .checksum file in win-vista that matches the .png file in win-xp. We shouldn't write the .checksum file. The patch fixes the bug by checking the fallback .png list rather than just checking for win-vista's .png. 379027 3 tony 2011-04-04 13:42:57 -0700 (In reply to comment #2) Dirk tells me I described the fallback wrong. Here's a version without platforms but with directories instead: 1) The rebaseline tool writes a png results in chromium-win 2) The rebaseline tool deletes the checksum result for chromium-win, since it's not needed 3) The rebaseline tool tries to write a png result for chromium-win-vista. Since it matches the chromium-win result, it does nothing. 4) The rebaseline tool writes a checksum result for chromium-win-vista, but since there's no chromium-win checksum, it goes ahead and writes the file. 379033 4 88114 dpranke 2011-04-04 13:52:57 -0700 Comment on attachment 88114 Patch LGTM. View in context: https://bugs.webkit.org/attachment.cgi?id=88114&action=review > Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:435 > + Nit: Can you pull this into a separate routine called png_for_checksum() or something like that to help clarify what's going on? 379046 5 88118 tony 2011-04-04 13:58:27 -0700 Created attachment 88118 Patch 379048 6 dpranke 2011-04-04 13:59:38 -0700 (In reply to comment #5) > Created an attachment (id=88118) [details] > Patch LGTM. 379050 7 88114 tony 2011-04-04 14:00:23 -0700 Comment on attachment 88114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88114&action=review >> Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:435 >> + png_fullpath = fs.join(all_baselines[0][0], all_baselines[0][1]) >> + > > Nit: Can you pull this into a separate routine called png_for_checksum() or something like that to help clarify what's going on? Done. Note: Code like this is why I hate returning tuples. 379074 8 dpranke 2011-04-04 14:21:52 -0700 (In reply to comment #7) > (From update of attachment 88114 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=88114&action=review > > >> Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:435 > >> + png_fullpath = fs.join(all_baselines[0][0], all_baselines[0][1]) > >> + > > > > Nit: Can you pull this into a separate routine called png_for_checksum() or something like that to help clarify what's going on? > > Done. Note: Code like this is why I hate returning tuples. It looks like expected_baselines() could and probably should be rewritten to only return a list of full paths to the tests, and then maybe we provide another helper function like baseline_dir_for_test() or something. That would probably clean things up somewhat. I know this code used to be more convoluted in the past and it can probably be made a fair amount simpler. 379193 9 tony 2011-04-04 16:31:09 -0700 Committed r82892: <http://trac.webkit.org/changeset/82892> 88114 2011-04-04 13:27:41 -0700 2011-04-04 14:00:23 -0700 Patch bug-57783-20110404132853.patch text/plain 5393 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NDcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZjIyMzcxOGU4Y2JhODlhZjkwYmNmZjc4YmVjN2JlOTYx ODk1ZGIxLi4yMDI3Mzg0MzBlYThjNGQ2NDY3Y2JiZGQwOGQyZjBjMGI2NmQwNjY1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDQtMDQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGRvbid0 IHdyaXRlIC5jaGVja3N1bSBmaWxlcyBpZiBhIGZhbGxiYWNrIHBsYXRmb3JtIGhhcyBhbiBlbWJl ZGRlZCBjaGVja3N1bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTc3ODMKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Jl YmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0 ZXN0LnB5OgorCiAyMDExLTA0LTA0ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJv bWl1bV93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQppbmRleCBkMmNmYzY2NzhlZTY3 OTkzZDdiMjY4YWY0NDkzYTVlMWQ1OGUxZGQwLi5jMzBjOWM0N2MxYzI5MzE5MzU0ODI1OTFhNDM1 MTczMjRmYjUyYzQ2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0 cy5weQpAQCAtMzkxLDcgKzM5MSw4IEBAIGNsYXNzIFJlYmFzZWxpbmVyKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgc2VsZi5fZGVsZXRlX2Jhc2VsaW5lKGV4cGVjdGVkX2Z1bGxwYXRoKQogICAg ICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAgIGlmIHN1ZmZpeCA9PSAnLmNoZWNr c3VtJyBhbmQgc2VsZi5fcG5nX2hhc19zYW1lX2NoZWNrc3VtKHRlbXBfbmFtZSwgZXhwZWN0ZWRf ZnVsbHBhdGgpOgorICAgICAgICAgICAgaWYgc3VmZml4ID09ICcuY2hlY2tzdW0nIGFuZCBzZWxm Ll9wbmdfaGFzX3NhbWVfY2hlY2tzdW0odGVtcF9uYW1lLCB0ZXN0LCBleHBlY3RlZF9mdWxscGF0 aCk6CisgICAgICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5yZW1vdmUodGVtcF9uYW1lKQog ICAgICAgICAgICAgICAgICMgSWYgYW4gb2xkIGNoZWNrc3VtIGV4aXN0cywgZGVsZXRlIGl0Lgog ICAgICAgICAgICAgICAgIHNlbGYuX2RlbGV0ZV9iYXNlbGluZShleHBlY3RlZF9mdWxscGF0aCkK ICAgICAgICAgICAgICAgICBjb250aW51ZQpAQCAtNDIzLDExICs0MjQsMTUgQEAgY2xhc3MgUmVi YXNlbGluZXIob2JqZWN0KToKICAgICAgICAgdGVtcGZpbGUuY2xvc2UoKQogICAgICAgICByZXR1 cm4gdGVtcF9uYW1lCiAKLSAgICBkZWYgX3BuZ19oYXNfc2FtZV9jaGVja3N1bShzZWxmLCBjaGVj a3N1bV9wYXRoLCBjaGVja3N1bV9leHBlY3RlZF9mdWxscGF0aCk6Ci0gICAgICAgICIiIlJldHVy bnMgVHJ1ZSBpZiB0aGUgcG5nIGZpbGUgbmV4dCB0byB8Y2hlY2tzdW1fZXhwZWN0ZWRfZnVsbHBh dGh8CisgICAgZGVmIF9wbmdfaGFzX3NhbWVfY2hlY2tzdW0oc2VsZiwgY2hlY2tzdW1fcGF0aCwg dGVzdCwgY2hlY2tzdW1fZXhwZWN0ZWRfZnVsbHBhdGgpOgorICAgICAgICAiIiJSZXR1cm5zIFRy dWUgaWYgdGhlIGZhbGxiYWNrIHBuZyBmb3IgfGNoZWNrc3VtX2V4cGVjdGVkX2Z1bGxwYXRofAog ICAgICAgICBjb250YWlucyB0aGUgc2FtZSBjaGVja3N1bS4iIiIKICAgICAgICAgZnMgPSBzZWxm Ll9maWxlc3lzdGVtCi0gICAgICAgIHBuZ19mdWxscGF0aCA9IGZzLnNwbGl0ZXh0KGNoZWNrc3Vt X2V4cGVjdGVkX2Z1bGxwYXRoKVswXSArICcucG5nJworICAgICAgICB0ZXN0X2ZpbGVwYXRoID0g ZnMuam9pbihzZWxmLl90YXJnZXRfcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksIHRlc3QpCisgICAg ICAgIGFsbF9iYXNlbGluZXMgPSBzZWxmLl9yZWJhc2VsaW5lX3BvcnQuZXhwZWN0ZWRfYmFzZWxp bmVzKAorICAgICAgICAgICAgdGVzdF9maWxlcGF0aCwgJy5wbmcnLCBUcnVlKQorICAgICAgICBw bmdfZnVsbHBhdGggPSBmcy5qb2luKGFsbF9iYXNlbGluZXNbMF1bMF0sIGFsbF9iYXNlbGluZXNb MF1bMV0pCisKICAgICAgICAgaWYgbm90IGZzLmV4aXN0cyhwbmdfZnVsbHBhdGgpOgogICAgICAg ICAgICAgX2xvZy5lcnJvcignICBDaGVja3N1bSB3aXRob3V0IHBuZyBmaWxlIGZvdW5kISBFeHBl Y3RlZCAlcyB0byBleGlzdC4nICUgcG5nX2Z1bGxwYXRoKQogICAgICAgICAgICAgcmV0dXJuIEZh bHNlCkBAIC00NDgsNyArNDUzLDggQEAgY2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAg ICAgICAgYmFzZWxpbmUgYW5kIGxpbnV4IGJhc2VsaW5lIHdpbGwgZmFsbGJhY2sgdG8gdGhlIHdp bmRvd3MgdmVyc2lvbi4KIAogICAgICAgICBBcmdzOgotICAgICAgICAgIGV4cGVjdGVkX2ZpbGVu YW1lOiBiYXNlbGluZSBleHBlY3RhdGlvbiBmaWxlIG5hbWUuCisgICAgICAgICAgbmV3X2Jhc2Vs aW5lOiB0ZW1wIGZpbGVuYW1lIGNvbnRhaW5pbmcgdGhlIG5ldyBiYXNlbGluZSByZXN1bHRzCisg ICAgICAgICAgYmFzZWxpbmVfcGF0aDogYmFzZWxpbmUgZXhwZWN0YXRpb24gZmlsZSBuYW1lLgog ICAgICAgICAgIHRlc3Q6IHRlc3QgbmFtZS4KICAgICAgICAgICBzdWZmaXg6IGZpbGUgc3VmZml4 IG9mIHRoZSBleHBlY3RlZCByZXN1bHRzLCBpbmNsdWRpbmcgZG90OwogICAgICAgICAgICAgICAg ICAgZS5nLiAnLnR4dCcgb3IgJy5wbmcnLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHNfdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2No cm9taXVtX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCA3MDgwNjc4ZmU4MjFiZDVjNWM0 N2Y0Y2VkOTBjMmY0NzY1NmEzZDhhLi43M2JjMWE3OGM5NjIzOTYwMjFiNDEyOGM0NGI5YWJjZDg3 NDU5ODk4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y ZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90 ZXN0c191bml0dGVzdC5weQpAQCAtMjg4LDYgKzI4OCwyMCBAQCBjbGFzcyBUZXN0UmViYXNlbGlu ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZpbGVzeXN0 ZW0uZmlsZXNbJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxl b3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQudHh0J10sICdw bmctY29tbWVudC10eHQnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZpbGVzeXN0ZW0uZmls ZXMuZ2V0KCcvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90ZXN0LW1hYy1sZW9w YXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4cGVjdGVkLmNoZWNrc3VtJywg Tm9uZSksIE5vbmUpCiAKKyAgICBkZWYgdGVzdF9wbmdfZmlsZV93aXRoX2NvbW1lbnRfYXNfZHVw bGljYXRlKHNlbGYpOgorICAgICAgICByZWJhc2VsaW5lciwgZmlsZXN5c3RlbSA9IHNlbGYubWFr ZV9yZWJhc2VsaW5lcigKKyAgICAgICAgICAgICJCVUdYIFJFQkFTRUxJTkUgTUFDIDogZmFpbHVy ZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0uaHRtbCA9IElNQUdFIikKKyAgICAgICAgZmlsZXN5 c3RlbS5maWxlc1snL3Rlc3QuY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vdGVzdC1tYWMt c25vd2xlb3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQucG5n J10gPSAndEVYdGNoZWNrc3VtXHgwMDAxMjM0NTY3ODknCisgICAgICAgIGZpbGVzeXN0ZW0uZmls ZXNbJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLXNub3dsZW9w YXJkL2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4cGVjdGVkLnR4dCddID0gJ3Bu Zy1jb21tZW50LXR4dCcKKworICAgICAgICBjb21waWxlX3N1Y2Nlc3MgPSByZWJhc2VsaW5lci5f Y29tcGlsZV9yZWJhc2VsaW5pbmdfdGVzdHMoKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoY29t cGlsZV9zdWNjZXNzKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNldChbJ2ZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlX2NoZWNrc3VtLmh0bWwnXSksIHJlYmFzZWxpbmVyLl9yZWJhc2VsaW5pbmdf dGVzdHMpCisgICAgICAgIHJlYmFzZWxpbmVyLnJ1bigpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoZmlsZXN5c3RlbS5maWxlcy5nZXQoJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRm b3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhw ZWN0ZWQucG5nJywgTm9uZSksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZXN5 c3RlbS5maWxlcy5nZXQoJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3Qt bWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQudHh0 JywgTm9uZSksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZXN5c3RlbS5maWxl cy5nZXQoJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3Bh cmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQuY2hlY2tzdW0nLCBO b25lKSwgTm9uZSkKKwogICAgIGRlZiB0ZXN0X2RpZmZfYmFzZWxpbmVzX3R4dChzZWxmKToKICAg ICAgICAgcmViYXNlbGluZXIsIGZpbGVzeXN0ZW0gPSBzZWxmLm1ha2VfcmViYXNlbGluZXIoIiIp CiAgICAgICAgIHBvcnQgPSByZWJhc2VsaW5lci5fcG9ydAo= 88118 2011-04-04 13:58:27 -0700 2011-04-04 16:21:00 -0700 Patch bug-57783-20110404135939.patch text/plain 5948 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODI4NDcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZjIyMzcxOGU4Y2JhODlhZjkwYmNmZjc4YmVjN2JlOTYx ODk1ZGIxLi4yMDI3Mzg0MzBlYThjNGQ2NDY3Y2JiZGQwOGQyZjBjMGI2NmQwNjY1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDQtMDQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGRvbid0 IHdyaXRlIC5jaGVja3N1bSBmaWxlcyBpZiBhIGZhbGxiYWNrIHBsYXRmb3JtIGhhcyBhbiBlbWJl ZGRlZCBjaGVja3N1bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTc3ODMKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Jl YmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0 ZXN0LnB5OgorCiAyMDExLTA0LTA0ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJv bWl1bV93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQppbmRleCBkMmNmYzY2NzhlZTY3 OTkzZDdiMjY4YWY0NDkzYTVlMWQ1OGUxZGQwLi5lZWE2YWIzNmFmZGExYTY2YjU1NzBjM2Y4ZTgy N2RkZDEzNjBmODFhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0 cy5weQpAQCAtMzkxLDcgKzM5MSw4IEBAIGNsYXNzIFJlYmFzZWxpbmVyKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgc2VsZi5fZGVsZXRlX2Jhc2VsaW5lKGV4cGVjdGVkX2Z1bGxwYXRoKQogICAg ICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAgIGlmIHN1ZmZpeCA9PSAnLmNoZWNr c3VtJyBhbmQgc2VsZi5fcG5nX2hhc19zYW1lX2NoZWNrc3VtKHRlbXBfbmFtZSwgZXhwZWN0ZWRf ZnVsbHBhdGgpOgorICAgICAgICAgICAgaWYgc3VmZml4ID09ICcuY2hlY2tzdW0nIGFuZCBzZWxm Ll9wbmdfaGFzX3NhbWVfY2hlY2tzdW0odGVtcF9uYW1lLCB0ZXN0LCBleHBlY3RlZF9mdWxscGF0 aCk6CisgICAgICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5yZW1vdmUodGVtcF9uYW1lKQog ICAgICAgICAgICAgICAgICMgSWYgYW4gb2xkIGNoZWNrc3VtIGV4aXN0cywgZGVsZXRlIGl0Lgog ICAgICAgICAgICAgICAgIHNlbGYuX2RlbGV0ZV9iYXNlbGluZShleHBlY3RlZF9mdWxscGF0aCkK ICAgICAgICAgICAgICAgICBjb250aW51ZQpAQCAtNDIzLDExICs0MjQsMTIgQEAgY2xhc3MgUmVi YXNlbGluZXIob2JqZWN0KToKICAgICAgICAgdGVtcGZpbGUuY2xvc2UoKQogICAgICAgICByZXR1 cm4gdGVtcF9uYW1lCiAKLSAgICBkZWYgX3BuZ19oYXNfc2FtZV9jaGVja3N1bShzZWxmLCBjaGVj a3N1bV9wYXRoLCBjaGVja3N1bV9leHBlY3RlZF9mdWxscGF0aCk6Ci0gICAgICAgICIiIlJldHVy bnMgVHJ1ZSBpZiB0aGUgcG5nIGZpbGUgbmV4dCB0byB8Y2hlY2tzdW1fZXhwZWN0ZWRfZnVsbHBh dGh8CisgICAgZGVmIF9wbmdfaGFzX3NhbWVfY2hlY2tzdW0oc2VsZiwgY2hlY2tzdW1fcGF0aCwg dGVzdCwgY2hlY2tzdW1fZXhwZWN0ZWRfZnVsbHBhdGgpOgorICAgICAgICAiIiJSZXR1cm5zIFRy dWUgaWYgdGhlIGZhbGxiYWNrIHBuZyBmb3IgfGNoZWNrc3VtX2V4cGVjdGVkX2Z1bGxwYXRofAog ICAgICAgICBjb250YWlucyB0aGUgc2FtZSBjaGVja3N1bS4iIiIKICAgICAgICAgZnMgPSBzZWxm Ll9maWxlc3lzdGVtCi0gICAgICAgIHBuZ19mdWxscGF0aCA9IGZzLnNwbGl0ZXh0KGNoZWNrc3Vt X2V4cGVjdGVkX2Z1bGxwYXRoKVswXSArICcucG5nJworICAgICAgICBwbmdfZnVsbHBhdGggPSBz ZWxmLl9maXJzdF9mYWxsYmFja19wbmdfZm9yX3Rlc3QodGVzdCkKKwogICAgICAgICBpZiBub3Qg ZnMuZXhpc3RzKHBuZ19mdWxscGF0aCk6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCcgIENoZWNr c3VtIHdpdGhvdXQgcG5nIGZpbGUgZm91bmQhIEV4cGVjdGVkICVzIHRvIGV4aXN0LicgJSBwbmdf ZnVsbHBhdGgpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKQEAgLTQ0MSw2ICs0NDMsMTIgQEAg Y2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNo ZWNrc3VtX2V4cGVjdGVkX2Z1bGxwYXRoLCBwbmdfZnVsbHBhdGgpKQogICAgICAgICAgICAgcmV0 dXJuIGNoZWNrc3VtX2luX3RleHRfZmlsZSA9PSBjaGVja3N1bV9pbl9wbmcKIAorICAgIGRlZiBf Zmlyc3RfZmFsbGJhY2tfcG5nX2Zvcl90ZXN0KHNlbGYsIHRlc3QpOgorICAgICAgICB0ZXN0X2Zp bGVwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3RhcmdldF9wb3J0LmxheW91dF90 ZXN0c19kaXIoKSwgdGVzdCkKKyAgICAgICAgYWxsX2Jhc2VsaW5lcyA9IHNlbGYuX3JlYmFzZWxp bmVfcG9ydC5leHBlY3RlZF9iYXNlbGluZXMoCisgICAgICAgICAgICB0ZXN0X2ZpbGVwYXRoLCAn LnBuZycsIFRydWUpCisgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYWxsX2Jh c2VsaW5lc1swXVswXSwgYWxsX2Jhc2VsaW5lc1swXVsxXSkKKwogICAgIGRlZiBfaXNfZHVwX2Jh c2VsaW5lKHNlbGYsIG5ld19iYXNlbGluZSwgYmFzZWxpbmVfcGF0aCwgdGVzdCwgc3VmZml4LCBw bGF0Zm9ybSk6CiAgICAgICAgICIiIkNoZWNrIHdoZXRoZXIgYSBiYXNlbGluZSBpcyBkdXBsaWNh dGUgYW5kIGNhbiBmYWxsYmFjayB0byBzYW1lCiAgICAgICAgICAgIGJhc2VsaW5lIGZvciBhbm90 aGVyIHBsYXRmb3JtLiBGb3IgZXhhbXBsZSwgaWYgYSB0ZXN0IGhhcyBzYW1lCkBAIC00NDgsNyAr NDU2LDggQEAgY2xhc3MgUmViYXNlbGluZXIob2JqZWN0KToKICAgICAgICAgICAgYmFzZWxpbmUg YW5kIGxpbnV4IGJhc2VsaW5lIHdpbGwgZmFsbGJhY2sgdG8gdGhlIHdpbmRvd3MgdmVyc2lvbi4K IAogICAgICAgICBBcmdzOgotICAgICAgICAgIGV4cGVjdGVkX2ZpbGVuYW1lOiBiYXNlbGluZSBl eHBlY3RhdGlvbiBmaWxlIG5hbWUuCisgICAgICAgICAgbmV3X2Jhc2VsaW5lOiB0ZW1wIGZpbGVu YW1lIGNvbnRhaW5pbmcgdGhlIG5ldyBiYXNlbGluZSByZXN1bHRzCisgICAgICAgICAgYmFzZWxp bmVfcGF0aDogYmFzZWxpbmUgZXhwZWN0YXRpb24gZmlsZSBuYW1lLgogICAgICAgICAgIHRlc3Q6 IHRlc3QgbmFtZS4KICAgICAgICAgICBzdWZmaXg6IGZpbGUgc3VmZml4IG9mIHRoZSBleHBlY3Rl ZCByZXN1bHRzLCBpbmNsdWRpbmcgZG90OwogICAgICAgICAgICAgICAgICAgZS5nLiAnLnR4dCcg b3IgJy5wbmcnLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90 ZXN0c191bml0dGVzdC5weQppbmRleCA3MDgwNjc4ZmU4MjFiZDVjNWM0N2Y0Y2VkOTBjMmY0NzY1 NmEzZDhhLi43M2JjMWE3OGM5NjIzOTYwMjFiNDEyOGM0NGI5YWJjZDg3NDU5ODk4IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9t aXVtX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0c191bml0dGVzdC5w eQpAQCAtMjg4LDYgKzI4OCwyMCBAQCBjbGFzcyBUZXN0UmViYXNlbGluZXIodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXNbJy90ZXN0 LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMv ZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQudHh0J10sICdwbmctY29tbWVudC10eHQn KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGZpbGVzeXN0ZW0uZmlsZXMuZ2V0KCcvdGVzdC5j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL2ZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4cGVjdGVkLmNoZWNrc3VtJywgTm9uZSksIE5vbmUpCiAK KyAgICBkZWYgdGVzdF9wbmdfZmlsZV93aXRoX2NvbW1lbnRfYXNfZHVwbGljYXRlKHNlbGYpOgor ICAgICAgICByZWJhc2VsaW5lciwgZmlsZXN5c3RlbSA9IHNlbGYubWFrZV9yZWJhc2VsaW5lcigK KyAgICAgICAgICAgICJCVUdYIFJFQkFTRUxJTkUgTUFDIDogZmFpbHVyZXMvZXhwZWN0ZWQvaW1h Z2VfY2hlY2tzdW0uaHRtbCA9IElNQUdFIikKKyAgICAgICAgZmlsZXN5c3RlbS5maWxlc1snL3Rl c3QuY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vdGVzdC1tYWMtc25vd2xlb3BhcmQvZmFp bHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQucG5nJ10gPSAndEVYdGNoZWNr c3VtXHgwMDAxMjM0NTY3ODknCisgICAgICAgIGZpbGVzeXN0ZW0uZmlsZXNbJy90ZXN0LmNoZWNr b3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLXNub3dsZW9wYXJkL2ZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlX2NoZWNrc3VtLWV4cGVjdGVkLnR4dCddID0gJ3BuZy1jb21tZW50LXR4dCcK KworICAgICAgICBjb21waWxlX3N1Y2Nlc3MgPSByZWJhc2VsaW5lci5fY29tcGlsZV9yZWJhc2Vs aW5pbmdfdGVzdHMoKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoY29tcGlsZV9zdWNjZXNzKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNldChbJ2ZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2No ZWNrc3VtLmh0bWwnXSksIHJlYmFzZWxpbmVyLl9yZWJhc2VsaW5pbmdfdGVzdHMpCisgICAgICAg IHJlYmFzZWxpbmVyLnJ1bigpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZXN5c3RlbS5m aWxlcy5nZXQoJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxl b3BhcmQvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQucG5nJywgTm9u ZSksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZXN5c3RlbS5maWxlcy5nZXQo Jy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFp bHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQudHh0JywgTm9uZSksIE5vbmUp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZXN5c3RlbS5maWxlcy5nZXQoJy90ZXN0LmNo ZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQvZmFpbHVyZXMvZXhw ZWN0ZWQvaW1hZ2VfY2hlY2tzdW0tZXhwZWN0ZWQuY2hlY2tzdW0nLCBOb25lKSwgTm9uZSkKKwog ICAgIGRlZiB0ZXN0X2RpZmZfYmFzZWxpbmVzX3R4dChzZWxmKToKICAgICAgICAgcmViYXNlbGlu ZXIsIGZpbGVzeXN0ZW0gPSBzZWxmLm1ha2VfcmViYXNlbGluZXIoIiIpCiAgICAgICAgIHBvcnQg PSByZWJhc2VsaW5lci5fcG9ydAo=