94553 2012-08-20 17:41:37 -0700 Add mountain lion to perf-tests, layout tests 2012-08-21 18:45:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bshafiei dpranke abarth dpranke eroman kbr ojan rniwa simon.fraser slewis tony oldest_to_newest 700256 0 bshafiei 2012-08-20 17:41:37 -0700 Need to add mountain-lion to set of allowed port names so that perf-tests can run http://build.webkit.org/builders/Apple%20MountainLion%20Release%20%28Perf%29/builds/14/steps/perf-test/logs/stdio Traceback (most recent call last): File "./Tools/Scripts/run-perf-tests", line 40, in <module> sys.exit(PerfTestsRunner().run()) File "/Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py", line 67, in __init__ self._port = self._host.port_factory.get(self._options.platform, self._options) File "/Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/Scripts/webkitpy/layout_tests/port/factory.py", line 114, in get return cls(self._host, port_name, options=options, **kwargs) File "/Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/Scripts/webkitpy/layout_tests/port/mac.py", line 56, in __init__ ApplePort.__init__(self, host, port_name, **kwargs) File "/Volumes/Data/slave/mountainlion-release-perf-tests/build/Tools/Scripts/webkitpy/layout_tests/port/apple.py", line 79, in __init__ assert port_name in allowed_port_names, "%s is not in %s" % (port_name, allowed_port_names) AssertionError: mac-mountainlion is not in ['mac-leopard', 'mac-snowleopard', 'mac-lion', 'mac', 'mac-future'] 700466 1 dpranke 2012-08-20 22:03:53 -0700 Note that you can work around this at the moment by passing mac-future, but we do need to fix this. Reassigning to me; last I checked fixing this was more convoluted than I would've liked. 701394 2 159822 dpranke 2012-08-21 17:52:48 -0700 Created attachment 159822 Patch 701469 3 dpranke 2012-08-21 18:45:33 -0700 Committed r126247: <http://trac.webkit.org/changeset/126247> 159822 2012-08-21 17:52:48 -0700 2012-08-21 17:57:38 -0700 Patch bug-94553-20120821175247.patch text/plain 19516 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MTg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzVlMDc3ODVlNGFjZGI4NjJmNzA3NDhiNWIwNTBkMzM2 OGY4NzVmYy4uZjBlNDlkNzlhNTZiMzUwN2M0ZmQxYTMwNjVlM2IwM2ExZjQ2MmM2YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU1 IEBACiAyMDEyLTA4LTIxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIEFkZCBtb3VudGFpbiBsaW9uIHRvIHBlcmYtdGVzdHMsIGxheW91dCB0ZXN0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ1NTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGFk ZHMgc3VwcG9ydCBmb3IgdGhlICdtYWMtbW91bnRhaW5saW9uJyBwbGF0Zm9ybSBhbmQKKyAgICAg ICAgc3RhbXBzIG91dCB0aGUgbGFzdCByZWZlcmVuY2VzIHRvICdtYWMtbGVvcGFyZCcgYXMgYSBz dXBwb3J0ZWQKKyAgICAgICAgbmFtZS4KKyAgICAgICAgCisgICAgICAgIFRoaXMgcGF0Y2ggZG9l cyBhIHNtYWxsIGFtb3VudCBvZiByZWZhY3RvcmluZyB0byB0cnkgYW5kIG1ha2UKKyAgICAgICAg dGhpbmdzIGEgbGl0dGxlIGNsZWFyZXIgaG93IHdlIHRyZWF0IHRoZSAibW9zdCByZWNlbnQgdmVy c2lvbiIKKyAgICAgICAgc3BlY2lhbGx5IGZvciBiYXNlbGluZXMgYW5kIHNraXBwZWQgZmlsZXMs IGFuZCBzbyB5b3Ugb25seQorICAgICAgICBzaG91bGQgaGF2ZSB0byB0b3VjaCB0aGUgVkVSU0lP Tl9GQUxMQkFDS19PUkRFUiBjb25zdGFudHMgb24gdGhlCisgICAgICAgIHBvcnRzLCBidXQgdW5m b3J0dW5hdGVseSBjaGFuZ2luZyB0aGlzIGxpc3QgY2hhbmdlcyBhIGJ1bmNoIG9mCisgICAgICAg IHRoZSB1bml0IHRlc3RzIHdoaWNoIGFyZSBkb2luZyBleGFjdCBtYXRjaGVzIGZvciBjb3JyZWN0 bmVzcywgc28KKyAgICAgICAgeW91IGhhdmUgdG8gdG91Y2ggbW9yZSB0aGFuIGEgY291cGxlIGZp bGVzIDooLiBUaGVyZSdzIHByb2JhYmx5CisgICAgICAgIHN0aWxsIG1vcmUgcmVmYWN0b3Jpbmcg dGhhdCBjYW4gYmUgZG9uZSBzbyB0aGF0IHdlIGRvbid0IGhhdmUgdG8KKyAgICAgICAgZG8gYWxs IG9mIHRoaXMgZnVuY3Rpb25hbCB0ZXN0aW5nIHRvIGZlZWwgY29tcGxldGVseSBjb3JyZWN0Lgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5w eToKKyAgICAgICAgKFBsYXRmb3JtSW5mby5fZGV0ZXJtaW5lX21hY192ZXJzaW9uKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0ZXN0 LnB5OgorICAgICAgICAoVGVzdFBsYXRmb3JtSW5mby50ZXN0X29zX3ZlcnNpb24pOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHk6CisgICAgICAg IChBcHBsZVBvcnQuX19pbml0X18pOgorICAgICAgICAoQXBwbGVQb3J0KToKKyAgICAgICAgKEFw cGxlUG9ydC5fc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyk6CisgICAgICAgIChBcHBsZVBvcnQu X2dlbmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgKENocm9t aXVtTWFjUG9ydCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9mYWN0b3J5X3VuaXR0ZXN0LnB5OgorICAgICAgICAoRmFjdG9yeVRlc3QudGVzdF9tYWMpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5OgorICAg ICAgICAoTWFjUG9ydCk6CisgICAgICAgIChNYWNQb3J0Ll9idWlsZF9kcml2ZXJfZmxhZ3MpOgor ICAgICAgICAoTWFjUG9ydC5zaG91bGRfcmV0cnlfY3Jhc2hlcyk6CisgICAgICAgIChNYWNQb3J0 LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAgICAgICAoTWFjUG9ydC5vcGVyYXRp bmdfc3lzdGVtKToKKyAgICAgICAgKE1hY1BvcnQuZGVmYXVsdF9jaGlsZF9wcm9jZXNzZXMpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0 LnB5OgorICAgICAgICAoTWFjVGVzdCk6CisgICAgICAgIChNYWNUZXN0LnRlc3Rfc2tpcHBlZF9m aWxlX3NlYXJjaF9wYXRocyk6CisgICAgICAgICh0ZXN0X3ZlcnNpb25zKToKKyAgICAgICAgKHRl c3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2luLnB5OgorICAgICAgICAoV2luUG9ydCk6CisgICAgICAgIChXaW5Q b3J0LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorCisyMDEyLTA4LTIxICBEaXJrIFBy YW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFRleHQgQXV0b3NpemluZzog OjpmaXJzdC1sZXR0ZXIgcHNldWRvLWVsZW1lbnQgaXMgaW5jb3JyZWN0bHkgc2l6ZWQKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NTQwCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8u cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5 CmluZGV4IDc0Y2ZmNTQxMmVlYzdjNTlhY2IyMTY0NjQ4Y2QzNzc4ZDg1ZjgzNDMuLmE5NzE3Y2M4 NGI5N2RkMjhlZjdjMTMxZTFkZDQzNGIzMmYzNjc3YjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQpAQCAtMTAzLDYgKzEw Myw3IEBAIGNsYXNzIFBsYXRmb3JtSW5mbyhvYmplY3QpOgogICAgICAgICAgICAgJzUnOiAnbGVv cGFyZCcsCiAgICAgICAgICAgICAnNic6ICdzbm93bGVvcGFyZCcsCiAgICAgICAgICAgICAnNyc6 ICdsaW9uJywKKyAgICAgICAgICAgICc4JzogJ21vdW50YWlubGlvbicsCiAgICAgICAgIH0KICAg ICAgICAgYXNzZXJ0IHJlbGVhc2VfdmVyc2lvbiA+PSBtaW4odmVyc2lvbl9zdHJpbmdzLmtleXMo KSkKICAgICAgICAgcmV0dXJuIHZlcnNpb25fc3RyaW5ncy5nZXQocmVsZWFzZV92ZXJzaW9uLCAn ZnV0dXJlJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl bS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5CmluZGV4IDhmYzk2MWIwODhkNjQ3YzI1 YWE5NzVkYTE5ZDI0NDQ2OTE4Nzc2MDkuLjQ0NWVmNWY3ZDMxOTFmZTJjYjNmODY5ZGUxMWExYzY4 ZjM2ZDVhODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl bS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb191bml0dGVzdC5weQpAQCAtMTMzLDcgKzEzMyw4IEBA IGNsYXNzIFRlc3RQbGF0Zm9ybUluZm8odW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnZGFyd2luJyksIGZha2VfcGxh dGZvcm0oJzEwLjUuMScpKS5vc192ZXJzaW9uLCAnbGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdkYXJ3aW4nKSwgZmFrZV9wbGF0Zm9y bSgnMTAuNi4xJykpLm9zX3ZlcnNpb24sICdzbm93bGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdkYXJ3aW4nKSwgZmFrZV9wbGF0Zm9y bSgnMTAuNy4xJykpLm9zX3ZlcnNpb24sICdsaW9uJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2RhcndpbicpLCBmYWtlX3BsYXRmb3JtKCcxMC44 LjAnKSkub3NfdmVyc2lvbiwgJ2Z1dHVyZScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNl bGYubWFrZV9pbmZvKGZha2Vfc3lzKCdkYXJ3aW4nKSwgZmFrZV9wbGF0Zm9ybSgnMTAuOC4xJykp Lm9zX3ZlcnNpb24sICdtb3VudGFpbmxpb24nKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhz ZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnZGFyd2luJyksIGZha2VfcGxhdGZvcm0oJzEwLjkuMCcp KS5vc192ZXJzaW9uLCAnZnV0dXJlJykKIAogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxm Lm1ha2VfaW5mbyhmYWtlX3N5cygnbGludXgyJykpLm9zX3ZlcnNpb24sICdsdWNpZCcpCiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwcGxlLnB5Cmlu ZGV4IDI4ZWNjNjM4MDg1ZTdjZDZmMDhjMTU5NTg1ODc1NWQyZTU5NzM1YTkuLjU4YjViNjRiNjYx MzQ1NjE2MGJkZTRkOWUyOTgwNzA5ZjlkNjE0MDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBsZS5weQpAQCAtNzYsOCArNzYsMTQgQEAgY2xh c3MgQXBwbGVQb3J0KFBvcnQpOgogCiAgICAgICAgIGFsbG93ZWRfcG9ydF9uYW1lcyA9IHNlbGYu VkVSU0lPTl9GQUxMQkFDS19PUkRFUiArIFtzZWxmLm9wZXJhdGluZ19zeXN0ZW0oKSArICItZnV0 dXJlIl0KICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lLnJlcGxhY2UoJy13azInLCAnJykK LSAgICAgICAgYXNzZXJ0IHBvcnRfbmFtZSBpbiBhbGxvd2VkX3BvcnRfbmFtZXMsICIlcyBpcyBu b3QgaW4gJXMiICUgKHBvcnRfbmFtZSwgYWxsb3dlZF9wb3J0X25hbWVzKQogICAgICAgICBzZWxm Ll92ZXJzaW9uID0gc2VsZi5fc3RyaXBfcG9ydF9uYW1lX3ByZWZpeChwb3J0X25hbWUpCisgICAg ICAgIGFzc2VydCBwb3J0X25hbWUgaW4gYWxsb3dlZF9wb3J0X25hbWVzLCAiJXMgaXMgbm90IGlu ICVzIiAlIChwb3J0X25hbWUsIGFsbG93ZWRfcG9ydF9uYW1lcykKKworICAgIGRlZiBfc2tpcHBl ZF9maWxlX3NlYXJjaF9wYXRocyhzZWxmKToKKyAgICAgICAgIyBXZSBkb24ndCBoYXZlIGEgZGVk aWNhdGVkIFNraXBwZWQgZmlsZSBmb3IgdGhlIG1vc3QgcmVjZW50IHZlcnNpb24gb2YgdGhlIHBv cnQ7CisgICAgICAgICMgd2UganVzdCB1c2UgdGhlIG9uZSBpbiBwbGF0Zm9ybS97bWFjLHdpbn0K KyAgICAgICAgbW9zdF9yZWNlbnRfbmFtZSA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUlst MV0KKyAgICAgICAgcmV0dXJuIHNldChmaWx0ZXIobGFtYmRhIG5hbWU6IG5hbWUgIT0gbW9zdF9y ZWNlbnRfbmFtZSwgc3VwZXIoQXBwbGVQb3J0LCBzZWxmKS5fc2tpcHBlZF9maWxlX3NlYXJjaF9w YXRocygpKSkKIAogICAgICMgRklYTUU6IEEgbW9yZSBzb3BoaXN0aWNhdGVkIHZlcnNpb24gb2Yg dGhpcyBmdW5jdGlvbiBzaG91bGQgbW92ZSB0byBXZWJLaXRQb3J0IGFuZCByZXBsYWNlIGFsbCBj YWxscyB0byBuYW1lKCkuCiAgICAgIyBUaGlzIGlzIGFsc28gYSBtaXNsZWFkaW5nIG5hbWUsIHNp bmNlICdtYWMtZnV0dXJlJyBnZXRzIHJlbWFwcGVkIHRvICdtYWMnLgpAQCAtODcsMTQgKzkzLDcg QEAgY2xhc3MgQXBwbGVQb3J0KFBvcnQpOgogICAgIGRlZiBfZ2VuZXJhdGVfYWxsX3Rlc3RfY29u ZmlndXJhdGlvbnMoc2VsZik6CiAgICAgICAgIGNvbmZpZ3VyYXRpb25zID0gW10KICAgICAgICAg Zm9yIHBvcnRfbmFtZSBpbiBzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVI6Ci0gICAgICAgICAg ICBpZiAnLScgaW4gcG9ydF9uYW1lOgotICAgICAgICAgICAgICAgIHZlcnNpb24gPSBzZWxmLl9z dHJpcF9wb3J0X25hbWVfcHJlZml4KHBvcnRfbmFtZSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAg ICAgICAgICAgICAgIyBUaGUgdmVyc2lvbiBmb3IgdGhlICJiYXNlIiBwb3J0IGlzIGN1cnJlbnRs eSBkZWZpbmVkIGFzICJmdXR1cmUiCi0gICAgICAgICAgICAgICAgIyBzaW5jZSBUZXN0Q29uZmln dXJhdGlvbiBkb2Vzbid0IGFsbG93IE5vbmUgYXMgYSB2YWxpZCB2ZXJzaW9uLgotICAgICAgICAg ICAgICAgIHZlcnNpb24gPSBzZWxmLkZVVFVSRV9WRVJTSU9OCi0KICAgICAgICAgICAgIGZvciBi dWlsZF90eXBlIGluIHNlbGYuQUxMX0JVSUxEX1RZUEVTOgogICAgICAgICAgICAgICAgIGZvciBh cmNoaXRlY3R1cmUgaW4gc2VsZi5BUkNISVRFQ1RVUkVTOgotICAgICAgICAgICAgICAgICAgICBj b25maWd1cmF0aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24odmVyc2lvbj12ZXJzaW9uLCBh cmNoaXRlY3R1cmU9YXJjaGl0ZWN0dXJlLCBidWlsZF90eXBlPWJ1aWxkX3R5cGUpKQorICAgICAg ICAgICAgICAgICAgICBjb25maWd1cmF0aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24odmVy c2lvbj1zZWxmLl9zdHJpcF9wb3J0X25hbWVfcHJlZml4KHBvcnRfbmFtZSksIGFyY2hpdGVjdHVy ZT1hcmNoaXRlY3R1cmUsIGJ1aWxkX3R5cGU9YnVpbGRfdHlwZSkpCiAgICAgICAgIHJldHVybiBj b25maWd1cmF0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weQppbmRleCBiYWVhMDYzOWJkM2RmZWI2N2NiYTRi NzBlOThiOWM0Nzc1NDIxMjA3Li41NTRmZWNhMjMwNmYxMTU2ODBiMDg2MTljNmE3OWNkZjNhMDk4 MTFlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX21hYy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX21hYy5weQpAQCAtMzksNyArMzksNyBAQCBfbG9nID0gbG9nZ2luZy5n ZXRMb2dnZXIoX19uYW1lX18pCiAKIAogY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNo cm9taXVtUG9ydCk6Ci0gICAgU1VQUE9SVEVEX09TX1ZFUlNJT05TID0gKCdzbm93bGVvcGFyZCcs ICdsaW9uJywgJ2Z1dHVyZScpCisgICAgU1VQUE9SVEVEX09TX1ZFUlNJT05TID0gKCdzbm93bGVv cGFyZCcsICdsaW9uJywgJ21vdW50YWlubGlvbicsICdmdXR1cmUnKQogICAgIHBvcnRfbmFtZSA9 ICdjaHJvbWl1bS1tYWMnCiAKICAgICBGQUxMQkFDS19QQVRIUyA9IHsKQEAgLTU0LDYgKzU0LDEx IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAg ICAgICAgJ2Nocm9taXVtJywKICAgICAgICAgICAgICdtYWMnLAogICAgICAgICBdLAorICAgICAg ICAnbW91bnRhaW5saW9uJzogWyAgIyBGSVhNRTogd2UgZG9uJ3QgdHJlYXQgTUwgZGlmZmVyZW50 IGZyb20gTGlvbiB5ZXQuCisgICAgICAgICAgICAnY2hyb21pdW0tbWFjJywKKyAgICAgICAgICAg ICdjaHJvbWl1bScsCisgICAgICAgICAgICAnbWFjJywKKyAgICAgICAgXSwKICAgICAgICAgJ2Z1 dHVyZSc6IFsKICAgICAgICAgICAgICdjaHJvbWl1bS1tYWMnLAogICAgICAgICAgICAgJ2Nocm9t aXVtJywKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvZmFjdG9yeV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZmFjdG9yeV91bml0dGVzdC5weQppbmRleCA3NzY0MzNmODAwMjY1NWY5MmYzNzUx M2ViNDgyOTQ4NjQ0NWEzYjRmLi5jYmE1ZDJiMzkxMDI2YzJmZmJhNjBkNGY3NDkyODY1Nzc4ODM1 YzMyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2ZhY3RvcnlfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0LnB5CkBAIC01Niw4ICs1Niw4IEBAIGNsYXNzIEZh Y3RvcnlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGlz aW5zdGFuY2UocG9ydCwgY2xzKSkKIAogICAgIGRlZiB0ZXN0X21hYyhzZWxmKToKLSAgICAgICAg c2VsZi5hc3NlcnRfcG9ydChwb3J0X25hbWU9J21hYy1sZW9wYXJkJywgY2xzPW1hYy5NYWNQb3J0 KQotICAgICAgICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT0nbWFjLWxlb3BhcmQtd2syJywg Y2xzPW1hYy5NYWNQb3J0KQorICAgICAgICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT0nbWFj LWxpb24nLCBjbHM9bWFjLk1hY1BvcnQpCisgICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQocG9ydF9u YW1lPSdtYWMtbGlvbi13azInLCBjbHM9bWFjLk1hY1BvcnQpCiAgICAgICAgIHNlbGYuYXNzZXJ0 X3BvcnQocG9ydF9uYW1lPSdtYWMnLCBvc19uYW1lPSdtYWMnLCBvc192ZXJzaW9uPSdsaW9uJywg Y2xzPW1hYy5NYWNQb3J0KQogICAgICAgICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT1Ob25l LCAgb3NfbmFtZT0nbWFjJywgb3NfdmVyc2lvbj0nbGlvbicsIGNscz1tYWMuTWFjUG9ydCkKIApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQppbmRl eCBkMGNhYTViMjIzNjM3M2NmZjg5Mzc5NTc1Y2UwZjk1NzViNjM3Zjg3Li5kZWVlM2QxYmViYjFl ZGQ1YjdlNWM1ZTkyZDJmZTQxYWZjYTUzMTczIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtNDYsOSArNDYsNyBAQCBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiBjbGFzcyBNYWNQb3J0KEFwcGxlUG9ydCk6CiAgICAg cG9ydF9uYW1lID0gIm1hYyIKIAotICAgICMgVGhpcyBpcyBhIGxpc3Qgb2YgYWxsIHN1cHBvcnRl ZCBPUy1WRVJTSU9OIHBhaXJzIGZvciB0aGUgQXBwbGVNYWMgcG9ydAotICAgICMgYW5kIHRoZSBv cmRlciBvZiBmYWxsYmFjayBiZXR3ZWVuIHRoZW0uICBNYXRjaGVzIE9SV1QuCi0gICAgVkVSU0lP Tl9GQUxMQkFDS19PUkRFUiA9IFsibWFjLWxlb3BhcmQiLCAibWFjLXNub3dsZW9wYXJkIiwgIm1h Yy1saW9uIiwgIm1hYyJdCisgICAgVkVSU0lPTl9GQUxMQkFDS19PUkRFUiA9IFsnbWFjLXNub3ds ZW9wYXJkJywgJ21hYy1saW9uJywgJ21hYy1tb3VudGFpbmxpb24nXQogCiAgICAgQVJDSElURUNU VVJFUyA9IFsneDg2XzY0JywgJ3g4NiddCiAKQEAgLTczLDI1ICs3MSwxNSBAQCBjbGFzcyBNYWNQ b3J0KEFwcGxlUG9ydCk6CiAgICAgZGVmIF9idWlsZF9kcml2ZXJfZmxhZ3Moc2VsZik6CiAgICAg ICAgIHJldHVybiBbJ0FSQ0hTPWkzODYnXSBpZiBzZWxmLmFyY2hpdGVjdHVyZSgpID09ICd4ODYn IGVsc2UgW10KIAotICAgIGRlZiBfbW9zdF9yZWNlbnRfdmVyc2lvbihzZWxmKToKLSAgICAgICAg IyBUaGlzIHJlcHJlc2VudHMgdGhlIG1vc3QgcmVjZW50bHktc2hpcHBpbmcgdmVyc2lvbiBvZiB0 aGUgb3BlcmF0aW5nIHN5c3RlbS4KLSAgICAgICAgcmV0dXJuIHNlbGYuVkVSU0lPTl9GQUxMQkFD S19PUkRFUlstMl0KLQogICAgIGRlZiBzaG91bGRfcmV0cnlfY3Jhc2hlcyhzZWxmKToKICAgICAg ICAgIyBPbiBBcHBsZSBNYWMsIHdlIHJldHJ5IGNyYXNoZXMgZHVlIHRvIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjIzMwogICAgICAgICByZXR1cm4gVHJ1ZQogCi0g ICAgZGVmIGJhc2VsaW5lX3BhdGgoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYubmFtZSgpID09IHNl bGYuX21vc3RfcmVjZW50X3ZlcnNpb24oKToKLSAgICAgICAgICAgICMgQmFzZWxpbmVzIGZvciB0 aGUgbW9zdCByZWNlbnRseSBzaGlwaW5nIHZlcnNpb24gc2hvdWxkIGdvIGludG8gJ21hYycsIG5v dCAnbWFjLWZvbycuCi0gICAgICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0 X3J1bm5lcicpOgotICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgnbWFjLXdrMicpCi0gICAgICAgICAgICByZXR1cm4gc2VsZi5fd2Via2l0X2Jhc2VsaW5l X3BhdGgoJ21hYycpCi0gICAgICAgIHJldHVybiBBcHBsZVBvcnQuYmFzZWxpbmVfcGF0aChzZWxm KQotCiAgICAgZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAg IGZhbGxiYWNrX2luZGV4ID0gc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSLmluZGV4KHNlbGYu X3BvcnRfbmFtZV93aXRoX3ZlcnNpb24oKSkKLSAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBsaXN0 KHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUltmYWxsYmFja19pbmRleDpdKQorICAgICAgICBp ZiBzZWxmLl9uYW1lLmVuZHN3aXRoKHNlbGYuRlVUVVJFX1ZFUlNJT04pOgorICAgICAgICAgICAg ZmFsbGJhY2tfbmFtZXMgPSBbc2VsZi5wb3J0X25hbWVdCisgICAgICAgIGVsc2U6CisgICAgICAg ICAgICBmYWxsYmFja19uYW1lcyA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUltzZWxmLlZF UlNJT05fRkFMTEJBQ0tfT1JERVIuaW5kZXgoc2VsZi5fbmFtZSk6LTFdICsgW3NlbGYucG9ydF9u YW1lXQogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgog ICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMuaW5zZXJ0KDAsIHNlbGYuX3drMl9wb3J0X25hbWUo KSkKICAgICAgICAgICAgICMgTm90ZSB3ZSBkbyBub3QgYWRkICd3azInIGhlcmUsIGV2ZW4gdGhv dWdoIGl0J3MgaW5jbHVkZWQgaW4gX3NraXBwZWRfc2VhcmNoX3BhdGhzKCkuCkBAIC0xMTAsMjIg Kzk4LDEwIEBAIGNsYXNzIE1hY1BvcnQoQXBwbGVQb3J0KToKICAgICBkZWYgb3BlcmF0aW5nX3N5 c3RlbShzZWxmKToKICAgICAgICAgcmV0dXJuICdtYWMnCiAKLSAgICAjIEJlbG9uZ3Mgb24gYSBQ bGF0Zm9ybSBvYmplY3QuCi0gICAgZGVmIGlzX2xlb3BhcmQoc2VsZik6Ci0gICAgICAgIHJldHVy biBzZWxmLl92ZXJzaW9uID09ICJsZW9wYXJkIgotCi0gICAgIyBCZWxvbmdzIG9uIGEgUGxhdGZv cm0gb2JqZWN0LgotICAgIGRlZiBpc19zbm93bGVvcGFyZChzZWxmKToKLSAgICAgICAgcmV0dXJu IHNlbGYuX3ZlcnNpb24gPT0gInNub3dsZW9wYXJkIgotCi0gICAgIyBCZWxvbmdzIG9uIGEgUGxh dGZvcm0gb2JqZWN0LgotICAgIGRlZiBpc19saW9uKHNlbGYpOgotICAgICAgICByZXR1cm4gc2Vs Zi5fdmVyc2lvbiA9PSAibGlvbiIKLQogICAgIGRlZiBkZWZhdWx0X2NoaWxkX3Byb2Nlc3Nlcyhz ZWxmKToKICAgICAgICAgIyBGSVhNRTogVGhlIFByaW50ZXIgaXNuJ3QgaW5pdGlhbGl6ZWQgd2hl biB0aGlzIGlzIGNhbGxlZCwgc28gdXNpbmcgX2xvZyB3b3VsZCBqdXN0IHNob3cgYW4gdW5pdGlh bGl6ZWQgbG9nZ2VyIGVycm9yLgogCi0gICAgICAgIGlmIHNlbGYuaXNfc25vd2xlb3BhcmQoKToK KyAgICAgICAgaWYgc2VsZi5fdmVyc2lvbiA9PSAic25vd2xlb3BhcmQiOgogICAgICAgICAgICAg cHJpbnQgPj4gc3lzLnN0ZGVyciwgIkNhbm5vdCBydW4gdGVzdHMgaW4gcGFyYWxsZWwgb24gU25v dyBMZW9wYXJkIGR1ZSB0byByZGFyOi8vcHJvYmxlbS8xMDYyMTUyNS4iCiAgICAgICAgICAgICBy ZXR1cm4gMQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hY191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CmluZGV4IGJjN2IwZGY0NDFhOTZmN2RlMGQ4MzliODQ2 Y2M5NDJhY2UwMTI3ZmQuLmU3NWFlZWZmNzcwYTg3YmYxZTQyNTU0OWU0MjNkYzhiMTE5NjFiMDAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFj X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbWFjX3VuaXR0ZXN0LnB5CkBAIC0zNyw4ICszNyw4IEBAIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5zeXN0ZW1ob3N0X21vY2sgaW1wb3J0IE1vY2tTeXN0ZW1Ib3N0CiAKIGNsYXNzIE1h Y1Rlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgIG9zX25hbWUgPSAnbWFjJwot ICAgIG9zX3ZlcnNpb24gPSAnbGVvcGFyZCcKLSAgICBwb3J0X25hbWUgPSAnbWFjLWxlb3BhcmQn CisgICAgb3NfdmVyc2lvbiA9ICdsaW9uJworICAgIHBvcnRfbmFtZSA9ICdtYWMtbGlvbicKICAg ICBwb3J0X21ha2VyID0gTWFjUG9ydAogCiAgICAgZGVmIGFzc2VydF9za2lwcGVkX2ZpbGVfc2Vh cmNoX3BhdGhzKHNlbGYsIHBvcnRfbmFtZSwgZXhwZWN0ZWRfcGF0aHMsIHVzZV93ZWJraXQyPUZh bHNlKToKQEAgLTUwLDE2ICs1MCwxNSBAQCBjbGFzcyBNYWNUZXN0KHBvcnRfdGVzdGNhc2UuUG9y dFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5tYWtlX3BvcnQob3B0 aW9ucz1Nb2NrT3B0aW9ucyhndWFyZF9tYWxsb2M9VHJ1ZSkpLmRlZmF1bHRfdGltZW91dF9tcygp LCAzNTAwMDApCiAKICAgICBkZWYgdGVzdF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKHNlbGYp OgorICAgICAgICAjIFdlIHNob3VsZCBoYXZlIHR3byBza2lwcGVkIGZpbGVzIC0gcGxhdGZvcm0r dmVyc2lvbiBhbmQgcGxhdGZvcm07IGhvd2V2ZXIsIHdlIGRvbid0CisgICAgICAgICMgaGF2ZSBw bGF0Zm9ybSt2ZXJzaW9uIGZvciBlaXRoZXIgdGhlIG1vc3QgcmVjZW50IHZlcnNpb24gb3IgbWFj LWZ1dHVyZS4KICAgICAgICAgc2VsZi5hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygn bWFjLXNub3dsZW9wYXJkJywgc2V0KFsnbWFjLXNub3dsZW9wYXJkJywgJ21hYyddKSkKLSAgICAg ICAgc2VsZi5hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFjLWxlb3BhcmQnLCBz ZXQoWydtYWMtbGVvcGFyZCcsICdtYWMnXSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0X3NraXBwZWRf ZmlsZV9zZWFyY2hfcGF0aHMoJ21hYy1saW9uJywgc2V0KFsnbWFjLWxpb24nLCAnbWFjJ10pKQot Ci0gICAgICAgICMgTm90ZSB0aGF0IHRoZXJlIGlzIG5vIHBsYXRmb3JtL21hYy1mdXR1cmUvU2tp cHBlZC4KKyAgICAgICAgc2VsZi5hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocygnbWFj LW1vdW50YWlubGlvbicsIHNldChbJ21hYyddKSkKICAgICAgICAgc2VsZi5hc3NlcnRfc2tpcHBl ZF9maWxlX3NlYXJjaF9wYXRocygnbWFjLWZ1dHVyZScsIHNldChbJ21hYyddKSkKIAogICAgICAg ICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKCdtYWMtc25vd2xlb3BhcmQn LCBzZXQoWydtYWMtc25vd2xlb3BhcmQnLCAnbWFjJywgJ21hYy13azInLCAnd2syJ10pLCB1c2Vf d2Via2l0Mj1UcnVlKQotICAgICAgICBzZWxmLmFzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3Bh dGhzKCdtYWMtbGVvcGFyZCcsIHNldChbJ21hYy1sZW9wYXJkJywgJ21hYycsICdtYWMtd2syJywg J3drMiddKSwgdXNlX3dlYmtpdDI9VHJ1ZSkKLSAgICAgICAgc2VsZi5hc3NlcnRfc2tpcHBlZF9m aWxlX3NlYXJjaF9wYXRocygnbWFjLWxpb24nLCBzZXQoWydtYWMtbGlvbicsICdtYWMnLCAnbWFj LXdrMicsICd3azInXSksIHVzZV93ZWJraXQyPVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0X3Nr aXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoJ21hYy1saW9uJywgc2V0KFsnbWFjJywgJ21hYy1saW9u JywgJ21hYy13azInLCAnd2syJ10pLCB1c2Vfd2Via2l0Mj1UcnVlKQogICAgICAgICBzZWxmLmFz c2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKCdtYWMtZnV0dXJlJywgc2V0KFsnbWFjJywg J21hYy13azInLCAnd2syJ10pLCB1c2Vfd2Via2l0Mj1UcnVlKQogCiAKQEAgLTExMCw0MSArMTA5 LDIyIEBAIGphdmEvCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LnZlcnNpb24oKSkKIAog ICAgIGRlZiB0ZXN0X3ZlcnNpb25zKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdt YWMnLCAnbGVvcGFyZCcsICdtYWMtbGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUo J21hYy1sZW9wYXJkJywgJ3RpZ2VyJywgJ21hYy1sZW9wYXJkJykKLSAgICAgICAgc2VsZi5hc3Nl cnRfbmFtZSgnbWFjLWxlb3BhcmQnLCAnbGVvcGFyZCcsICdtYWMtbGVvcGFyZCcpCi0gICAgICAg IHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1sZW9wYXJkJywgJ3Nub3dsZW9wYXJkJywgJ21hYy1sZW9w YXJkJykKLQorICAgICAgICAjIE5vdGU6IHRoZXNlIHRlc3RzIGRvbid0IG5lZWQgdG8gYmUgZXho YXVzdGl2ZSBhcyBsb25nIGFzIHdlIGdldCBwYXRoIGNvdmVyYWdlLgogICAgICAgICBzZWxmLmFz c2VydF9uYW1lKCdtYWMnLCAnc25vd2xlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJykKLSAgICAg ICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLXNub3dsZW9wYXJkJywgJ3RpZ2VyJywgJ21hYy1zbm93 bGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1zbm93bGVvcGFyZCcsICds ZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21h Yy1zbm93bGVvcGFyZCcsICdzbm93bGVvcGFyZCcsICdtYWMtc25vd2xlb3BhcmQnKQorICAgICAg ICBzZWxmLmFzc2VydF9uYW1lKCdtYWMtc25vd2xlb3BhcmQnLCAnbGlvbicsICdtYWMtc25vd2xl b3BhcmQnKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYycsICdsaW9uJywgJ21hYy1s aW9uJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLWxpb24nLCAnbGlvbicsICdtYWMt bGlvbicpCiAKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjJywgJ21vdW50YWlubGlvbics ICdtYWMtbW91bnRhaW5saW9uJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLW1vdW50 YWlubGlvbicsICdsaW9uJywgJ21hYy1tb3VudGFpbmxpb24nKQorCiAgICAgICAgIHNlbGYuYXNz ZXJ0X25hbWUoJ21hYycsICdmdXR1cmUnLCAnbWFjLWZ1dHVyZScpCiAgICAgICAgIHNlbGYuYXNz ZXJ0X25hbWUoJ21hYy1mdXR1cmUnLCAnZnV0dXJlJywgJ21hYy1mdXR1cmUnKQogCiAgICAgICAg IHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFzc2VydF9uYW1lLCAnbWFj LXRpZ2VyJywgJ2xlb3BhcmQnLCAnbWFjLWxlb3BhcmQnKQogCi0KLSAgICBkZWYgdGVzdF9pc192 ZXJzaW9uX21ldGhvZHMoc2VsZik6Ci0gICAgICAgIGxlb3BhcmRfcG9ydCA9IHNlbGYubWFrZV9w b3J0KHBvcnRfbmFtZT0nbWFjLWxlb3BhcmQnKQotICAgICAgICBzZWxmLmFzc2VydFRydWUobGVv cGFyZF9wb3J0LmlzX2xlb3BhcmQoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShsZW9wYXJk X3BvcnQuaXNfc25vd2xlb3BhcmQoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShsZW9wYXJk X3BvcnQuaXNfbGlvbigpKQotCi0gICAgICAgIHNub3dsZW9wYXJkX3BvcnQgPSBzZWxmLm1ha2Vf cG9ydChwb3J0X25hbWU9J21hYy1zbm93bGVvcGFyZCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0RmFs c2Uoc25vd2xlb3BhcmRfcG9ydC5pc19sZW9wYXJkKCkpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShzbm93bGVvcGFyZF9wb3J0LmlzX3Nub3dsZW9wYXJkKCkpCi0gICAgICAgIHNlbGYuYXNzZXJ0 RmFsc2Uoc25vd2xlb3BhcmRfcG9ydC5pc19saW9uKCkpCi0KLSAgICAgICAgbGlvbl9wb3J0ID0g c2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPSdtYWMtbGlvbicpCi0gICAgICAgIHNlbGYuYXNzZXJ0 RmFsc2UobGlvbl9wb3J0LmlzX2xlb3BhcmQoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShs aW9uX3BvcnQuaXNfc25vd2xlb3BhcmQoKSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGxpb25f cG9ydC5pc19saW9uKCkpCi0KICAgICBkZWYgdGVzdF9zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIo c2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25z KGxlYWtzPVRydWUsIGd1YXJkX21hbGxvYz1UcnVlKSkKICAgICAgICAgZW52ID0gcG9ydC5zZXR1 cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIocG9ydC5kcml2ZXJfbmFtZSgpKQpAQCAtMTU4LDE4ICsxMzgs MTQgQEAgamF2YS8KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5iYXNlbGluZV9zZWFy Y2hfcGF0aCgpLCBhYnNvbHV0ZV9zZWFyY2hfcGF0aHMpCiAKICAgICBkZWYgdGVzdF9iYXNlbGlu ZV9zZWFyY2hfcGF0aChzZWxmKToKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCdt YWMtbGVvcGFyZCcsICdtYWMtbGVvcGFyZCcsIFsnbWFjLWxlb3BhcmQnLCAnbWFjLXNub3dsZW9w YXJkJywgJ21hYy1saW9uJywgJ21hYyddKQorICAgICAgICAjIE5vdGUgdGhhdCB3ZSBkb24ndCBu ZWVkIHRvdGFsIGNvdmVyYWdlIGhlcmUsIGp1c3QgcGF0aCBjb3ZlcmFnZSwgc2luY2UgdGhpcyBp cyBhbGwgZGF0YSBkcml2ZW4uCiAgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFj LXNub3dsZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcsIFsnbWFjLXNub3dsZW9wYXJkJywgJ21h Yy1saW9uJywgJ21hYyddKQotCi0gICAgICAgICMgTm90ZSB0aGF0IG1hYy1saW9uIHdyaXRlcyBi YXNlbGluZXMgaW50byBtYWMsIG5vdCBtYWMtbGlvbiEgKGJ1dCBpdCB3aWxsIHJlYWQgZnJvbSBt YWMtbGlvbikKLSAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCdtYWMtbGlvbicsICdt YWMnLCBbJ21hYy1saW9uJywgJ21hYyddKQotCi0gICAgICAgICMgTm90ZSB0aGF0IHRoZXJlIGlz IG5vICdtYWMtZnV0dXJlJzsgaXQgdXNlcyB0aGUgJ21hYycgZGlyZWN0b3J5IGFzIHdlbGwuCisg ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWxpb24nLCAnbWFjLWxpb24nLCBb J21hYy1saW9uJywgJ21hYyddKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoJ21h Yy1tb3VudGFpbmxpb24nLCAnbWFjJywgWydtYWMnXSkKICAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKCdtYWMtZnV0dXJlJywgJ21hYycsIFsnbWFjJ10pCi0KLSAgICAgICAgc2VsZi5f YXNzZXJ0X3NlYXJjaF9wYXRoKCdtYWMtbGVvcGFyZCcsICdtYWMtd2syJywgWydtYWMtd2syJywg J21hYy1sZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcsICdtYWMtbGlvbicsICdtYWMnXSwgdXNl X3dlYmtpdDI9VHJ1ZSkKICAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKCdtYWMtc25v d2xlb3BhcmQnLCAnbWFjLXdrMicsIFsnbWFjLXdrMicsICdtYWMtc25vd2xlb3BhcmQnLCAnbWFj LWxpb24nLCAnbWFjJ10sIHVzZV93ZWJraXQyPVRydWUpCiAgICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aCgnbWFjLWxpb24nLCAnbWFjLXdrMicsIFsnbWFjLXdrMicsICdtYWMtbGlvbics ICdtYWMnXSwgdXNlX3dlYmtpdDI9VHJ1ZSkKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9w YXRoKCdtYWMtbW91bnRhaW5saW9uJywgJ21hYy13azInLCBbJ21hYy13azInLCAnbWFjJ10sIHVz ZV93ZWJraXQyPVRydWUpCiAgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aCgnbWFjLWZ1 dHVyZScsICdtYWMtd2syJywgWydtYWMtd2syJywgJ21hYyddLCB1c2Vfd2Via2l0Mj1UcnVlKQog CiAgICAgZGVmIHRlc3Rfc2hvd19yZXN1bHRzX2h0bWxfZmlsZShzZWxmKToKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKaW5kZXggMjg0NjViZmYz Nzk4OWI5NzJjZmNiODkzNDE0MDZkODMwNzY2YTYwZi4uZmY0NzNmZWMyNDgxMjJkM2YyNTg3Nzg5 MjZjYzA4Y2QwNWM1MTk2ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC93aW4ucHkKQEAgLTQyLDkgKzQyLDcgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9n Z2VyKF9fbmFtZV9fKQogY2xhc3MgV2luUG9ydChBcHBsZVBvcnQpOgogICAgIHBvcnRfbmFtZSA9 ICJ3aW4iCiAKLSAgICAjIFRoaXMgaXMgYSBsaXN0IG9mIGFsbCBzdXBwb3J0ZWQgT1MtVkVSU0lP TiBwYWlycyBmb3IgdGhlIEFwcGxlV2luIHBvcnQKLSAgICAjIGFuZCB0aGUgb3JkZXIgb2YgZmFs bGJhY2sgYmV0d2VlbiB0aGVtLiAgTWF0Y2hlcyBPUldULgotICAgIFZFUlNJT05fRkFMTEJBQ0tf T1JERVIgPSBbIndpbi14cCIsICJ3aW4tdmlzdGEiLCAid2luLTdzcDAiLCAid2luIl0KKyAgICBW RVJTSU9OX0ZBTExCQUNLX09SREVSID0gWyJ3aW4teHAiLCAid2luLXZpc3RhIiwgIndpbi03c3Aw IiwgIndpbi13aW43Il0KIAogICAgIEFSQ0hJVEVDVFVSRVMgPSBbJ3g4NiddCiAKQEAgLTYzLDgg KzYxLDEwIEBAIGNsYXNzIFdpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgcmV0dXJuIGV4cGVj dGVkX3RleHQgIT0gYWN0dWFsX3RleHQKIAogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJj aF9wYXRoKHNlbGYpOgotICAgICAgICBmYWxsYmFja19pbmRleCA9IHNlbGYuVkVSU0lPTl9GQUxM QkFDS19PUkRFUi5pbmRleChzZWxmLl9wb3J0X25hbWVfd2l0aF92ZXJzaW9uKCkpCi0gICAgICAg IGZhbGxiYWNrX25hbWVzID0gbGlzdChzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVJbZmFsbGJh Y2tfaW5kZXg6XSkKKyAgICAgICAgaWYgc2VsZi5fbmFtZS5lbmRzd2l0aChzZWxmLkZVVFVSRV9W RVJTSU9OKToKKyAgICAgICAgICAgIGZhbGxiYWNrX25hbWVzID0gW3NlbGYucG9ydF9uYW1lXQor ICAgICAgICBlbHNlOgorICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBzZWxmLlZFUlNJT05f RkFMTEJBQ0tfT1JERVJbc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSLmluZGV4KHNlbGYuX25h bWUpOi0xXSArIFtzZWxmLnBvcnRfbmFtZV0KICAgICAgICAgIyBGSVhNRTogVGhlIEFwcGxlV2lu IHBvcnQgZmFsbHMgYmFjayB0byBBcHBsZU1hYyBmb3Igc29tZSByZXN1bHRzLiAgRXZlbnR1YWxs eSB3ZSdsbCBoYXZlIGEgc2hhcmVkICdhcHBsZScgcG9ydC4KICAgICAgICAgaWYgc2VsZi5nZXRf b3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgIGZhbGxiYWNrX25hbWVz Lmluc2VydCgwLCAnd2luLXdrMicpCg==