77873 2012-02-06 07:31:00 -0800 check-webkit-style failing with "Path does not exist." 2012-02-08 13:04:48 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pdr dpranke abarth dpranke levin ojan webkit.review.bot oldest_to_newest 549987 0 pdr 2012-02-06 07:31:00 -0800 On a fresh checkout check-webkit-style runs without error, but make a space change to LayoutTests/platform/win/test_expectations.txt (which will force check-webkit-style to actually check that file) and the following error will result: WARNING: Exception while getting port for path LayoutTests/platform/win/test_expectations.txt WARNING: Could not determine the port for LayoutTests/platform/win/test_expectations.txt. Using 'test' port, but platform-specific expectations will fail the check. LayoutTests/platform/win/test_expectations.txt:5: Path does not exist. fast/ruby/after-block-doesnt-crash.html [test/expectations] [5] LayoutTests/platform/win/test_expectations.txt:6: Path does not exist. fast/ruby/after-table-doesnt-crash.html [test/expectations] [5] LayoutTests/platform/win/test_expectations.txt:7: Path does not exist. fast/ruby/generated-after-counter-doesnt-crash.html [test/expectations] [5] LayoutTests/platform/win/test_expectations.txt:8: Path does not exist. fast/ruby/generated-before-and-after-counter-doesnt-crash.html [test/expectations] [5] LayoutTests/platform/win/test_expectations.txt:11: Path does not exist. fast/forms/listbox-clip.html [test/expectations] [5] [ ... snip about 100 lines for brevity ... ] LayoutTests/platform/win/test_expectations.txt:133: Path does not exist. fast/table/027.html [test/expectations] [5] LayoutTests/platform/win/test_expectations.txt:134: Path does not exist. fast/table/027-vertical.html [test/expectations] [5] Total errors found: 113 in 1 files 550103 1 abarth 2012-02-06 10:58:25 -0800 fast/table/027.html at least does seem to exist. 550159 2 ojan 2012-02-06 11:50:32 -0800 At a quick glance, it looks like the problem is that it's not correctly mapping the "win" in the test_expectations.txt path to a port. The "test" port is the fallback port when the port can't be identified. IIRC, Dirk already has a patch somewhere fixing this, but I don't know what the status of it is. 550161 3 ojan 2012-02-06 11:52:23 -0800 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py#L74 550191 4 dpranke 2012-02-06 12:23:00 -0800 (In reply to comment #2) > At a quick glance, it looks like the problem is that it's not correctly mapping the "win" in the test_expectations.txt path to a port. The "test" port is the fallback port when the port can't be identified. IIRC, Dirk already has a patch somewhere fixing this, but I don't know what the status of it is. Hm. I think Ojan might be referring to bug 76745, which is a bit different (at least, that's the only patch I've worked on that is ringing a bell for me). That said, fixing this is straightforward. The mapping from LayoutTests/platform/$name to port is loose at best; the code in lines 74-81 is wrong and what we should do is fetch all of the ports using PortFactory.all_port_names() and then grep the list until you find one whose path_to_test_expectations_file() matches. I will upload a patch for this shortly. 550391 5 125724 dpranke 2012-02-06 16:19:01 -0800 Created attachment 125724 Patch 550396 6 dpranke 2012-02-06 16:22:35 -0800 Here's a patch that fixes the lookup for all of the real test_expectations.txt files; however, I'm not sure what the right thing to do is if we attempt to check the style for (say) LayoutTests/platform/foo/test_expectations.txt (since there is no foo port) ... the existing code will use the 'test' port, which seems a bit weird at best? It seems like we should either raise an assertion that we're trying to check an unknown file, or have some other sort of no-op checker? 550530 7 125724 ojan 2012-02-06 18:53:01 -0800 Comment on attachment 125724 Patch Seems fine. 552417 8 126137 dpranke 2012-02-08 13:02:12 -0800 Created attachment 126137 test bad paths better 552418 9 dpranke 2012-02-08 13:03:07 -0800 Committed r107124: <http://trac.webkit.org/changeset/107124> 552419 10 pdr 2012-02-08 13:04:48 -0800 I just wanted to thank you (Dirk) and Ojan for the quick fixes for these bugs! You guys rock 125724 2012-02-06 16:19:01 -0800 2012-02-08 13:02:08 -0800 Patch bug-77873-20120206161859.patch text/plain 6046 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2ODU3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmViMmIwZDA0ZTc3YmM4MzQ3NDQ5ZGFkNThjNjdkNGM5 MTE0NWQ2Mi4uNTY4YjgwOTM3YzhhZGI1NzQ5OTAzYmQzZDYzOWUwMTE2MjdjOGJiZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTAyLTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSBmYWlsaW5nIHdpdGggIlBhdGggZG9lcyBub3QgZXhp c3QuIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc4 NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGNoYW5nZSBmaXhlcyB0aGUgd2F5IHRoZSBzdHlsZSBjaGVja2VyIGRldGVybWluZXMgd2hpY2gK KyAgICAgICAgUG9ydCBjbGFzcyB0byB1c2UgZm9yIGEgZ2l2ZW4gdGVzdF9leHBlY3RhdGlvbnMu dHh0IHBhdGg7IHRoZQorICAgICAgICBwcmV2aW91cyB2ZXJzaW9uIHVzZWQgYSBoZXVyaXN0aWMg dGhhdCBkaWRuJ3QgcmVhbGx5IHdvcmsgaW4gdGhlCisgICAgICAgIGZpcnN0IHBsYWNlLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9u cy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyLl9kZXRlcm1pbmVfcG9ydF9m cm9tX2V4cGVjdGF0aW9uc19wYXRoKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnNDaGVja2Vy Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rl c3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uc1Rl c3RDYXNlLl9leHBlY3RfcG9ydF9mb3JfZXhwZWN0YXRpb25zX3BhdGgpOgorICAgICAgICAoVGVz dEV4cGVjdGF0aW9uc1Rlc3RDYXNlLnRlc3RfZGV0ZXJtaW5lX3BvcnRfZnJvbV9leHBlY3RhdGlv bnNfcGF0aCk6CisKIDIwMTItMDItMDYgIEthbGV2IExlbWJlciAgPGthbGV2bGVtYmVyQGdtYWls LmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgbWlzc2luZyBwYW5nbyBpbmNsdWRlIGRpciB0byBm aXggYnVpbGQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDJjYWJjODBhZDA3NTBjNjc5N2QxNjky NjhhYTZjZGZhMWE4NDMxZjAuLmQ3Yjc3YTliNDBiZmZkMDk1MGNlNmJjZWQzNDNiZWMyMDA0NWNk OTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVz dF9leHBlY3RhdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtNDcsMTYgKzQ3LDE1IEBAIGNsYXNzIFRlc3RF eHBlY3RhdGlvbnNDaGVja2VyKG9iamVjdCk6CiAKICAgICBjYXRlZ29yaWVzID0gc2V0KFsndGVz dC9leHBlY3RhdGlvbnMnXSkKIAotICAgIGRlZiBfZGV0ZXJtaW5lX3BvcnRfZnJvbV9leGVwZWN0 YXRpb25zX3BhdGgoc2VsZiwgaG9zdCwgZXhwZWN0YXRpb25zX3BhdGgpOgotICAgICAgICB0cnk6 Ci0gICAgICAgICAgICBwb3J0X25hbWUgPSBleHBlY3RhdGlvbnNfcGF0aC5zcGxpdChob3N0LmZp bGVzeXN0ZW0uc2VwKVstMl0KLSAgICAgICAgICAgIGlmIG5vdCBwb3J0X25hbWU6Ci0gICAgICAg ICAgICAgICAgcmV0dXJuIE5vbmUKLQotICAgICAgICAgICAgIyBQYXNzIGEgY29uZmlndXJhdGlv biB0byBhdm9pZCBjYWxsaW5nIGRlZmF1bHRfY29uZmlndXJhdGlvbigpIHdoZW4gaW5pdGlhbGl6 aW5nIHRoZSBwb3J0ICh0YWtlcyAwLjUgc2Vjb25kcyBvbiBhIE1hYyBQcm8hKS4KLSAgICAgICAg ICAgIHJldHVybiBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lLCBvcHRpb25zPUR1bW15 T3B0aW9ucyhjb25maWd1cmF0aW9uPSJSZWxlYXNlIikpCi0gICAgICAgIGV4Y2VwdCBFeGNlcHRp b24sIGU6Ci0gICAgICAgICAgICBfbG9nLndhcm4oIkV4Y2VwdGlvbiB3aGlsZSBnZXR0aW5nIHBv cnQgZm9yIHBhdGggJXMiICUgZXhwZWN0YXRpb25zX3BhdGgpCisgICAgZGVmIF9kZXRlcm1pbmVf cG9ydF9mcm9tX2V4cGVjdGF0aW9uc19wYXRoKHNlbGYsIGhvc3QsIGV4cGVjdGF0aW9uc19wYXRo KToKKyAgICAgICAgIyBQYXNzIGEgY29uZmlndXJhdGlvbiB0byBhdm9pZCBjYWxsaW5nIGRlZmF1 bHRfY29uZmlndXJhdGlvbigpIHdoZW4gaW5pdGlhbGl6aW5nIHRoZSBwb3J0ICh0YWtlcyAwLjUg c2Vjb25kcyBvbiBhIE1hYyBQcm8hKS4KKyAgICAgICAgb3B0aW9ucyA9IER1bW15T3B0aW9ucyhj b25maWd1cmF0aW9uPSdSZWxlYXNlJykKKyAgICAgICAgZm9yIHBvcnRfbmFtZSBpbiBob3N0LnBv cnRfZmFjdG9yeS5hbGxfcG9ydF9uYW1lcygpOgorICAgICAgICAgICAgcG9ydCA9IGhvc3QucG9y dF9mYWN0b3J5LmdldChwb3J0X25hbWUsIG9wdGlvbnM9b3B0aW9ucykKKyAgICAgICAgICAgIGlm IHBvcnQucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCkucmVwbGFjZShwb3J0LnBhdGhf ZnJvbV93ZWJraXRfYmFzZSgpICsgaG9zdC5maWxlc3lzdGVtLnNlcCwgJycpID09IGV4cGVjdGF0 aW9uc19wYXRoOgorICAgICAgICAgICAgICAgIHJldHVybiBwb3J0CisgICAgICAgIGVsc2U6Cisg ICAgICAgICAgICBfbG9nLndhcm4oIk5vIHBvcnQgdXNlcyBwYXRoICVzIGZvciB0ZXN0X2V4cGVj dGF0aW9ucyIgJSBleHBlY3RhdGlvbnNfcGF0aCkKICAgICAgICAgICAgIHJldHVybiBOb25lCiAK ICAgICBkZWYgX19pbml0X18oc2VsZiwgZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IsIGhv c3Q9Tm9uZSk6CkBAIC03MSw5ICs3MCw5IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNDaGVja2Vy KG9iamVjdCk6CiAgICAgICAgIGhvc3QuX2luaXRpYWxpemVfc2NtKCkKIAogICAgICAgICAjIERl dGVybWluaW5nIHRoZSBwb3J0IG9mIHRoaXMgZXhwZWN0YXRpb25zLgotICAgICAgICBzZWxmLl9w b3J0X29iaiA9IHNlbGYuX2RldGVybWluZV9wb3J0X2Zyb21fZXhlcGVjdGF0aW9uc19wYXRoKGhv c3QsIGZpbGVfcGF0aCkKLSAgICAgICAgIyBVc2luZyAndGVzdCcgcG9ydCB3aGVuIHdlIGNvdWxk bid0IGRldGVybWluZSB0aGUgcG9ydCBmb3IgdGhpcwotICAgICAgICAjIGV4cGVjdGF0aW9ucy4K KyAgICAgICAgc2VsZi5fcG9ydF9vYmogPSBzZWxmLl9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4cGVj dGF0aW9uc19wYXRoKGhvc3QsIGZpbGVfcGF0aCkKKworICAgICAgICAjIEZJWE1FOiBXaGF0IGlz IHRoZSBwcm9wZXIgd2F5IHRvIGVycm9yIG91dCBoZXJlPyBSYWlzZSBhbiBleGNlcHRpb24/CiAg ICAgICAgIGlmIG5vdCBzZWxmLl9wb3J0X29iajoKICAgICAgICAgICAgIF9sb2cud2FybigiQ291 bGQgbm90IGRldGVybWluZSB0aGUgcG9ydCBmb3IgJXMuICIKICAgICAgICAgICAgICAgICAgICAg ICAiVXNpbmcgJ3Rlc3QnIHBvcnQsIGJ1dCBwbGF0Zm9ybS1zcGVjaWZpYyBleHBlY3RhdGlvbnMg IgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0 X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKaW5kZXggMTBjYzdkZWU1ZTFm YzkzOTIyYTYwOWI0ZmUwN2E5MmFjMWU5MmExOC4uZDdmYjQ4ODhhOWU5NDNkMmZjMDliYzdkZmNk ZDQyZmRkOTQyN2U5YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CkBA IC02MywxOCArNjMsMjEgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uc1Rlc3RDYXNlKHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5fZXJyb3JfY29sbGVjdG9yID0gRXJyb3JDb2xsZWN0 b3IoKQogICAgICAgICBzZWxmLl90ZXN0X2ZpbGUgPSAncGFzc2VzL3RleHQuaHRtbCcKIAotICAg IGRlZiBfZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKHNlbGYsIGV4cGVjdGVkX3Bv cnRfb3JfcG9ydF9jbGFzcywgZXhwZWN0YXRpb25zX3BhdGgpOgorICAgIGRlZiBfZXhwZWN0X3Bv cnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKHNlbGYsIGV4cGVjdGVkX3BvcnRfaW1wbGVtZW50YXRp b24sIGV4cGVjdGF0aW9uc19wYXRoKToKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICAg ICAgY2hlY2tlciA9IFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyKGV4cGVjdGF0aW9uc19wYXRoLCBF cnJvckNvbGxlY3RvcigpLCBob3N0PWhvc3QpCi0gICAgICAgIHBvcnQgPSBjaGVja2VyLl9kZXRl cm1pbmVfcG9ydF9mcm9tX2V4ZXBlY3RhdGlvbnNfcGF0aChob3N0LCBleHBlY3RhdGlvbnNfcGF0 aCkKKyAgICAgICAgcG9ydCA9IGNoZWNrZXIuX2RldGVybWluZV9wb3J0X2Zyb21fZXhwZWN0YXRp b25zX3BhdGgoaG9zdCwgZXhwZWN0YXRpb25zX3BhdGgpCiAgICAgICAgIGlmIHBvcnQ6Ci0gICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9fY2xhc3NfXy5fX25hbWVfXywgZXhwZWN0 ZWRfcG9ydF9vcl9wb3J0X2NsYXNzKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQu bmFtZSgpLnN0YXJ0c3dpdGgoZXhwZWN0ZWRfcG9ydF9pbXBsZW1lbnRhdGlvbikpCiAgICAgICAg IGVsc2U6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LCBleHBlY3RlZF9wb3J0 X29yX3BvcnRfY2xhc3MpCi0KLSAgICBkZWYgdGVzdF9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4ZXBl Y3RhdGlvbnNfcGF0aChzZWxmKToKLSAgICAgICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVj dGF0aW9uc19wYXRoKE5vbmUsICIvIikKLSAgICAgICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4 cGVjdGF0aW9uc19wYXRoKCJDaHJvbWl1bU1hY1BvcnQiLCAiL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvY2hyb21pdW0tbWFjL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCIpCisgICAgICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhOb25lLCBleHBlY3RlZF9wb3J0X2ltcGxlbWVudGF0aW9uKQorCisg ICAgZGVmIHRlc3RfZGV0ZXJtaW5lX3BvcnRfZnJvbV9leHBlY3RhdGlvbnNfcGF0aChzZWxmKToK KyAgICAgICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKE5vbmUsICcv JykKKyAgICAgICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKE5vbmUs ICdMYXlvdXRUZXN0cy9jaHJvbWl1bS1tYWMvdGVzdF9leHBlY3RhdGlvbnMudHh0JykKKyAgICAg ICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKCdjaHJvbWl1bScsICdM YXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQnKQorICAg ICAgICBzZWxmLl9leHBlY3RfcG9ydF9mb3JfZXhwZWN0YXRpb25zX3BhdGgoTm9uZSwgJy9tb2Nr LWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi90ZXN0X2V4cGVjdGF0aW9ucy50eHQn KQorICAgICAgICBzZWxmLl9leHBlY3RfcG9ydF9mb3JfZXhwZWN0YXRpb25zX3BhdGgoJ3dpbics ICdMYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vdGVzdF9leHBlY3RhdGlvbnMudHh0JykKIAogICAg IGRlZiBhc3NlcnRfbGluZXNfbGludChzZWxmLCBsaW5lcywgc2hvdWxkX3Bhc3MsIGV4cGVjdGVk X291dHB1dD1Ob25lKToKICAgICAgICAgc2VsZi5fZXJyb3JfY29sbGVjdG9yLnJlc2V0X2Vycm9y cygpCg== 126137 2012-02-08 13:02:12 -0800 2012-02-08 13:03:15 -0800 test bad paths better bug-77873-20120208130211.patch text/plain 7870 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MTIyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTE4ZTQ4OTIwYmRhMTU2M2M2MTU5ODE0Y2EwZmZmNzAx OGM2ZTc4YS4uYjc3OGVkOTlhNGQwNjNmOGI4ODAyYzNiMWRkODc2ZDg0ZmVmZTVmNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTAyLTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSBmYWlsaW5nIHdpdGggIlBhdGggZG9lcyBub3QgZXhp c3QuIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc4 NzMKKworICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgorCisgICAgICAgIFRoaXMgY2hh bmdlIGZpeGVzIHRoZSB3YXkgdGhlIHN0eWxlIGNoZWNrZXIgZGV0ZXJtaW5lcyB3aGljaAorICAg ICAgICBQb3J0IGNsYXNzIHRvIHVzZSBmb3IgYSBnaXZlbiB0ZXN0X2V4cGVjdGF0aW9ucy50eHQg cGF0aDsgdGhlCisgICAgICAgIHByZXZpb3VzIHZlcnNpb24gdXNlZCBhIGhldXJpc3RpYyB0aGF0 IGRpZG4ndCByZWFsbHkgd29yayBpbiB0aGUKKyAgICAgICAgZmlyc3QgcGxhY2UuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5 OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIuX2RldGVybWluZV9wb3J0X2Zyb21f ZXhwZWN0YXRpb25zX3BhdGgpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIuX19p bml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9l eHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zVGVzdENh c2UuX2V4cGVjdF9wb3J0X2Zvcl9leHBlY3RhdGlvbnNfcGF0aCk6CisgICAgICAgIChUZXN0RXhw ZWN0YXRpb25zVGVzdENhc2UudGVzdF9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4cGVjdGF0aW9uc19w YXRoKToKKwogMjAxMi0wMi0wOCAgRmVow6lyIFpzb2x0ICA8ZmVoZXJ6c0BpbmYudS1zemVnZWQu aHU+CiAKICAgICAgICAgbnJ3dDogbWFrZSAtLXNraXAtcGl4ZWwtdGVzdC1pZi1uby1iYXNlbGlu ZSBvcHRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDJjYWJjODBhZDA3NTBjNjc5N2QxNjky NjhhYTZjZGZhMWE4NDMxZjAuLmZmMWJlOWMyOWZkNDMxMDEwMTlhNGIzZGExZjA1OTg1NzA1YzZk ODcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVz dF9leHBlY3RhdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtNDcsMTcgKzQ3LDE0IEBAIGNsYXNzIFRlc3RF eHBlY3RhdGlvbnNDaGVja2VyKG9iamVjdCk6CiAKICAgICBjYXRlZ29yaWVzID0gc2V0KFsndGVz dC9leHBlY3RhdGlvbnMnXSkKIAotICAgIGRlZiBfZGV0ZXJtaW5lX3BvcnRfZnJvbV9leGVwZWN0 YXRpb25zX3BhdGgoc2VsZiwgaG9zdCwgZXhwZWN0YXRpb25zX3BhdGgpOgotICAgICAgICB0cnk6 Ci0gICAgICAgICAgICBwb3J0X25hbWUgPSBleHBlY3RhdGlvbnNfcGF0aC5zcGxpdChob3N0LmZp bGVzeXN0ZW0uc2VwKVstMl0KLSAgICAgICAgICAgIGlmIG5vdCBwb3J0X25hbWU6Ci0gICAgICAg ICAgICAgICAgcmV0dXJuIE5vbmUKLQotICAgICAgICAgICAgIyBQYXNzIGEgY29uZmlndXJhdGlv biB0byBhdm9pZCBjYWxsaW5nIGRlZmF1bHRfY29uZmlndXJhdGlvbigpIHdoZW4gaW5pdGlhbGl6 aW5nIHRoZSBwb3J0ICh0YWtlcyAwLjUgc2Vjb25kcyBvbiBhIE1hYyBQcm8hKS4KLSAgICAgICAg ICAgIHJldHVybiBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lLCBvcHRpb25zPUR1bW15 T3B0aW9ucyhjb25maWd1cmF0aW9uPSJSZWxlYXNlIikpCi0gICAgICAgIGV4Y2VwdCBFeGNlcHRp b24sIGU6Ci0gICAgICAgICAgICBfbG9nLndhcm4oIkV4Y2VwdGlvbiB3aGlsZSBnZXR0aW5nIHBv cnQgZm9yIHBhdGggJXMiICUgZXhwZWN0YXRpb25zX3BhdGgpCi0gICAgICAgICAgICByZXR1cm4g Tm9uZQorICAgIGRlZiBfZGV0ZXJtaW5lX3BvcnRfZnJvbV9leHBlY3RhdGlvbnNfcGF0aChzZWxm LCBob3N0LCBleHBlY3RhdGlvbnNfcGF0aCk6CisgICAgICAgICMgUGFzcyBhIGNvbmZpZ3VyYXRp b24gdG8gYXZvaWQgY2FsbGluZyBkZWZhdWx0X2NvbmZpZ3VyYXRpb24oKSB3aGVuIGluaXRpYWxp emluZyB0aGUgcG9ydCAodGFrZXMgMC41IHNlY29uZHMgb24gYSBNYWMgUHJvISkuCisgICAgICAg IG9wdGlvbnMgPSBEdW1teU9wdGlvbnMoY29uZmlndXJhdGlvbj0nUmVsZWFzZScpCisgICAgICAg IGZvciBwb3J0X25hbWUgaW4gaG9zdC5wb3J0X2ZhY3RvcnkuYWxsX3BvcnRfbmFtZXMoKToKKyAg ICAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lLCBvcHRpb25z PW9wdGlvbnMpCisgICAgICAgICAgICBpZiBwb3J0LnBhdGhfdG9fdGVzdF9leHBlY3RhdGlvbnNf ZmlsZSgpLnJlcGxhY2UocG9ydC5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSArIGhvc3QuZmlsZXN5 c3RlbS5zZXAsICcnKSA9PSBleHBlY3RhdGlvbnNfcGF0aDoKKyAgICAgICAgICAgICAgICByZXR1 cm4gcG9ydAorICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZp bGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yLCBob3N0PU5vbmUpOgogICAgICAgICBzZWxmLl9m aWxlX3BhdGggPSBmaWxlX3BhdGgKQEAgLTcwLDE1ICs2Nyw4IEBAIGNsYXNzIFRlc3RFeHBlY3Rh dGlvbnNDaGVja2VyKG9iamVjdCk6CiAgICAgICAgIGhvc3QgPSBob3N0IG9yIEhvc3QoKQogICAg ICAgICBob3N0Ll9pbml0aWFsaXplX3NjbSgpCiAKLSAgICAgICAgIyBEZXRlcm1pbmluZyB0aGUg cG9ydCBvZiB0aGlzIGV4cGVjdGF0aW9ucy4KLSAgICAgICAgc2VsZi5fcG9ydF9vYmogPSBzZWxm Ll9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4ZXBlY3RhdGlvbnNfcGF0aChob3N0LCBmaWxlX3BhdGgp Ci0gICAgICAgICMgVXNpbmcgJ3Rlc3QnIHBvcnQgd2hlbiB3ZSBjb3VsZG4ndCBkZXRlcm1pbmUg dGhlIHBvcnQgZm9yIHRoaXMKLSAgICAgICAgIyBleHBlY3RhdGlvbnMuCi0gICAgICAgIGlmIG5v dCBzZWxmLl9wb3J0X29iajoKLSAgICAgICAgICAgIF9sb2cud2FybigiQ291bGQgbm90IGRldGVy bWluZSB0aGUgcG9ydCBmb3IgJXMuICIKLSAgICAgICAgICAgICAgICAgICAgICAiVXNpbmcgJ3Rl c3QnIHBvcnQsIGJ1dCBwbGF0Zm9ybS1zcGVjaWZpYyBleHBlY3RhdGlvbnMgIgotICAgICAgICAg ICAgICAgICAgICAgICJ3aWxsIGZhaWwgdGhlIGNoZWNrLiIgJSBzZWxmLl9maWxlX3BhdGgpCi0g ICAgICAgICAgICBzZWxmLl9wb3J0X29iaiA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVzdCcp CisgICAgICAgIHNlbGYuX3BvcnRfb2JqID0gc2VsZi5fZGV0ZXJtaW5lX3BvcnRfZnJvbV9leHBl Y3RhdGlvbnNfcGF0aChob3N0LCBmaWxlX3BhdGgpCisKICAgICAgICAgIyBTdXBwcmVzcyBlcnJv ciBtZXNzYWdlcyBvZiB0ZXN0X2V4cGVjdGF0aW9ucyBtb2R1bGUgc2luY2UgdGhleSB3aWxsIGJl IHJlcG9ydGVkIGxhdGVyLgogICAgICAgICBsb2cgPSBsb2dnaW5nLmdldExvZ2dlcigid2Via2l0 cHkubGF5b3V0X3Rlc3RzLmxheW91dF9wYWNrYWdlLnRlc3RfZXhwZWN0YXRpb25zIikKICAgICAg ICAgbG9nLnNldExldmVsKGxvZ2dpbmcuQ1JJVElDQUwpCkBAIC0xMTIsOCArMTAyLDEyIEBAIGNs YXNzIFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyKG9iamVjdCk6CiAgICAgZGVmIGNoZWNrKHNlbGYs IGxpbmVzKToKICAgICAgICAgb3ZlcnJpZGVzID0gc2VsZi5fcG9ydF9vYmoudGVzdF9leHBlY3Rh dGlvbnNfb3ZlcnJpZGVzKCkKICAgICAgICAgZXhwZWN0YXRpb25zID0gJ1xuJy5qb2luKGxpbmVz KQotICAgICAgICBzZWxmLmNoZWNrX3Rlc3RfZXhwZWN0YXRpb25zKGV4cGVjdGF0aW9uc19zdHI9 ZXhwZWN0YXRpb25zLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3Rz PU5vbmUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3ZlcnJpZGVzPW92 ZXJyaWRlcykKKyAgICAgICAgaWYgc2VsZi5fcG9ydF9vYmo6CisgICAgICAgICAgICBzZWxmLmNo ZWNrX3Rlc3RfZXhwZWN0YXRpb25zKGV4cGVjdGF0aW9uc19zdHI9ZXhwZWN0YXRpb25zLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0cz1Ob25lLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdmVycmlkZXM9b3ZlcnJpZGVzKQor ICAgICAgICBlbHNlOgorICAgICAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yKDEsICd0 ZXN0L2V4cGVjdGF0aW9ucycsIDUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJ05vIHBvcnQgdXNlcyBwYXRoICVzIGZvciB0ZXN0X2V4cGVjdGF0aW9ucycgJSBzZWxmLl9m aWxlX3BhdGgpCiAgICAgICAgICMgV2FybiB0YWJzIGluIGxpbmVzIGFzIHdlbGwKICAgICAgICAg c2VsZi5jaGVja190YWJzKGxpbmVzKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3Qu cHkKaW5kZXggMTBjYzdkZWU1ZTFmYzkzOTIyYTYwOWI0ZmUwN2E5MmFjMWU5MmExOC4uNzdiZGY4 Mjg5ZDY4N2ZiZTMyMDMwMmM0NmY1ZmJjOWM4M2ZmYWQ5NSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0 YXRpb25zX3VuaXR0ZXN0LnB5CkBAIC02MywyMyArNjMsMzQgQEAgY2xhc3MgVGVzdEV4cGVjdGF0 aW9uc1Rlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5fZXJyb3JfY29s bGVjdG9yID0gRXJyb3JDb2xsZWN0b3IoKQogICAgICAgICBzZWxmLl90ZXN0X2ZpbGUgPSAncGFz c2VzL3RleHQuaHRtbCcKIAotICAgIGRlZiBfZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19w YXRoKHNlbGYsIGV4cGVjdGVkX3BvcnRfb3JfcG9ydF9jbGFzcywgZXhwZWN0YXRpb25zX3BhdGgp OgorICAgIGRlZiBfZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKHNlbGYsIGV4cGVj dGVkX3BvcnRfaW1wbGVtZW50YXRpb24sIGV4cGVjdGF0aW9uc19wYXRoKToKICAgICAgICAgaG9z dCA9IE1vY2tIb3N0KCkKICAgICAgICAgY2hlY2tlciA9IFRlc3RFeHBlY3RhdGlvbnNDaGVja2Vy KGV4cGVjdGF0aW9uc19wYXRoLCBFcnJvckNvbGxlY3RvcigpLCBob3N0PWhvc3QpCi0gICAgICAg IHBvcnQgPSBjaGVja2VyLl9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4ZXBlY3RhdGlvbnNfcGF0aCho b3N0LCBleHBlY3RhdGlvbnNfcGF0aCkKKyAgICAgICAgcG9ydCA9IGNoZWNrZXIuX2RldGVybWlu ZV9wb3J0X2Zyb21fZXhwZWN0YXRpb25zX3BhdGgoaG9zdCwgZXhwZWN0YXRpb25zX3BhdGgpCiAg ICAgICAgIGlmIHBvcnQ6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9fY2xh c3NfXy5fX25hbWVfXywgZXhwZWN0ZWRfcG9ydF9vcl9wb3J0X2NsYXNzKQorICAgICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHBvcnQubmFtZSgpLnN0YXJ0c3dpdGgoZXhwZWN0ZWRfcG9ydF9pbXBs ZW1lbnRhdGlvbikpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhwb3J0LCBleHBlY3RlZF9wb3J0X29yX3BvcnRfY2xhc3MpCisgICAgICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhOb25lLCBleHBlY3RlZF9wb3J0X2ltcGxlbWVudGF0aW9uKQogCi0gICAgZGVm IHRlc3RfZGV0ZXJtaW5lX3BvcnRfZnJvbV9leGVwZWN0YXRpb25zX3BhdGgoc2VsZik6Ci0gICAg ICAgIHNlbGYuX2V4cGVjdF9wb3J0X2Zvcl9leHBlY3RhdGlvbnNfcGF0aChOb25lLCAiLyIpCi0g ICAgICAgIHNlbGYuX2V4cGVjdF9wb3J0X2Zvcl9leHBlY3RhdGlvbnNfcGF0aCgiQ2hyb21pdW1N YWNQb3J0IiwgIi9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2Nocm9taXVtLW1hYy90ZXN0X2V4 cGVjdGF0aW9ucy50eHQiKQorICAgIGRlZiB0ZXN0X2RldGVybWluZV9wb3J0X2Zyb21fZXhwZWN0 YXRpb25zX3BhdGgoc2VsZik6CisgICAgICAgIHNlbGYuX2V4cGVjdF9wb3J0X2Zvcl9leHBlY3Rh dGlvbnNfcGF0aChOb25lLCAnLycpCisgICAgICAgIHNlbGYuX2V4cGVjdF9wb3J0X2Zvcl9leHBl Y3RhdGlvbnNfcGF0aChOb25lLCAnTGF5b3V0VGVzdHMvY2hyb21pdW0tbWFjL3Rlc3RfZXhwZWN0 YXRpb25zLnR4dCcpCisgICAgICAgIHNlbGYuX2V4cGVjdF9wb3J0X2Zvcl9leHBlY3RhdGlvbnNf cGF0aCgnY2hyb21pdW0nLCAnTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBl Y3RhdGlvbnMudHh0JykKKyAgICAgICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9u c19wYXRoKE5vbmUsICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vdGVz dF9leHBlY3RhdGlvbnMudHh0JykKKyAgICAgICAgc2VsZi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVj dGF0aW9uc19wYXRoKCd3aW4nLCAnTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL3Rlc3RfZXhwZWN0 YXRpb25zLnR4dCcpCiAKICAgICBkZWYgYXNzZXJ0X2xpbmVzX2xpbnQoc2VsZiwgbGluZXMsIHNo b3VsZF9wYXNzLCBleHBlY3RlZF9vdXRwdXQ9Tm9uZSk6CiAgICAgICAgIHNlbGYuX2Vycm9yX2Nv bGxlY3Rvci5yZXNldF9lcnJvcnMoKQorCisgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAg ICAgIGNoZWNrZXIgPSBUZXN0RXhwZWN0YXRpb25zQ2hlY2tlcigndGVzdC90ZXN0X2V4cGVjdGF0 aW9ucy50eHQnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vs Zi5fZXJyb3JfY29sbGVjdG9yLCBob3N0PU1vY2tIb3N0KCkpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9lcnJvcl9jb2xsZWN0b3IsIGhvc3Q9aG9zdCkK KworICAgICAgICAjIFdlIHNob3VsZCBoYXZlIGZhaWxlZCB0byBmaW5kIGEgdmFsaWQgcG9ydCBv YmplY3QgZm9yIHRoYXQgcGF0aC4KKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoY2hlY2tlci5f cG9ydF9vYmosIE5vbmUpCisKKyAgICAgICAgIyBOb3cgdXNlIGEgdGVzdCBwb3J0IHNvIHdlIGNh biBjaGVjayB0aGUgbGluZXMuCisgICAgICAgIGNoZWNrZXIuX3BvcnRfb2JqID0gaG9zdC5wb3J0 X2ZhY3RvcnkuZ2V0KCd0ZXN0LW1hYy1sZW9wYXJkJykKICAgICAgICAgY2hlY2tlci5jaGVja190 ZXN0X2V4cGVjdGF0aW9ucyhleHBlY3RhdGlvbnNfc3RyPSdcbicuam9pbihsaW5lcyksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVzdHM9W3NlbGYuX3Rlc3RfZmls ZV0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3ZlcnJpZGVzPU5v bmUpCg==