104761 2012-12-11 19:26:13 -0800 support -wk2 port names properly in webkitpy.layout_tests.port 2012-12-13 13:54:05 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 1 dpranke dpranke abarth eric ojan rniwa tony oldest_to_newest 789119 0 dpranke 2012-12-11 19:26:13 -0800 Unfortunately, we're not yet in a world where there is a 1:1 mapping between port names and the list of all the ports (and port configurations) that we care about. For example, the port names don't necessarily tell you if there are both release and debug bots for that port name, or wk1 vs. wk2. So, using all_port_names() as a proxy for "all of the port configurations and/or builders I need to care about" is probably doing the wrong thing. This manifested itself in bug 102389, but it wouldn't surprise me if there were other bugs in the code resulting from this. It's not immediately clear to me what the right way to fix this is, either ... 790000 1 179137 dpranke 2012-12-12 15:49:54 -0800 Created attachment 179137 Patch 790002 2 dpranke 2012-12-12 15:51:24 -0800 The uploaded patch at least makes port names ending in '-wk2' work properly. I'm still not sure what to do about release/debug, but I'm not sure if there's any cases where that information is needed from the port name, so this should fix most if not all of the current issues. (retitling the bug subject as well). 790827 3 179137 eric 2012-12-13 12:46:08 -0800 Comment on attachment 179137 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179137&action=review Bleh. This code all stinks. (not your fault). But if this moves us closer to expected behavior, and you feel we've sufficiently tested this, then this is OK. And we'll just keep making it better... eventually. In my view some sort of PortFactory should be responsible for computing the full "name" (or config dictionary) for the Port and then creating the port with that. Our current behavior of having the Port constructors do that doesn't work well. :( > Tools/Scripts/webkitpy/layout_tests/port/base.py:115 > + if self._name and '-wk2' in self._name: > + self._options.webkit_test_runner = True Do you need to use your fancy set_default instead? 790829 4 dpranke 2012-12-13 12:48:50 -0800 (In reply to comment #3) > (From update of attachment 179137 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=179137&action=review > > Bleh. This code all stinks. (not your fault). But if this moves us closer to expected behavior, and you feel we've sufficiently tested this, then this is OK. And we'll just keep making it better... eventually. > > In my view some sort of PortFactory should be responsible for computing the full "name" (or config dictionary) for the Port and then creating the port with that. Our current behavior of having the Port constructors do that doesn't work well. :( > Agreed. The PortFactory is trying to do that now, but we're not quite there yet (this patch does get us closer). I think the testing is sufficient. I guess we'll find out :) > > Tools/Scripts/webkitpy/layout_tests/port/base.py:115 > > + if self._name and '-wk2' in self._name: > > + self._options.webkit_test_runner = True > > Do you need to use your fancy set_default instead? No, we don't want this to be a default option; it should override whatever the default was, since -wk2 is being explicitly requested. 790888 5 dpranke 2012-12-13 13:54:05 -0800 Committed r137650: <http://trac.webkit.org/changeset/137650> 179137 2012-12-12 15:49:54 -0800 2012-12-13 12:46:08 -0800 Patch bug-104761-20121212154831.patch text/plain 13678 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NTE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTY0NDg5Yzk1MWM2YWVlNGIzMDEwZGIzYzdkOGNiYWVk YzNjMmQzZS4uZGRlZTllMGZlYjFjMTU1MTMzNDJmNjgyOWIzNzI1NjM3NDIyN2NjNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDEyLTEyLTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHN1cHBvcnQgLXdrMiBwb3J0IG5hbWVzIHByb3Blcmx5IGluIHdlYmtpdHB5LmxheW91 dF90ZXN0cy5wb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDQ3NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBPdXIgc3VwcG9ydCBmb3IgV0syIHBvcnQgbmFtZXMgd2FzIGluY29uc2lzdGVudCBhdCBi ZXN0OyB0aGlzIHBhdGNoCisgICAgICAgIG1vZGlmaWVzIHRoZSBjb2RlIHNvIHRoYXQgPHBvcnRf bmFtZT4td2syIGlzIHN1cHBvcnRlZCBmb3IgYWxsIHBvcnRzIHRoYXQKKyAgICAgICAgaGF2ZSBX SzIgaW1wbGVtZW50YXRpb25zIGFuZCBpcyBlcXVpdmFsZW50IHRvIHNwZWNpZnlpbmcgPHBvcnRf bmFtZT4KKyAgICAgICAgYW5kIC0yLy0td2Via2l0LXRlc3QtcnVubmVyLiBJbiBhZGRpdGlvbiwg dGhpcyBtb2RpZmllcworICAgICAgICBidWlsZGVycy5hbGxfcG9ydF9uYW1lcygpIHRvIGluY2x1 ZGUgdGhlIHdrMiB2YXJpYW50cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHk6CisgICAgICAgIChBcHBsZVBvcnQuZGV0ZXJt aW5lX2Z1bGxfcG9ydF9uYW1lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LmRldGVybWluZV9mdWxsX3BvcnRfbmFt ZSk6CisgICAgICAgIChQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRHJpdmVy VGVzdC5tYWtlX3BvcnQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvbWFjLnB5OgorICAgICAgICAoTWFjUG9ydC5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9w YXRoKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5w eToKKyAgICAgICAgKFdpblBvcnQuZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3Qu cHk6CisgICAgICAgIChUZXN0UmViYXNlbGluZUV4cGVjdGF0aW9ucy50ZXN0X3JlYmFzZWxpbmVf ZXhwZWN0YXRpb25zKToKKworMjAxMi0xMi0xMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9t aXVtLm9yZz4KKwogICAgICAgICBucnd0OiByZW1vdmUgZGVwcmVjYXRlZCBPUldUIGNvbXBhdGli aWxpdHkgY29tbWFuZCBsaW5lIGZsYWdzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDQzMDEKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvYmFzZWxpbmVvcHRpbWl6ZXIucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNlbGluZW9wdGltaXplci5weQppbmRleCA5NmNi ODI4MWE4YmE4MjQ3ZmYwNWUzODY4YWMyNzc5ODQwYjA2MGUxLi5kMmQ1M2E1Njg0ZGJiOGRkZmEx ODU2MGQyMWI4ODIwZjFhZjIxNzc1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9iYXNlbGluZW9wdGltaXplci5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNlbGluZW9wdGltaXplci5weQpAQCAtNjAsMTAg KzYwLDYgQEAgX1ZJUlRVQUxfUE9SVFMgPSB7CiAgICAgJ21hYy1mdXR1cmUnOiBbJ0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy1mdXR1cmUnLCAnTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjJywgJ0xh eW91dFRlc3RzJ10sCiAgICAgJ3dpbi1mdXR1cmUnOiBbJ0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi1mdXR1cmUnLCAnTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luJywgJ0xheW91dFRlc3RzJ10sCiAg ICAgJ3F0LXVua25vd24nOiBbJ0xheW91dFRlc3RzL3BsYXRmb3JtL3F0LXVua25vd24nLCAnTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQnLCAnTGF5b3V0VGVzdHMnXSwKLQotICAgICMgRklYTUU6IEFj Y291bnQgZm9yIHRoZSBlZmwtd2syIHBvcnQgd2hpY2ggaXNuJ3QgcmV0dXJuZWQgaW4gYnVpbGRl cnMuYWxsX3BvcnRfbmFtZXMoKS4KLSAgICAjIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA0NzYxLgotICAgICdlZmwtd2syJzogWydMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9lZmwtd2syJywgJ0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbCcsICdMYXlvdXRUZXN0cydd LAogfQogCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYXBwbGUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2FwcGxlLnB5CmluZGV4IGQ0MzRjOGRhODlmZTdmNjkzM2RhYmY0MGM1NGZmM2YyMTE4YzNhZDgu LjA3ZjI5MTJiZDQ3ODc3ZjU4ZjlmMjgyZjc0MmY5ZDEyODQ4YTZlMGQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBsZS5weQpAQCAtNTUsMTcg KzU1LDIxIEBAIGNsYXNzIEFwcGxlUG9ydChQb3J0KToKIAogICAgIEBjbGFzc21ldGhvZAogICAg IGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25zLCBwb3J0X25h bWUpOgotICAgICAgICAjIElmIHRoZSBwb3J0X25hbWUgbWF0Y2hlcyB0aGUgKGJhZGx5IG5hbWVk KSBjbHMucG9ydF9uYW1lLCB0aGF0Ci0gICAgICAgICMgbWVhbnMgdGhhdCB0aGV5IHBhc3NlZCAn bWFjJyBvciAnd2luJyBhbmQgZGlkbid0IHNwZWNpZnkgYSB2ZXJzaW9uLgotICAgICAgICAjIFRo YXQgY29udmVudGlvbiBtZWFucyB0aGF0IHdlJ3JlIHN1cHBvc2VkIHRvIHVzZSB0aGUgdmVyc2lv biBjdXJyZW50bHkKLSAgICAgICAgIyBiZWluZyBydW4sIHNvIHRoaXMgd29uJ3Qgd29yayBpZiB5 b3UncmUgbm90IG9uIG1hYyBvciB3aW4gKHJlc3BlY3RpdmVseSkuCi0gICAgICAgICMgSWYgeW91 J3JlIG5vdCBvbiB0aGUgby9zIGluIHF1ZXN0aW9uLCB5b3UgbXVzdCBzcGVjaWZ5IGEgZnVsbCB2 ZXJzaW9uIG9yIC1mdXR1cmUgKGNmLiBhYm92ZSkuCi0gICAgICAgIGlmIHBvcnRfbmFtZSA9PSBj bHMucG9ydF9uYW1lOgotICAgICAgICAgICAgYXNzZXJ0IHBvcnRfbmFtZSA9PSBob3N0LnBsYXRm b3JtLm9zX25hbWUKLSAgICAgICAgICAgIHJldHVybiBjbHMucG9ydF9uYW1lICsgJy0nICsgaG9z dC5wbGF0Zm9ybS5vc192ZXJzaW9uCi0gICAgICAgIGlmIHBvcnRfbmFtZSA9PSBjbHMucG9ydF9u YW1lICsgJy13azInOgotICAgICAgICAgICAgYXNzZXJ0IHBvcnRfbmFtZSA9PSBob3N0LnBsYXRm b3JtLm9zX25hbWUgKyAnLXdrMicKLSAgICAgICAgICAgIHJldHVybiBjbHMucG9ydF9uYW1lICsg Jy0nICsgaG9zdC5wbGF0Zm9ybS5vc192ZXJzaW9uICsgJy13azInCisgICAgICAgIG9wdGlvbnMg PSBvcHRpb25zIG9yIHt9CisgICAgICAgIGlmIHBvcnRfbmFtZSBpbiAoY2xzLnBvcnRfbmFtZSwg Y2xzLnBvcnRfbmFtZSArICctd2syJyk6CisgICAgICAgICAgICAjIElmIHRoZSBwb3J0X25hbWUg bWF0Y2hlcyB0aGUgKGJhZGx5IG5hbWVkKSBjbHMucG9ydF9uYW1lLCB0aGF0CisgICAgICAgICAg ICAjIG1lYW5zIHRoYXQgdGhleSBwYXNzZWQgJ21hYycgb3IgJ3dpbicgYW5kIGRpZG4ndCBzcGVj aWZ5IGEgdmVyc2lvbi4KKyAgICAgICAgICAgICMgVGhhdCBjb252ZW50aW9uIG1lYW5zIHRoYXQg d2UncmUgc3VwcG9zZWQgdG8gdXNlIHRoZSB2ZXJzaW9uIGN1cnJlbnRseQorICAgICAgICAgICAg IyBiZWluZyBydW4sIHNvIHRoaXMgd29uJ3Qgd29yayBpZiB5b3UncmUgbm90IG9uIG1hYyBvciB3 aW4gKHJlc3BlY3RpdmVseSkuCisgICAgICAgICAgICAjIElmIHlvdSdyZSBub3Qgb24gdGhlIG8v cyBpbiBxdWVzdGlvbiwgeW91IG11c3Qgc3BlY2lmeSBhIGZ1bGwgdmVyc2lvbiBvciAtZnV0dXJl IChjZi4gYWJvdmUpLgorICAgICAgICAgICAgYXNzZXJ0IGhvc3QucGxhdGZvcm0ub3NfbmFtZSBp biBwb3J0X25hbWUKKyAgICAgICAgICAgIGlmIHBvcnRfbmFtZSA9PSBjbHMucG9ydF9uYW1lIGFu ZCBub3QgZ2V0YXR0cihvcHRpb25zLCAnd2Via2l0X3Rlc3RfcnVubmVyJywgRmFsc2UpOgorICAg ICAgICAgICAgICAgIHBvcnRfbmFtZSA9IGNscy5wb3J0X25hbWUgKyAnLScgKyBob3N0LnBsYXRm b3JtLm9zX3ZlcnNpb24KKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgcG9ydF9u YW1lID0gY2xzLnBvcnRfbmFtZSArICctJyArIGhvc3QucGxhdGZvcm0ub3NfdmVyc2lvbiArICct d2syJworICAgICAgICBlbGlmIGdldGF0dHIob3B0aW9ucywgJ3dlYmtpdF90ZXN0X3J1bm5lcics IEZhbHNlKSBhbmQgICctd2syJyBub3QgaW4gcG9ydF9uYW1lOgorICAgICAgICAgICAgcG9ydF9u YW1lICs9ICctd2syJworCiAgICAgICAgIHJldHVybiBwb3J0X25hbWUKIAogICAgIGRlZiBfc3Ry aXBfcG9ydF9uYW1lX3ByZWZpeChzZWxmLCBwb3J0X25hbWUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGFmNzQyYzllMmE5ODk2 MTZlMGExZmQyYzY0MWU5MDMyOThkN2RlMTEuLjJlZWRiNmYxODgzOTg1YzU5Mjc3NmNlNzgyMGVh ZTU2NTNhYTZjNmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Jhc2UucHkKQEAgLTg4LDcgKzg4LDExIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAg ICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9u YW1lKToKICAgICAgICAgIiIiUmV0dXJuIGEgZnVsbHktc3BlY2lmaWVkIHBvcnQgbmFtZSB0aGF0 IGNhbiBiZSB1c2VkIHRvIGNvbnN0cnVjdCBvYmplY3RzLiIiIgogICAgICAgICAjIFN1YmNsYXNz ZXMgd2lsbCB1c3VhbGx5IG92ZXJyaWRlIHRoaXMuCi0gICAgICAgIHJldHVybiBjbHMucG9ydF9u YW1lCisgICAgICAgIG9wdGlvbnMgPSBvcHRpb25zIG9yIHt9CisgICAgICAgIGFzc2VydCBwb3J0 X25hbWUuc3RhcnRzd2l0aChjbHMucG9ydF9uYW1lKQorICAgICAgICBpZiBnZXRhdHRyKG9wdGlv bnMsICd3ZWJraXRfdGVzdF9ydW5uZXInLCBGYWxzZSkgYW5kIG5vdCAnLXdrMicgaW4gcG9ydF9u YW1lOgorICAgICAgICAgICAgcmV0dXJuIHBvcnRfbmFtZSArICctd2syJworICAgICAgICByZXR1 cm4gcG9ydF9uYW1lCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPU5v bmUsIG9wdGlvbnM9Tm9uZSwgKiprd2FyZ3MpOgogCkBAIC0xMDcsNiArMTExLDkgQEAgY2xhc3Mg UG9ydChvYmplY3QpOgogICAgICAgICAjIG9wdGlvbnMgZGVmaW5lZCBvbiBpdC4KICAgICAgICAg c2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMgb3Igb3B0cGFyc2UuVmFsdWVzKCkKIAorICAgICAgICBp ZiBzZWxmLl9uYW1lIGFuZCAnLXdrMicgaW4gc2VsZi5fbmFtZToKKyAgICAgICAgICAgIHNlbGYu X29wdGlvbnMud2Via2l0X3Rlc3RfcnVubmVyID0gVHJ1ZQorCiAgICAgICAgIHNlbGYuaG9zdCA9 IGhvc3QKICAgICAgICAgc2VsZi5fZXhlY3V0aXZlID0gaG9zdC5leGVjdXRpdmUKICAgICAgICAg c2VsZi5fZmlsZXN5c3RlbSA9IGhvc3QuZmlsZXN5c3RlbQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9idWlsZGVycy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYnVpbGRlcnMucHkKaW5kZXggNGI5NmVkMjEz Yjg2NmJmOWE0YzI0YmMwZWE3NmQ2NjVkNjk2YjBhMS4uOTY2YzZjNDdlZGI0ZmY3MGIxNzU4YzI3 NjVhMjMyNzNlNjg1N2FkMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9idWlsZGVycy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5CkBAIC02MiwxMiArNjIsMTIgQEAgX2V4YWN0X21h dGNoZXMgPSB7CiAgICAgIyBUaGVzZSBidWlsZGVycyBhcmUgb24gYnVpbGQud2Via2l0Lm9yZy4K ICAgICAiQXBwbGUgTW91bnRhaW5MaW9uIFJlbGVhc2UgV0sxIChUZXN0cykiOiB7InBvcnRfbmFt ZSI6ICJtYWMtbW91bnRhaW5saW9uIiwgInNwZWNpZmllcnMiOiBzZXQoWyJtb3VudGFpbmxpb24i XSksICJyZWJhc2VsaW5lX292ZXJyaWRlX2RpciI6ICJtYWMifSwKICAgICAiQXBwbGUgTW91bnRh aW5MaW9uIERlYnVnIFdLMSAoVGVzdHMpIjogeyJwb3J0X25hbWUiOiAibWFjLW1vdW50YWlubGlv biIsICJzcGVjaWZpZXJzIjogc2V0KFsibW91bnRhaW5saW9uIiwgImRlYnVnIl0pLCAicmViYXNl bGluZV9vdmVycmlkZV9kaXIiOiAibWFjIn0sCi0gICAgIkFwcGxlIE1vdW50YWluTGlvbiBSZWxl YXNlIFdLMiAoVGVzdHMpIjogeyJwb3J0X25hbWUiOiAibWFjLW1vdW50YWlubGlvbiIsICJzcGVj aWZpZXJzIjogc2V0KFsibW91bnRhaW5saW9uIiwgIndrMiJdKSwgInJlYmFzZWxpbmVfb3ZlcnJp ZGVfZGlyIjogIm1hYyJ9LAotICAgICJBcHBsZSBNb3VudGFpbkxpb24gRGVidWcgV0syIChUZXN0 cykiOiB7InBvcnRfbmFtZSI6ICJtYWMtbW91bnRhaW5saW9uIiwgInNwZWNpZmllcnMiOiBzZXQo WyJtb3VudGFpbmxpb24iLCAid2syIiwgImRlYnVnIl0pLCAicmViYXNlbGluZV9vdmVycmlkZV9k aXIiOiAibWFjIn0sCisgICAgIkFwcGxlIE1vdW50YWluTGlvbiBSZWxlYXNlIFdLMiAoVGVzdHMp IjogeyJwb3J0X25hbWUiOiAibWFjLW1vdW50YWlubGlvbi13azIiLCAic3BlY2lmaWVycyI6IHNl dChbIm1vdW50YWlubGlvbiIsICJ3azIiXSksICJyZWJhc2VsaW5lX292ZXJyaWRlX2RpciI6ICJt YWMifSwKKyAgICAiQXBwbGUgTW91bnRhaW5MaW9uIERlYnVnIFdLMiAoVGVzdHMpIjogeyJwb3J0 X25hbWUiOiAibWFjLW1vdW50YWlubGlvbi13azIiLCAic3BlY2lmaWVycyI6IHNldChbIm1vdW50 YWlubGlvbiIsICJ3azIiLCAiZGVidWciXSksICJyZWJhc2VsaW5lX292ZXJyaWRlX2RpciI6ICJt YWMifSwKICAgICAiQXBwbGUgTGlvbiBSZWxlYXNlIFdLMSAoVGVzdHMpIjogeyJwb3J0X25hbWUi OiAibWFjLWxpb24iLCAic3BlY2lmaWVycyI6IHNldChbImxpb24iXSl9LAogICAgICJBcHBsZSBM aW9uIERlYnVnIFdLMSAoVGVzdHMpIjogeyJwb3J0X25hbWUiOiAibWFjLWxpb24iLCAic3BlY2lm aWVycyI6IHNldChbImxpb24iLCAiZGVidWciXSl9LAotICAgICJBcHBsZSBMaW9uIFJlbGVhc2Ug V0syIChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJtYWMtbGlvbiIsICJzcGVjaWZpZXJzIjogc2V0 KFsibGlvbiIsICJ3azIiXSl9LAotICAgICJBcHBsZSBMaW9uIERlYnVnIFdLMiAoVGVzdHMpIjog eyJwb3J0X25hbWUiOiAibWFjLWxpb24iLCAic3BlY2lmaWVycyI6IHNldChbImxpb24iLCAid2sy IiwgImRlYnVnIl0pfSwKKyAgICAiQXBwbGUgTGlvbiBSZWxlYXNlIFdLMiAoVGVzdHMpIjogeyJw b3J0X25hbWUiOiAibWFjLWxpb24td2syIiwgInNwZWNpZmllcnMiOiBzZXQoWyJsaW9uIiwgIndr MiJdKX0sCisgICAgIkFwcGxlIExpb24gRGVidWcgV0syIChUZXN0cykiOiB7InBvcnRfbmFtZSI6 ICJtYWMtbGlvbi13azIiLCAic3BlY2lmaWVycyI6IHNldChbImxpb24iLCAid2syIiwgImRlYnVn Il0pfSwKIAogICAgICJBcHBsZSBXaW4gWFAgRGVidWcgKFRlc3RzKSI6IHsicG9ydF9uYW1lIjog Indpbi14cCIsICJzcGVjaWZpZXJzIjogc2V0KFsid2luIiwgImRlYnVnIl0pfSwKICAgICAjIEZJ WE1FOiBSZW1vdmUgcmViYXNlbGluZV9vdmVycmlkZV9kaXIgb25jZSB0aGVyZSBpcyBhbiBBcHBs ZSBidWlsZGJvdCB0aGF0IGNvcnJlc3BvbmRzIHRvIHBsYXRmb3JtL3dpbi4KQEAgLTc2LDE0ICs3 NiwxNCBAQCBfZXhhY3RfbWF0Y2hlcyA9IHsKICAgICAiR1RLIExpbnV4IDMyLWJpdCBSZWxlYXNl IjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2Iiwg InJlbGVhc2UiXSl9LAogICAgICJHVEsgTGludXggNjQtYml0IERlYnVnIjogeyJwb3J0X25hbWUi OiAiZ3RrIiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2XzY0IiwgImRlYnVnIl0pfSwK ICAgICAiR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlIjogeyJwb3J0X25hbWUiOiAiZ3RrIiwgInNw ZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2XzY0IiwgInJlbGVhc2UiXSl9LAotICAgICJHVEsg TGludXggNjQtYml0IFJlbGVhc2UgV0syIChUZXN0cykiOiB7InBvcnRfbmFtZSI6ICJndGsiLCAi c3BlY2lmaWVycyI6IHNldChbImd0ayIsICJ4ODZfNjQiLCAid2syIiwgInJlbGVhc2UiXSl9LAor ICAgICJHVEsgTGludXggNjQtYml0IFJlbGVhc2UgV0syIChUZXN0cykiOiB7InBvcnRfbmFtZSI6 ICJndGstd2syIiwgInNwZWNpZmllcnMiOiBzZXQoWyJndGsiLCAieDg2XzY0IiwgIndrMiIsICJy ZWxlYXNlIl0pfSwKIAogICAgICMgRklYTUU6IFJlbW92ZSByZWJhc2VsaW5lX292ZXJyaWRlX2Rp ciBvbmNlIHRoZXJlIGFyZSBRdCBib3RzIGZvciBhbGwgdGhlIHBsYXRmb3JtL3F0LSogZGlyZWN0 b3JpZXMuCiAgICAgIlF0IExpbnV4IFJlbGVhc2UiOiB7InBvcnRfbmFtZSI6ICJxdC1saW51eCIs ICJzcGVjaWZpZXJzIjogc2V0KFsid2luIiwgImxpbnV4IiwgIm1hYyJdKSwgInJlYmFzZWxpbmVf b3ZlcnJpZGVfZGlyIjogInF0In0sCiAKICAgICAiRUZMIExpbnV4IDY0LWJpdCBSZWxlYXNlIjog eyJwb3J0X25hbWUiOiAiZWZsIiwgInNwZWNpZmllcnMiOiBzZXQoWyJlZmwiLCAicmVsZWFzZSJd KX0sCi0gICAgIkVGTCBMaW51eCA2NC1iaXQgUmVsZWFzZSBXSzIiOiB7InBvcnRfbmFtZSI6ICJl ZmwiLCAic3BlY2lmaWVycyI6IHNldChbImVmbCIsICJ3azIiLCAicmVsZWFzZSJdKX0sCi0gICAg IkVGTCBMaW51eCA2NC1iaXQgRGVidWcgV0syIjogeyJwb3J0X25hbWUiOiAiZWZsIiwgInNwZWNp ZmllcnMiOiBzZXQoWyJlZmwiLCAid2syIiwgImRlYnVnIl0pfSwKKyAgICAiRUZMIExpbnV4IDY0 LWJpdCBSZWxlYXNlIFdLMiI6IHsicG9ydF9uYW1lIjogImVmbC13azIiLCAic3BlY2lmaWVycyI6 IHNldChbImVmbCIsICJ3azIiLCAicmVsZWFzZSJdKX0sCisgICAgIkVGTCBMaW51eCA2NC1iaXQg RGVidWcgV0syIjogeyJwb3J0X25hbWUiOiAiZWZsLXdrMiIsICJzcGVjaWZpZXJzIjogc2V0KFsi ZWZsIiwgIndrMiIsICJkZWJ1ZyJdKX0sCiB9CiAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQppbmRl eCBkMWM5YzJmZGQ4ZmM5MzRmOGQxNjQ0ZmQ3OThmN2U2OTQxMjNhZDQ5Li5mNjBkYzNkNDEyNTZi ZWI5Mzc1YThjMDRmZWU0Mjk1NTUwMzM3YzI0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQpAQCAt ODIsNyArODIsNyBAQCBjbGFzcyBEcml2ZXJPdXRwdXRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK IAogY2xhc3MgRHJpdmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIG1ha2VfcG9y dChzZWxmKToKLSAgICAgICAgcG9ydCA9IFBvcnQoTW9ja1N5c3RlbUhvc3QoKSwgTW9ja09wdGlv bnMoY29uZmlndXJhdGlvbj0nUmVsZWFzZScpKQorICAgICAgICBwb3J0ID0gUG9ydChNb2NrU3lz dGVtSG9zdCgpLCAndGVzdCcsIE1vY2tPcHRpb25zKGNvbmZpZ3VyYXRpb249J1JlbGVhc2UnKSkK ICAgICAgICAgcG9ydC5fY29uZmlnLmJ1aWxkX2RpcmVjdG9yeSA9IGxhbWJkYSBjb25maWd1cmF0 aW9uOiAnL21vY2stYnVpbGQnCiAgICAgICAgIHJldHVybiBwb3J0CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKaW5kZXggZWViYTJiYTQzMzRm NmU1ZDA0N2NkYTg1NjU1YjdiMzZiMDRmN2I3MS4uYzY4OTY5ZmMxZGFkODgwYjE2MWY3YTZjOGQ2 YjA1Yjk3ZmQzMDdjYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWMucHkKQEAgLTczLDEwICs3MywxMSBAQCBjbGFzcyBNYWNQb3J0KEFwcGxlUG9y dCk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgZGVmYXVsdF9iYXNlbGluZV9zZWFy Y2hfcGF0aChzZWxmKToKLSAgICAgICAgaWYgc2VsZi5fbmFtZS5lbmRzd2l0aChzZWxmLkZVVFVS RV9WRVJTSU9OKToKKyAgICAgICAgbmFtZSA9IHNlbGYuX25hbWUucmVwbGFjZSgnLXdrMicsICcn KQorICAgICAgICBpZiBuYW1lLmVuZHN3aXRoKHNlbGYuRlVUVVJFX1ZFUlNJT04pOgogICAgICAg ICAgICAgZmFsbGJhY2tfbmFtZXMgPSBbc2VsZi5wb3J0X25hbWVdCiAgICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUltz ZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVIuaW5kZXgoc2VsZi5fbmFtZSk6LTFdICsgW3NlbGYu cG9ydF9uYW1lXQorICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBzZWxmLlZFUlNJT05fRkFM TEJBQ0tfT1JERVJbc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSLmluZGV4KG5hbWUpOi0xXSAr IFtzZWxmLnBvcnRfbmFtZV0KICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVz dF9ydW5uZXInKToKICAgICAgICAgICAgIGZhbGxiYWNrX25hbWVzLmluc2VydCgwLCBzZWxmLl93 azJfcG9ydF9uYW1lKCkpCiAgICAgICAgICAgICAjIE5vdGUgd2UgZG8gbm90IGFkZCAnd2syJyBo ZXJlLCBldmVuIHRob3VnaCBpdCdzIGluY2x1ZGVkIGluIF9za2lwcGVkX3NlYXJjaF9wYXRocygp LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93 aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weQpp bmRleCBmZjQ3M2ZlYzI0ODEyMmQzZjI1ODc3ODkyNmNjMDhjZDA1YzUxOTZlLi42YWRiZjc1M2Q0 NGE2MmQwNmJmMzZmM2I5ZTQ5NzFmOGM4MDJlNDU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weQpAQCAtNjEsMTAgKzYxLDExIEBAIGNsYXNz IFdpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgcmV0dXJuIGV4cGVjdGVkX3RleHQgIT0gYWN0 dWFsX3RleHQKIAogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgot ICAgICAgICBpZiBzZWxmLl9uYW1lLmVuZHN3aXRoKHNlbGYuRlVUVVJFX1ZFUlNJT04pOgorICAg ICAgICBuYW1lID0gc2VsZi5fbmFtZS5yZXBsYWNlKCctd2syJywgJycpCisgICAgICAgIGlmIG5h bWUuZW5kc3dpdGgoc2VsZi5GVVRVUkVfVkVSU0lPTik6CiAgICAgICAgICAgICBmYWxsYmFja19u YW1lcyA9IFtzZWxmLnBvcnRfbmFtZV0KICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGZhbGxi YWNrX25hbWVzID0gc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSW3NlbGYuVkVSU0lPTl9GQUxM QkFDS19PUkRFUi5pbmRleChzZWxmLl9uYW1lKTotMV0gKyBbc2VsZi5wb3J0X25hbWVdCisgICAg ICAgICAgICBmYWxsYmFja19uYW1lcyA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUltzZWxm LlZFUlNJT05fRkFMTEJBQ0tfT1JERVIuaW5kZXgobmFtZSk6LTFdICsgW3NlbGYucG9ydF9uYW1l XQogICAgICAgICAjIEZJWE1FOiBUaGUgQXBwbGVXaW4gcG9ydCBmYWxscyBiYWNrIHRvIEFwcGxl TWFjIGZvciBzb21lIHJlc3VsdHMuICBFdmVudHVhbGx5IHdlJ2xsIGhhdmUgYSBzaGFyZWQgJ2Fw cGxlJyBwb3J0LgogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5l cicpOgogICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMuaW5zZXJ0KDAsICd3aW4td2syJykKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5l X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmVfdW5pdHRlc3QucHkKaW5kZXggY2MyNWZhZTJiOTJkNTdjNjIxMzM1MzUyZTA0MGRjYTU1 NDYwMTljMS4uNGQ0YzZmOTE1MzJkMzA5NzcwNjA1OWI1YzkxNDI1YjVmMmJhNDE3YyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmVfdW5pdHRlc3QucHkKQEAgLTMzNiw3ICszMzYsNyBAQCBjbGFzcyBUZXN0UmViYXNlbGlu ZUV4cGVjdGF0aW9ucyhfQmFzZVRlc3RDYXNlKToKICAgICAgICAgIyBGSVhNRTogY2hhbmdlIHRo aXMgdG8gdXNlIHRoZSB0ZXN0LSBwb3J0cy4KICAgICAgICAgY2FsbHMgPSBmaWx0ZXIobGFtYmRh IHg6IHggIT0gWydxbWFrZScsICctdiddLCBzZWxmLnRvb2wuZXhlY3V0aXZlLmNhbGxzKQogICAg ICAgICBzZWxmLmFzc2VydFRydWUobGVuKGNhbGxzKSA9PSAxKQotICAgICAgICBzZWxmLmFzc2Vy dFRydWUobGVuKGNhbGxzWzBdKSA9PSAyNikKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGxlbihj YWxsc1swXSkgPT0gMzQpCiAKICAgICBkZWYgdGVzdF9yZWJhc2VsaW5lX2V4cGVjdGF0aW9uc19u b29wKHNlbGYpOgogICAgICAgICBzZWxmLl96ZXJvX291dF90ZXN0X2V4cGVjdGF0aW9ucygpCg==