59761 2011-04-28 16:37:45 -0700 fix pretty_patch_available and wdiff_available 2011-04-29 12:17:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan dpranke eric tony oldest_to_newest 394898 0 ojan 2011-04-28 16:37:45 -0700 fix pretty_patch_available and wdiff_available 394903 1 91588 ojan 2011-04-28 16:39:41 -0700 Created attachment 91588 Patch 394916 2 91588 tony 2011-04-28 16:47:43 -0700 Comment on attachment 91588 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91588&action=review > Tools/Scripts/webkitpy/layout_tests/port/base.py:211 > + def check_wdiff(self, logging=True): > + return False What is the logging param for? > Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py:110 > - result = self._check_wdiff_install() and result > + result = self.check_wdiff() and result I think mac can use wdiff too. 394920 3 dpranke 2011-04-28 16:52:42 -0700 Patch looks like it's along the lines we discussed and so generally looks fine, but it needs to be implemented more broadly or I'm worried about the inconsistencies that might arise (shouldn't be much additional work). See the specific comments. > Tools/Scripts/webkitpy/layout_tests/port/base.py:211 > + return False wdiff actually exists (or can) on nearly every port, so we need to provide a better default implementation. There's also a _check_wdiff in chromium_mac that should be renamed, and you should probably add a check_wdiff() call to the chromium implementation of check_build(). > Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py:84 > + This should probably be a generic test in port/port_testcase.py instead. Tony - the logging parameter controls whether the routine will log any messages if it finds wdiff isn't available; it is called with a value of True by port.check_build(). 395373 4 91705 ojan 2011-04-29 11:11:27 -0700 Created attachment 91705 Patch 395427 5 91705 dpranke 2011-04-29 12:13:26 -0700 Comment on attachment 91705 Patch looks great! Thanks for cleaning this up. 395431 6 ojan 2011-04-29 12:17:46 -0700 Committed r85347: <http://trac.webkit.org/changeset/85347> 91588 2011-04-28 16:39:41 -0700 2011-04-29 11:11:24 -0700 Patch bug-59761-20110428163939.patch text/plain 4779 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogODUyNTUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NWE1MTJjMGQ1NGY1M2VjYWJlZGQyYWM4ZGU1Mzc2NjI4 ZTE3NDhkLi5iN2YyODU1YzFlNzA3Y2UzYjVjOTc1YWYzNGZhMWQzZWFkZWI3ZDk1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTEtMDQtMjggIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmaXggcHJldHR5X3BhdGNo X2F2YWlsYWJsZSBhbmQgd2RpZmZfYXZhaWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTc2MQorCisgICAgICAgIFRoZXNlIG1ldGhvZHMgcmVs eSBvbiB0aGUgY2hlY2tfKiBtZXRob2QgYmVpbmcgY2FsbGVkIGZpcnN0LgorICAgICAgICBUaGlz IHdvdWxkIG9ubHkgaGFwcGVuZCB3aGVuIHdlIGFjdHVhbGx5IHRyaWVkIHRvIGNvbXB1dGUgYSBk aWZmLAorICAgICAgICBidXQgY29tcHV0aW5nIHRoZSBkaWZmIGhhcHBlbnMgb24gYSBkaWZmZXJl bnQgcHJvY2Vzcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fbGludXhfdW5pdHRlc3QucHk6CisKKzIwMTEtMDQtMjggIE9qYW4g VmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBNaWhhaSBQ YXJwYXJpdGEuCiAKICAgICAgICAgdXNlIGEgaGllcmFyY2hpY2FsIGRhdGEgc3RydWN0dXJlIHRv IHN0b3JlIHJlc3VsdHMganNvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGJjNmQ1ODJkMmUzZTU3ZDRjZjk4YzU4MjgwOGZhYTk1 MzU5ODAzYzkuLjViZDMwMmE3ZWUyNGQwYjc5NjFjMzRlZGU0NzVhZWI5OTQxODM4MzUgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAg LTEyNyw3ICsxMjcsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICMgaHR0cDovL21h aWwucHl0aG9uLm9yZy9waXBlcm1haWwvcHl0aG9uLWxpc3QvCiAgICAgICAgICMgICAgMjAwOC1B dWd1c3QvNTA1NzUzLmh0bWwKICAgICAgICAgIyBodHRwOi8vYnVncy5weXRob24ub3JnL2lzc3Vl MzIxMAotICAgICAgICBzZWxmLl93ZGlmZl9hdmFpbGFibGUgPSBUcnVlCisgICAgICAgIHNlbGYu X3dkaWZmX2F2YWlsYWJsZSA9IE5vbmUKIAogICAgICAgICAjIEZJWE1FOiBwcmV0dHlwYXRjaC5w eSBrbm93cyB0aGlzIHBhdGgsIHdoeSBpcyBpdCBjb3BpZWQgaGVyZT8KICAgICAgICAgc2VsZi5f cHJldHR5X3BhdGNoX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgiV2Vic2l0ZXMi LApAQCAtMTQxLDEwICsxNDEsMTQgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBzZWxm Ll9yZXN1bHRzX2RpcmVjdG9yeSA9IE5vbmUKIAogICAgIGRlZiB3ZGlmZl9hdmFpbGFibGUoc2Vs Zik6Ci0gICAgICAgIHJldHVybiBib29sKHNlbGYuX3dkaWZmX2F2YWlsYWJsZSkKKyAgICAgICAg aWYgc2VsZi5fd2RpZmZfYXZhaWxhYmxlIGlzIE5vbmU6CisgICAgICAgICAgICBzZWxmLl93ZGlm Zl9hdmFpbGFibGUgPSBzZWxmLmNoZWNrX3dkaWZmKGxvZ2dpbmc9RmFsc2UpCisgICAgICAgIHJl dHVybiBzZWxmLl93ZGlmZl9hdmFpbGFibGUKIAogICAgIGRlZiBwcmV0dHlfcGF0Y2hfYXZhaWxh YmxlKHNlbGYpOgotICAgICAgICByZXR1cm4gYm9vbChzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxh YmxlKQorICAgICAgICBpZiBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlIGlzIE5vbmU6Cisg ICAgICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlID0gc2VsZi5jaGVja19wcmV0 dHlfcGF0Y2gobG9nZ2luZz1GYWxzZSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRj aF9hdmFpbGFibGUKIAogICAgIGRlZiBkZWZhdWx0X2NoaWxkX3Byb2Nlc3NlcyhzZWxmKToKICAg ICAgICAgIiIiUmV0dXJuIHRoZSBudW1iZXIgb2YgRHVtcFJlbmRlclRyZWUgaW5zdGFuY2VzIHRv IHVzZSBmb3IgdGhpcwpAQCAtMjAzLDYgKzIwNyw5IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAog ICAgICAgICByZXR1cm4gVHJ1ZQogCisgICAgZGVmIGNoZWNrX3dkaWZmKHNlbGYsIGxvZ2dpbmc9 VHJ1ZSk6CisgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgZGVmIGNvbXBhcmVfdGV4dChzZWxm LCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4dCk6CiAgICAgICAgICIiIlJldHVybiB3aGV0aGVy IG9yIG5vdCB0aGUgdHdvIHN0cmluZ3MgYXJlICpub3QqIGVxdWFsLiBUaGlzCiAgICAgICAgIHJv dXRpbmUgaXMgdXNlZCB0byBkaWZmIHRleHQgb3V0cHV0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKaW5k ZXggNDljMDFjNGVlOTBlYjZjODYxMWJhMmIyOGVhNjJlMmQ1ZTBlMDJmMS4uYThiOWFlNDNiYmY2 YjdlZDBjOWQ4NzU5NTk1ZGYzM2Q3MTJlNTVjNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CkBAIC0x MDcsNyArMTA3LDcgQEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Q b3J0KToKICAgICAgICAgICAgICAgICByZXN1bHQgPSBzZWxmLl9jaGVja19hcGFjaGVfaW5zdGFs bCgpIGFuZCByZXN1bHQKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgcmVzdWx0 ID0gc2VsZi5fY2hlY2tfbGlnaHR0cGRfaW5zdGFsbCgpIGFuZCByZXN1bHQKLSAgICAgICAgcmVz dWx0ID0gc2VsZi5fY2hlY2tfd2RpZmZfaW5zdGFsbCgpIGFuZCByZXN1bHQKKyAgICAgICAgcmVz dWx0ID0gc2VsZi5jaGVja193ZGlmZigpIGFuZCByZXN1bHQKIAogICAgICAgICBpZiBub3QgcmVz dWx0OgogICAgICAgICAgICAgX2xvZy5lcnJvcignRm9yIGNvbXBsZXRlIExpbnV4IGJ1aWxkIHJl cXVpcmVtZW50cywgcGxlYXNlIHNlZTonKQpAQCAtMTU5LDcgKzE1OSw3IEBAIGNsYXNzIENocm9t aXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICAgICBfbG9nLmVy cm9yKCcnKQogICAgICAgICByZXR1cm4gcmVzdWx0CiAKLSAgICBkZWYgX2NoZWNrX3dkaWZmX2lu c3RhbGwoc2VsZik6CisgICAgZGVmIGNoZWNrX3dkaWZmKHNlbGYpOgogICAgICAgICByZXN1bHQg PSBzZWxmLl9jaGVja19maWxlX2V4aXN0cyhzZWxmLl9wYXRoX3RvX3dkaWZmKCksICd3ZGlmZicp CiAgICAgICAgIGlmIG5vdCByZXN1bHQ6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCcgICAgUGxl YXNlIGluc3RhbGwgdXNpbmc6ICJzdWRvIGFwdC1nZXQgaW5zdGFsbCAnCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4X3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9saW51eF91bml0dGVzdC5weQppbmRleCAwNWVjMDY3NWE0NTFlYTM1NTJiMTEyMGYxOGUy MmE3MmJhODAyZTdiLi5iNGM5NmNhNTM3NTI3OWMzZmE0MzQ5OWRhZWE5MzAzZGI2M2EwOWU5IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX2xpbnV4X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXhfdW5pdHRlc3QucHkKQEAgLTc4LDYgKzc4LDEwIEBA IGNsYXNzIENocm9taXVtTGludXhQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6 CiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBjaHJvbWl1bV9saW51 eC5DaHJvbWl1bUxpbnV4UG9ydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9ydF9uYW1l PSdjaHJvbWl1bS1saW51eC14ODYtZ3B1JykKIAorICAgIGRlZiB0ZXN0X2NoZWNrX2J1aWxkKHNl bGYpOgorICAgICAgICBwb3J0ID0gY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQoKQor ICAgICAgICBwb3J0LmNoZWNrX2J1aWxkKG5lZWRzX2h0dHA9VHJ1ZSkKKwogICAgIGRlZiB0ZXN0 X2RldGVybWluZV9hcmNoaXRlY3R1cmVfZmFpbHMoc2VsZik6CiAgICAgICAgICMgVGVzdCB0aGF0 IHdlIGRlZmF1bHQgdG8gJ3g4NicgaWYgdGhlIGRyaXZlciBkb2Vzbid0IGV4aXN0LgogICAgICAg ICBmaWxlc3lzdGVtID0gZmlsZXN5c3RlbV9tb2NrLk1vY2tGaWxlU3lzdGVtKCkK 91705 2011-04-29 11:11:27 -0700 2011-04-29 12:13:26 -0700 Patch bug-59761-20110429111126.patch text/plain 10029 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogODUzMzgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMTBlYmUyODViN2EwNWRkYzhjZmI5MjEyMGNmNzkzNzAw OGRlNjlkLi5hNDZkNzkzODc1YTQ4MDgzOGZlODQ4YTg2YWE5ZjVhYjcyMTIzODFmIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDQtMjggIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmaXggcHJldHR5X3BhdGNo X2F2YWlsYWJsZSBhbmQgd2RpZmZfYXZhaWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTc2MQorCisgICAgICAgIFRoZXNlIG1ldGhvZHMgcmVs eSBvbiB0aGUgY2hlY2tfKiBtZXRob2QgYmVpbmcgY2FsbGVkIGZpcnN0LgorICAgICAgICBUaGlz IHdvdWxkIG9ubHkgaGFwcGVuIHdoZW4gd2UgYWN0dWFsbHkgdHJpZWQgdG8gY29tcHV0ZSBhIGRp ZmYsCisgICAgICAgIGJ1dCBjb21wdXRpbmcgdGhlIGRpZmYgaGFwcGVucyBvbiBhIGRpZmZlcmVu dCBwcm9jZXNzLgorICAgICAgICAKKyAgICAgICAgQWxzbyBmaXggc2V0dGluZyBfd2RpZmZfYXZp YWxhYmxlIHRvIFRydWUgYnkgZGVmYXVsdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXhfdW5pdHRlc3QucHk6CisKIDIw MTEtMDQtMjkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlLnB5CmluZGV4IGJjNmQ1ODJkMmUzZTU3ZDRjZjk4YzU4MjgwOGZhYTk1MzU5 ODAzYzkuLjE5Y2QxNjlkM2U0NjA0NWFhY2M5NmUyNjFkM2RkYjRkOTQxZjRkOTUgMTAwNzU1Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTEy Nyw3ICsxMjcsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICMgaHR0cDovL21haWwu cHl0aG9uLm9yZy9waXBlcm1haWwvcHl0aG9uLWxpc3QvCiAgICAgICAgICMgICAgMjAwOC1BdWd1 c3QvNTA1NzUzLmh0bWwKICAgICAgICAgIyBodHRwOi8vYnVncy5weXRob24ub3JnL2lzc3VlMzIx MAotICAgICAgICBzZWxmLl93ZGlmZl9hdmFpbGFibGUgPSBUcnVlCisgICAgICAgIHNlbGYuX3dk aWZmX2F2YWlsYWJsZSA9IE5vbmUKIAogICAgICAgICAjIEZJWE1FOiBwcmV0dHlwYXRjaC5weSBr bm93cyB0aGlzIHBhdGgsIHdoeSBpcyBpdCBjb3BpZWQgaGVyZT8KICAgICAgICAgc2VsZi5fcHJl dHR5X3BhdGNoX3BhdGggPSBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgiV2Vic2l0ZXMiLApA QCAtMTQxLDEwICsxNDEsMTQgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBzZWxmLl9y ZXN1bHRzX2RpcmVjdG9yeSA9IE5vbmUKIAogICAgIGRlZiB3ZGlmZl9hdmFpbGFibGUoc2VsZik6 Ci0gICAgICAgIHJldHVybiBib29sKHNlbGYuX3dkaWZmX2F2YWlsYWJsZSkKKyAgICAgICAgaWYg c2VsZi5fd2RpZmZfYXZhaWxhYmxlIGlzIE5vbmU6CisgICAgICAgICAgICBzZWxmLl93ZGlmZl9h dmFpbGFibGUgPSBzZWxmLmNoZWNrX3dkaWZmKGxvZ2dpbmc9RmFsc2UpCisgICAgICAgIHJldHVy biBzZWxmLl93ZGlmZl9hdmFpbGFibGUKIAogICAgIGRlZiBwcmV0dHlfcGF0Y2hfYXZhaWxhYmxl KHNlbGYpOgotICAgICAgICByZXR1cm4gYm9vbChzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxl KQorICAgICAgICBpZiBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlIGlzIE5vbmU6CisgICAg ICAgICAgICBzZWxmLl9wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlID0gc2VsZi5jaGVja19wcmV0dHlf cGF0Y2gobG9nZ2luZz1GYWxzZSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX3ByZXR0eV9wYXRjaF9h dmFpbGFibGUKIAogICAgIGRlZiBkZWZhdWx0X2NoaWxkX3Byb2Nlc3NlcyhzZWxmKToKICAgICAg ICAgIiIiUmV0dXJuIHRoZSBudW1iZXIgb2YgRHVtcFJlbmRlclRyZWUgaW5zdGFuY2VzIHRvIHVz ZSBmb3IgdGhpcwpAQCAtMTg1LDcgKzE4OSw2IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAg IGRlZiBjaGVja19wcmV0dHlfcGF0Y2goc2VsZiwgbG9nZ2luZz1UcnVlKToKICAgICAgICAgIiIi Q2hlY2tzIHdoZXRoZXIgd2UgY2FuIHVzZSB0aGUgUHJldHR5UGF0Y2ggcnVieSBzY3JpcHQuIiIi Ci0gICAgICAgICMgY2hlY2sgaWYgUnVieSBpcyBpbnN0YWxsZWQKICAgICAgICAgdHJ5OgogICAg ICAgICAgICAgcmVzdWx0ID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsncnVieScsICct LXZlcnNpb24nXSkKICAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6CkBAIC0yMDMsNiArMjA2LDIw IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgICAgICByZXR1cm4gVHJ1ZQogCisgICAgZGVm IGNoZWNrX3dkaWZmKHNlbGYsIGxvZ2dpbmc9VHJ1ZSk6CisgICAgICAgIGlmIG5vdCBzZWxmLl9w YXRoX3RvX3dkaWZmKCk6CisgICAgICAgICAgICAjIERvbid0IG5lZWQgdG8gbG9nIGhlcmUgc2lu Y2UgdGhpcyBpcyB0aGUgcG9ydCBjaG9vc2luZyBub3QgdG8gdXNlIHdkaWZmLgorICAgICAgICAg ICAgcmV0dXJuIEZhbHNlCisKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmVzdWx0ID0gc2Vs Zi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFtzZWxmLl9wYXRoX3RvX3dkaWZmKCksICctLWhlbHAn XSkKKyAgICAgICAgZXhjZXB0IE9TRXJyb3I6CisgICAgICAgICAgICBpZiBsb2dnaW5nOgorICAg ICAgICAgICAgICAgIF9sb2cuZXJyb3IoIndkaWZmIGlzIG5vdCBpbnN0YWxsZWQuIikKKyAgICAg ICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIHJldHVybiBUcnVlCisKICAgICBkZWYgY29t cGFyZV90ZXh0KHNlbGYsIGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KToKICAgICAgICAgIiIi UmV0dXJuIHdoZXRoZXIgb3Igbm90IHRoZSB0d28gc3RyaW5ncyBhcmUgKm5vdCogZXF1YWwuIFRo aXMKICAgICAgICAgcm91dGluZSBpcyB1c2VkIHRvIGRpZmYgdGV4dCBvdXRwdXQuCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xp bnV4LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9saW51eC5weQppbmRleCA0OWMwMWM0ZWU5MGViNmM4NjExYmEyYjI4ZWE2MmUyZDVlMGUwMmYx Li45MTkwMzljODQ0NWNmOWYwMzRjOWU1ODhmMTZlNGU1ZGUxNzhmNzgwIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f bGludXgucHkKQEAgLTEwNyw3ICsxMDcsNyBAQCBjbGFzcyBDaHJvbWl1bUxpbnV4UG9ydChjaHJv bWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuX2NoZWNr X2FwYWNoZV9pbnN0YWxsKCkgYW5kIHJlc3VsdAogICAgICAgICAgICAgZWxzZToKICAgICAgICAg ICAgICAgICByZXN1bHQgPSBzZWxmLl9jaGVja19saWdodHRwZF9pbnN0YWxsKCkgYW5kIHJlc3Vs dAotICAgICAgICByZXN1bHQgPSBzZWxmLl9jaGVja193ZGlmZl9pbnN0YWxsKCkgYW5kIHJlc3Vs dAorICAgICAgICByZXN1bHQgPSBzZWxmLmNoZWNrX3dkaWZmKCkgYW5kIHJlc3VsdAogCiAgICAg ICAgIGlmIG5vdCByZXN1bHQ6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCdGb3IgY29tcGxldGUg TGludXggYnVpbGQgcmVxdWlyZW1lbnRzLCBwbGVhc2Ugc2VlOicpCkBAIC0xNTksOSArMTU5LDkg QEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAg ICAgICAgIF9sb2cuZXJyb3IoJycpCiAgICAgICAgIHJldHVybiByZXN1bHQKIAotICAgIGRlZiBf Y2hlY2tfd2RpZmZfaW5zdGFsbChzZWxmKToKKyAgICBkZWYgY2hlY2tfd2RpZmYoc2VsZiwgbG9n Z2luZz1UcnVlKToKICAgICAgICAgcmVzdWx0ID0gc2VsZi5fY2hlY2tfZmlsZV9leGlzdHMoc2Vs Zi5fcGF0aF90b193ZGlmZigpLCAnd2RpZmYnKQotICAgICAgICBpZiBub3QgcmVzdWx0OgorICAg ICAgICBpZiBub3QgcmVzdWx0IGFuZCBsb2dnaW5nOgogICAgICAgICAgICAgX2xvZy5lcnJvcign ICAgIFBsZWFzZSBpbnN0YWxsIHVzaW5nOiAic3VkbyBhcHQtZ2V0IGluc3RhbGwgJwogICAgICAg ICAgICAgICAgICAgICAgICAnd2RpZmYiJykKICAgICAgICAgICAgIF9sb2cuZXJyb3IoJycpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX21hYy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fbWFjLnB5CmluZGV4IDdmNTdiZGY5NTI2ZmIyNDExNzA1YjcwYzlhMzFjYWVmNjkyZDcw MTkuLmE5NjdjNzQxNTk5YWYyNDM0MWQ2N2U2YTNjNzJiZGRkMTQ2NmIzZTUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f bWFjLnB5CkBAIC05MiwxMiArOTIsMTMgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVt LkNocm9taXVtUG9ydCk6CiAKICAgICBkZWYgY2hlY2tfYnVpbGQoc2VsZiwgbmVlZHNfaHR0cCk6 CiAgICAgICAgIHJlc3VsdCA9IGNocm9taXVtLkNocm9taXVtUG9ydC5jaGVja19idWlsZChzZWxm LCBuZWVkc19odHRwKQotICAgICAgICByZXN1bHQgPSBzZWxmLl9jaGVja193ZGlmZl9pbnN0YWxs KCkgYW5kIHJlc3VsdAorICAgICAgICByZXN1bHQgPSBzZWxmLmNoZWNrX3dkaWZmKCkgYW5kIHJl c3VsdAogICAgICAgICBpZiBub3QgcmVzdWx0OgogICAgICAgICAgICAgX2xvZy5lcnJvcignRm9y IGNvbXBsZXRlIE1hYyBidWlsZCByZXF1aXJlbWVudHMsIHBsZWFzZSBzZWU6JykKICAgICAgICAg ICAgIF9sb2cuZXJyb3IoJycpCiAgICAgICAgICAgICBfbG9nLmVycm9yKCcgICAgaHR0cDovL2Nv ZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL3dpa2kvJwogICAgICAgICAgICAgICAgICAgICAgICAn TWFjQnVpbGRJbnN0cnVjdGlvbnMnKQorCiAgICAgICAgIHJldHVybiByZXN1bHQKIAogICAgIGRl ZiBkZWZhdWx0X2NoaWxkX3Byb2Nlc3NlcyhzZWxmKToKQEAgLTEyNSwxMyArMTI2LDE0IEBAIGNs YXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICByZXR1 cm4gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoCiAgICAgICAgICAgICAnU291cmNlJywgJ1dl YktpdCcsICdjaHJvbWl1bScsICd4Y29kZWJ1aWxkJywgKmNvbXBzKQogCi0gICAgZGVmIF9jaGVj a193ZGlmZl9pbnN0YWxsKHNlbGYpOgorICAgIGRlZiBjaGVja193ZGlmZihzZWxmLCBsb2dnaW5n PVRydWUpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICAjIFdlJ3JlIGlnbm9yaW5nIHRoZSBy ZXR1cm4gYW5kIGFsd2F5cyByZXR1cm5pbmcgVHJ1ZQogICAgICAgICAgICAgc2VsZi5fZXhlY3V0 aXZlLnJ1bl9jb21tYW5kKFtzZWxmLl9wYXRoX3RvX3dkaWZmKCldLCBlcnJvcl9oYW5kbGVyPUV4 ZWN1dGl2ZS5pZ25vcmVfZXJyb3IpCiAgICAgICAgIGV4Y2VwdCBPU0Vycm9yOgotICAgICAgICAg ICAgX2xvZy53YXJuaW5nKCd3ZGlmZiBub3QgZm91bmQuIEluc3RhbGwgdXNpbmcgTWFjUG9ydHMg b3Igc29tZSAnCi0gICAgICAgICAgICAgICAgICAgICAgICAgJ290aGVyIG1lYW5zJykKKyAgICAg ICAgICAgIGlmIGxvZ2dpbmc6CisgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCd3ZGlmZiBu b3QgZm91bmQuIEluc3RhbGwgdXNpbmcgTWFjUG9ydHMgb3Igc29tZSAnCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICdvdGhlciBtZWFucycpCiAgICAgICAgIHJldHVybiBUcnVlCiAKICAg ICBkZWYgX2xpZ2h0dHBkX3BhdGgoc2VsZiwgKmNvbXBzKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNf dW5pdHRlc3QucHkKaW5kZXggNGY5YzMwMmM5MzJiYjQ5MjUxYjcwYTI5MTFmY2M1MGExNmFjMmM0 MS4uYWQzMThiZmY5MzhhMTM3NjFlYWNjMjA4ODIyNDEyYTQ2NDc0NDU3NiAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWNfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWNfdW5pdHRlc3QucHkKQEAgLTQwLDExICs0MCw5IEBAIGNsYXNzIENocm9taXVt TWFjUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICAgICAgcmV0 dXJuIE5vbmUKICAgICAgICAgcmV0dXJuIGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQKIAot ICAgIGRlZiB0ZXN0X2NoZWNrX3dkaWZmX2luc3RhbGwoc2VsZik6CisgICAgZGVmIHRlc3RfY2hl Y2tfd2RpZmYoc2VsZik6CiAgICAgICAgIHBvcnQgPSBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQ b3J0KCkKLQotICAgICAgICAjIEN1cnJlbnRseSBpcyBhbHdheXMgdHJ1ZSwganVzdCBsb2dzIGlm IG1pc3NpbmcuCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9jaGVja193ZGlmZl9pbnN0 YWxsKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmNoZWNrX3dkaWZmKCkpCiAKICAg ICBkZWYgYXNzZXJ0X25hbWUoc2VsZiwgcG9ydF9uYW1lLCBvc192ZXJzaW9uX3N0cmluZywgZXhw ZWN0ZWQpOgogICAgICAgICBwb3J0ID0gY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydChwb3J0 X25hbWU9cG9ydF9uYW1lLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkKaW5kZXggMDI2MGRmZmQ3 ZmI1MTBlYWMwNThhMDBkNTU5NzJkNDY5MTE1MzFmZS4uYjg1YWYwNTIzMzI3YTE2NDRhNGJhZmIy MjUzNTVhYzNhMWUyN2EwMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CkBAIC0xMjcsNiAr MTI3LDE0IEBAIGNsYXNzIENocm9taXVtUG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENh c2UpOgogICAgICAgICAjIE92ZXJyaWRlIHRoaXMgdGVzdCBzaW5jZSBDaHJvbWl1bVBvcnQgZG9l c24ndCBpbXBsZW1lbnQgYmFzZWxpbmVfc2VhcmNoX3BhdGgoKS4KICAgICAgICAgcGFzcwogCisg ICAgZGVmIHRlc3RfY2hlY2tfYnVpbGQoc2VsZik6CisgICAgICAgICMgT3ZlcnJpZGUgdGhpcyB0 ZXN0IHNpbmNlIENocm9taXVtUG9ydCBkb2Vzbid0IGltcGxlbWVudCBfcGF0aF90b19kcml2ZXIo KS4KKyAgICAgICAgcGFzcworCisgICAgZGVmIHRlc3RfY2hlY2tfd2RpZmYoc2VsZik6CisgICAg ICAgICMgT3ZlcnJpZGUgdGhpcyB0ZXN0IHNpbmNlIENocm9taXVtUG9ydCBkb2Vzbid0IGltcGxl bWVudCBfcGF0aF90b19kcml2ZXIoKS4KKyAgICAgICAgcGFzcworCiAgICAgY2xhc3MgVGVzdE1h Y1BvcnQoY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydCk6CiAgICAgICAgIGRlZiBfX2luaXRf XyhzZWxmLCBvcHRpb25zKToKICAgICAgICAgICAgIGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1Bv cnQuX19pbml0X18oc2VsZiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0ZXN0LnB5CmluZGV4IGNiNWZkYTAz NDJjMmU3YzRkZThmYThkYzg5NGNiY2VjNzljN2E4MmUuLjRhNjZhYTA4MDA3NGFkNGViMDYzOGEw NTAzMzhlYTU2ZjVlNzkzMzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5weQpAQCAtNjYsMTAg KzY2LDYgQEAgY2xhc3MgTW9ja0RSVFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNl KToKICAgICAgICAgIyBPbmx5IGNoZWNraW5nIHRoYXQgbm8gZXhjZXB0aW9uIGlzIHJhaXNlZC4K ICAgICAgICAgc2VsZi5tYWtlX3BvcnQoKS5yZWxlYXNlX2h0dHBfbG9jaygpCiAKLSAgICBkZWYg dGVzdF9jaGVja19idWlsZChzZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkK LSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuY2hlY2tfYnVpbGQoVHJ1ZSkpCi0KICAgICBk ZWYgdGVzdF9jaGVja19zeXNfZGVwcyhzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9w b3J0KCkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuY2hlY2tfc3lzX2RlcHMoVHJ1ZSkp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Bv cnRfdGVzdGNhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3BvcnRfdGVzdGNhc2UucHkKaW5kZXggY2IxYjkxNWUyZGE4YjEwMmMyYjc1MGVlYzM0NTc2OWM1 YjdkZDE1My4uZmIxNjVkZWQ1NWI0OTAzOTVmNjRkODYxNTQ4ZTkzM2YyZjExMzk1YiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3Rj YXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9y dF90ZXN0Y2FzZS5weQpAQCAtMTM4LDYgKzEzOCwxNyBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5kaWZmX2ltYWdl KCdmb28nLCBOb25lLCBOb25lKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuZGlmZl9p bWFnZSgnZm9vJywgJycsIE5vbmUpKQogCisgICAgZGVmIHRlc3RfY2hlY2tfYnVpbGQoc2VsZik6 CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIGlmIG5vdCBwb3J0Ogor ICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIHBvcnQuY2hlY2tfYnVpbGQobmVlZHNfaHR0cD1U cnVlKQorCisgICAgZGVmIHRlc3RfY2hlY2tfd2RpZmYoc2VsZik6CisgICAgICAgIHBvcnQgPSBz ZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIGlmIG5vdCBwb3J0OgorICAgICAgICAgICAgcmV0dXJu CisgICAgICAgIHBvcnQuY2hlY2tfd2RpZmYoKQogCiAgICAgZGVmIGRpc2FibGVkX3Rlc3Rfd2Vi c29ja2V0X3NlcnZlcihzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkK