179344 2017-11-06 14:08:02 -0800 [Win] The way to detect Windows 10 is wrong 2017-12-08 23:39:52 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 179216 1 basuke basuke achristensen basuke bfulgham buildbot commit-queue don.olmstead fujii glenn lforschler pvollan rniwa webkit-bug-importer oldest_to_newest 1368790 0 basuke 2017-11-06 14:08:02 -0800 It falls always 'future'. 1368792 1 basuke 2017-11-06 14:20:33 -0800 > $ python2 > ActivePython 2.7.13.2716 (ActiveState Software Inc.) based on > Python 2.7.13 (default, Jun 26 2017, 14:28:43) [MSC v.1500 64 bit (AMD64)] on win32 > Type "help", "copyright", "credits" or "license" for more information. > >>> import sys > >>> sys.getwindowsversion() > sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='') Windows python2 doesn't return correct information :( (It should be major=10, minor=10, build=1xxxx). python3 returns correct information. 1370214 2 fujii 2017-11-09 21:25:48 -0800 This issue has been addressed in Python 2. https://hg.python.org/cpython/rev/d8453733cc0c We need to use platform.version() instead of sys.getwindowsversion(). > C:\>ver > > Microsoft Windows [Version 10.0.14393] > > C:\>python > ActivePython 2.7.13.2716 (ActiveState Software Inc.) based on > Python 2.7.13 (default, Jun 26 2017, 14:28:43) [MSC v.1500 64 bit (AMD64)] on win32 > Type "help", "copyright", "credits" or "license" for more information. > >>> import sys > >>> sys.getwindowsversion() > sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='') > >>> import platform > >>> platform.version() > '10.0.14393' > >>> 1370556 3 326646 basuke 2017-11-10 15:59:16 -0800 Created attachment 326646 patch 1370560 4 basuke 2017-11-10 16:00:45 -0800 platform.release() seems more straightforward to me. https://docs.python.org/2/library/platform.html?highlight=platform%20release#platform.release 1370629 5 326646 commit-queue 2017-11-10 18:35:56 -0800 Comment on attachment 326646 patch Clearing flags on attachment: 326646 Committed r224720: <https://trac.webkit.org/changeset/224720> 1370630 6 commit-queue 2017-11-10 18:35:58 -0800 All reviewed patches have been landed. Closing bug. 1371968 7 webkit-bug-importer 2017-11-15 09:42:25 -0800 <rdar://problem/35562264> 1379869 8 basuke 2017-12-08 16:45:30 -0800 Windows 10 is not detected correctly again after Version standardize refactoring. The issue is getwindowsversion() doesn't return correct answer on Python2.7 on Windows. We should use win32_ver()[1] which is same result with `ver` command. 1379892 9 328890 basuke 2017-12-08 17:07:30 -0800 Created attachment 328890 fix use win32_ver() instead of getwindowsversion() 1379932 10 328900 basuke 2017-12-08 20:58:09 -0800 Created attachment 328900 fix test modify test 1379938 11 328902 basuke 2017-12-08 21:10:23 -0800 Created attachment 328902 add test and changelog 1379953 12 328902 commit-queue 2017-12-08 23:39:50 -0800 Comment on attachment 328902 add test and changelog Clearing flags on attachment: 328902 Committed r225722: <https://trac.webkit.org/changeset/225722> 1379954 13 commit-queue 2017-12-08 23:39:52 -0800 All reviewed patches have been landed. Closing bug. 326646 2017-11-10 15:59:16 -0800 2017-12-08 17:07:30 -0800 patch bug-179344.diff text/plain 1169 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmYTI5 MTUxMjE1MC4uZGU4MTAzYTU5MzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNy0xMS0xMCAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl0gVGhlIHdheSB0byBk ZXRlY3QgV2luZG93cyAxMCBpcyB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MzQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZv cm1pbmZvLnB5OgorICAgICAgICAoUGxhdGZvcm1JbmZvLl9kZXRlcm1pbmVfd2luX3ZlcnNpb24p OgorCiAyMDE3LTExLTEwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgog CiAgICAgICAgIEZpbmlzaCByb2xsaW5nIG91dCByMjI0NTQ0CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQppbmRleCBiMDRlZmM0 NjNjZi4uNGY4OTMwMzliMjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQpAQCAtMTc5LDYgKzE3OSw4IEBAIGNsYXNzIFBs YXRmb3JtSW5mbyhvYmplY3QpOgogICAgICAgICByZXR1cm4gJ2x1Y2lkJwogCiAgICAgZGVmIF9k ZXRlcm1pbmVfd2luX3ZlcnNpb24oc2VsZiwgd2luX3ZlcnNpb24pOgorICAgICAgICBpZiBzZWxm Ll9wbGF0Zm9ybV9tb2R1bGUucmVsZWFzZSgpID09ICcxMCc6CisgICAgICAgICAgICByZXR1cm4g J3dpbjEwJwogICAgICAgICBpZiB3aW5fdmVyc2lvbi5tYWpvciA9PSAwIGFuZCB3aW5fdmVyc2lv bi5taW5vciA9PSAwOgogICAgICAgICAgICAgaWYgd2luX3ZlcnNpb25bMl0gPiAxMDAwMDoKICAg ICAgICAgICAgICAgICByZXR1cm4gJ3dpbjEwJwo= 328890 2017-12-08 17:07:30 -0800 2017-12-08 20:58:09 -0800 fix bug-179344.diff text/plain 2917 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwYzM4 YWI4N2IzYi4uYzc5MjgzNmE5MGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0xMi0wOCAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl0gVGhlIHdheSB0byBk ZXRlY3QgV2luZG93cyAxMCBpcyB3cm9uZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MzQ0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTU2MjI2 ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQeXRo b24yLjcgZG9lc24ndCByZXR1cm4gY29ycmVjdCBpbmZvcm1hdGlvbiBvbiBXaW5kb3dzIDEwLgor ICAgICAgICBVc2UgcGxhdGZvcm0ud2luMzJfdmVyKCkgaW5zdGVhZCBvZiBzeXMuZ2V0d2luZG93 c3ZlcnNpb24oKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9w bGF0Zm9ybWluZm8ucHk6CisgICAgICAgIChQbGF0Zm9ybUluZm8uX3dpbl92ZXJzaW9uKToKKyAg ICAgICAgKFBsYXRmb3JtSW5mby5fd2luX3ZlcnNpb25fc3RyKToKKwogMjAxNy0xMi0wNSAgU3Rl cGhhbiBTemFibyAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CiAKICAgICAgICAgU3dpdGNoIHdp bmRvd3MgYnVpbGQgdG8gVmlzdWFsIFN0dWRpbyAyMDE3CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQppbmRleCAzMTI1OTFmZjdi Yi4uODU0YmU2NjIzYTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQpAQCAtNTcsNyArNTcsNyBAQCBjbGFzcyBQbGF0Zm9y bUluZm8ob2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5vc19uYW1lLnN0YXJ0c3dpdGgoJ21hYycp OgogICAgICAgICAgICAgdmVyc2lvbiA9IFZlcnNpb24uZnJvbV9zdHJpbmcocGxhdGZvcm1fbW9k dWxlLm1hY192ZXIoKVswXSkKICAgICAgICAgZWxpZiBzZWxmLm9zX25hbWUuc3RhcnRzd2l0aCgn d2luJyk6Ci0gICAgICAgICAgICB2ZXJzaW9uID0gc2VsZi5fd2luX3ZlcnNpb24oc3lzX21vZHVs ZSkKKyAgICAgICAgICAgIHZlcnNpb24gPSBzZWxmLl93aW5fdmVyc2lvbigpCiAgICAgICAgIGVs aWYgc2VsZi5vc19uYW1lID09ICdsaW51eCcgb3Igc2VsZi5vc19uYW1lID09ICdmcmVlYnNkJyBv ciBzZWxmLm9zX25hbWUgPT0gJ29wZW5ic2QnIG9yIHNlbGYub3NfbmFtZSA9PSAnbmV0YnNkJzoK ICAgICAgICAgICAgIHZlcnNpb24gPSBOb25lCiAgICAgICAgIGVsc2U6CkBAIC0xNzYsMTQgKzE3 NiwxNSBAQCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiAn aGFpa3UnCiAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCd1bnJlY29nbml6ZWQgcGxhdGZv cm0gc3RyaW5nICIlcyInICUgc3lzX3BsYXRmb3JtKQogCi0gICAgZGVmIF93aW5fdmVyc2lvbihz ZWxmLCBzeXNfbW9kdWxlKToKLSAgICAgICAgaWYgaGFzYXR0cihzeXNfbW9kdWxlLCAnZ2V0d2lu ZG93c3ZlcnNpb24nKToKLSAgICAgICAgICAgIHJldHVybiBWZXJzaW9uLmZyb21faXRlcmFibGUo c3lzX21vZHVsZS5nZXR3aW5kb3dzdmVyc2lvbigpWzA6M10pCi0gICAgICAgIHJldHVybiBWZXJz aW9uLmZyb21faXRlcmFibGUoc2VsZi5fd2luX3ZlcnNpb25fZnJvbV9jbWQoKSkKKyAgICBkZWYg X3dpbl92ZXJzaW9uKHNlbGYpOgorICAgICAgICB2ZXJzaW9uID0gc2VsZi5fd2luX3ZlcnNpb25f c3RyKCkKKyAgICAgICAgbWF0Y2hfb2JqZWN0ID0gcmUuc2VhcmNoKHInKD9QPG1ham9yPlxkKylc Lig/UDxtaW5vcj5cZCspXC4oP1A8YnVpbGQ+XGQrKScsIHZlcnNpb24pCisgICAgICAgIGFzc2Vy dCBtYXRjaF9vYmplY3QsICdjbWQgcmV0dXJuZWQgYW4gdW5leHBlY3RlZCB2ZXJzaW9uIHN0cmlu ZzogJyArIHZlcnNpb24KKyAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJvbV9pdGVyYWJsZShtYXRj aF9vYmplY3QuZ3JvdXBzKCkpCiAKLSAgICBkZWYgX3dpbl92ZXJzaW9uX2Zyb21fY21kKHNlbGYp OgorICAgIGRlZiBfd2luX3ZlcnNpb25fc3RyKHNlbGYpOgorICAgICAgICB2ZXJzaW9uID0gc2Vs Zi5fcGxhdGZvcm1fbW9kdWxlLndpbjMyX3ZlcigpWzFdCisgICAgICAgIGlmIHZlcnNpb246Cisg ICAgICAgICAgICByZXR1cm4gdmVyc2lvbgogICAgICAgICAjIE5vdGUgdGhhdCB0aGlzIHNob3Vs ZCBvbmx5IGV2ZXIgYmUgY2FsbGVkIG9uIHdpbmRvd3MsIHNvIHRoaXMgc2hvdWxkIGFsd2F5cyB3 b3JrLgotICAgICAgICB2ZXJfb3V0cHV0ID0gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsn Y21kJywgJy9jJywgJ3ZlciddLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQotICAgICAgICBtYXRjaF9v YmplY3QgPSByZS5zZWFyY2gocicoP1A8bWFqb3I+XGQrKVwuKD9QPG1pbm9yPlxkKylcLig/UDxi dWlsZD5cZCspJywgdmVyX291dHB1dCkKLSAgICAgICAgYXNzZXJ0IG1hdGNoX29iamVjdCwgJ2Nt ZCByZXR1cm5lZCBhbiB1bmV4cGVjdGVkIHZlcnNpb24gc3RyaW5nOiAnICsgdmVyX291dHB1dAot ICAgICAgICByZXR1cm4gbWF0Y2hfb2JqZWN0Lmdyb3VwcygpCisgICAgICAgIHJldHVybiBzZWxm Ll9leGVjdXRpdmUucnVuX2NvbW1hbmQoWydjbWQnLCAnL2MnLCAndmVyJ10sIGRlY29kZV9vdXRw dXQ9RmFsc2UpCg== 328900 2017-12-08 20:58:09 -0800 2017-12-08 21:10:23 -0800 fix test bug-179344-2.diff text/plain 6761 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm8ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvLnB5CmluZGV4IDMxMjU5MWYuLjg1NGJlNjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQpAQCAtNTcsNyArNTcsNyBA QCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5vc19uYW1lLnN0 YXJ0c3dpdGgoJ21hYycpOgogICAgICAgICAgICAgdmVyc2lvbiA9IFZlcnNpb24uZnJvbV9zdHJp bmcocGxhdGZvcm1fbW9kdWxlLm1hY192ZXIoKVswXSkKICAgICAgICAgZWxpZiBzZWxmLm9zX25h bWUuc3RhcnRzd2l0aCgnd2luJyk6Ci0gICAgICAgICAgICB2ZXJzaW9uID0gc2VsZi5fd2luX3Zl cnNpb24oc3lzX21vZHVsZSkKKyAgICAgICAgICAgIHZlcnNpb24gPSBzZWxmLl93aW5fdmVyc2lv bigpCiAgICAgICAgIGVsaWYgc2VsZi5vc19uYW1lID09ICdsaW51eCcgb3Igc2VsZi5vc19uYW1l ID09ICdmcmVlYnNkJyBvciBzZWxmLm9zX25hbWUgPT0gJ29wZW5ic2QnIG9yIHNlbGYub3NfbmFt ZSA9PSAnbmV0YnNkJzoKICAgICAgICAgICAgIHZlcnNpb24gPSBOb25lCiAgICAgICAgIGVsc2U6 CkBAIC0xNzYsMTQgKzE3NiwxNSBAQCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAg ICAgICAgIHJldHVybiAnaGFpa3UnCiAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCd1bnJl Y29nbml6ZWQgcGxhdGZvcm0gc3RyaW5nICIlcyInICUgc3lzX3BsYXRmb3JtKQogCi0gICAgZGVm IF93aW5fdmVyc2lvbihzZWxmLCBzeXNfbW9kdWxlKToKLSAgICAgICAgaWYgaGFzYXR0cihzeXNf bW9kdWxlLCAnZ2V0d2luZG93c3ZlcnNpb24nKToKLSAgICAgICAgICAgIHJldHVybiBWZXJzaW9u LmZyb21faXRlcmFibGUoc3lzX21vZHVsZS5nZXR3aW5kb3dzdmVyc2lvbigpWzA6M10pCi0gICAg ICAgIHJldHVybiBWZXJzaW9uLmZyb21faXRlcmFibGUoc2VsZi5fd2luX3ZlcnNpb25fZnJvbV9j bWQoKSkKKyAgICBkZWYgX3dpbl92ZXJzaW9uKHNlbGYpOgorICAgICAgICB2ZXJzaW9uID0gc2Vs Zi5fd2luX3ZlcnNpb25fc3RyKCkKKyAgICAgICAgbWF0Y2hfb2JqZWN0ID0gcmUuc2VhcmNoKHIn KD9QPG1ham9yPlxkKylcLig/UDxtaW5vcj5cZCspXC4oP1A8YnVpbGQ+XGQrKScsIHZlcnNpb24p CisgICAgICAgIGFzc2VydCBtYXRjaF9vYmplY3QsICdjbWQgcmV0dXJuZWQgYW4gdW5leHBlY3Rl ZCB2ZXJzaW9uIHN0cmluZzogJyArIHZlcnNpb24KKyAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJv bV9pdGVyYWJsZShtYXRjaF9vYmplY3QuZ3JvdXBzKCkpCiAKLSAgICBkZWYgX3dpbl92ZXJzaW9u X2Zyb21fY21kKHNlbGYpOgorICAgIGRlZiBfd2luX3ZlcnNpb25fc3RyKHNlbGYpOgorICAgICAg ICB2ZXJzaW9uID0gc2VsZi5fcGxhdGZvcm1fbW9kdWxlLndpbjMyX3ZlcigpWzFdCisgICAgICAg IGlmIHZlcnNpb246CisgICAgICAgICAgICByZXR1cm4gdmVyc2lvbgogICAgICAgICAjIE5vdGUg dGhhdCB0aGlzIHNob3VsZCBvbmx5IGV2ZXIgYmUgY2FsbGVkIG9uIHdpbmRvd3MsIHNvIHRoaXMg c2hvdWxkIGFsd2F5cyB3b3JrLgotICAgICAgICB2ZXJfb3V0cHV0ID0gc2VsZi5fZXhlY3V0aXZl LnJ1bl9jb21tYW5kKFsnY21kJywgJy9jJywgJ3ZlciddLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQot ICAgICAgICBtYXRjaF9vYmplY3QgPSByZS5zZWFyY2gocicoP1A8bWFqb3I+XGQrKVwuKD9QPG1p bm9yPlxkKylcLig/UDxidWlsZD5cZCspJywgdmVyX291dHB1dCkKLSAgICAgICAgYXNzZXJ0IG1h dGNoX29iamVjdCwgJ2NtZCByZXR1cm5lZCBhbiB1bmV4cGVjdGVkIHZlcnNpb24gc3RyaW5nOiAn ICsgdmVyX291dHB1dAotICAgICAgICByZXR1cm4gbWF0Y2hfb2JqZWN0Lmdyb3VwcygpCisgICAg ICAgIHJldHVybiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWydjbWQnLCAnL2MnLCAndmVy J10sIGRlY29kZV9vdXRwdXQ9RmFsc2UpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb191bml0dGVzdC5weQppbmRleCA0 ZTg0NDA1Li40OTBmMGJkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkKQEAgLTM1LDE3ICsz NSwxNSBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0 IE1vY2tFeGVjdXRpdmUsIE1vY2tFeGVjdXRpdmUyCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0ucGxhdGZvcm1pbmZvIGltcG9ydCBQbGF0Zm9ybUluZm8KIAogCi1kZWYgZmFrZV9zeXMocGxh dGZvcm1fc3RyPSdkYXJ3aW4nLCB3aW5kb3dzX3ZlcnNpb25fdHVwbGU9Tm9uZSk6CitkZWYgZmFr ZV9zeXMocGxhdGZvcm1fc3RyPSdkYXJ3aW4nKToKIAogICAgIGNsYXNzIEZha2VTeXNNb2R1bGUo b2JqZWN0KToKICAgICAgICAgcGxhdGZvcm0gPSBwbGF0Zm9ybV9zdHIKLSAgICAgICAgaWYgd2lu ZG93c192ZXJzaW9uX3R1cGxlOgotICAgICAgICAgICAgZ2V0d2luZG93c3ZlcnNpb24gPSBsYW1i ZGEgeDogd2luZG93c192ZXJzaW9uX3R1cGxlCiAKICAgICByZXR1cm4gRmFrZVN5c01vZHVsZSgp CiAKIAotZGVmIGZha2VfcGxhdGZvcm0obWFjX3ZlcnNpb25fc3RyaW5nPScxMC42LjMnLCByZWxl YXNlX3N0cmluZz0nYmFyJyk6CitkZWYgZmFrZV9wbGF0Zm9ybShtYWNfdmVyc2lvbl9zdHJpbmc9 JzEwLjYuMycsIHJlbGVhc2Vfc3RyaW5nPSdiYXInLCB3aW5fdmVyc2lvbl9zdHJpbmc9JycpOgog CiAgICAgY2xhc3MgRmFrZVBsYXRmb3JtTW9kdWxlKG9iamVjdCk6CiAgICAgICAgIGRlZiBtYWNf dmVyKHNlbGYpOgpAQCAtNTcsNiArNTUsOSBAQCBkZWYgZmFrZV9wbGF0Zm9ybShtYWNfdmVyc2lv bl9zdHJpbmc9JzEwLjYuMycsIHJlbGVhc2Vfc3RyaW5nPSdiYXInKToKICAgICAgICAgZGVmIHJl bGVhc2Uoc2VsZik6CiAgICAgICAgICAgICByZXR1cm4gcmVsZWFzZV9zdHJpbmcKIAorICAgICAg ICBkZWYgd2luMzJfdmVyKHNlbGYpOgorICAgICAgICAgICAgcmV0dXJuIHR1cGxlKFsnJywgd2lu X3ZlcnNpb25fc3RyaW5nLCAnJ10pCisKICAgICByZXR1cm4gRmFrZVBsYXRmb3JtTW9kdWxlKCkK IAogCkBAIC0xMDYsNyArMTA3LDcgQEAgY2xhc3MgVGVzdFBsYXRmb3JtSW5mbyh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc193aW4oKSkKICAgICAg ICAgc2VsZi5hc3NlcnRGYWxzZShpbmZvLmlzX2ZyZWVic2QoKSkKIAotICAgICAgICBpbmZvID0g c2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ3dpbjMyJywgdHVwbGUoWzYsIDEsIDc2MDBdKSkpCisg ICAgICAgIGluZm8gPSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2luMzInKSwgZmFrZV9wbGF0 Zm9ybSh3aW5fdmVyc2lvbl9zdHJpbmc9JzYuMS43NjAwJykpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoaW5mby5vc19uYW1lLCAnd2luJykKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShpbmZv LmlzX2xpbnV4KCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaW5mby5pc19tYWMoKSkKQEAg LTE0OSwxMiArMTUwLDEyIEBAIGNsYXNzIFRlc3RQbGF0Zm9ybUluZm8odW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdm cmVlYnNkOCcpLCBmYWtlX3BsYXRmb3JtKCcnLCAnOC4zLVBSRVJFTEVBU0UnKSkub3NfdmVyc2lv biwgTm9uZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5 cygnZnJlZWJzZDknKSwgZmFrZV9wbGF0Zm9ybSgnJywgJzkuMC1SRUxFQVNFJykpLm9zX3ZlcnNp b24sIE5vbmUpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoQXNzZXJ0aW9uRXJyb3IsIHNl bGYubWFrZV9pbmZvLCBmYWtlX3N5cygnd2luMzInLCB0dXBsZShbNSwgMCwgMTIzNF0pKSkKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2luMzInLCB0 dXBsZShbMTAsIDAsIDE0MzkzXSkpKS5vc192ZXJzaW9uLCAnd2luMTAnKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicsIHR1cGxlKFs2LCAy LCAxMjM0XSkpKS5vc192ZXJzaW9uLCAnOCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2Vs Zi5tYWtlX2luZm8oZmFrZV9zeXMoJ3dpbjMyJywgdHVwbGUoWzYsIDEsIDc2MDBdKSkpLm9zX3Zl cnNpb24sICc3c3AwJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhm YWtlX3N5cygnd2luMzInLCB0dXBsZShbNiwgMCwgMTIzNF0pKSkub3NfdmVyc2lvbiwgJ3Zpc3Rh JykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2lu MzInLCB0dXBsZShbNSwgMSwgMTIzNF0pKSkub3NfdmVyc2lvbiwgJ3hwJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRSYWlzZXMoQXNzZXJ0aW9uRXJyb3IsIHNlbGYubWFrZV9pbmZvLCBmYWtlX3N5cygn d2luMzInKSwgZmFrZV9wbGF0Zm9ybSh3aW5fdmVyc2lvbl9zdHJpbmc9JzUuMC4xMjM0JykpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ3dpbjMyJyks IGZha2VfcGxhdGZvcm0od2luX3ZlcnNpb25fc3RyaW5nPScxMC4wLjE0MzkzJykpLm9zX3ZlcnNp b24sICd3aW4xMCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtlX2luZm8oZmFr ZV9zeXMoJ3dpbjMyJyksIGZha2VfcGxhdGZvcm0od2luX3ZlcnNpb25fc3RyaW5nPSc2LjIuMTIz NCcpKS5vc192ZXJzaW9uLCAnOCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtl X2luZm8oZmFrZV9zeXMoJ3dpbjMyJyksIGZha2VfcGxhdGZvcm0od2luX3ZlcnNpb25fc3RyaW5n PSc2LjEuNzYwMCcpKS5vc192ZXJzaW9uLCAnN3NwMCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ3dpbjMyJyksIGZha2VfcGxhdGZvcm0od2luX3Zl cnNpb25fc3RyaW5nPSc2LjAuMTIzNCcpKS5vc192ZXJzaW9uLCAndmlzdGEnKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicpLCBmYWtlX3Bs YXRmb3JtKHdpbl92ZXJzaW9uX3N0cmluZz0nNS4xLjEyMzQnKSkub3NfdmVyc2lvbiwgJ3hwJykK IAogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRpb25FcnJvciwgc2VsZi5tYWtlX2lu Zm8sIGZha2Vfc3lzKCd3aW4zMicpLCBleGVjdXRpdmU9ZmFrZV9leGVjdXRpdmUoJzUuMC4xMjM0 JykpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2N5 Z3dpbicpLCBleGVjdXRpdmU9ZmFrZV9leGVjdXRpdmUoJzYuMi4xMjM0JykpLm9zX3ZlcnNpb24s ICc4JykKQEAgLTE2Niw3ICsxNjcsNyBAQCBjbGFzcyBUZXN0UGxhdGZvcm1JbmZvKHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgaW5mbyA9IHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdkYXJ3 aW4nKSkKICAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbHMoaW5mby5kaXNwbGF5X25hbWUoKSwg JycpCiAKLSAgICAgICAgaW5mbyA9IHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicsIHR1 cGxlKFs2LCAxLCA3NjAwXSkpKQorICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2luZm8oZmFrZV9z eXMoJ3dpbjMyJyksIGZha2VfcGxhdGZvcm0od2luX3ZlcnNpb25fc3RyaW5nPSc2LjEuNzYwMCcp KQogICAgICAgICBzZWxmLmFzc2VydE5vdEVxdWFscyhpbmZvLmRpc3BsYXlfbmFtZSgpLCAnJykK IAogICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2xpbnV4MicpLCBmYWtl X3BsYXRmb3JtKCcnLCAnMTAuNCcpKQpAQCAtMTc5LDcgKzE4MCw3IEBAIGNsYXNzIFRlc3RQbGF0 Zm9ybUluZm8odW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2lu Zm8oZmFrZV9zeXMoJ2RhcndpbicpLCBmYWtlX3BsYXRmb3JtKCcxMC42LjMnKSwgZmFrZV9leGVj dXRpdmUoJzEyMzQnKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbmZvLnRvdGFsX2J5dGVz X21lbW9yeSgpLCAxMjM0KQogCi0gICAgICAgIGluZm8gPSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5 cygnd2luMzInLCB0dXBsZShbNiwgMSwgNzYwMF0pKSkKKyAgICAgICAgaW5mbyA9IHNlbGYubWFr ZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicpLCBmYWtlX3BsYXRmb3JtKHdpbl92ZXJzaW9uX3N0cmlu Zz0nNi4xLjc2MDAnKSkKICAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUoaW5mby50b3RhbF9ieXRl c19tZW1vcnkoKSkKIAogICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2xp bnV4MicpLCBmYWtlX3BsYXRmb3JtKCcnLCAnMTAuNCcpKQo= 328902 2017-12-08 21:10:23 -0800 2017-12-08 23:39:50 -0800 add test and changelog bug-179344.diff text/plain 7933 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwYzM4 YWI4Li4yOGJmMjZjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTctMTItMDggIEJhc3VrZSBTdXp1a2kgIDxCYXN1 a2UuU3V6dWtpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIFRoZSB3YXkgdG8gZGV0ZWN0IFdp bmRvd3MgMTAgaXMgd3JvbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3OTM0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzU1NjIyNjQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHl0aG9uMi43IGRv ZXNuJ3QgcmV0dXJuIGNvcnJlY3QgaW5mb3JtYXRpb24gb24gV2luZG93cyAxMC4KKyAgICAgICAg VXNlIHBsYXRmb3JtLndpbjMyX3ZlcigpIGluc3RlYWQgb2Ygc3lzLmdldHdpbmRvd3N2ZXJzaW9u KCkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvLnB5OgorICAgICAgICAoUGxhdGZvcm1JbmZvLl93aW5fdmVyc2lvbik6CisgICAgICAgIChQ bGF0Zm9ybUluZm8uX3dpbl92ZXJzaW9uX3N0cik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb191bml0dGVzdC5weToKKyAgICAgICAgKGZha2Vf c3lzKToKKyAgICAgICAgKGZha2Vfc3lzLkZha2VTeXNNb2R1bGUpOgorICAgICAgICAoZmFrZV9w bGF0Zm9ybSk6CisgICAgICAgIChmYWtlX3BsYXRmb3JtLkZha2VQbGF0Zm9ybU1vZHVsZS53aW4z Ml92ZXIpOgorICAgICAgICAoVGVzdFBsYXRmb3JtSW5mby50ZXN0X29zX25hbWVfYW5kX3dyYXBw ZXJzKToKKyAgICAgICAgKFRlc3RQbGF0Zm9ybUluZm8udGVzdF9vc192ZXJzaW9uKToKKyAgICAg ICAgKFRlc3RQbGF0Zm9ybUluZm8udGVzdF9kaXNwbGF5X25hbWUpOgorICAgICAgICAoVGVzdFBs YXRmb3JtSW5mby50ZXN0X3RvdGFsX2J5dGVzX21lbW9yeSk6CisKIDIwMTctMTItMDUgIFN0ZXBo YW4gU3phYm8gIDxzdGVwaGFuLnN6YWJvQHNvbnkuY29tPgogCiAgICAgICAgIFN3aXRjaCB3aW5k b3dzIGJ1aWxkIHRvIFZpc3VhbCBTdHVkaW8gMjAxNwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKaW5kZXggMzEyNTkxZi4uODU0 YmU2NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Bs YXRmb3JtaW5mby5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v cGxhdGZvcm1pbmZvLnB5CkBAIC01Nyw3ICs1Nyw3IEBAIGNsYXNzIFBsYXRmb3JtSW5mbyhvYmpl Y3QpOgogICAgICAgICBpZiBzZWxmLm9zX25hbWUuc3RhcnRzd2l0aCgnbWFjJyk6CiAgICAgICAg ICAgICB2ZXJzaW9uID0gVmVyc2lvbi5mcm9tX3N0cmluZyhwbGF0Zm9ybV9tb2R1bGUubWFjX3Zl cigpWzBdKQogICAgICAgICBlbGlmIHNlbGYub3NfbmFtZS5zdGFydHN3aXRoKCd3aW4nKToKLSAg ICAgICAgICAgIHZlcnNpb24gPSBzZWxmLl93aW5fdmVyc2lvbihzeXNfbW9kdWxlKQorICAgICAg ICAgICAgdmVyc2lvbiA9IHNlbGYuX3dpbl92ZXJzaW9uKCkKICAgICAgICAgZWxpZiBzZWxmLm9z X25hbWUgPT0gJ2xpbnV4JyBvciBzZWxmLm9zX25hbWUgPT0gJ2ZyZWVic2QnIG9yIHNlbGYub3Nf bmFtZSA9PSAnb3BlbmJzZCcgb3Igc2VsZi5vc19uYW1lID09ICduZXRic2QnOgogICAgICAgICAg ICAgdmVyc2lvbiA9IE5vbmUKICAgICAgICAgZWxzZToKQEAgLTE3NiwxNCArMTc2LDE1IEBAIGNs YXNzIFBsYXRmb3JtSW5mbyhvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuICdoYWlrdScKICAg ICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ3VucmVjb2duaXplZCBwbGF0Zm9ybSBzdHJpbmcg IiVzIicgJSBzeXNfcGxhdGZvcm0pCiAKLSAgICBkZWYgX3dpbl92ZXJzaW9uKHNlbGYsIHN5c19t b2R1bGUpOgotICAgICAgICBpZiBoYXNhdHRyKHN5c19tb2R1bGUsICdnZXR3aW5kb3dzdmVyc2lv bicpOgotICAgICAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJvbV9pdGVyYWJsZShzeXNfbW9kdWxl LmdldHdpbmRvd3N2ZXJzaW9uKClbMDozXSkKLSAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJvbV9p dGVyYWJsZShzZWxmLl93aW5fdmVyc2lvbl9mcm9tX2NtZCgpKQorICAgIGRlZiBfd2luX3ZlcnNp b24oc2VsZik6CisgICAgICAgIHZlcnNpb24gPSBzZWxmLl93aW5fdmVyc2lvbl9zdHIoKQorICAg ICAgICBtYXRjaF9vYmplY3QgPSByZS5zZWFyY2gocicoP1A8bWFqb3I+XGQrKVwuKD9QPG1pbm9y PlxkKylcLig/UDxidWlsZD5cZCspJywgdmVyc2lvbikKKyAgICAgICAgYXNzZXJ0IG1hdGNoX29i amVjdCwgJ2NtZCByZXR1cm5lZCBhbiB1bmV4cGVjdGVkIHZlcnNpb24gc3RyaW5nOiAnICsgdmVy c2lvbgorICAgICAgICByZXR1cm4gVmVyc2lvbi5mcm9tX2l0ZXJhYmxlKG1hdGNoX29iamVjdC5n cm91cHMoKSkKIAotICAgIGRlZiBfd2luX3ZlcnNpb25fZnJvbV9jbWQoc2VsZik6CisgICAgZGVm IF93aW5fdmVyc2lvbl9zdHIoc2VsZik6CisgICAgICAgIHZlcnNpb24gPSBzZWxmLl9wbGF0Zm9y bV9tb2R1bGUud2luMzJfdmVyKClbMV0KKyAgICAgICAgaWYgdmVyc2lvbjoKKyAgICAgICAgICAg IHJldHVybiB2ZXJzaW9uCiAgICAgICAgICMgTm90ZSB0aGF0IHRoaXMgc2hvdWxkIG9ubHkgZXZl ciBiZSBjYWxsZWQgb24gd2luZG93cywgc28gdGhpcyBzaG91bGQgYWx3YXlzIHdvcmsuCi0gICAg ICAgIHZlcl9vdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWydjbWQnLCAnL2Mn LCAndmVyJ10sIGRlY29kZV9vdXRwdXQ9RmFsc2UpCi0gICAgICAgIG1hdGNoX29iamVjdCA9IHJl LnNlYXJjaChyJyg/UDxtYWpvcj5cZCspXC4oP1A8bWlub3I+XGQrKVwuKD9QPGJ1aWxkPlxkKykn LCB2ZXJfb3V0cHV0KQotICAgICAgICBhc3NlcnQgbWF0Y2hfb2JqZWN0LCAnY21kIHJldHVybmVk IGFuIHVuZXhwZWN0ZWQgdmVyc2lvbiBzdHJpbmc6ICcgKyB2ZXJfb3V0cHV0Ci0gICAgICAgIHJl dHVybiBtYXRjaF9vYmplY3QuZ3JvdXBzKCkKKyAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2 ZS5ydW5fY29tbWFuZChbJ2NtZCcsICcvYycsICd2ZXInXSwgZGVjb2RlX291dHB1dD1GYWxzZSkK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm9fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v cGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5CmluZGV4IDRlODQ0MDUuLjQ5MGYwYmQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRm b3JtaW5mb191bml0dGVzdC5weQpAQCAtMzUsMTcgKzM1LDE1IEBAIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZSwgTW9ja0V4ZWN1 dGl2ZTIKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5wbGF0Zm9ybWluZm8gaW1wb3J0IFBs YXRmb3JtSW5mbwogCiAKLWRlZiBmYWtlX3N5cyhwbGF0Zm9ybV9zdHI9J2RhcndpbicsIHdpbmRv d3NfdmVyc2lvbl90dXBsZT1Ob25lKToKK2RlZiBmYWtlX3N5cyhwbGF0Zm9ybV9zdHI9J2Rhcndp bicpOgogCiAgICAgY2xhc3MgRmFrZVN5c01vZHVsZShvYmplY3QpOgogICAgICAgICBwbGF0Zm9y bSA9IHBsYXRmb3JtX3N0cgotICAgICAgICBpZiB3aW5kb3dzX3ZlcnNpb25fdHVwbGU6Ci0gICAg ICAgICAgICBnZXR3aW5kb3dzdmVyc2lvbiA9IGxhbWJkYSB4OiB3aW5kb3dzX3ZlcnNpb25fdHVw bGUKIAogICAgIHJldHVybiBGYWtlU3lzTW9kdWxlKCkKIAogCi1kZWYgZmFrZV9wbGF0Zm9ybSht YWNfdmVyc2lvbl9zdHJpbmc9JzEwLjYuMycsIHJlbGVhc2Vfc3RyaW5nPSdiYXInKToKK2RlZiBm YWtlX3BsYXRmb3JtKG1hY192ZXJzaW9uX3N0cmluZz0nMTAuNi4zJywgcmVsZWFzZV9zdHJpbmc9 J2JhcicsIHdpbl92ZXJzaW9uX3N0cmluZz0nJyk6CiAKICAgICBjbGFzcyBGYWtlUGxhdGZvcm1N b2R1bGUob2JqZWN0KToKICAgICAgICAgZGVmIG1hY192ZXIoc2VsZik6CkBAIC01Nyw2ICs1NSw5 IEBAIGRlZiBmYWtlX3BsYXRmb3JtKG1hY192ZXJzaW9uX3N0cmluZz0nMTAuNi4zJywgcmVsZWFz ZV9zdHJpbmc9J2JhcicpOgogICAgICAgICBkZWYgcmVsZWFzZShzZWxmKToKICAgICAgICAgICAg IHJldHVybiByZWxlYXNlX3N0cmluZwogCisgICAgICAgIGRlZiB3aW4zMl92ZXIoc2VsZik6Cisg ICAgICAgICAgICByZXR1cm4gdHVwbGUoWycnLCB3aW5fdmVyc2lvbl9zdHJpbmcsICcnXSkKKwog ICAgIHJldHVybiBGYWtlUGxhdGZvcm1Nb2R1bGUoKQogCiAKQEAgLTEwNiw3ICsxMDcsNyBAQCBj bGFzcyBUZXN0UGxhdGZvcm1JbmZvKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5h c3NlcnRGYWxzZShpbmZvLmlzX3dpbigpKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8u aXNfZnJlZWJzZCgpKQogCi0gICAgICAgIGluZm8gPSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygn d2luMzInLCB0dXBsZShbNiwgMSwgNzYwMF0pKSkKKyAgICAgICAgaW5mbyA9IHNlbGYubWFrZV9p bmZvKGZha2Vfc3lzKCd3aW4zMicpLCBmYWtlX3BsYXRmb3JtKHdpbl92ZXJzaW9uX3N0cmluZz0n Ni4xLjc2MDAnKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbmZvLm9zX25hbWUsICd3aW4n KQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGluZm8uaXNfbGludXgoKSkKICAgICAgICAgc2Vs Zi5hc3NlcnRGYWxzZShpbmZvLmlzX21hYygpKQpAQCAtMTQ5LDEyICsxNTAsMTIgQEAgY2xhc3Mg VGVzdFBsYXRmb3JtSW5mbyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2ZyZWVic2Q4JyksIGZha2VfcGxhdGZvcm0o JycsICc4LjMtUFJFUkVMRUFTRScpKS5vc192ZXJzaW9uLCBOb25lKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdmcmVlYnNkOScpLCBmYWtlX3BsYXRm b3JtKCcnLCAnOS4wLVJFTEVBU0UnKSkub3NfdmVyc2lvbiwgTm9uZSkKIAotICAgICAgICBzZWxm LmFzc2VydFJhaXNlcyhBc3NlcnRpb25FcnJvciwgc2VsZi5tYWtlX2luZm8sIGZha2Vfc3lzKCd3 aW4zMicsIHR1cGxlKFs1LCAwLCAxMjM0XSkpKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNl bGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicsIHR1cGxlKFsxMCwgMCwgMTQzOTNdKSkpLm9z X3ZlcnNpb24sICd3aW4xMCcpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtlX2lu Zm8oZmFrZV9zeXMoJ3dpbjMyJywgdHVwbGUoWzYsIDIsIDEyMzRdKSkpLm9zX3ZlcnNpb24sICc4 JykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2lu MzInLCB0dXBsZShbNiwgMSwgNzYwMF0pKSkub3NfdmVyc2lvbiwgJzdzcDAnKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicsIHR1cGxlKFs2 LCAwLCAxMjM0XSkpKS5vc192ZXJzaW9uLCAndmlzdGEnKQotICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicsIHR1cGxlKFs1LCAxLCAxMjM0XSkp KS5vc192ZXJzaW9uLCAneHAnKQorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRpb25F cnJvciwgc2VsZi5tYWtlX2luZm8sIGZha2Vfc3lzKCd3aW4zMicpLCBmYWtlX3BsYXRmb3JtKHdp bl92ZXJzaW9uX3N0cmluZz0nNS4wLjEyMzQnKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChz ZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2luMzInKSwgZmFrZV9wbGF0Zm9ybSh3aW5fdmVyc2lv bl9zdHJpbmc9JzEwLjAuMTQzOTMnKSkub3NfdmVyc2lvbiwgJ3dpbjEwJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2luMzInKSwgZmFrZV9wbGF0 Zm9ybSh3aW5fdmVyc2lvbl9zdHJpbmc9JzYuMi4xMjM0JykpLm9zX3ZlcnNpb24sICc4JykKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2luMzInKSwg ZmFrZV9wbGF0Zm9ybSh3aW5fdmVyc2lvbl9zdHJpbmc9JzYuMS43NjAwJykpLm9zX3ZlcnNpb24s ICc3c3AwJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5 cygnd2luMzInKSwgZmFrZV9wbGF0Zm9ybSh3aW5fdmVyc2lvbl9zdHJpbmc9JzYuMC4xMjM0Jykp Lm9zX3ZlcnNpb24sICd2aXN0YScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5tYWtl X2luZm8oZmFrZV9zeXMoJ3dpbjMyJyksIGZha2VfcGxhdGZvcm0od2luX3ZlcnNpb25fc3RyaW5n PSc1LjEuMTIzNCcpKS5vc192ZXJzaW9uLCAneHAnKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFp c2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLm1ha2VfaW5mbywgZmFrZV9zeXMoJ3dpbjMyJyksIGV4 ZWN1dGl2ZT1mYWtlX2V4ZWN1dGl2ZSgnNS4wLjEyMzQnKSkKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnY3lnd2luJyksIGV4ZWN1dGl2ZT1mYWtlX2V4 ZWN1dGl2ZSgnNi4yLjEyMzQnKSkub3NfdmVyc2lvbiwgJzgnKQpAQCAtMTY2LDcgKzE2Nyw3IEBA IGNsYXNzIFRlc3RQbGF0Zm9ybUluZm8odW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBpbmZv ID0gc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ2RhcndpbicpKQogICAgICAgICBzZWxmLmFzc2Vy dE5vdEVxdWFscyhpbmZvLmRpc3BsYXlfbmFtZSgpLCAnJykKIAotICAgICAgICBpbmZvID0gc2Vs Zi5tYWtlX2luZm8oZmFrZV9zeXMoJ3dpbjMyJywgdHVwbGUoWzYsIDEsIDc2MDBdKSkpCisgICAg ICAgIGluZm8gPSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnd2luMzInKSwgZmFrZV9wbGF0Zm9y bSh3aW5fdmVyc2lvbl9zdHJpbmc9JzYuMS43NjAwJykpCiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90 RXF1YWxzKGluZm8uZGlzcGxheV9uYW1lKCksICcnKQogCiAgICAgICAgIGluZm8gPSBzZWxmLm1h a2VfaW5mbyhmYWtlX3N5cygnbGludXgyJyksIGZha2VfcGxhdGZvcm0oJycsICcxMC40JykpCkBA IC0xNzksNyArMTgwLDcgQEAgY2xhc3MgVGVzdFBsYXRmb3JtSW5mbyh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIGluZm8gPSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnZGFyd2luJyksIGZh a2VfcGxhdGZvcm0oJzEwLjYuMycpLCBmYWtlX2V4ZWN1dGl2ZSgnMTIzNCcpKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGluZm8udG90YWxfYnl0ZXNfbWVtb3J5KCksIDEyMzQpCiAKLSAgICAg ICAgaW5mbyA9IHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCd3aW4zMicsIHR1cGxlKFs2LCAxLCA3 NjAwXSkpKQorICAgICAgICBpbmZvID0gc2VsZi5tYWtlX2luZm8oZmFrZV9zeXMoJ3dpbjMyJyks IGZha2VfcGxhdGZvcm0od2luX3ZlcnNpb25fc3RyaW5nPSc2LjEuNzYwMCcpKQogICAgICAgICBz ZWxmLmFzc2VydElzTm9uZShpbmZvLnRvdGFsX2J5dGVzX21lbW9yeSgpKQogCiAgICAgICAgIGlu Zm8gPSBzZWxmLm1ha2VfaW5mbyhmYWtlX3N5cygnbGludXgyJyksIGZha2VfcGxhdGZvcm0oJycs ICcxMC40JykpCg==