53719 2011-02-03 15:02:23 -0800 new-run-webkit-tests: fix handling of port_names, options parsing 2011-02-03 16:15:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke dglazkov eric mihaip ojan tony oldest_to_newest 345029 0 dpranke 2011-02-03 15:02:23 -0800 new-run-webkit-tests: fix handling of port_names, options parsing 345036 1 81118 dpranke 2011-02-03 15:07:54 -0800 Created attachment 81118 Patch 345073 2 81118 mihaip 2011-02-03 15:45:11 -0800 Comment on attachment 81118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81118&action=review > Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:43 > + def test_get_chromium_gpu__on_linux(self): Nit: Did you really mean to have two underscores after gpu (same thing below). 345075 3 dpranke 2011-02-03 15:46:48 -0800 (In reply to comment #2) > (From update of attachment 81118 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=81118&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:43 > > + def test_get_chromium_gpu__on_linux(self): > > Nit: Did you really mean to have two underscores after gpu (same thing below). Yes, I often try to do that to help distinguish the function or method being tested from some aspect of the test. 345103 4 dpranke 2011-02-03 16:15:27 -0800 Committed r77551: <http://trac.webkit.org/changeset/77551> 81118 2011-02-03 15:07:54 -0800 2011-02-03 15:45:11 -0800 Patch bug-53719-20110203150753.patch text/plain 9723 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0Y2Nl NzJmZTI5M2Y1NzdhNTAyMDEyNTM3YjM0MDRjYWRjN2Q4NjliLi43MDJhZmY1M2YzMDBlOGMzMTVm YzcyYTlkMmM3NWU3MjAzODA0Mjk1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDItMDMgIERpcmsgUHJhbmtl ICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHM6IEZpeCBidWcgaW50cm9kdWNl ZCBpbiByNzc0MzQgdGhhdCB3YXMKKyAgICAgICAgY2F1c2luZyB1cyB0byBydW4gdGhlIGNhbnZh cyBHUFUgdGVzdHMgb24gdGhlIE1hYyBHUFUgcG9ydC4gVGhpcworICAgICAgICBidWcgcmV2ZWFs ZWQgdGhhdCB3ZSB3ZXJlIG5vdCBzZXR0aW5nIHRoZSBwb3J0Lm5hbWUoKSBmaWVsZAorICAgICAg ICBwcm9wZXJseSBpbiBtYW55IGNhc2VzLCBzbyBJJ3ZlIGNsZWFuZWQgdXAgYWxsIG9mIHRoYXQg Y29kZSwgYW5kCisgICAgICAgIHJlbW92ZWQgYSBmZXcgY29tbWVudHMgYWJvdXQgInZlcnNpb24t c3BlY2lmaWMiIEdQVSBwb3J0cyB0aGF0CisgICAgICAgIGRvbid0IGV4aXN0IGFuZCBqdXN0IGNv bmZ1c2VkIHRoaW5ncy4KKworICAgICAgICBUZXN0aW5nIGFsc28gcmV2ZWFsZWQgdGhhdCBwb3J0 LmFic3BhdGhfZm9yX3Rlc3QoKSB3YXNuJ3QKKyAgICAgICAgbm9ybWFsaXppbmcgcGF0aHMgb24g V2luZG93cyBwcm9wZXJseSwgc28gSSBmaXhlZCB0aGF0IGFzIHdlbGwuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNzE5CisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRl c3QucHk6CisKIDIwMTEtMDItMDIgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggZDJjMzM3MGQ0NjEyOTVjNGFk NWU1ZDI5ZmU3MjliMWIzYTc0YzgwNS4uYWQxY2Q3YWZkNTExYThjNjA3OTAwZjg5MTgwMGNlYTIy MGNlMjMxMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQpAQCAtNTA3LDggKzUwNyw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBk ZWYgYWJzcGF0aF9mb3JfdGVzdChzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICAiIiJSZXR1cm5z IHRoZSBmdWxsIHBhdGggdG8gdGhlIGZpbGUgZm9yIGEgZ2l2ZW4gdGVzdCBuYW1lLiBUaGlzIGlz IHRoZQogICAgICAgICBpbnZlcnNlIG9mIHJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUoKS4iIiIKLSAg ICAgICAgIyBGSVhNRTogSXMgdGhpcyBoYW5kbGluZyB3aW5kb3dzLXN0eWxlIGFic3BhdGhzIGNv cnJlY3RseT8KLSAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLmxheW91 dF90ZXN0c19kaXIoKSwgdGVzdF9uYW1lKQorICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3Rl bS5ub3JtcGF0aChzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5sYXlvdXRfdGVzdHNfZGlyKCks IHRlc3RfbmFtZSkpCiAKICAgICBkZWYgcmVzdWx0c19kaXJlY3Rvcnkoc2VsZik6CiAgICAgICAg ICIiIkFic29sdXRlIHBhdGggdG8gdGhlIHBsYWNlIHRvIHN0b3JlIHRoZSB0ZXN0IHJlc3VsdHMu IiIiCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2dwdS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fZ3B1LnB5CmluZGV4IDI4ZTI2ODI2OWQ5YmY4YzQzMDY3MWU2NTczZjEzNzZh YzBhZmE0YjMuLjk2ODBmNzA1NWUwNmE4NTRkMjRiODM3ZjY2ZDVlM2RiNDlkZWZjMTQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f Z3B1LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fZ3B1LnB5CkBAIC0zMiw0OCArMzIsNDMgQEAgaW1wb3J0IGNocm9taXVtX3dpbgogCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCB0ZXN0X2ZpbGVzCiAKLWRlZiBn ZXQoKiprd2FyZ3MpOgorCitkZWYgZ2V0KHBsYXRmb3JtPU5vbmUsIHBvcnRfbmFtZT0nY2hyb21p dW0tZ3B1JywgKiprd2FyZ3MpOgogICAgICIiIlNvbWUgdGVzdHMgaGF2ZSBzbGlnaHRseSBkaWZm ZXJlbnQgcmVzdWx0cyB3aGVuIHJ1biB3aGlsZSB1c2luZwogICAgIGhhcmR3YXJlIGFjY2VsZXJh dGlvbi4gIEluIHRob3NlIGNhc2VzLCB3ZSBwcmVwZW5kIGFuIGFkZGl0aW9uYWwgZGlyZWN0b3J5 CiAgICAgdG8gdGhlIGJhc2VsaW5lIHBhdGhzLiIiIgotICAgIHBvcnRfbmFtZSA9IGt3YXJncy5n ZXQoJ3BvcnRfbmFtZScsIE5vbmUpCisgICAgcGxhdGZvcm0gPSBwbGF0Zm9ybSBvciBzeXMucGxh dGZvcm0KICAgICBpZiBwb3J0X25hbWUgPT0gJ2Nocm9taXVtLWdwdSc6Ci0gICAgICAgIGlmIHN5 cy5wbGF0Zm9ybSBpbiAoJ2N5Z3dpbicsICd3aW4zMicpOgorICAgICAgICBpZiBwbGF0Zm9ybSBp biAoJ2N5Z3dpbicsICd3aW4zMicpOgogICAgICAgICAgICAgcG9ydF9uYW1lID0gJ2Nocm9taXVt LWdwdS13aW4nCi0gICAgICAgIGVsaWYgc3lzLnBsYXRmb3JtID09ICdsaW51eDInOgorICAgICAg ICBlbGlmIHBsYXRmb3JtID09ICdsaW51eDInOgogICAgICAgICAgICAgcG9ydF9uYW1lID0gJ2No cm9taXVtLWdwdS1saW51eCcKLSAgICAgICAgZWxpZiBzeXMucGxhdGZvcm0gPT0gJ2Rhcndpbic6 CisgICAgICAgIGVsaWYgcGxhdGZvcm0gPT0gJ2Rhcndpbic6CiAgICAgICAgICAgICBwb3J0X25h bWUgPSAnY2hyb21pdW0tZ3B1LW1hYycKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHJhaXNl IE5vdEltcGxlbWVudGVkRXJyb3IoJ3Vuc3VwcG9ydGVkIHBsYXRmb3JtOiAlcycgJQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeXMucGxhdGZvcm0pCisgICAgICAgICAg ICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCd1bnN1cHBvcnRlZCBwbGF0Zm9ybTogJXMnICUg cGxhdGZvcm0pCiAKLSAgICAjIEZJWE1FOiBoYW5kbGUgdmVyc2lvbi1zcGVjaWZpYyB2YXJpYW50 cy4KICAgICBpZiBwb3J0X25hbWUgPT0gJ2Nocm9taXVtLWdwdS1saW51eCc6Ci0gICAgICAgIHJl dHVybiBDaHJvbWl1bUdwdUxpbnV4UG9ydCgqKmt3YXJncykKLQotICAgIGlmIHBvcnRfbmFtZS5z dGFydHN3aXRoKCdjaHJvbWl1bS1ncHUtbWFjJyk6Ci0gICAgICAgIHJldHVybiBDaHJvbWl1bUdw dU1hY1BvcnQoKiprd2FyZ3MpCi0KLSAgICBpZiBwb3J0X25hbWUuc3RhcnRzd2l0aCgnY2hyb21p dW0tZ3B1LXdpbicpOgotICAgICAgICByZXR1cm4gQ2hyb21pdW1HcHVXaW5Qb3J0KCoqa3dhcmdz KQotCisgICAgICAgIHJldHVybiBDaHJvbWl1bUdwdUxpbnV4UG9ydChwb3J0X25hbWU9cG9ydF9u YW1lLCAqKmt3YXJncykKKyAgICBpZiBwb3J0X25hbWUgPT0gJ2Nocm9taXVtLWdwdS1tYWMnOgor ICAgICAgICByZXR1cm4gQ2hyb21pdW1HcHVNYWNQb3J0KHBvcnRfbmFtZT1wb3J0X25hbWUsICoq a3dhcmdzKQorICAgIGlmIHBvcnRfbmFtZSA9PSAnY2hyb21pdW0tZ3B1LXdpbic6CisgICAgICAg IHJldHVybiBDaHJvbWl1bUdwdVdpblBvcnQocG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3Mp CiAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigndW5zdXBwb3J0ZWQgcG9ydDogJXMnICUg cG9ydF9uYW1lKQogCiAKICMgRklYTUU6IFRoZXNlIHNob3VsZCByZWFsbHkgYmUgYSBtaXhpbiBj bGFzcy4KIAotZGVmIF9zZXRfZ3B1X29wdGlvbnMob3B0aW9ucyk6Ci0gICAgaWYgb3B0aW9uczoK LSAgICAgICAgaWYgb3B0aW9ucy5hY2NlbGVyYXRlZF9jb21wb3NpdGluZyBpcyBOb25lOgotICAg ICAgICAgICAgb3B0aW9ucy5hY2NlbGVyYXRlZF9jb21wb3NpdGluZyA9IFRydWUKLSAgICAgICAg aWYgb3B0aW9ucy5hY2NlbGVyYXRlZF8yZF9jYW52YXMgaXMgTm9uZToKLSAgICAgICAgICAgIG9w dGlvbnMuYWNjZWxlcmF0ZWRfMmRfY2FudmFzID0gVHJ1ZQorZGVmIF9zZXRfZ3B1X29wdGlvbnMo cG9ydCk6CisgICAgaWYgcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRlZF9jb21wb3NpdGluZycp IGlzIE5vbmU6CisgICAgICAgIHBvcnQuX29wdGlvbnMuYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmcg PSBUcnVlCisgICAgaWYgcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRlZF8yZF9jYW52YXMnKSBp cyBOb25lOgorICAgICAgICBwb3J0Ll9vcHRpb25zLmFjY2VsZXJhdGVkXzJkX2NhbnZhcyA9IFRy dWUKIAotICAgICAgICAjIEZJWE1FOiBSZW1vdmUgdGhpcyBhZnRlciBodHRwOi8vY29kZXJldmll dy5jaHJvbWl1bS5vcmcvNTEzMzAwMS8gaXMgZW5hYmxlZAotICAgICAgICAjIG9uIHRoZSBib3Rz LgotICAgICAgICBpZiBvcHRpb25zLmJ1aWxkZXJfbmFtZSBpcyBub3QgTm9uZSBhbmQgbm90ICcg LSBHUFUnIGluIG9wdGlvbnMuYnVpbGRlcl9uYW1lOgotICAgICAgICAgICAgb3B0aW9ucy5idWls ZGVyX25hbWUgPSBvcHRpb25zLmJ1aWxkZXJfbmFtZSArICcgLSBHUFUnCisgICAgIyBGSVhNRTog UmVtb3ZlIHRoaXMgYWZ0ZXIgaHR0cDovL2NvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzUxMzMwMDEv IGlzIGVuYWJsZWQKKyAgICAjIG9uIHRoZSBib3RzLgorICAgIGlmIHBvcnQuZ2V0X29wdGlvbign YnVpbGRlcl9uYW1lJykgaXMgbm90IE5vbmUgYW5kIG5vdCAnIC0gR1BVJyBpbiBwb3J0Ll9vcHRp b25zLmJ1aWxkZXJfbmFtZToKKyAgICAgICAgcG9ydC5fb3B0aW9ucy5idWlsZGVyX25hbWUgKz0g JyAtIEdQVScKIAogCiBkZWYgX2dwdV9vdmVycmlkZXMocG9ydCk6CkBAIC05OCwxMCArOTMsOSBA QCBkZWYgX3Rlc3RzKHBvcnQsIHBhdGhzKToKIAogCiBjbGFzcyBDaHJvbWl1bUdwdUxpbnV4UG9y dChjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxpbnV4UG9ydCk6Ci0gICAgZGVmIF9faW5pdF9fKHNl bGYsICoqa3dhcmdzKToKLSAgICAgICAga3dhcmdzLnNldGRlZmF1bHQoJ3BvcnRfbmFtZScsICdj aHJvbWl1bS1ncHUtbGludXgnKQotICAgICAgICBfc2V0X2dwdV9vcHRpb25zKGt3YXJncy5nZXQo J29wdGlvbnMnKSkKLSAgICAgICAgY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQuX19p bml0X18oc2VsZiwgKiprd2FyZ3MpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfbmFtZT0n Y2hyb21pdW0tZ3B1LWxpbnV4JywgKiprd2FyZ3MpOgorICAgICAgICBjaHJvbWl1bV9saW51eC5D aHJvbWl1bUxpbnV4UG9ydC5fX2luaXRfXyhzZWxmLCBwb3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3 YXJncykKKyAgICAgICAgX3NldF9ncHVfb3B0aW9ucyhzZWxmKQogCiAgICAgZGVmIGJhc2VsaW5l X3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICAjIE1pbWljIHRoZSBMaW51eCAtPiBXaW4gZXhw ZWN0YXRpb25zIGZhbGxiYWNrIGluIHRoZSBvcmRpbmFyeSBDaHJvbWl1bSBwb3J0LgpAQCAtMTIz LDEwICsxMTcsOSBAQCBjbGFzcyBDaHJvbWl1bUdwdUxpbnV4UG9ydChjaHJvbWl1bV9saW51eC5D aHJvbWl1bUxpbnV4UG9ydCk6CiAKIAogY2xhc3MgQ2hyb21pdW1HcHVNYWNQb3J0KGNocm9taXVt X21hYy5DaHJvbWl1bU1hY1BvcnQpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6 Ci0gICAgICAgIGt3YXJncy5zZXRkZWZhdWx0KCdwb3J0X25hbWUnLCAnY2hyb21pdW0tZ3B1LW1h YycpCi0gICAgICAgIF9zZXRfZ3B1X29wdGlvbnMoa3dhcmdzLmdldCgnb3B0aW9ucycpKQotICAg ICAgICBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0Ll9faW5pdF9fKHNlbGYsICoqa3dhcmdz KQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0X25hbWU9J2Nocm9taXVtLWdwdS1tYWMnLCAq Kmt3YXJncyk6CisgICAgICAgIGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQuX19pbml0X18o c2VsZiwgcG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCisgICAgICAgIF9zZXRfZ3B1X29w dGlvbnMoc2VsZikKIAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAg ICAgcmV0dXJuIChtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIFsnY2hyb21pdW0tZ3B1 LW1hYycsICdjaHJvbWl1bS1ncHUnXSkgKwpAQCAtMTQ3LDEwICsxNDAsOSBAQCBjbGFzcyBDaHJv bWl1bUdwdU1hY1BvcnQoY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydCk6CiAKIAogY2xhc3Mg Q2hyb21pdW1HcHVXaW5Qb3J0KGNocm9taXVtX3dpbi5DaHJvbWl1bVdpblBvcnQpOgotICAgIGRl ZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6Ci0gICAgICAgIGt3YXJncy5zZXRkZWZhdWx0KCdw b3J0X25hbWUnLCAnY2hyb21pdW0tZ3B1LXdpbicgKyBzZWxmLnZlcnNpb24oKSkKLSAgICAgICAg X3NldF9ncHVfb3B0aW9ucyhrd2FyZ3MuZ2V0KCdvcHRpb25zJykpCi0gICAgICAgIGNocm9taXVt X3dpbi5DaHJvbWl1bVdpblBvcnQuX19pbml0X18oc2VsZiwgKiprd2FyZ3MpCisgICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBvcnRfbmFtZT0nY2hyb21pdW0tZ3B1LXdpbicsICoqa3dhcmdzKToKKyAg ICAgICAgY2hyb21pdW1fd2luLkNocm9taXVtV2luUG9ydC5fX2luaXRfXyhzZWxmLCBwb3J0X25h bWU9cG9ydF9uYW1lLCAqKmt3YXJncykKKyAgICAgICAgX3NldF9ncHVfb3B0aW9ucyhzZWxmKQog CiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gKG1h cChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgWydjaHJvbWl1bS1ncHUtd2luJywgJ2Nocm9t aXVtLWdwdSddKSArCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX2dwdV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5CmluZGV4IGQxZjFh OWFiODI3NWE5Yzc5Zjc0ZWQzNzkwMjcyYzU0MmQ1YWZlNTQuLmY3YzU2ZWJmOGIzMzFkMTI0MDc5 OWNjMmQzMThhZTYzODM2MGVhMDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5 CkBAIC00MCwyMCArNDAsMzQgQEAgY2xhc3MgQ2hyb21pdW1HcHVUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICBkZWYgdGVzdF9nZXRfY2hyb21pdW1fZ3B1X3dpbihzZWxmKToKICAgICAgICAg c2VsZi5hc3NlcnRPdmVycmlkZXNXb3JrZWQoJ2Nocm9taXVtLWdwdS13aW4nKQogCi0gICAgZGVm IGFzc2VydE92ZXJyaWRlc1dvcmtlZChzZWxmLCBwb3J0X25hbWUpOgorICAgIGRlZiB0ZXN0X2dl dF9jaHJvbWl1bV9ncHVfX29uX2xpbnV4KHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydE92ZXJy aWRlc1dvcmtlZCgnY2hyb21pdW0tZ3B1LWxpbnV4JywgJ2Nocm9taXVtLWdwdScsICdsaW51eDIn KQorCisgICAgZGVmIHRlc3RfZ2V0X2Nocm9taXVtX2dwdV9fb25fbWFjKHNlbGYpOgorICAgICAg ICBzZWxmLmFzc2VydE92ZXJyaWRlc1dvcmtlZCgnY2hyb21pdW0tZ3B1LW1hYycsICdjaHJvbWl1 bS1ncHUnLCAnZGFyd2luJykKKworICAgIGRlZiB0ZXN0X2dldF9jaHJvbWl1bV9ncHVfX29uX3dp bihzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRPdmVycmlkZXNXb3JrZWQoJ2Nocm9taXVtLWdw dS13aW4nLCAnY2hyb21pdW0tZ3B1JywgJ3dpbjMyJykKKyAgICAgICAgc2VsZi5hc3NlcnRPdmVy cmlkZXNXb3JrZWQoJ2Nocm9taXVtLWdwdS13aW4nLCAnY2hyb21pdW0tZ3B1JywgJ2N5Z3dpbicp CisKKyAgICBkZWYgYXNzZXJ0T3ZlcnJpZGVzV29ya2VkKHNlbGYsIHBvcnRfbmFtZSwgaW5wdXRf bmFtZT1Ob25lLCBwbGF0Zm9ybT1Ob25lKToKICAgICAgICAgIyB0ZXN0IHRoYXQgd2UgZ290IHRo ZSByaWdodCBwb3J0CiAgICAgICAgIG1vY2tfb3B0aW9ucyA9IG1vY2t0b29sLk1vY2tPcHRpb25z KGFjY2VsZXJhdGVkX2NvbXBvc2l0aW5nPU5vbmUsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFjY2VsZXJhdGVkXzJkX2NhbnZhcz1Ob25lLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWlsZGVyX25hbWU9J2ZvbycsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkX3Byb2Nlc3Nl cz1Ob25lKQotICAgICAgICBwb3J0ID0gY2hyb21pdW1fZ3B1LmdldChwb3J0X25hbWU9cG9ydF9u YW1lLCBvcHRpb25zPW1vY2tfb3B0aW9ucykKKyAgICAgICAgaWYgaW5wdXRfbmFtZSBhbmQgcGxh dGZvcm06CisgICAgICAgICAgICBwb3J0ID0gY2hyb21pdW1fZ3B1LmdldChwbGF0Zm9ybT1wbGF0 Zm9ybSwgcG9ydF9uYW1lPWlucHV0X25hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBvcHRpb25zPW1vY2tfb3B0aW9ucykKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAg IHBvcnQgPSBjaHJvbWl1bV9ncHUuZ2V0KHBvcnRfbmFtZT1wb3J0X25hbWUsIG9wdGlvbnM9bW9j a19vcHRpb25zKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5fb3B0aW9ucy5hY2NlbGVy YXRlZF9jb21wb3NpdGluZykKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX29wdGlvbnMu YWNjZWxlcmF0ZWRfMmRfY2FudmFzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGVm YXVsdF9jaGlsZF9wcm9jZXNzZXMoKSwgMSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0 Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSwgJ2ZvbyAtIEdQVScpCiAKLSAgICAgICAgIyB3ZSB1c2Ug c3RhcnRzd2l0aCgpIGluc3RlYWQgb2YgRXF1YWwgdG8gZ2xvc3Mgb3ZlciBwbGF0Zm9ybSB2ZXJz aW9ucy4KLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQubmFtZSgpLnN0YXJ0c3dpdGgocG9y dF9uYW1lKSkKKyAgICAgICAgIyBXZSBkb24ndCBzdXBwb3J0IHBsYXRmb3JtLXNwZWNpZmljIHZl cnNpb25zIG9mIHRoZSBHUFUgcG9ydCB5ZXQuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9y dC5uYW1lKCksIHBvcnRfbmFtZSkKIAogICAgICAgICAjIHRlc3QgdGhhdCBpdCBoYXMgdGhlIHJp Z2h0IGRpcmVjdG9yaWVzIGluIGZyb250IG9mIHRoZSBzZWFyY2ggcGF0aC4KICAgICAgICAgcGF0 aHMgPSBwb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKCkK