60466 2011-05-09 07:06:49 -0700 check-webkit-style can miss XML syntax and test_expectations.txt errors when checking patches 2012-12-11 12:46:11 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aroben levin abarth commit-queue dpranke enne eric hamaji levin oldest_to_newest 400483 0 aroben 2011-05-09 07:06:49 -0700 Attachment 92746 in bug 54181 contained XML syntax errors in WebCore.vcproj. check-webkit-style didn't flag those errors, so the buggy patch was committed in r86047. I had to land a fix in r86052 to fix them. We should figure out why check-webkit-style didn't flag the errors. 400487 1 aroben 2011-05-09 07:23:01 -0700 Note that check-webkit-style *does* flag the errors if run on the r86047 version of WebCore.vcproj. It just doesn't flag the errors when run on the patch. 400488 2 levin 2011-05-09 07:31:51 -0700 (In reply to comment #0) > Attachment 92746 [details] in bug 54181 contained XML syntax errors in WebCore.vcproj. check-webkit-style didn't flag those errors, so the buggy patch was committed in r86047. I had to land a fix in r86052 to fix them. > > We should figure out why check-webkit-style didn't flag the errors. I suspect this has to do with the fact that it filters to only be on the lines where changes were made. In general, this is really good, but for some checkers like the xml one, it probably shouldn't happen. 400698 3 levin 2011-05-09 13:08:50 -0700 (In reply to comment #2) > (In reply to comment #0) > > Attachment 92746 [details] [details] in bug 54181 contained XML syntax errors in WebCore.vcproj. check-webkit-style didn't flag those errors, so the buggy patch was committed in r86047. I had to land a fix in r86052 to fix them. > > > > We should figure out why check-webkit-style didn't flag the errors. > > I suspect this has to do with the fact that it filters to only be on the lines where changes were made. In general, this is really good, but for some checkers like the xml one, it probably shouldn't happen. Yep, that was it. Patching coming shortly. The test expectations checker had the same issue. 400708 4 levin 2011-05-09 13:23:50 -0700 *** Bug 60373 has been marked as a duplicate of this bug. *** 400711 5 92839 levin 2011-05-09 13:31:55 -0700 Created attachment 92839 Patch 400713 6 aroben 2011-05-09 13:33:17 -0700 Changed the title back to describing a symptom, not a cause. 401267 7 92839 hamaji 2011-05-10 09:44:09 -0700 Comment on attachment 92839 Patch Looks good 401298 8 92839 commit-queue 2011-05-10 10:28:19 -0700 Comment on attachment 92839 Patch Clearing flags on attachment: 92839 Committed r86165: <http://trac.webkit.org/changeset/86165> 401300 9 commit-queue 2011-05-10 10:28:24 -0700 All reviewed patches have been landed. Closing bug. 788684 10 dpranke 2012-12-11 12:45:45 -0800 Just for the record, it doesn't seem to still make sense to check the whole file for TestExpectations changes, so I've restored the line filtering in bug 104701 ... see the comments in that bug for more context. 788685 11 dpranke 2012-12-11 12:46:11 -0800 Argh, bug 104687, not bug 104701. 92839 2011-05-09 13:31:55 -0700 2011-05-10 10:28:19 -0700 Patch bug-60466-20110509133153.patch text/plain 11759 levin U3VidmVyc2lvbiBSZXZpc2lvbjogODYwODUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MWE1ZDgyMTkwNDNjN2MyMzBhMTNmNmQxYThkNmUwYTU0 ZGFmYWYyLi4yNDE4ZDUwZDViMDYzODVkNDc1ZjIxNDM3NTkxN2ExYTUyZWJlODIwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDUtMDkgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNoZWNrLXdlYmtpdC1z dHlsZSBzaG91bGRuJ3QgZmlsdGVyIHRoZSBlcnJvcnMgdXNpbmcgdGhlIG1vZGlmaWVkIGxpbmVz IGZvciB0aGUgeG1sIGFuZCB0ZXN0IGV4cGVjdGF0aW9ucyBjaGVja2Vycy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwNDY2CisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHk6ICh1bnJlbGF0ZWQpIHN0eWxlIGZpeC4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHk6IFJl bW92ZSB0aGUgZmlsZV9wYXRoIGNoZWNrIHNpbmNlCisgICAgICAgICAgdGhhdCBwcm9wZXJ0eSB3 YXMgcmVtb3ZlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rl c3RfZXhwZWN0YXRpb25zLnB5OiBUdXJuIG9mZiB0aGUgbGluZQorICAgICAgICAgIGZpbHRlcmlu ZyBmb3IgZXJyb3JzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMv dGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6IEFkZCB0ZXN0aW5nIHRvCisgICAgICAgICAg dmVyaWZ5IHRoYXQgdGhlIGxpbmUgZmlsdGVyaW5nIGlzIHR1cm5lZCBvZmYuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy94bWwucHk6IFR1cm4gb2ZmIHRoZSBsaW5l IGZpbHRlcmluZyBmb3IgZXJyb3JzCisgICAgICAgICAgYW5kIHJlbW92ZSB0aGUgdW51c2VkIGZp bGVfcGF0aCBwYXJhbWV0ZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy94bWxfdW5pdHRlc3QucHk6IEFkZCB0ZXN0aW5nIHRvIHZlcmlmeSB0aGF0IHRoZQorICAg ICAgICAgIGxpbmUgZmlsdGVyaW5nIGlzIHR1cm5lZCBvZmYgKGFuZCBmaXggdGVzdF9ub19lcnJv cikuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVycy5weTog QWRkZWQgYSB3YXkgdG8gdHVybiBvZmYgdGhlIGZpbHRlcmluZworICAgICAgICAgIG9mIGVycm9y cyBiYXNlZCBvbiB0aGUgbGluZXMgY2hhbmdlZCBpbiB0aGUgcGF0Y2guCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weTogQWRkZWQgYSB0 ZXN0IGZvciB0dXJuaW5nIG9mZgorICAgICAgICAgIHRoZSBmaWx0ZXJpbmcuCisKIDIwMTEtMDUt MDkgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5w eQppbmRleCBhMzZlYzY3YWNiZTgyNDdiM2RmMzlkNWM1ZjQ2MDU2ZDNiYWE0ZTY1Li4yN2JhMjk0 ZjVhN2M0ZDhlNzQ5NDc0ZDk5NTM3NDQ2MTc0MGU3MjlhIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2VyLnB5CkBAIC03NjUsOCArNzY1LDggQEAgY2xhc3MgU3R5bGVQcm9jZXNz b3IoUHJvY2Vzc29yQmFzZSk6CiAKICAgICAgICAgbWluX2NvbmZpZGVuY2UgPSBzZWxmLl9jb25m aWd1cmF0aW9uLm1pbl9jb25maWRlbmNlCiAgICAgICAgIGNoZWNrZXIgPSBzZWxmLl9kaXNwYXRj aGVyLmRpc3BhdGNoKGZpbGVfcGF0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0eWxlX2Vycm9yX2hhbmRsZXIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtaW5fY29uZmlkZW5jZSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3R5bGVfZXJyb3Jf aGFuZGxlciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWlu X2NvbmZpZGVuY2UpCiAKICAgICAgICAgaWYgY2hlY2tlciBpcyBOb25lOgogICAgICAgICAgICAg cmFpc2UgQXNzZXJ0aW9uRXJyb3IoIkZpbGUgc2hvdWxkIG5vdCBiZSBjaGVja2VkOiAnJXMnIiAl IGZpbGVfcGF0aCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91 bml0dGVzdC5weQppbmRleCA0OTU5NTc3MDQ0MWQ1ODlmMWVjYjUwOTZiZDk1ZjcxYWE1NDZiYWM2 Li5hZTFmYTg4MzViZjBkMDM2MTBhYzY4NDg5YjRkMWRkNjAyMjU4MDk5IDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CkBAIC01NDcsOCAr NTQ3LDcgQEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNoZXJEaXNwYXRjaFRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICBmaWxlX3BhdGggPSBmaWxlX2Jhc2UgKyAiLiIgKyBmaWxlX2V4dGVu c2lvbgogICAgICAgICBzZWxmLmFzc2VydF9jaGVja2VyX3htbChmaWxlX3BhdGgpCiAgICAgICAg IGNoZWNrZXIgPSBzZWxmLmRpc3BhdGNoKGZpbGVfcGF0aCkKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoY2hlY2tlci5maWxlX3BhdGgsIGZpbGVfcGF0aCkKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoY2hlY2tlci5oYW5kbGVfc3R5bGVfZXJyb3IsCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKGNoZWNrZXIuX2hhbmRsZV9zdHlsZV9lcnJvciwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2VsZi5tb2NrX2hhbmRsZV9zdHlsZV9lcnJvcikKIAogICAgIGRlZiB0ZXN0X25vbmVfcGF0 aHMoc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNr ZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCA4NzA5ZTM0ZmY0OGY0OTU2ZDNlZDcz YjVhZTFmODVmYjhkNjExODJiLi4wNjY1MjIzYThjMjdhODc1ZTBiYTMxNzIyY2Y3NWUxMWEwMTEx ODFlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rl c3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTU4LDYgKzU4LDcgQEAgY2xhc3MgVGVzdEV4 cGVjdGF0aW9uc0NoZWNrZXIob2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgZmlsZV9w YXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpOgogICAgICAgICBzZWxmLl9maWxlX3BhdGggPSBmaWxl X3BhdGgKICAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vy cm9yCisgICAgICAgIHNlbGYuX2hhbmRsZV9zdHlsZV9lcnJvci50dXJuX29mZl9saW5lX2ZpbHRl cmluZygpCiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2VyID0gVGFiQ2hlY2tlcihmaWxlX3BhdGgs IGhhbmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAgc2VsZi5fb3V0cHV0X3JlZ2V4ID0gcmUuY29t cGlsZSgnTGluZTooP1A8bGluZT5cZCspXHMqKD9QPG1lc3NhZ2U+LispJykKICAgICAgICAgIyBE ZXRlcm1pbmluZyB0aGUgcG9ydCBvZiB0aGlzIGV4cGVjdGF0aW9ucy4KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnNfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhw ZWN0YXRpb25zX3VuaXR0ZXN0LnB5CmluZGV4IDlkMDNhY2NlOTRkZWFlY2FiMjVmOTk0NDBlMmE3 ZWJkMTYxYzBhZTQuLjZkNjliY2ZlNjNkNzI5MDg4NjExZGI4NzU5YmY2MDZjOTgxOWM5OGEgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBl Y3RhdGlvbnNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQpAQCAtNTAsNiArNTAsMTAgQEAg Y2xhc3MgRXJyb3JDb2xsZWN0b3Iob2JqZWN0KToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmKToK ICAgICAgICAgc2VsZi5fZXJyb3JzID0gW10KKyAgICAgICAgc2VsZi50dXJuZWRfb2ZmX2ZpbHRl cmluZyA9IEZhbHNlCisKKyAgICBkZWYgdHVybl9vZmZfbGluZV9maWx0ZXJpbmcoc2VsZik6Cisg ICAgICAgIHNlbGYudHVybmVkX29mZl9maWx0ZXJpbmcgPSBUcnVlCiAKICAgICBkZWYgX19jYWxs X18oc2VsZiwgbGluZW5vLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwgbWVzc2FnZSk6CiAgICAgICAg IHNlbGYuX2Vycm9ycy5hcHBlbmQoJyVzICBbJXNdIFslZF0nICUgKG1lc3NhZ2UsIGNhdGVnb3J5 LCBjb25maWRlbmNlKSkKQEAgLTU5LDYgKzYzLDcgQEAgY2xhc3MgRXJyb3JDb2xsZWN0b3Iob2Jq ZWN0KToKIAogICAgIGRlZiByZXNldF9lcnJvcnMoc2VsZik6CiAgICAgICAgIHNlbGYuX2Vycm9y cyA9IFtdCisgICAgICAgIHNlbGYudHVybmVkX29mZl9maWx0ZXJpbmcgPSBGYWxzZQogCiAKIGNs YXNzIFRlc3RFeHBlY3RhdGlvbnNUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CkBAIC04MSw2 ICs4Niw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3ZlcnJpZGVzPU5v bmUpCiAgICAgICAgIGNoZWNrZXIuY2hlY2tfdGFicyhsaW5lcykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChleHBlY3RlZCwgc2VsZi5fZXJyb3JfY29sbGVjdG9yLmdldF9lcnJvcnMoKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlbGYuX2Vycm9yX2NvbGxlY3Rvci50dXJuZWRfb2ZmX2Zp bHRlcmluZykKIAogICAgIGRlZiB0ZXN0X3ZhbGlkX2V4cGVjdGF0aW9ucyhzZWxmKToKICAgICAg ICAgc2VsZi5hc3NlcnRfbGluZXNfbGludCgKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcnMveG1sLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy94bWwucHkKaW5kZXggMmY3YzBjZTVkODMzMDgzMzk1OTBkN2YyODkwZTFjNzI1 NTRlZTgwYi4uZmY0YTQxNTlmMWEyMzc3NTM2YzRiYmVhODJkYWRiNGU4ZmNjMDU2MyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy94bWwucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy94bWwucHkKQEAgLTMxLDggKzMx LDggQEAgY2xhc3MgWE1MQ2hlY2tlcihvYmplY3QpOgogICAgICIiIlByb2Nlc3NlcyBYTUwgbGlu ZXMgZm9yIGNoZWNraW5nIHN0eWxlLiIiIgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZpbGVf cGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKToKLSAgICAgICAgc2VsZi5maWxlX3BhdGggPSBmaWxl X3BhdGgKLSAgICAgICAgc2VsZi5oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJy b3IKKyAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9y CisgICAgICAgIHNlbGYuX2hhbmRsZV9zdHlsZV9lcnJvci50dXJuX29mZl9saW5lX2ZpbHRlcmlu ZygpCiAKICAgICBkZWYgY2hlY2soc2VsZiwgbGluZXMpOgogICAgICAgICBwYXJzZXIgPSBleHBh dC5QYXJzZXJDcmVhdGUoKQpAQCAtNDIsNCArNDIsNCBAQCBjbGFzcyBYTUxDaGVja2VyKG9iamVj dCk6CiAgICAgICAgICAgICAgICAgcGFyc2VyLlBhcnNlKCdcbicpCiAgICAgICAgICAgICBwYXJz ZXIuUGFyc2UoJycsIFRydWUpCiAgICAgICAgIGV4Y2VwdCBleHBhdC5FeHBhdEVycm9yLCBlcnJv cjoKLSAgICAgICAgICAgIHNlbGYuaGFuZGxlX3N0eWxlX2Vycm9yKGVycm9yLmxpbmVubywgJ3ht bC9zeW50YXgnLCA1LCBleHBhdC5FcnJvclN0cmluZyhlcnJvci5jb2RlKSkKKyAgICAgICAgICAg IHNlbGYuX2hhbmRsZV9zdHlsZV9lcnJvcihlcnJvci5saW5lbm8sICd4bWwvc3ludGF4JywgNSwg ZXhwYXQuRXJyb3JTdHJpbmcoZXJyb3IuY29kZSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3htbF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMveG1sX3VuaXR0ZXN0LnB5CmluZGV4IDM4MjU2NjBiNzUz ZjAzOTJmNDhiNWI5NjAxZWIzMmZlY2RjNGQ1OTAuLjliY2Y5N2YwYTRhMTNiNTQzZGUwOWY5Y2U5 NjZlZjQ3MjIxNWU4NDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMveG1sX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcnMveG1sX3VuaXR0ZXN0LnB5CkBAIC0yOSwyMyArMjksNDMgQEAgaW1wb3J0IHVu aXR0ZXN0CiBpbXBvcnQgeG1sCiAKIAorY2xhc3MgTW9ja0Vycm9ySGFuZGxlcihvYmplY3QpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBoYW5kbGVfc3R5bGVfZXJyb3IpOgorICAgICAgICBzZWxm LnR1cm5lZF9vZmZfZmlsdGVyaW5nID0gRmFsc2UKKyAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxl X2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9yCisKKyAgICBkZWYgdHVybl9vZmZfbGluZV9maWx0 ZXJpbmcoc2VsZik6CisgICAgICAgIHNlbGYudHVybmVkX29mZl9maWx0ZXJpbmcgPSBUcnVlCisK KyAgICBkZWYgX19jYWxsX18oc2VsZiwgbGluZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNl LCBtZXNzYWdlKToKKyAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yKHNlbGYsIGxpbmVf bnVtYmVyLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwgbWVzc2FnZSkKKworCiBjbGFzcyBYTUxDaGVj a2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgIiIiVGVzdHMgWE1MQ2hlY2tlciBjbGFz cy4iIiIKIAogICAgIGRlZiBhc3NlcnRfbm9fZXJyb3Ioc2VsZiwgeG1sX2RhdGEpOgotICAgICAg ICBkZWYgaGFuZGxlX3N0eWxlX2Vycm9yKGxpbmVfbnVtYmVyLCBjYXRlZ29yeSwgY29uZmlkZW5j ZSwgbWVzc2FnZSk6CisgICAgICAgIGRlZiBoYW5kbGVfc3R5bGVfZXJyb3IobW9ja19lcnJvcl9o YW5kbGVyLCBsaW5lX251bWJlciwgY2F0ZWdvcnksIGNvbmZpZGVuY2UsIG1lc3NhZ2UpOgogICAg ICAgICAgICAgc2VsZi5mYWlsKCdVbmV4cGVjdGVkIGVycm9yOiAlZCAlcyAlZCAlcycgJSAobGlu ZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNlLCBtZXNzYWdlKSkKLSAgICAgICAgY2hlY2tl ciA9IHhtbC5YTUxDaGVja2VyKCdmb28ueG1sJywgaGFuZGxlX3N0eWxlX2Vycm9yKQorCisgICAg ICAgIGVycm9yX2hhbmRsZXIgPSBNb2NrRXJyb3JIYW5kbGVyKGhhbmRsZV9zdHlsZV9lcnJvcikK KyAgICAgICAgY2hlY2tlciA9IHhtbC5YTUxDaGVja2VyKCdmb28ueG1sJywgZXJyb3JfaGFuZGxl cikKICAgICAgICAgY2hlY2tlci5jaGVjayh4bWxfZGF0YS5zcGxpdCgnXG4nKSkKKyAgICAgICAg c2VsZi5hc3NlcnRUcnVlKGVycm9yX2hhbmRsZXIudHVybmVkX29mZl9maWx0ZXJpbmcpCiAKICAg ICBkZWYgYXNzZXJ0X2Vycm9yKHNlbGYsIGV4cGVjdGVkX2xpbmVfbnVtYmVyLCBleHBlY3RlZF9j YXRlZ29yeSwgeG1sX2RhdGEpOgotICAgICAgICBkZWYgaGFuZGxlX3N0eWxlX2Vycm9yKGxpbmVf bnVtYmVyLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwgbWVzc2FnZSk6Ci0gICAgICAgICAgICBzZWxm LmhhZF9lcnJvciA9IFRydWUKKyAgICAgICAgZGVmIGhhbmRsZV9zdHlsZV9lcnJvcihtb2NrX2Vy cm9yX2hhbmRsZXIsIGxpbmVfbnVtYmVyLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwgbWVzc2FnZSk6 CisgICAgICAgICAgICBtb2NrX2Vycm9yX2hhbmRsZXIuaGFkX2Vycm9yID0gVHJ1ZQogICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwZWN0ZWRfbGluZV9udW1iZXIsIGxpbmVfbnVtYmVy KQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwZWN0ZWRfY2F0ZWdvcnksIGNhdGVn b3J5KQotICAgICAgICBjaGVja2VyID0geG1sLlhNTENoZWNrZXIoJ2Zvby54bWwnLCBoYW5kbGVf c3R5bGVfZXJyb3IpCisKKyAgICAgICAgZXJyb3JfaGFuZGxlciA9IE1vY2tFcnJvckhhbmRsZXIo aGFuZGxlX3N0eWxlX2Vycm9yKQorICAgICAgICBlcnJvcl9oYW5kbGVyLmhhZF9lcnJvciA9IEZh bHNlCisKKyAgICAgICAgY2hlY2tlciA9IHhtbC5YTUxDaGVja2VyKCdmb28ueG1sJywgZXJyb3Jf aGFuZGxlcikKICAgICAgICAgY2hlY2tlci5jaGVjayh4bWxfZGF0YS5zcGxpdCgnXG4nKSkKLSAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlbGYuaGFkX2Vycm9yKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUoZXJyb3JfaGFuZGxlci5oYWRfZXJyb3IpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShl cnJvcl9oYW5kbGVyLnR1cm5lZF9vZmZfZmlsdGVyaW5nKQogCiAgICAgZGVmIG1vY2tfaGFuZGxl X3N0eWxlX2Vycm9yKHNlbGYpOgogICAgICAgICBwYXNzCkBAIC01NywxNiArNzcsMTUgQEAgY2xh c3MgWE1MQ2hlY2tlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2Vy dF9lcnJvcigzLCAneG1sL3N5bnRheCcsICc8Zm9vPlxuPC9mb28+XG48L2Zvbz5cbicpCiAKICAg ICBkZWYgdGVzdF9pbml0KHNlbGYpOgotICAgICAgICBjaGVja2VyID0geG1sLlhNTENoZWNrZXIo J2Zvby54bWwnLCBzZWxmLm1vY2tfaGFuZGxlX3N0eWxlX2Vycm9yKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhjaGVja2VyLmZpbGVfcGF0aCwgJ2Zvby54bWwnKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhjaGVja2VyLmhhbmRsZV9zdHlsZV9lcnJvciwgc2VsZi5tb2NrX2hhbmRsZV9z dHlsZV9lcnJvcikKKyAgICAgICAgZXJyb3JfaGFuZGxlciA9IE1vY2tFcnJvckhhbmRsZXIoc2Vs Zi5tb2NrX2hhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAgICAgY2hlY2tlciA9IHhtbC5YTUxDaGVj a2VyKCdmb28ueG1sJywgZXJyb3JfaGFuZGxlcikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo Y2hlY2tlci5faGFuZGxlX3N0eWxlX2Vycm9yLCBlcnJvcl9oYW5kbGVyKQogCiAgICAgZGVmIHRl c3RfbWlzc2luZ19jbG9zaW5nX3RhZyhzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRfZXJyb3Io MywgJ3htbC9zeW50YXgnLCAnPGZvbz5cbjxiYXI+XG48L2Zvbz5cbicpCiAKICAgICBkZWYgdGVz dF9ub19lcnJvcihzZWxmKToKLSAgICAgICAgY2hlY2tlciA9IHhtbC5YTUxDaGVja2VyKCdmb28u eG1sJywgc2VsZi5hc3NlcnRfbm9fZXJyb3IpCi0gICAgICAgIGNoZWNrZXIuY2hlY2soWyc8Zm9v PicsICc8L2Zvbz4nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRfbm9fZXJyb3IoJzxmb28+XG48L2Zv bz4nKQogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0Lm1haW4oKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVycy5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnMucHkKaW5kZXgg NWQ4YjA0MWQ2ZmUyODYwYmQxYmE3MDc2NDlkYWRmYjYyMjdmMGJlZi4uODlkMWM4YTNkYjllMTRj NDUxOGMyZDM3NWY5MTFmYWUyZTY3OGNjYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9lcnJvcl9oYW5kbGVycy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2Vycm9yX2hhbmRsZXJzLnB5CkBAIC0xMjgsNiArMTI4LDkgQEAgY2xhc3MgRGVmYXVs dFN0eWxlRXJyb3JIYW5kbGVyKG9iamVjdCk6CiAgICAgICAgICMgV2FzIHRoZSBsaW5lIHRoYXQg d2FzIG1vZGlmaWVkPwogICAgICAgICByZXR1cm4gc2VsZi5fbGluZV9udW1iZXJzIGlzIE5vbmUg b3IgbGluZV9udW1iZXIgaW4gc2VsZi5fbGluZV9udW1iZXJzCiAKKyAgICBkZWYgdHVybl9vZmZf bGluZV9maWx0ZXJpbmcoc2VsZik6CisgICAgICAgIHNlbGYuX2xpbmVfbnVtYmVycyA9IE5vbmUK KwogICAgIGRlZiBfX2NhbGxfXyhzZWxmLCBsaW5lX251bWJlciwgY2F0ZWdvcnksIGNvbmZpZGVu Y2UsIG1lc3NhZ2UpOgogICAgICAgICAiIiJIYW5kbGUgdGhlIG9jY3VycmVuY2Ugb2YgYSBzdHls ZSBlcnJvci4KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJv cl9oYW5kbGVyc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJy b3JfaGFuZGxlcnNfdW5pdHRlc3QucHkKaW5kZXggMjM2MTljYzUzOTVhODY5YTZlNGQ0NGU0MGM3 YmRkZWNkNWNkMjZiYi4uODY0YmMwZjdhMzRhYTg1YjFhOTc1ZDg5Y2IzNWFkYTZkZmYzMjI4YyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRs ZXJzX3VuaXR0ZXN0LnB5CkBAIC0xODUsMyArMTg1LDEyIEBAIGNsYXNzIERlZmF1bHRTdHlsZUVy cm9ySGFuZGxlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVx dWFscygxLCBzZWxmLl9lcnJvcl9jb3VudCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2Vs Zi5fZXJyb3JfbWVzc2FnZXMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIFsiZm9vLmgoNTAp OiAgbWVzc2FnZSAgW3doaXRlc3BhY2UvdGFiXSBbNV1cbiJdKQorCisgICAgICAgICMgRXJyb3Ig b24gbm9uLW1vZGlmaWVkIGxpbmUgYWZ0ZXIgdHVybmluZyBvZmYgbGluZSBmaWx0ZXJpbmc6IGVy cm9yLgorICAgICAgICBlcnJvcl9oYW5kbGVyLnR1cm5fb2ZmX2xpbmVfZmlsdGVyaW5nKCkKKyAg ICAgICAgc2VsZi5fY2FsbF9lcnJvcl9oYW5kbGVyKGVycm9yX2hhbmRsZXIsIGNvbmZpZGVuY2Us IGxpbmVfbnVtYmVyPTYwKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscygyLCBzZWxmLl9lcnJv cl9jb3VudCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5fZXJyb3JfbWVzc2FnZXMs CisgICAgICAgICAgICAgICAgICAgICAgICAgIFsnZm9vLmgoNTApOiAgbWVzc2FnZSAgW3doaXRl c3BhY2UvdGFiXSBbNV1cbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAnZm9vLmgoNjAp OiAgbWVzc2FnZSAgW3doaXRlc3BhY2UvdGFiXSBbNV1cbicsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAnU3VwcHJlc3NpbmcgZnVydGhlciBbd2hpdGVzcGFjZS90YWJdIHJlcG9ydHMgZm9y IHRoaXMgZmlsZS5cbiddKQo=