100998 2012-11-01 16:23:22 -0700 webkit-patch analyze-baselines output is weak 2012-11-02 12:02:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ojan simon.fraser oldest_to_newest 756710 0 dpranke 2012-11-01 16:23:22 -0700 webkit-patch analyze-baselines output is weak 756714 1 171951 dpranke 2012-11-01 16:25:16 -0700 Created attachment 171951 Patch 756775 2 171963 dpranke 2012-11-01 18:09:56 -0700 Created attachment 171963 fix tests and modify output when optimize fails 756788 3 171963 ojan 2012-11-01 18:26:14 -0700 Comment on attachment 171963 fix tests and modify output when optimize fails View in context: https://bugs.webkit.org/attachment.cgi?id=171963&action=review > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:225 > + optparse.make_option('--missing', action='store_true', default=False, help='show missing baselines as well'), Why not always do this? 756870 4 dpranke 2012-11-01 21:02:32 -0700 (In reply to comment #3) > (From update of attachment 171963 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171963&action=review > > > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:225 > > + optparse.make_option('--missing', action='store_true', default=False, help='show missing baselines as well'), > > Why not always do this? Because most of the time we're missing baselines for .wav and usually .png files, and printing "missing" gets awfully verbose. 757433 5 dpranke 2012-11-02 12:02:48 -0700 Committed r133328: <http://trac.webkit.org/changeset/133328> 171951 2012-11-01 16:25:16 -0700 2012-11-01 18:09:53 -0700 Patch bug-100998-20121101162333.patch text/plain 10548 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWEzMDlkYzFmMWNiMGM2NzZiMWY4ODFlNzNmNzk4OWYy MjcwMDQxZi4uYjhkYzBkMjg5ZjkyOGRiOGNlYWZkZGI0ZDdkNGZjNTZjYjFmNDg4YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDEyLTExLTAxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdC1wYXRjaCBhbmFseXplLWJhc2VsaW5lcyBvdXRwdXQgaXMgd2VhaworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IGFu YWx5emUtYmFzZWxpbmVzIHByaW50cyBhIGxpc3Qgb2YgYmFzZWxpbmVzIHRoYXQgaGF2ZQorICAg ICAgICB0aGUgc2FtZSBjaGVja3N1bSBwZXIgbGluZSwgYnV0IHRoZSBmb3JtYXQgaXMgaGFyZCB0 byByZWFkOworICAgICAgICB0aGlzIHBhdGNoIGNsZWFucyB1cCB0aGUgb3V0cHV0IHRvIHByaW50 IGJ5IGRpcmVjdG9yeSBpbnN0ZWFkCisgICAgICAgIGFuZCB1c2UgdGhlIHNhbWUgZm9ybWF0IEkg cmVjZW50bHkgYWRkZWQgZm9yIGRlYnVnZ2luZyBvcHRpbWl6ZS1iYXNlbGluZXMsCisgICAgICAg IHRoZW4gcmVmYWN0b3JzIHRoZSBjb2RlIHNvIHRoYXQgd2Ugc2hhcmUgYW5kIGFkZHMgdGVzdHMg Zm9yCisgICAgICAgIGFuYWx5emUtYmFzZWxpbmVzICh3aGljaCB3YXMgdW50ZXN0ZWQpLgorCisg ICAgICAgIEFsc28sIEkgZ290IHJpZCBvZiBhIGNvdXBsZSBvZiB1bm5lY2Vzc2FyaWx5LWhhcmRj b2RlZCBwb3J0IG5hbWVzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvYmFzZWxpbmVvcHRpbWl6ZXIucHk6CisgICAgICAgIChCYXNlbGluZU9wdGltaXplci5y ZWFkX3Jlc3VsdHNfYnlfZGlyZWN0b3J5KToKKyAgICAgICAgKEJhc2VsaW5lT3B0aW1pemVyLndy aXRlX2J5X2RpcmVjdG9yeSk6CisgICAgICAgIChCYXNlbGluZU9wdGltaXplci5vcHRpbWl6ZSk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6 CisgICAgICAgIChPcHRpbWl6ZUJhc2VsaW5lcy5leGVjdXRlKToKKyAgICAgICAgKEFuYWx5emVC YXNlbGluZXMuX19pbml0X18pOgorICAgICAgICAoQW5hbHl6ZUJhc2VsaW5lcy5fd3JpdGUpOgor ICAgICAgICAoQW5hbHl6ZUJhc2VsaW5lcy5fYW5hbHl6ZV9iYXNlbGluZSk6CisgICAgICAgIChB bmFseXplQmFzZWxpbmVzLmV4ZWN1dGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5OgorICAgICAgICAoX0Zha2VPcHRpbWl6 ZXIpOgorICAgICAgICAoX0Zha2VPcHRpbWl6ZXIucmVhZF9yZXN1bHRzX2J5X2RpcmVjdG9yeSk6 CisgICAgICAgIChUZXN0QW5hbHl6ZUJhc2VsaW5lcyk6CisgICAgICAgIChUZXN0QW5hbHl6ZUJh c2VsaW5lcy5zZXRVcCk6CisgICAgICAgIChUZXN0QW5hbHl6ZUJhc2VsaW5lcy50ZXN0X2RlZmF1 bHQpOgorICAgICAgICAoVGVzdEFuYWx5emVCYXNlbGluZXMudGVzdF9taXNzaW5nX2Jhc2VsaW5l cyk6CisKIDIwMTItMTEtMDEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAg ICAgICAgQWRkIExMREItUHl0aG9uIHNjcmlwdHMgdG8gc3VwcG9ydCBXZWJLaXQgZGF0YSB0eXBl cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jh c2VsaW5lb3B0aW1pemVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvYmFzZWxpbmVvcHRpbWl6ZXIucHkKaW5kZXggODNkZjgxNTAzNjlmZTc3NWM4ZTEwMzllMDMw YTEzOTI5ZjU0MGU2MS4uOWIyYWJkMjVjZGU5ZTk5NjA1ZTZjN2E4MjliOTA4ZDczZjhkNjcxNCAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYmFzZWxp bmVvcHRpbWl6ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvYmFzZWxpbmVvcHRpbWl6ZXIucHkKQEAgLTgxLDcgKzgxLDcgQEAgY2xhc3MgQmFzZWxpbmVP cHRpbWl6ZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5faHlwZXJncmFwaCA9IF9iYXNlbGluZV9z ZWFyY2hfaHlwZXJncmFwaChob3N0KQogICAgICAgICBzZWxmLl9kaXJlY3RvcmllcyA9IHJlZHVj ZShzZXQudW5pb24sIG1hcChzZXQsIHNlbGYuX2h5cGVyZ3JhcGgudmFsdWVzKCkpKQogCi0gICAg ZGVmIF9yZWFkX3Jlc3VsdHNfYnlfZGlyZWN0b3J5KHNlbGYsIGJhc2VsaW5lX25hbWUpOgorICAg IGRlZiByZWFkX3Jlc3VsdHNfYnlfZGlyZWN0b3J5KHNlbGYsIGJhc2VsaW5lX25hbWUpOgogICAg ICAgICByZXN1bHRzX2J5X2RpcmVjdG9yeSA9IHt9CiAgICAgICAgIGZvciBkaXJlY3RvcnkgaW4g c2VsZi5fZGlyZWN0b3JpZXM6CiAgICAgICAgICAgICBwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5q b2luKHNlbGYuX3NjbS5jaGVja291dF9yb290LCBkaXJlY3RvcnksIGJhc2VsaW5lX25hbWUpCkBA IC0yNDMsNiArMjQzLDEwIEBAIGNsYXNzIEJhc2VsaW5lT3B0aW1pemVyKG9iamVjdCk6CiAgICAg ICAgIHJlc3VsdHNfYnlfZGlyZWN0b3J5ID0gc2VsZi5fcmVhZF9yZXN1bHRzX2J5X2RpcmVjdG9y eShiYXNlbGluZV9uYW1lKQogICAgICAgICByZXR1cm4gX2ludmVydF9kaWN0aW9uYXJ5KHJlc3Vs dHNfYnlfZGlyZWN0b3J5KQogCisgICAgZGVmIHdyaXRlX2J5X2RpcmVjdG9yeShzZWxmLCByZXN1 bHRzX2J5X2RpcmVjdG9yeSwgd3JpdGVyLCBpbmRlbnQpOgorICAgICAgICBmb3IgcGF0aCBpbiBz b3J0ZWQocmVzdWx0c19ieV9kaXJlY3RvcnkpOgorICAgICAgICAgICAgd3JpdGVyKCIlcyVzOiAl cyIgJSAoaW5kZW50LCBzZWxmLl9wbGF0Zm9ybShwYXRoKSwgcmVzdWx0c19ieV9kaXJlY3Rvcnlb cGF0aF1bMDo2XSkpCisKICAgICBkZWYgb3B0aW1pemUoc2VsZiwgYmFzZWxpbmVfbmFtZSk6CiAg ICAgICAgIGJhc2VuYW1lID0gc2VsZi5fZmlsZXN5c3RlbS5iYXNlbmFtZShiYXNlbGluZV9uYW1l KQogICAgICAgICByZXN1bHRzX2J5X2RpcmVjdG9yeSwgbmV3X3Jlc3VsdHNfYnlfZGlyZWN0b3J5 ID0gc2VsZi5fZmluZF9vcHRpbWFsX3Jlc3VsdF9wbGFjZW1lbnQoYmFzZWxpbmVfbmFtZSkKQEAg LTI1MCw5ICsyNTQsNyBAQCBjbGFzcyBCYXNlbGluZU9wdGltaXplcihvYmplY3QpOgogICAgICAg ICBpZiBuZXdfcmVzdWx0c19ieV9kaXJlY3RvcnkgPT0gcmVzdWx0c19ieV9kaXJlY3Rvcnk6CiAg ICAgICAgICAgICBpZiBuZXdfcmVzdWx0c19ieV9kaXJlY3Rvcnk6CiAgICAgICAgICAgICAgICAg X2xvZy5kZWJ1ZygiICAlczogKGFscmVhZHkgb3B0aW1hbCkiICUgYmFzZW5hbWUpCi0gICAgICAg ICAgICAgICAgZm9yIHBhdGggaW4gc29ydGVkKHJlc3VsdHNfYnlfZGlyZWN0b3J5KToKLSAgICAg ICAgICAgICAgICAgICAgcmVzdWx0ID0gcmVzdWx0c19ieV9kaXJlY3RvcnlbcGF0aF0KLSAgICAg ICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiICAgICAgJXM6ICVzIiAlIChzZWxmLl9wbGF0Zm9y bShwYXRoKSwgcmVzdWx0WzA6Nl0pKQorICAgICAgICAgICAgICAgIHNlbGYud3JpdGVfYnlfZGly ZWN0b3J5KHJlc3VsdHNfYnlfZGlyZWN0b3J5LCBfbG9nLmRlYnVnLCAiICAgICIpCiAgICAgICAg ICAgICBlbHNlOgogICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIiAgJXM6IChubyBiYXNlbGlu ZXMgZm91bmQpIiAlIGJhc2VuYW1lKQogICAgICAgICAgICAgcmV0dXJuIFRydWUKQEAgLTI2Miwx MyArMjY0LDkgQEAgY2xhc3MgQmFzZWxpbmVPcHRpbWl6ZXIob2JqZWN0KToKIAogICAgICAgICBf bG9nLmRlYnVnKCIgICVzOiIgJSBiYXNlbmFtZSkKICAgICAgICAgX2xvZy5kZWJ1ZygiICAgIEJl Zm9yZTogIikKLSAgICAgICAgZm9yIHBhdGggaW4gc29ydGVkKHJlc3VsdHNfYnlfZGlyZWN0b3J5 KToKLSAgICAgICAgICAgIHJlc3VsdCA9IHJlc3VsdHNfYnlfZGlyZWN0b3J5W3BhdGhdCi0gICAg ICAgICAgICBfbG9nLmRlYnVnKCIgICAgICAlczogJXMiICUgKHNlbGYuX3BsYXRmb3JtKHBhdGgp LCByZXN1bHRbMDo2XSkpCisgICAgICAgIHNlbGYud3JpdGVfYnlfZGlyZWN0b3J5KHJlc3VsdHNf YnlfZGlyZWN0b3J5LCBfbG9nLmRlYnVnLCAiICAgICAgIikKICAgICAgICAgX2xvZy5kZWJ1Zygi ICAgIEFmdGVyOiAiKQotICAgICAgICBmb3IgcGF0aCBpbiBzb3J0ZWQobmV3X3Jlc3VsdHNfYnlf ZGlyZWN0b3J5KToKLSAgICAgICAgICAgIHJlc3VsdCA9IG5ld19yZXN1bHRzX2J5X2RpcmVjdG9y eVtwYXRoXQotICAgICAgICAgICAgX2xvZy5kZWJ1ZygiICAgICAgJXM6ICVzIiAlIChzZWxmLl9w bGF0Zm9ybShwYXRoKSwgcmVzdWx0WzA6Nl0pKQorICAgICAgICBzZWxmLndyaXRlX2J5X2RpcmVj dG9yeShuZXdfcmVzdWx0c19ieV9kaXJlY3RvcnksIF9sb2cuZGVidWcsICIgICAgICAiKQogCiAg ICAgICAgIHNlbGYuX21vdmVfYmFzZWxpbmVzKGJhc2VsaW5lX25hbWUsIHJlc3VsdHNfYnlfZGly ZWN0b3J5LCBuZXdfcmVzdWx0c19ieV9kaXJlY3RvcnkpCiAgICAgICAgIHJldHVybiBUcnVlCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGlu ZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5 CmluZGV4IDljNjgzM2NkYjNhNDdjZWJiYzQ1ZjQ3MTY4MWNhMjU0YjIzYTcyZDcuLjAyYmViMjgz MzhmN2ExMTYxZmY5NDg1NDYyZWI5NGRkNjY2OTRlYzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC0yMDgsOCArMjA4LDcg QEAgY2xhc3MgT3B0aW1pemVCYXNlbGluZXMoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToK ICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgc2Vs Zi5fYmFzZWxpbmVfc3VmZml4X2xpc3QgPSBvcHRpb25zLnN1ZmZpeGVzLnNwbGl0KCcsJykKICAg ICAgICAgc2VsZi5fYmFzZWxpbmVfb3B0aW1pemVyID0gQmFzZWxpbmVPcHRpbWl6ZXIodG9vbCkK LSAgICAgICAgc2VsZi5fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldCgiY2hyb21pdW0td2lu LXdpbjciKSAgIyBGSVhNRTogVGhpcyBzaG91bGQgYmUgc2VsZWN0YWJsZS4KLQorICAgICAgICBz ZWxmLl9wb3J0ID0gdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KCkKICAgICAgICAgZm9yIHRlc3RfbmFt ZSBpbiBzZWxmLl9wb3J0LnRlc3RzKGFyZ3MpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCJPcHRp bWl6aW5nICVzIiAlIHRlc3RfbmFtZSkKICAgICAgICAgICAgIHNlbGYuX29wdGltaXplX2Jhc2Vs aW5lKHRlc3RfbmFtZSkKQEAgLTIyMSwyOCArMjIwLDMxIEBAIGNsYXNzIEFuYWx5emVCYXNlbGlu ZXMoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICBhcmd1bWVudF9uYW1lcyA9ICJU RVNUX05BTUVTIgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAgICByZXR1cm4gc3Vw ZXIoQW5hbHl6ZUJhc2VsaW5lcywgc2VsZikuX19pbml0X18ob3B0aW9ucz1bc2VsZi5zdWZmaXhl c19vcHRpb25dKQorICAgICAgICBzdXBlcihBbmFseXplQmFzZWxpbmVzLCBzZWxmKS5fX2luaXRf XyhvcHRpb25zPVsKKyAgICAgICAgICAgIHNlbGYuc3VmZml4ZXNfb3B0aW9uLAorICAgICAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tbWlzc2luZycsIGFjdGlvbj0nc3RvcmVfdHJ1ZScs IGRlZmF1bHQ9RmFsc2UsIGhlbHA9J3Nob3cgbWlzc2luZyBiYXNlbGluZXMgYXMgd2VsbCcpLAor ICAgICAgICAgICAgXSkKKyAgICAgICAgc2VsZi5fb3B0aW1pemVyX2NsYXNzID0gQmFzZWxpbmVP cHRpbWl6ZXIgICMgb3ZlcnJpZGFibGUgZm9yIHRlc3RpbmcKIAotICAgIGRlZiBfcHJpbnQoc2Vs ZiwgYmFzZWxpbmVfbmFtZSwgZGlyZWN0b3JpZXNfYnlfcmVzdWx0KToKLSAgICAgICAgZm9yIHJl c3VsdCwgZGlyZWN0b3JpZXMgaW4gZGlyZWN0b3JpZXNfYnlfcmVzdWx0Lml0ZW1zKCk6Ci0gICAg ICAgICAgICBpZiBsZW4oZGlyZWN0b3JpZXMpIDw9IDE6Ci0gICAgICAgICAgICAgICAgY29udGlu dWUKLSAgICAgICAgICAgIHJlc3VsdHNfbmFtZXMgPSBbc2VsZi5fdG9vbC5maWxlc3lzdGVtLmpv aW4oZGlyZWN0b3J5LCBiYXNlbGluZV9uYW1lKSBmb3IgZGlyZWN0b3J5IGluIGRpcmVjdG9yaWVz XQotICAgICAgICAgICAgcHJpbnQgJyAnLmpvaW4ocmVzdWx0c19uYW1lcykKKyAgICBkZWYgX3dy aXRlKHNlbGYsIG1zZyk6CisgICAgICAgIHByaW50IG1zZwogCi0gICAgZGVmIF9hbmFseXplX2Jh c2VsaW5lKHNlbGYsIHRlc3RfbmFtZSk6CisgICAgZGVmIF9hbmFseXplX2Jhc2VsaW5lKHNlbGYs IG9wdGlvbnMsIHRlc3RfbmFtZSk6CiAgICAgICAgIGZvciBzdWZmaXggaW4gc2VsZi5fYmFzZWxp bmVfc3VmZml4X2xpc3Q6CiAgICAgICAgICAgICBiYXNlbGluZV9uYW1lID0gX2Jhc2VsaW5lX25h bWUoc2VsZi5fdG9vbC5maWxlc3lzdGVtLCB0ZXN0X25hbWUsIHN1ZmZpeCkKLSAgICAgICAgICAg IGRpcmVjdG9yaWVzX2J5X3Jlc3VsdCA9IHNlbGYuX2Jhc2VsaW5lX29wdGltaXplci5kaXJlY3Rv cmllc19ieV9yZXN1bHQoYmFzZWxpbmVfbmFtZSkKLSAgICAgICAgICAgIHNlbGYuX3ByaW50KGJh c2VsaW5lX25hbWUsIGRpcmVjdG9yaWVzX2J5X3Jlc3VsdCkKKyAgICAgICAgICAgIHJlc3VsdHNf YnlfZGlyZWN0b3J5ID0gc2VsZi5fYmFzZWxpbmVfb3B0aW1pemVyLnJlYWRfcmVzdWx0c19ieV9k aXJlY3RvcnkoYmFzZWxpbmVfbmFtZSkKKyAgICAgICAgICAgIGlmIHJlc3VsdHNfYnlfZGlyZWN0 b3J5OgorICAgICAgICAgICAgICAgIHNlbGYuX3dyaXRlKCIlczoiICUgYmFzZWxpbmVfbmFtZSkK KyAgICAgICAgICAgICAgICBzZWxmLl9iYXNlbGluZV9vcHRpbWl6ZXIud3JpdGVfYnlfZGlyZWN0 b3J5KHJlc3VsdHNfYnlfZGlyZWN0b3J5LCBzZWxmLl93cml0ZSwgIiAgIikKKyAgICAgICAgICAg IGVsaWYgb3B0aW9ucy5taXNzaW5nOgorICAgICAgICAgICAgICAgIHNlbGYuX3dyaXRlKCIlczog KG5vIGJhc2VsaW5lcyBmb3VuZCkiICUgYmFzZWxpbmVfbmFtZSkKIAogICAgIGRlZiBleGVjdXRl KHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgogICAgICAgICBzZWxmLl9iYXNlbGluZV9zdWZm aXhfbGlzdCA9IG9wdGlvbnMuc3VmZml4ZXMuc3BsaXQoJywnKQotICAgICAgICBzZWxmLl9iYXNl bGluZV9vcHRpbWl6ZXIgPSBCYXNlbGluZU9wdGltaXplcih0b29sKQotICAgICAgICBzZWxmLl9w b3J0ID0gdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KCJjaHJvbWl1bS13aW4td2luNyIpICAjIEZJWE1F OiBUaGlzIHNob3VsZCBiZSBzZWxlY3RhYmxlLgotCisgICAgICAgIHNlbGYuX2Jhc2VsaW5lX29w dGltaXplciA9IHNlbGYuX29wdGltaXplcl9jbGFzcyh0b29sKQorICAgICAgICBzZWxmLl9wb3J0 ID0gdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KCkKICAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiBzZWxm Ll9wb3J0LnRlc3RzKGFyZ3MpOgotICAgICAgICAgICAgc2VsZi5fYW5hbHl6ZV9iYXNlbGluZSh0 ZXN0X25hbWUpCisgICAgICAgICAgICBzZWxmLl9hbmFseXplX2Jhc2VsaW5lKG9wdGlvbnMsIHRl c3RfbmFtZSkKIAogCiBjbGFzcyBBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQoQWJz dHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkKaW5kZXggZTU2 OTRkMmZiMmNjZGExNDg5YjkwYWI3MjJmMzIxM2NjY2MxNWRjMy4uYzFmMzMxZjY1ZGNmOTA1NTk2 NzVhZmUxZGUwYzkxNzBmYTM4OThlMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkKQEAgLTI5LDEx ICsyOSwxMiBAQAogaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5vdXRwdXRjYXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCitmcm9tIHdlYmtpdHB5LmNvbW1v bi5jaGVja291dC5iYXNlbGluZW9wdGltaXplciBpbXBvcnQgQmFzZWxpbmVPcHRpbWl6ZXIKK2Zy b20gd2Via2l0cHkuY29tbW9uLm5ldC5idWlsZGJvdC5idWlsZGJvdF9tb2NrIGltcG9ydCBNb2Nr QnVpbGRlcgorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9y dCBNb2NrRXhlY3V0aXZlMgogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1wb3J0IE1v Y2sKIGZyb20gd2Via2l0cHkudG9vbC5jb21tYW5kcy5yZWJhc2VsaW5lIGltcG9ydCAqCiBmcm9t IHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tUb29sLCBNb2NrT3B0aW9ucwotZnJv bSB3ZWJraXRweS5jb21tb24ubmV0LmJ1aWxkYm90LmJ1aWxkYm90X21vY2sgaW1wb3J0IE1vY2tC dWlsZGVyCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0 IE1vY2tFeGVjdXRpdmUyCiAKIAogY2xhc3MgX0Jhc2VUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2Fz ZSk6CkBAIC0zNjAsMyArMzYxLDM2IEBAIGNsYXNzIFRlc3RSZWJhc2VsaW5lRXhwZWN0YXRpb25z KF9CYXNlVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLl9yZWFkKHNl bGYubGlvbl9leHBlY3RhdGlvbnNfcGF0aCksICcnKQogCiAKK2NsYXNzIF9GYWtlT3B0aW1pemVy KEJhc2VsaW5lT3B0aW1pemVyKToKKyAgICBkZWYgcmVhZF9yZXN1bHRzX2J5X2RpcmVjdG9yeShz ZWxmLCBiYXNlbGluZV9uYW1lKToKKyAgICAgICAgaWYgYmFzZWxpbmVfbmFtZS5lbmRzd2l0aCgn dHh0Jyk6CisgICAgICAgICAgICByZXR1cm4geydMYXlvdXRUZXN0cy9wYXNzZXMvdGV4dC5odG1s JzogJzEyMzQ1NicsCisgICAgICAgICAgICAgICAgICAgICdMYXlvdXRUZXN0cy9wbGF0Zm9ybS90 ZXN0LW1hYy1sZW9wYXJkL3Bhc3Nlcy90ZXh0Lmh0bWwnOiAnYWJjZGVmJ30KKyAgICAgICAgcmV0 dXJuIHt9CisKKworY2xhc3MgVGVzdEFuYWx5emVCYXNlbGluZXMoX0Jhc2VUZXN0Q2FzZSk6Cisg ICAgY29tbWFuZF9jb25zdHJ1Y3RvciA9IEFuYWx5emVCYXNlbGluZXMKKworICAgIGRlZiBzZXRV cChzZWxmKToKKyAgICAgICAgc3VwZXIoVGVzdEFuYWx5emVCYXNlbGluZXMsIHNlbGYpLnNldFVw KCkKKyAgICAgICAgc2VsZi5wb3J0ID0gc2VsZi50b29sLnBvcnRfZmFjdG9yeS5nZXQoJ3Rlc3Qn KQorICAgICAgICBzZWxmLnRvb2wucG9ydF9mYWN0b3J5LmdldCA9IGxhbWJkYSBwb3J0X25hbWU9 Tm9uZSwgb3B0aW9ucz1Ob25lOiBzZWxmLnBvcnQKKyAgICAgICAgc2VsZi5saW5lcyA9IFtdCisg ICAgICAgIHNlbGYuY29tbWFuZC5fb3B0aW1pemVyX2NsYXNzID0gX0Zha2VPcHRpbWl6ZXIKKyAg ICAgICAgc2VsZi5jb21tYW5kLl93cml0ZSA9IGxhbWJkYSBtc2c6IHNlbGYubGluZXMuYXBwZW5k KG1zZykKKworICAgIGRlZiB0ZXN0X2RlZmF1bHQoc2VsZik6CisgICAgICAgIHNlbGYuY29tbWFu ZC5leGVjdXRlKE1vY2tPcHRpb25zKHN1ZmZpeGVzPSd0eHQnLCBtaXNzaW5nPUZhbHNlKSwgWydw YXNzZXMvdGV4dC5odG1sJ10sIHNlbGYudG9vbCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo c2VsZi5saW5lcywKKyAgICAgICAgICAgIFsncGFzc2VzL3RleHQtZXhwZWN0ZWQudHh0OicsCisg ICAgICAgICAgICAgJyAgKGdlbmVyaWMpOiAxMjM0NTYnLAorICAgICAgICAgICAgICcgIHRlc3Qt bWFjLWxlb3BhcmQ6IGFiY2RlZiddKQorCisgICAgZGVmIHRlc3RfbWlzc2luZ19iYXNlbGluZXMo c2VsZik6CisgICAgICAgIHNlbGYuY29tbWFuZC5leGVjdXRlKE1vY2tPcHRpb25zKHN1ZmZpeGVz PSdwbmcsdHh0JywgbWlzc2luZz1UcnVlKSwgWydwYXNzZXMvdGV4dC5odG1sJ10sIHNlbGYudG9v bCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5saW5lcywKKyAgICAgICAgICAgIFsn cGFzc2VzL3RleHQtZXhwZWN0ZWQucG5nOiAobm8gYmFzZWxpbmVzIGZvdW5kKScsCisgICAgICAg ICAgICAgJ3Bhc3Nlcy90ZXh0LWV4cGVjdGVkLnR4dDonLAorICAgICAgICAgICAgICcgIChnZW5l cmljKTogMTIzNDU2JywKKyAgICAgICAgICAgICAnICB0ZXN0LW1hYy1sZW9wYXJkOiBhYmNkZWYn XSkK 171963 2012-11-01 18:09:56 -0700 2012-11-01 18:26:13 -0700 fix tests and modify output when optimize fails bug-100998-20121101180810.patch text/plain 12892 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWEzMDlkYzFmMWNiMGM2NzZiMWY4ODFlNzNmNzk4OWYy MjcwMDQxZi4uMjA3NDY0MDkxZWRhMTk4MTJmMjAzNDllMDA0NzA3N2FiZDhiNjMyOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDEyLTExLTAxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdC1wYXRjaCBhbmFseXplLWJhc2VsaW5lcyBvdXRwdXQgaXMgd2VhaworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IGFu YWx5emUtYmFzZWxpbmVzIHByaW50cyBhIGxpc3Qgb2YgYmFzZWxpbmVzIHRoYXQgaGF2ZQorICAg ICAgICB0aGUgc2FtZSBjaGVja3N1bSBwZXIgbGluZSwgYnV0IHRoZSBmb3JtYXQgaXMgaGFyZCB0 byByZWFkOworICAgICAgICB0aGlzIHBhdGNoIGNsZWFucyB1cCB0aGUgb3V0cHV0IHRvIHByaW50 IGJ5IGRpcmVjdG9yeSBpbnN0ZWFkCisgICAgICAgIGFuZCB1c2UgdGhlIHNhbWUgZm9ybWF0IEkg cmVjZW50bHkgYWRkZWQgZm9yIGRlYnVnZ2luZyBvcHRpbWl6ZS1iYXNlbGluZXMsCisgICAgICAg IHRoZW4gcmVmYWN0b3JzIHRoZSBjb2RlIHNvIHRoYXQgd2Ugc2hhcmUgYW5kIGFkZHMgdGVzdHMg Zm9yCisgICAgICAgIGFuYWx5emUtYmFzZWxpbmVzICh3aGljaCB3YXMgdW50ZXN0ZWQpLgorCisg ICAgICAgIEFsc28sIEkgZ290IHJpZCBvZiBhIGNvdXBsZSBvZiB1bm5lY2Vzc2FyaWx5LWhhcmRj b2RlZCBwb3J0IG5hbWVzLAorICAgICAgICBhbmQgbW9kaWZpZWQgdGhlIGJhc2VsaW5lIG9wdGlt aXplciB0byBsb2cgdGhlIGN1cnJlbnQgd29ybGQgd2hlbgorICAgICAgICBvcHRpbWl6ZSBmYWls cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5l b3B0aW1pemVyLnB5OgorICAgICAgICAoQmFzZWxpbmVPcHRpbWl6ZXIucmVhZF9yZXN1bHRzX2J5 X2RpcmVjdG9yeSk6CisgICAgICAgIChCYXNlbGluZU9wdGltaXplci53cml0ZV9ieV9kaXJlY3Rv cnkpOgorICAgICAgICAoQmFzZWxpbmVPcHRpbWl6ZXIub3B0aW1pemUpOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5OgorICAgICAgICAoT3B0 aW1pemVCYXNlbGluZXMuZXhlY3V0ZSk6CisgICAgICAgIChBbmFseXplQmFzZWxpbmVzLl9faW5p dF9fKToKKyAgICAgICAgKEFuYWx5emVCYXNlbGluZXMuX3dyaXRlKToKKyAgICAgICAgKEFuYWx5 emVCYXNlbGluZXMuX2FuYWx5emVfYmFzZWxpbmUpOgorICAgICAgICAoQW5hbHl6ZUJhc2VsaW5l cy5leGVjdXRlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmVi YXNlbGluZV91bml0dGVzdC5weToKKyAgICAgICAgKF9GYWtlT3B0aW1pemVyKToKKyAgICAgICAg KF9GYWtlT3B0aW1pemVyLnJlYWRfcmVzdWx0c19ieV9kaXJlY3RvcnkpOgorICAgICAgICAoVGVz dEFuYWx5emVCYXNlbGluZXMpOgorICAgICAgICAoVGVzdEFuYWx5emVCYXNlbGluZXMuc2V0VXAp OgorICAgICAgICAoVGVzdEFuYWx5emVCYXNlbGluZXMudGVzdF9kZWZhdWx0KToKKyAgICAgICAg KFRlc3RBbmFseXplQmFzZWxpbmVzLnRlc3RfbWlzc2luZ19iYXNlbGluZXMpOgorCiAyMDEyLTEx LTAxICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBMTERC LVB5dGhvbiBzY3JpcHRzIHRvIHN1cHBvcnQgV2ViS2l0IGRhdGEgdHlwZXMuCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9iYXNlbGluZW9wdGltaXpl ci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5lb3B0 aW1pemVyLnB5CmluZGV4IDgzZGY4MTUwMzY5ZmU3NzVjOGUxMDM5ZTAzMGExMzkyOWY1NDBlNjEu LjY0MWIwYWJlZWUwMzFhNzQ2NDRiMGRlOGZkOTM5N2I0Zjg1MTRlNWEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5lb3B0 aW1pemVyLnB5CkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIEJhc2VsaW5lT3B0aW1pemVyKG9iamVj dCk6CiAgICAgICAgIHNlbGYuX2h5cGVyZ3JhcGggPSBfYmFzZWxpbmVfc2VhcmNoX2h5cGVyZ3Jh cGgoaG9zdCkKICAgICAgICAgc2VsZi5fZGlyZWN0b3JpZXMgPSByZWR1Y2Uoc2V0LnVuaW9uLCBt YXAoc2V0LCBzZWxmLl9oeXBlcmdyYXBoLnZhbHVlcygpKSkKIAotICAgIGRlZiBfcmVhZF9yZXN1 bHRzX2J5X2RpcmVjdG9yeShzZWxmLCBiYXNlbGluZV9uYW1lKToKKyAgICBkZWYgcmVhZF9yZXN1 bHRzX2J5X2RpcmVjdG9yeShzZWxmLCBiYXNlbGluZV9uYW1lKToKICAgICAgICAgcmVzdWx0c19i eV9kaXJlY3RvcnkgPSB7fQogICAgICAgICBmb3IgZGlyZWN0b3J5IGluIHNlbGYuX2RpcmVjdG9y aWVzOgogICAgICAgICAgICAgcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9zY20u Y2hlY2tvdXRfcm9vdCwgZGlyZWN0b3J5LCBiYXNlbGluZV9uYW1lKQpAQCAtMTIyLDcgKzEyMiw3 IEBAIGNsYXNzIEJhc2VsaW5lT3B0aW1pemVyKG9iamVjdCk6CiAgICAgICAgICAgICByZXN1bHRz X2J5X2RpcmVjdG9yeVtkaXJlY3RvcnldID0gcmVzdWx0CiAKICAgICBkZWYgX2ZpbmRfb3B0aW1h bF9yZXN1bHRfcGxhY2VtZW50KHNlbGYsIGJhc2VsaW5lX25hbWUpOgotICAgICAgICByZXN1bHRz X2J5X2RpcmVjdG9yeSA9IHNlbGYuX3JlYWRfcmVzdWx0c19ieV9kaXJlY3RvcnkoYmFzZWxpbmVf bmFtZSkKKyAgICAgICAgcmVzdWx0c19ieV9kaXJlY3RvcnkgPSBzZWxmLnJlYWRfcmVzdWx0c19i eV9kaXJlY3RvcnkoYmFzZWxpbmVfbmFtZSkKICAgICAgICAgcmVzdWx0c19ieV9wb3J0X25hbWUg PSBzZWxmLl9yZXN1bHRzX2J5X3BvcnRfbmFtZShyZXN1bHRzX2J5X2RpcmVjdG9yeSkKICAgICAg ICAgcG9ydF9uYW1lc19ieV9yZXN1bHQgPSBfaW52ZXJ0X2RpY3Rpb25hcnkocmVzdWx0c19ieV9w b3J0X25hbWUpCiAKQEAgLTE4MSw3ICsxODEsNyBAQCBjbGFzcyBCYXNlbGluZU9wdGltaXplcihv YmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIGJlc3Rfc29fZmFyCiAgICAgICAgIGV4Y2VwdCBL ZXlFcnJvciBhcyBlOgogICAgICAgICAgICAgIyBGSVhNRTogS2V5RXJyb3JzIGdldCByYWlzZWQg aWYgd2UncmUgbWlzc2luZyBiYXNlbGluZXMuIFdlIHNob3VsZCBoYW5kbGUgdGhpcyBiZXR0ZXIu Ci0gICAgICAgICAgICByZXR1cm4gcmVzdWx0c19ieV9kaXJlY3RvcnkKKyAgICAgICAgICAgIHJl dHVybiB7fQogCiAgICAgZGVmIF9maW5kX2luX2ZhbGxiYWNrcGF0aChzZWxmLCBmYWxsYmFja19w YXRoLCBjdXJyZW50X3Jlc3VsdCwgcmVzdWx0c19ieV9kaXJlY3RvcnkpOgogICAgICAgICBmb3Ig aW5kZXgsIGRpcmVjdG9yeSBpbiBlbnVtZXJhdGUoZmFsbGJhY2tfcGF0aCk6CkBAIC0yNDAsOSAr MjQwLDEzIEBAIGNsYXNzIEJhc2VsaW5lT3B0aW1pemVyKG9iamVjdCk6CiAgICAgICAgICAgICBf bG9nLmRlYnVnKCIgICAgKE5vdGhpbmcgdG8gYWRkKSIpCiAKICAgICBkZWYgZGlyZWN0b3JpZXNf YnlfcmVzdWx0KHNlbGYsIGJhc2VsaW5lX25hbWUpOgotICAgICAgICByZXN1bHRzX2J5X2RpcmVj dG9yeSA9IHNlbGYuX3JlYWRfcmVzdWx0c19ieV9kaXJlY3RvcnkoYmFzZWxpbmVfbmFtZSkKKyAg ICAgICAgcmVzdWx0c19ieV9kaXJlY3RvcnkgPSBzZWxmLnJlYWRfcmVzdWx0c19ieV9kaXJlY3Rv cnkoYmFzZWxpbmVfbmFtZSkKICAgICAgICAgcmV0dXJuIF9pbnZlcnRfZGljdGlvbmFyeShyZXN1 bHRzX2J5X2RpcmVjdG9yeSkKIAorICAgIGRlZiB3cml0ZV9ieV9kaXJlY3Rvcnkoc2VsZiwgcmVz dWx0c19ieV9kaXJlY3RvcnksIHdyaXRlciwgaW5kZW50KToKKyAgICAgICAgZm9yIHBhdGggaW4g c29ydGVkKHJlc3VsdHNfYnlfZGlyZWN0b3J5KToKKyAgICAgICAgICAgIHdyaXRlcigiJXMlczog JXMiICUgKGluZGVudCwgc2VsZi5fcGxhdGZvcm0ocGF0aCksIHJlc3VsdHNfYnlfZGlyZWN0b3J5 W3BhdGhdWzA6Nl0pKQorCiAgICAgZGVmIG9wdGltaXplKHNlbGYsIGJhc2VsaW5lX25hbWUpOgog ICAgICAgICBiYXNlbmFtZSA9IHNlbGYuX2ZpbGVzeXN0ZW0uYmFzZW5hbWUoYmFzZWxpbmVfbmFt ZSkKICAgICAgICAgcmVzdWx0c19ieV9kaXJlY3RvcnksIG5ld19yZXN1bHRzX2J5X2RpcmVjdG9y eSA9IHNlbGYuX2ZpbmRfb3B0aW1hbF9yZXN1bHRfcGxhY2VtZW50KGJhc2VsaW5lX25hbWUpCkBA IC0yNTAsMjUgKzI1NCwyMCBAQCBjbGFzcyBCYXNlbGluZU9wdGltaXplcihvYmplY3QpOgogICAg ICAgICBpZiBuZXdfcmVzdWx0c19ieV9kaXJlY3RvcnkgPT0gcmVzdWx0c19ieV9kaXJlY3Rvcnk6 CiAgICAgICAgICAgICBpZiBuZXdfcmVzdWx0c19ieV9kaXJlY3Rvcnk6CiAgICAgICAgICAgICAg ICAgX2xvZy5kZWJ1ZygiICAlczogKGFscmVhZHkgb3B0aW1hbCkiICUgYmFzZW5hbWUpCi0gICAg ICAgICAgICAgICAgZm9yIHBhdGggaW4gc29ydGVkKHJlc3VsdHNfYnlfZGlyZWN0b3J5KToKLSAg ICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gcmVzdWx0c19ieV9kaXJlY3RvcnlbcGF0aF0KLSAg ICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiICAgICAgJXM6ICVzIiAlIChzZWxmLl9wbGF0 Zm9ybShwYXRoKSwgcmVzdWx0WzA6Nl0pKQorICAgICAgICAgICAgICAgIHNlbGYud3JpdGVfYnlf ZGlyZWN0b3J5KHJlc3VsdHNfYnlfZGlyZWN0b3J5LCBfbG9nLmRlYnVnLCAiICAgICIpCiAgICAg ICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIiAgJXM6IChubyBiYXNl bGluZXMgZm91bmQpIiAlIGJhc2VuYW1lKQogICAgICAgICAgICAgcmV0dXJuIFRydWUKICAgICAg ICAgaWYgc2VsZi5fZmlsdGVyZWRfcmVzdWx0c19ieV9wb3J0X25hbWUocmVzdWx0c19ieV9kaXJl Y3RvcnkpICE9IHNlbGYuX2ZpbHRlcmVkX3Jlc3VsdHNfYnlfcG9ydF9uYW1lKG5ld19yZXN1bHRz X2J5X2RpcmVjdG9yeSk6Ci0gICAgICAgICAgICBfbG9nLndhcm5pbmcoIk9wdGltaXphdGlvbiBm YWlsZWQiKQorICAgICAgICAgICAgX2xvZy53YXJuaW5nKCIgICVzOiBvcHRpbWl6YXRpb24gZmFp bGVkIiAlIGJhc2VuYW1lKQorICAgICAgICAgICAgc2VsZi53cml0ZV9ieV9kaXJlY3RvcnkocmVz dWx0c19ieV9kaXJlY3RvcnksIF9sb2cud2FybmluZywgIiAgICAgICIpCiAgICAgICAgICAgICBy ZXR1cm4gRmFsc2UKIAogICAgICAgICBfbG9nLmRlYnVnKCIgICVzOiIgJSBiYXNlbmFtZSkKICAg ICAgICAgX2xvZy5kZWJ1ZygiICAgIEJlZm9yZTogIikKLSAgICAgICAgZm9yIHBhdGggaW4gc29y dGVkKHJlc3VsdHNfYnlfZGlyZWN0b3J5KToKLSAgICAgICAgICAgIHJlc3VsdCA9IHJlc3VsdHNf YnlfZGlyZWN0b3J5W3BhdGhdCi0gICAgICAgICAgICBfbG9nLmRlYnVnKCIgICAgICAlczogJXMi ICUgKHNlbGYuX3BsYXRmb3JtKHBhdGgpLCByZXN1bHRbMDo2XSkpCisgICAgICAgIHNlbGYud3Jp dGVfYnlfZGlyZWN0b3J5KHJlc3VsdHNfYnlfZGlyZWN0b3J5LCBfbG9nLmRlYnVnLCAiICAgICAg IikKICAgICAgICAgX2xvZy5kZWJ1ZygiICAgIEFmdGVyOiAiKQotICAgICAgICBmb3IgcGF0aCBp biBzb3J0ZWQobmV3X3Jlc3VsdHNfYnlfZGlyZWN0b3J5KToKLSAgICAgICAgICAgIHJlc3VsdCA9 IG5ld19yZXN1bHRzX2J5X2RpcmVjdG9yeVtwYXRoXQotICAgICAgICAgICAgX2xvZy5kZWJ1Zygi ICAgICAgJXM6ICVzIiAlIChzZWxmLl9wbGF0Zm9ybShwYXRoKSwgcmVzdWx0WzA6Nl0pKQorICAg ICAgICBzZWxmLndyaXRlX2J5X2RpcmVjdG9yeShuZXdfcmVzdWx0c19ieV9kaXJlY3RvcnksIF9s b2cuZGVidWcsICIgICAgICAiKQogCiAgICAgICAgIHNlbGYuX21vdmVfYmFzZWxpbmVzKGJhc2Vs aW5lX25hbWUsIHJlc3VsdHNfYnlfZGlyZWN0b3J5LCBuZXdfcmVzdWx0c19ieV9kaXJlY3Rvcnkp CiAgICAgICAgIHJldHVybiBUcnVlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9iYXNlbGluZW9wdGltaXplcl91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyX3VuaXR0ZXN0 LnB5CmluZGV4IGQ0NGY3MWU5MWE3ZWUzODhiZDU3YmE0MzE1MTVkYmRiYTExZTQzNDkuLjA1MjE3 MzBiMzNkMGM3NThkZjdjMjAxMmFmNGY3YzhmYWQ4M2UzYmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5lb3B0aW1pemVyX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Jhc2VsaW5l b3B0aW1pemVyX3VuaXR0ZXN0LnB5CkBAIC00Miw3ICs0Miw3IEBAIGNsYXNzIFRlc3RCYXNlbGlu ZU9wdGltaXplcihCYXNlbGluZU9wdGltaXplcik6CiAKICAgICAjIFdlIG92ZXJyaWRlIHRoaXMg bWV0aG9kIGZvciB0ZXN0aW5nIHNvIHdlIGRvbid0IGhhdmUgdG8gY29uc3RydWN0IGFuCiAgICAg IyBlbGFib3JhdGUgbW9jayBmaWxlIHN5c3RlbS4KLSAgICBkZWYgX3JlYWRfcmVzdWx0c19ieV9k aXJlY3Rvcnkoc2VsZiwgYmFzZWxpbmVfbmFtZSk6CisgICAgZGVmIHJlYWRfcmVzdWx0c19ieV9k aXJlY3Rvcnkoc2VsZiwgYmFzZWxpbmVfbmFtZSk6CiAgICAgICAgIHJldHVybiBzZWxmLl9tb2Nr X3Jlc3VsdHNfYnlfZGlyZWN0b3J5CiAKICAgICBkZWYgX21vdmVfYmFzZWxpbmVzKHNlbGYsIGJh c2VsaW5lX25hbWUsIHJlc3VsdHNfYnlfZGlyZWN0b3J5LCBuZXdfcmVzdWx0c19ieV9kaXJlY3Rv cnkpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3Jl YmFzZWxpbmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNl bGluZS5weQppbmRleCA5YzY4MzNjZGIzYTQ3Y2ViYmM0NWY0NzE2ODFjYTI1NGIyM2E3MmQ3Li4w MmJlYjI4MzM4ZjdhMTE2MWZmOTQ4NTQ2MmViOTRkZDY2Njk0ZWMyIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQpAQCAtMjA4LDgg KzIwOCw3IEBAIGNsYXNzIE9wdGltaXplQmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29t bWFuZCk6CiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CiAgICAg ICAgIHNlbGYuX2Jhc2VsaW5lX3N1ZmZpeF9saXN0ID0gb3B0aW9ucy5zdWZmaXhlcy5zcGxpdCgn LCcpCiAgICAgICAgIHNlbGYuX2Jhc2VsaW5lX29wdGltaXplciA9IEJhc2VsaW5lT3B0aW1pemVy KHRvb2wpCi0gICAgICAgIHNlbGYuX3BvcnQgPSB0b29sLnBvcnRfZmFjdG9yeS5nZXQoImNocm9t aXVtLXdpbi13aW43IikgICMgRklYTUU6IFRoaXMgc2hvdWxkIGJlIHNlbGVjdGFibGUuCi0KKyAg ICAgICAgc2VsZi5fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldCgpCiAgICAgICAgIGZvciB0 ZXN0X25hbWUgaW4gc2VsZi5fcG9ydC50ZXN0cyhhcmdzKToKICAgICAgICAgICAgIF9sb2cuaW5m bygiT3B0aW1pemluZyAlcyIgJSB0ZXN0X25hbWUpCiAgICAgICAgICAgICBzZWxmLl9vcHRpbWl6 ZV9iYXNlbGluZSh0ZXN0X25hbWUpCkBAIC0yMjEsMjggKzIyMCwzMSBAQCBjbGFzcyBBbmFseXpl QmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgYXJndW1lbnRfbmFt ZXMgPSAiVEVTVF9OQU1FUyIKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgcmV0 dXJuIHN1cGVyKEFuYWx5emVCYXNlbGluZXMsIHNlbGYpLl9faW5pdF9fKG9wdGlvbnM9W3NlbGYu c3VmZml4ZXNfb3B0aW9uXSkKKyAgICAgICAgc3VwZXIoQW5hbHl6ZUJhc2VsaW5lcywgc2VsZiku X19pbml0X18ob3B0aW9ucz1bCisgICAgICAgICAgICBzZWxmLnN1ZmZpeGVzX29wdGlvbiwKKyAg ICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCctLW1pc3NpbmcnLCBhY3Rpb249J3N0b3Jl X3RydWUnLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSdzaG93IG1pc3NpbmcgYmFzZWxpbmVzIGFzIHdl bGwnKSwKKyAgICAgICAgICAgIF0pCisgICAgICAgIHNlbGYuX29wdGltaXplcl9jbGFzcyA9IEJh c2VsaW5lT3B0aW1pemVyICAjIG92ZXJyaWRhYmxlIGZvciB0ZXN0aW5nCiAKLSAgICBkZWYgX3By aW50KHNlbGYsIGJhc2VsaW5lX25hbWUsIGRpcmVjdG9yaWVzX2J5X3Jlc3VsdCk6Ci0gICAgICAg IGZvciByZXN1bHQsIGRpcmVjdG9yaWVzIGluIGRpcmVjdG9yaWVzX2J5X3Jlc3VsdC5pdGVtcygp OgotICAgICAgICAgICAgaWYgbGVuKGRpcmVjdG9yaWVzKSA8PSAxOgotICAgICAgICAgICAgICAg IGNvbnRpbnVlCi0gICAgICAgICAgICByZXN1bHRzX25hbWVzID0gW3NlbGYuX3Rvb2wuZmlsZXN5 c3RlbS5qb2luKGRpcmVjdG9yeSwgYmFzZWxpbmVfbmFtZSkgZm9yIGRpcmVjdG9yeSBpbiBkaXJl Y3Rvcmllc10KLSAgICAgICAgICAgIHByaW50ICcgJy5qb2luKHJlc3VsdHNfbmFtZXMpCisgICAg ZGVmIF93cml0ZShzZWxmLCBtc2cpOgorICAgICAgICBwcmludCBtc2cKIAotICAgIGRlZiBfYW5h bHl6ZV9iYXNlbGluZShzZWxmLCB0ZXN0X25hbWUpOgorICAgIGRlZiBfYW5hbHl6ZV9iYXNlbGlu ZShzZWxmLCBvcHRpb25zLCB0ZXN0X25hbWUpOgogICAgICAgICBmb3Igc3VmZml4IGluIHNlbGYu X2Jhc2VsaW5lX3N1ZmZpeF9saXN0OgogICAgICAgICAgICAgYmFzZWxpbmVfbmFtZSA9IF9iYXNl bGluZV9uYW1lKHNlbGYuX3Rvb2wuZmlsZXN5c3RlbSwgdGVzdF9uYW1lLCBzdWZmaXgpCi0gICAg ICAgICAgICBkaXJlY3Rvcmllc19ieV9yZXN1bHQgPSBzZWxmLl9iYXNlbGluZV9vcHRpbWl6ZXIu ZGlyZWN0b3JpZXNfYnlfcmVzdWx0KGJhc2VsaW5lX25hbWUpCi0gICAgICAgICAgICBzZWxmLl9w cmludChiYXNlbGluZV9uYW1lLCBkaXJlY3Rvcmllc19ieV9yZXN1bHQpCisgICAgICAgICAgICBy ZXN1bHRzX2J5X2RpcmVjdG9yeSA9IHNlbGYuX2Jhc2VsaW5lX29wdGltaXplci5yZWFkX3Jlc3Vs dHNfYnlfZGlyZWN0b3J5KGJhc2VsaW5lX25hbWUpCisgICAgICAgICAgICBpZiByZXN1bHRzX2J5 X2RpcmVjdG9yeToKKyAgICAgICAgICAgICAgICBzZWxmLl93cml0ZSgiJXM6IiAlIGJhc2VsaW5l X25hbWUpCisgICAgICAgICAgICAgICAgc2VsZi5fYmFzZWxpbmVfb3B0aW1pemVyLndyaXRlX2J5 X2RpcmVjdG9yeShyZXN1bHRzX2J5X2RpcmVjdG9yeSwgc2VsZi5fd3JpdGUsICIgICIpCisgICAg ICAgICAgICBlbGlmIG9wdGlvbnMubWlzc2luZzoKKyAgICAgICAgICAgICAgICBzZWxmLl93cml0 ZSgiJXM6IChubyBiYXNlbGluZXMgZm91bmQpIiAlIGJhc2VsaW5lX25hbWUpCiAKICAgICBkZWYg ZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgc2VsZi5fYmFzZWxp bmVfc3VmZml4X2xpc3QgPSBvcHRpb25zLnN1ZmZpeGVzLnNwbGl0KCcsJykKLSAgICAgICAgc2Vs Zi5fYmFzZWxpbmVfb3B0aW1pemVyID0gQmFzZWxpbmVPcHRpbWl6ZXIodG9vbCkKLSAgICAgICAg c2VsZi5fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldCgiY2hyb21pdW0td2luLXdpbjciKSAg IyBGSVhNRTogVGhpcyBzaG91bGQgYmUgc2VsZWN0YWJsZS4KLQorICAgICAgICBzZWxmLl9iYXNl bGluZV9vcHRpbWl6ZXIgPSBzZWxmLl9vcHRpbWl6ZXJfY2xhc3ModG9vbCkKKyAgICAgICAgc2Vs Zi5fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldCgpCiAgICAgICAgIGZvciB0ZXN0X25hbWUg aW4gc2VsZi5fcG9ydC50ZXN0cyhhcmdzKToKLSAgICAgICAgICAgIHNlbGYuX2FuYWx5emVfYmFz ZWxpbmUodGVzdF9uYW1lKQorICAgICAgICAgICAgc2VsZi5fYW5hbHl6ZV9iYXNlbGluZShvcHRp b25zLCB0ZXN0X25hbWUpCiAKIAogY2xhc3MgQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21t YW5kKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5Cmlu ZGV4IGU1Njk0ZDJmYjJjY2RhMTQ4OWI5MGFiNzIyZjMyMTNjY2NjMTVkYzMuLmMxZjMzMWY2NWRj ZjkwNTU5Njc1YWZlMWRlMGM5MTcwZmEzODk4ZTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5CkBA IC0yOSwxMSArMjksMTIgQEAKIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRw eS5jb21tb24uY2hlY2tvdXQuYmFzZWxpbmVvcHRpbWl6ZXIgaW1wb3J0IEJhc2VsaW5lT3B0aW1p emVyCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuYnVpbGRib3QuYnVpbGRib3RfbW9jayBpbXBv cnQgTW9ja0J1aWxkZXIKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9j ayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZTIKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGlt cG9ydCBNb2NrCiBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMucmViYXNlbGluZSBpbXBvcnQg KgogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrVG9vbCwgTW9ja09wdGlv bnMKLWZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWlsZGJvdC5idWlsZGJvdF9tb2NrIGltcG9y dCBNb2NrQnVpbGRlcgotZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2Nr IGltcG9ydCBNb2NrRXhlY3V0aXZlMgogCiAKIGNsYXNzIF9CYXNlVGVzdENhc2UodW5pdHRlc3Qu VGVzdENhc2UpOgpAQCAtMzYwLDMgKzM2MSwzNiBAQCBjbGFzcyBUZXN0UmViYXNlbGluZUV4cGVj dGF0aW9ucyhfQmFzZVRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5f cmVhZChzZWxmLmxpb25fZXhwZWN0YXRpb25zX3BhdGgpLCAnJykKIAogCitjbGFzcyBfRmFrZU9w dGltaXplcihCYXNlbGluZU9wdGltaXplcik6CisgICAgZGVmIHJlYWRfcmVzdWx0c19ieV9kaXJl Y3Rvcnkoc2VsZiwgYmFzZWxpbmVfbmFtZSk6CisgICAgICAgIGlmIGJhc2VsaW5lX25hbWUuZW5k c3dpdGgoJ3R4dCcpOgorICAgICAgICAgICAgcmV0dXJuIHsnTGF5b3V0VGVzdHMvcGFzc2VzL3Rl eHQuaHRtbCc6ICcxMjM0NTYnLAorICAgICAgICAgICAgICAgICAgICAnTGF5b3V0VGVzdHMvcGxh dGZvcm0vdGVzdC1tYWMtbGVvcGFyZC9wYXNzZXMvdGV4dC5odG1sJzogJ2FiY2RlZid9CisgICAg ICAgIHJldHVybiB7fQorCisKK2NsYXNzIFRlc3RBbmFseXplQmFzZWxpbmVzKF9CYXNlVGVzdENh c2UpOgorICAgIGNvbW1hbmRfY29uc3RydWN0b3IgPSBBbmFseXplQmFzZWxpbmVzCisKKyAgICBk ZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHN1cGVyKFRlc3RBbmFseXplQmFzZWxpbmVzLCBzZWxm KS5zZXRVcCgpCisgICAgICAgIHNlbGYucG9ydCA9IHNlbGYudG9vbC5wb3J0X2ZhY3RvcnkuZ2V0 KCd0ZXN0JykKKyAgICAgICAgc2VsZi50b29sLnBvcnRfZmFjdG9yeS5nZXQgPSBsYW1iZGEgcG9y dF9uYW1lPU5vbmUsIG9wdGlvbnM9Tm9uZTogc2VsZi5wb3J0CisgICAgICAgIHNlbGYubGluZXMg PSBbXQorICAgICAgICBzZWxmLmNvbW1hbmQuX29wdGltaXplcl9jbGFzcyA9IF9GYWtlT3B0aW1p emVyCisgICAgICAgIHNlbGYuY29tbWFuZC5fd3JpdGUgPSBsYW1iZGEgbXNnOiBzZWxmLmxpbmVz LmFwcGVuZChtc2cpCisKKyAgICBkZWYgdGVzdF9kZWZhdWx0KHNlbGYpOgorICAgICAgICBzZWxm LmNvbW1hbmQuZXhlY3V0ZShNb2NrT3B0aW9ucyhzdWZmaXhlcz0ndHh0JywgbWlzc2luZz1GYWxz ZSksIFsncGFzc2VzL3RleHQuaHRtbCddLCBzZWxmLnRvb2wpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHNlbGYubGluZXMsCisgICAgICAgICAgICBbJ3Bhc3Nlcy90ZXh0LWV4cGVjdGVkLnR4 dDonLAorICAgICAgICAgICAgICcgIChnZW5lcmljKTogMTIzNDU2JywKKyAgICAgICAgICAgICAn ICB0ZXN0LW1hYy1sZW9wYXJkOiBhYmNkZWYnXSkKKworICAgIGRlZiB0ZXN0X21pc3NpbmdfYmFz ZWxpbmVzKHNlbGYpOgorICAgICAgICBzZWxmLmNvbW1hbmQuZXhlY3V0ZShNb2NrT3B0aW9ucyhz dWZmaXhlcz0ncG5nLHR4dCcsIG1pc3Npbmc9VHJ1ZSksIFsncGFzc2VzL3RleHQuaHRtbCddLCBz ZWxmLnRvb2wpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYubGluZXMsCisgICAgICAg ICAgICBbJ3Bhc3Nlcy90ZXh0LWV4cGVjdGVkLnBuZzogKG5vIGJhc2VsaW5lcyBmb3VuZCknLAor ICAgICAgICAgICAgICdwYXNzZXMvdGV4dC1leHBlY3RlZC50eHQ6JywKKyAgICAgICAgICAgICAn ICAoZ2VuZXJpYyk6IDEyMzQ1NicsCisgICAgICAgICAgICAgJyAgdGVzdC1tYWMtbGVvcGFyZDog YWJjZGVmJ10pCg==