73406 2011-11-30 00:27:39 -0800 [NRWT] TestResultWriter should pass tolerance=0 to port.diff_image in case of reftests. 2011-12-04 18:54:46 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hayato hayato abarth dglazkov ojan rniwa webkit.review.bot oldest_to_newest 511464 0 hayato 2011-11-30 00:27:39 -0800 TestResultWriter should pass tolerance=0 explicitly to port.diff_image in case of reftests. Mac port uses '0.1' as default value of tolerance. In case of reftests, we should use tolerance=0 in the phase of writing test results in addition to the phase of comparing images. See https://bugs.webkit.org/show_bug.cgi?id=73381 also. 511480 1 rniwa 2011-11-30 00:54:47 -0800 This doesn't really help as ImageDiff itself has a default tolerance level. 511505 2 hayato 2011-11-30 01:27:32 -0800 Is there any ImageDiff which doesn't accept tolerance parameter? It seems that ImageDiff used by chromium port doesn't use tolerance parameter. I assumed its default is 'zero' though I've not investigated every ImageDiff program's behavior on every platform yet. (In reply to comment #1) > This doesn't really help as ImageDiff itself has a default tolerance level. 511506 3 hayato 2011-11-30 01:29:46 -0800 At least, passing tolerance=0 resolves mac port's issue and this doesn't affect other platforms because we don't pass tolerance parameter to ImageDiff on other platforms. Things should not become worse than now, I guess. 511525 4 117143 hayato 2011-11-30 01:48:23 -0800 Created attachment 117143 pass zero 511837 5 117143 rniwa 2011-11-30 10:07:29 -0800 Comment on attachment 117143 pass zero View in context: https://bugs.webkit.org/attachment.cgi?id=117143&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py:54 > + driver_output1, driver_output2, failures) Wrong indentation. 512064 6 117143 webkit.review.bot 2011-11-30 13:23:02 -0800 Comment on attachment 117143 pass zero Attachment 117143 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10696325 512716 7 117143 webkit.review.bot 2011-12-01 06:03:57 -0800 Comment on attachment 117143 pass zero Rejecting attachment 117143 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: and returned 256 at Tools/Scripts/update-webkit-chromium line 109. Re-trying 'depot_tools/gclient sync --force --reset --delete_unversioned_trees' No such file or directory at /mnt/git/webkit-commit-queue/Tools/Scripts/webkitdirs.pm line 2020. Failed to run "['Tools/Scripts/build-webkit', '--release', '--chromium', '--update-chromium']" exit_code: 2 sync --force --reset --delete_unversioned_trees' No such file or directory at /mnt/git/webkit-commit-queue/Tools/Scripts/webkitdirs.pm line 2020. Full output: http://queues.webkit.org/results/10695236 513418 8 rniwa 2011-12-01 19:57:25 -0800 Is https://bugs.webkit.org/show_bug.cgi?id=55652 a duplicate of this bug? 513438 9 117143 webkit.review.bot 2011-12-01 20:32:44 -0800 Comment on attachment 117143 pass zero Clearing flags on attachment: 117143 Committed r101739: <http://trac.webkit.org/changeset/101739> 513439 10 webkit.review.bot 2011-12-01 20:32:49 -0800 All reviewed patches have been landed. Closing bug. 514829 11 hayato 2011-12-04 18:53:42 -0800 *** Bug 55652 has been marked as a duplicate of this bug. *** 514830 12 hayato 2011-12-04 18:54:46 -0800 Right. I marked it as duplicate of this bug. (In reply to comment #8) > Is https://bugs.webkit.org/show_bug.cgi?id=55652 a duplicate of this bug? 117143 2011-11-30 01:48:23 -0800 2011-12-01 20:32:43 -0800 pass zero bug-73406-20111130184821.patch text/plain 11710 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDU2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDc3ZTc3NDVlMWU0NWVmOTgzMTBmZmNlNGQ0MTM2Yzkz ODcxNDY3OC4uNDcwNDE5NjEzZGM3Zjc1NDRlMThkZDgwM2UwMDYwNGRlM2ZkMzYyYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDExLTExLTMwICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAg ICAgICBFeHBsaWNpdGx5IHBhc3MgdG9sZXJhbmNlPTAgdG8gcG9ydC5kaWZmX2ltYWdlIGluIGNh c2Ugb2YgUmVmVGVzdE1pc21hdGNoIGZhaWx1cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzQwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdFBvcnQncyBpbWFnZV9kaWZmIHVzZXMgdG9sZXJh bmNlPScwLjEnIGluIGRlZmF1bHQuCisgICAgICAgIFdoZW4gcmVmdGVzdHMgZmFpbCwgd2Ugc2hv dWxkIHVzZSB0b2xlcmFjZT0wIHdoZW4gZGlmZi1pbmcgaW1hZ2VzLgorCisgICAgICAgIFNpbmNl IEltYWdlRGlmZiBvbiBjaHJvbWl1bSBwb3J0IGRvZXNuJ3QgdXNlIHRvbGVyYW5jZSB2YWx1ZSBh cyBvZiBub3csCisgICAgICAgIHRoaXMgY2hhbmdlIGRvZXNuJ3QgYWZmZWN0IGNocm9taXVtIHBv cnQncyBiZWhhdmlvci4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weToKKyAgICAgICAgKHdyaXRlX3Rlc3Rf cmVzdWx0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jh c2UucHk6CisgICAgICAgIChQb3J0LmRpZmZfaW1hZ2UpOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6CisgICAgICAgIChDaHJvbWl1bVBv cnQuZGlmZl9pbWFnZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC90ZXN0LnB5OgorICAgICAgICAoVGVzdFBvcnQuZGlmZl9pbWFnZSk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHk6CisgICAgICAgIChX ZWJLaXRQb3J0LmRpZmZfaW1hZ2UpOgorICAgICAgICAoV2ViS2l0UG9ydC5fc3RhcnRfaW1hZ2Vf ZGlmZl9wcm9jZXNzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weToKKyAgICAgICAgKE1haW5UZXN0LnRl c3RfdG9sZXJhbmNlLkltYWdlRGlmZlRlc3RQb3J0LmRpZmZfaW1hZ2UpOgorCiAyMDExLTExLTI5 ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTa2lwIHdyaXRp bmcgdGhlIHJlc3VsdCBvZiBkaWZmX2ltYWdlIHNpbmNlIG5vbi1jaHJvbWl1bSBwb3J0cyBkb24n dCBpbXBsZW1lbnQgZGlmZl9pbWFnZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dy aXRlci5weQppbmRleCA5ZWMwNWYwOTc5YWNmODI3MTVhM2Y2YzMyYzViYjI0ZWQzNjYwNzQ1Li5k ZDExZWUzYTNhNGZmYmJmY2Q0ZDI1YTdmMDMxODkxYzZkOTk0Y2I0IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93 cml0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5CkBAIC03MCwxMCArNzAsMTEgQEAgZGVmIHdyaXRl X3Rlc3RfcmVzdWx0KHBvcnQsIHRlc3RfbmFtZSwgZHJpdmVyX291dHB1dCwKICAgICAgICAgICAg ICMgRklYTUU6IFRoaXMgd29yayBzaG91bGQgYmUgZG9uZSBlYXJsaWVyIGluIHRoZSBwaXBlbGlu ZSAoZS5nLiwgd2hlbiB3ZSBjb21wYXJlIGltYWdlcyBmb3Igbm9uLXJlZiB0ZXN0cykuCiAgICAg ICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgYWx3YXlzIGhhdmUgMiBpbWFnZXMgaGVyZS4KICAg ICAgICAgICAgIGlmIGRyaXZlcl9vdXRwdXQuaW1hZ2UgYW5kIGV4cGVjdGVkX2RyaXZlcl9vdXRw dXQuaW1hZ2U6Ci0gICAgICAgICAgICAgICAgaW1hZ2VfZGlmZiA9IHBvcnQuZGlmZl9pbWFnZShk cml2ZXJfb3V0cHV0LmltYWdlLCBleHBlY3RlZF9kcml2ZXJfb3V0cHV0LmltYWdlKVswXQotICAg ICAgICAgICAgICAgICMgTm9uLWNocm9taXVtIHBvcnRzIHJldHVybiAnTm9uZScgc2luY2UgdGhl eSBkb24ndCBpbXBsZW1lbnQgZGlmZl9pbWFnZS4KLSAgICAgICAgICAgICAgICBpZiBpbWFnZV9k aWZmIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgICAgIGltYWdlX2RpZmYgPSBwb3J0LmRpZmZf aW1hZ2UoZHJpdmVyX291dHB1dC5pbWFnZSwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dC5pbWFnZSwg dG9sZXJhbmNlPTApWzBdCisgICAgICAgICAgICAgICAgaWYgaW1hZ2VfZGlmZjoKICAgICAgICAg ICAgICAgICAgICAgd3JpdGVyLndyaXRlX2ltYWdlX2RpZmZfZmlsZXMoaW1hZ2VfZGlmZikKKyAg ICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICBfbG9nLndhcm4oJ0NhbiBu b3QgZ2V0IGltYWdlIGRpZmYuIEltYWdlRGlmZiBwcm9ncmFtIG1pZ2h0IG5vdCB3b3JrIGNvcnJl Y3RseS4nKQogICAgICAgICAgICAgd3JpdGVyLmNvcHlfZmlsZShmYWlsdXJlLnJlZmVyZW5jZV9m aWxlbmFtZSkKICAgICAgICAgZWxpZiBpc2luc3RhbmNlKGZhaWx1cmUsIHRlc3RfZmFpbHVyZXMu RmFpbHVyZVJlZnRlc3RNaXNtYXRjaERpZE5vdE9jY3VyKToKICAgICAgICAgICAgIHdyaXRlci53 cml0ZV9pbWFnZV9maWxlcyhkcml2ZXJfb3V0cHV0LmltYWdlLCBleHBlY3RlZF9pbWFnZT1Ob25l KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0ZXN0 LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjdhZDQ0OWZhZWFjZjNkMmZhM2JjM2JhMjcxNDI4NWVlZWFiMGVkMTMK LS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXJfdW5pdHRlc3QucHkKQEAgLTAsMCArMSw1OSBA QAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCisjIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQor IyBtZXQ6CisjCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy CisjIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMg TElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisj IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IHVuaXR0ZXN0CisKK2Zyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLmNvbnRyb2xsZXJzIGltcG9ydCB0ZXN0X3Jlc3VsdF93cml0ZXIKK2Zyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscyBpbXBvcnQgdGVzdF9mYWlsdXJlcworZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMucG9ydC5kcml2ZXIgaW1wb3J0IERyaXZlck91dHB1dAorZnJvbSB3 ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC50ZXN0IGltcG9ydCBUZXN0UG9ydAorCisKK2NsYXNz IFRlc3RSZXN1bHRXcml0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKworICAgIGRlZiB0ZXN0 X3JlZnRlc3RfZGlmZl9pbWFnZXQoc2VsZik6CisgICAgICAgICIiIkEgd3JpdGVfdGVzdF9yZXN1 bHQgc2hvdWxkIGNhbGwgcG9ydC5kaWZmX2ltYWdlIHdpdGggdG9sZXJhbmNlPTAgaW4gY2FzZSBv ZiBGYWlsdXJlUmVmdGVzdE1pc21hdGNoLiIiIgorICAgICAgICB1c2VkX3RvbGVyYW5jZV92YWx1 ZXMgPSBbXQorCisgICAgICAgIGNsYXNzIEltYWdlRGlmZlRlc3RQb3J0KFRlc3RQb3J0KToKKyAg ICAgICAgICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxf Y29udGVudHMsIHRvbGVyYW5jZT1Ob25lKToKKyAgICAgICAgICAgICAgICB1c2VkX3RvbGVyYW5j ZV92YWx1ZXMuYXBwZW5kKHRvbGVyYW5jZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gKFRydWUs IDEpCisKKyAgICAgICAgcG9ydCA9IEltYWdlRGlmZlRlc3RQb3J0KCkKKyAgICAgICAgZnMgPSBw b3J0Ll9maWxlc3lzdGVtCisgICAgICAgIHRlc3RfbmFtZSA9ICdmYWlsdXJlcy91bmV4cGVjdGVk L3JlZnRlc3QuaHRtbCcKKyAgICAgICAgdGVzdF9yZWZlcmVuY2VfZmlsZSA9IGZzLmpvaW4ocG9y dC5sYXlvdXRfdGVzdHNfZGlyKCksIHBvcnQucmVmdGVzdF9leHBlY3RlZF9maWxlbmFtZSh0ZXN0 X25hbWUpKQorICAgICAgICBkcml2ZXJfb3V0cHV0MSA9IERyaXZlck91dHB1dCgndGV4dDEnLCAn aW1hZ2UxJywgJ2ltYWdlaGFzaDEnLCAnYXVkaW8xJykKKyAgICAgICAgZHJpdmVyX291dHB1dDIg PSBEcml2ZXJPdXRwdXQoJ3RleHQyJywgJ2ltYWdlMicsICdpbWFnZWhhc2gyJywgJ2F1ZGlvMicp CisgICAgICAgIGZhaWx1cmVzID0gW3Rlc3RfZmFpbHVyZXMuRmFpbHVyZVJlZnRlc3RNaXNtYXRj aCh0ZXN0X3JlZmVyZW5jZV9maWxlKV0KKyAgICAgICAgdGVzdF9yZXN1bHRfd3JpdGVyLndyaXRl X3Rlc3RfcmVzdWx0KEltYWdlRGlmZlRlc3RQb3J0KCksIHRlc3RfbmFtZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRyaXZlcl9vdXRwdXQxLCBkcml2ZXJf b3V0cHV0MiwgZmFpbHVyZXMpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWzBdLCB1c2VkX3Rv bGVyYW5jZV92YWx1ZXMpCisKKworaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKKyAgICB1bml0 dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQppbmRleCA0YzFiYmU4ZTA4NzA4MjMxZjA0YTkyYjIyMzBiOGMwODNiN2VjMzQ5 Li4wZThkOTFlY2ZmNGFjOGYyZWM5ZWVmMjgwMzcwOGQ0NTg2ZDY2ODM1IDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0yNTgsNyAr MjU4LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAiIiJSZXR1cm4gd2hldGhlciB0 aGUgdHdvIGF1ZGlvIGZpbGVzIGFyZSAqbm90KiBlcXVhbC4iIiIKICAgICAgICAgcmV0dXJuIGV4 cGVjdGVkX2F1ZGlvICE9IGFjdHVhbF9hdWRpbwogCi0gICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwg ZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cywgdG9sZXJhbmNlPTApOgorICAgIGRl ZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRv bGVyYW5jZT1Ob25lKToKICAgICAgICAgIiIiQ29tcGFyZSB0d28gaW1hZ2VzIGFuZCByZXR1cm4g YSB0dXBsZSBvZiBhbiBpbWFnZSBkaWZmLCBhbmQgYSBwZXJjZW50YWdlIGRpZmZlcmVuY2UgKDAt MTAwKS4KIAogICAgICAgICB8dG9sZXJhbmNlfCBzaG91bGQgYmUgYSBwZXJjZW50YWdlIHZhbHVl ICgwLjAgLSAxMDAuMCkuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bS5weQppbmRleCAwZDY1ZmJiZDlkYTI1Y2MyMzM2MjI5MDkzM2Y3 ZTU5MmQzMWM3NWYwLi43ZDlhNTNlYTYyYTk2ZjBiODc2ZmFhYWZjMWNmNjZiNWI1ZjM2MGQ2IDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW0ucHkKQEAgLTE2NSw5ICsxNjUsMTIgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KFBvcnQpOgog ICAgICAgICByZXR1cm4gc2VsZi5fY2hlY2tfZmlsZV9leGlzdHMoaW1hZ2VfZGlmZl9wYXRoLCAn aW1hZ2UgZGlmZiBleGUnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg b3ZlcnJpZGVfc3RlcCwgbG9nZ2luZykKIAotICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVj dGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMpOgorICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYs IGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVyYW5jZT1Ob25lKToKICAg ICAgICAgIyBGSVhNRTogbmVlZCB1bml0IHRlc3RzIGZvciB0aGlzLgogCisgICAgICAgICMgdG9s ZXJhbmNlIGlzIG5vdCB1c2VkIGluIGNocm9taXVtLiBNYWtlIHN1cmUgY2FsbGVyIGRvZXNuJ3Qg cGFzcyB0b2xlcmFuY2Ugb3RoZXIgdGhhbiB6ZXJvIG9yIE5vbmUuCisgICAgICAgIGFzc2VydCAo dG9sZXJhbmNlIGlzIE5vbmUpIG9yIHRvbGVyYW5jZSA9PSAwCisKICAgICAgICAgIyBJZiBvbmx5 IG9uZSBvZiB0aGVtIGV4aXN0cywgcmV0dXJuIHRoYXQgb25lLgogICAgICAgICBpZiBub3QgYWN0 dWFsX2NvbnRlbnRzIGFuZCBub3QgZXhwZWN0ZWRfY29udGVudHM6CiAgICAgICAgICAgICByZXR1 cm4gKE5vbmUsIDApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3QucHkKaW5kZXggYTRmYzkyNDRjM2E1ZDljNTI0NTk1YzIzOGIwMTdiZjVlYWQxZTFl NS4uNTA1NzkyMzUxN2ExOGFiYjQ4Y2IyNTdjY2ZiODY5NzY0ZGU4YTA1ZiAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQpAQCAtMzQxLDcg KzM0MSw3IEBAIGNsYXNzIFRlc3RQb3J0KFBvcnQpOgogICAgIGRlZiBkZWZhdWx0X2NvbmZpZ3Vy YXRpb24oc2VsZik6CiAgICAgICAgIHJldHVybiAnUmVsZWFzZScKIAotICAgIGRlZiBkaWZmX2lt YWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMpOgorICAgIGRlZiBk aWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVy YW5jZT1Ob25lKToKICAgICAgICAgZGlmZmVkID0gYWN0dWFsX2NvbnRlbnRzICE9IGV4cGVjdGVk X2NvbnRlbnRzCiAgICAgICAgIGlmIGRpZmZlZDoKICAgICAgICAgICAgIHJldHVybiBbIjwgJXNc bi0tLVxuPiAlc1xuIiAlIChleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzKSwgMV0K ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Vi a2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQu cHkKaW5kZXggZGUzZTg5MzFkMWNmYzRiNjI3ODFmM2JiNjJmYWU2M2QxMDZhYjVkYi4uMjhmNDM4 NjkxYWY2MDhkZmZkMjc1OGVhNGFjYWE5ZTJkYmQ3ZDg2YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTE1NSw3ICsxNTUs NyBAQCBjbGFzcyBXZWJLaXRQb3J0KFBvcnQpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAg ICAgICAgIHJldHVybiBUcnVlCiAKLSAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBlY3RlZF9j b250ZW50cywgYWN0dWFsX2NvbnRlbnRzKToKKyAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBl Y3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2U9Tm9uZSk6CiAgICAgICAg ICMgSGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSB0ZXN0IGRpZG4ndCBhY3R1YWxseSBnZW5lcmF0 ZSBhbiBpbWFnZS4KICAgICAgICAgIyBGSVhNRTogbmVlZCB1bml0IHRlc3RzIGZvciB0aGlzLgog ICAgICAgICBpZiBub3QgYWN0dWFsX2NvbnRlbnRzIGFuZCBub3QgZXhwZWN0ZWRfY29udGVudHM6 CkBAIC0xNjUsMTcgKzE2NSwxOCBAQCBjbGFzcyBXZWJLaXRQb3J0KFBvcnQpOgogICAgICAgICAg ICAgIyBNYXliZSB3ZSBzaG91bGQgdGhyb3cgYW4gZXhjZXB0aW9uPwogICAgICAgICAgICAgcmV0 dXJuIChUcnVlLCAwKQogCi0gICAgICAgIHByb2Nlc3MgPSBzZWxmLl9zdGFydF9pbWFnZV9kaWZm X3Byb2Nlc3MoZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cykKKyAgICAgICAgcHJv Y2VzcyA9IHNlbGYuX3N0YXJ0X2ltYWdlX2RpZmZfcHJvY2VzcyhleHBlY3RlZF9jb250ZW50cywg YWN0dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2U9dG9sZXJhbmNlKQogICAgICAgICByZXR1cm4gc2Vs Zi5fcmVhZF9pbWFnZV9kaWZmKHByb2Nlc3MpCiAKLSAgICBkZWYgX3N0YXJ0X2ltYWdlX2RpZmZf cHJvY2VzcyhzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzKToKKyAgICBk ZWYgX3N0YXJ0X2ltYWdlX2RpZmZfcHJvY2VzcyhzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0 dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2U9Tm9uZSk6CiAgICAgICAgICMgRklYTUU6IFRoZXJlIG5l ZWRzIHRvIGJlIGEgbW9yZSBzYW5lIHdheSBvZiBoYW5kbGluZyBkZWZhdWx0CiAgICAgICAgICMg dmFsdWVzIGZvciBvcHRpb25zIHNvIHRoYXQgeW91IGNhbiBkaXN0aW5ndWlzaCBiZXR3ZWVuIGEg ZGVmYXVsdAogICAgICAgICAjIHZhbHVlIG9mIE5vbmUgYW5kIGEgZGVmYXVsdCB2YWx1ZSB0aGF0 IHdhc24ndCBzZXQuCi0gICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndG9sZXJhbmNlJykgaXMg bm90IE5vbmU6Ci0gICAgICAgICAgICB0b2xlcmFuY2UgPSBzZWxmLmdldF9vcHRpb24oJ3RvbGVy YW5jZScpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICB0b2xlcmFuY2UgPSAwLjEKKyAgICAg ICAgaWYgdG9sZXJhbmNlIGlzIE5vbmU6CisgICAgICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24o J3RvbGVyYW5jZScpIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgICAgIHRvbGVyYW5jZSA9IHNl bGYuZ2V0X29wdGlvbigndG9sZXJhbmNlJykKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAg ICAgICAgdG9sZXJhbmNlID0gMC4xCiAgICAgICAgIGNvbW1hbmQgPSBbc2VsZi5fcGF0aF90b19p bWFnZV9kaWZmKCksICctLXRvbGVyYW5jZScsIHN0cih0b2xlcmFuY2UpXQogICAgICAgICBwcm9j ZXNzID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2VzcyhzZWxmLCAnSW1hZ2VEaWZmJywgY29t bWFuZCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQppbmRl eCA1ZDM3Y2ZlMzhhNmYwN2E4ZDU4MjJiNTI3YmIwNWNlMTk5MGMxN2YxLi5kMTViZTA3ZGFiYjY3 MGYzMWM0M2MzNjllMzIxZDRhNzJiM2YxZWEwIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz X2ludGVncmF0aW9udGVzdC5weQpAQCAtNjQ0LDcgKzY0NCw3IEBAIGNsYXNzIE1haW5UZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X3RvbGVyYW5jZShzZWxmKToKICAgICAg ICAgY2xhc3MgSW1hZ2VEaWZmVGVzdFBvcnQoVGVzdFBvcnQpOgotICAgICAgICAgICAgZGVmIGRp ZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cyk6CisgICAg ICAgICAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2Nv bnRlbnRzLCB0b2xlcmFuY2U9Tm9uZSk6CiAgICAgICAgICAgICAgICAgc2VsZi50b2xlcmFuY2Vf dXNlZF9mb3JfZGlmZl9pbWFnZSA9IHNlbGYuX29wdGlvbnMudG9sZXJhbmNlCiAgICAgICAgICAg ICAgICAgcmV0dXJuIChUcnVlLCAxKQogCg==