48744 2010-11-01 01:05:00 -0700 REGRESSION: rebaseline-chromium-webkit-tests uses non-zero tolerance for image dup detection 2010-11-03 04:20:37 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 1 tkent webkit-unassigned abarth dpranke eric hamaji mihaip tony oldest_to_newest 302588 0 tkent 2010-11-01 01:05:00 -0700 For example, editing/selection/transformed-selection-rects.html is failing as IMAGE on Mac, and layout-test-results.zip of the canary bot contains .png and .checksum for it. Then, add "REBASELINE" to the line for it in test_expectations.txt and run the following: % rebaseline-chromium-webkit-tests -w WIN and LINUX results are added to the local working copy, but MAC results are not added. rebaseline-chromium-webkit-tests uses a port object for Mac (not Chromium-Mac), and port.diff_image() for Mac uses the default tolerance value 0.1. ] 302597 1 72493 tkent 2010-11-01 03:45:33 -0700 Created attachment 72493 Patch 302627 2 72493 mihaip 2010-11-01 06:17:29 -0700 Comment on attachment 72493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72493&action=review Sorry about the regression. > WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:881 > + options.tolerance = 0 Any reason why you wouldn't always set this? Before r70279, this tool was always setting tolerance to 0, which seems like the right thing to do. 302635 3 tkent 2010-11-01 06:33:35 -0700 (In reply to comment #2) > > WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:881 > > + options.tolerance = 0 > > Any reason why you wouldn't always set this? Before r70279, this tool was always setting tolerance to 0, which seems like the right thing to do. Because It seems rebaseline-chromium-webkit-tests has code to support non-Chromium port targets. I don't know if it works. 302637 4 mihaip 2010-11-01 06:36:02 -0700 (In reply to comment #3) > Because It seems rebaseline-chromium-webkit-tests has code to support non-Chromium port targets. I don't know if it works. Ports that don't care about the tolerance setting will just ignore the field in the options object. new-run-webkit-tests always sets tolerance, it's up to each port to do something with it (only the Mac port respects it), and that hasn't been an issue. 302642 5 tkent 2010-11-01 06:41:43 -0700 (In reply to comment #4) > (In reply to comment #3) > > Because It seems rebaseline-chromium-webkit-tests has code to support non-Chromium port targets. I don't know if it works. > > Ports that don't care about the tolerance setting will just ignore the field in the options object. new-run-webkit-tests always sets tolerance, it's up to each port to do something with it (only the Mac port respects it), and that hasn't been an issue. Ah, right. So, the ideal fix is that ImageDiff of the host port runs with the tolerance value of the target port? 302824 6 dpranke 2010-11-01 11:54:59 -0700 Good catch. I agree with Mihai that we should use a tolerance of 0 across the board. 302825 7 dpranke 2010-11-01 11:55:24 -0700 Meaning, I wouldn't even make it a command line option, just set it to zero in the call. 303024 8 72585 tkent 2010-11-01 16:05:28 -0700 Created attachment 72585 Patch 2 (always tolerance=0) 303211 9 tkent 2010-11-01 22:17:14 -0700 Would some review this please? 303213 10 tkent 2010-11-01 22:17:40 -0700 (In reply to comment #9) > Would some review this please? someone 303216 11 abarth 2010-11-01 22:20:49 -0700 Our goal here is to match the HTML5 spec. How does a WebKit nightly compare to Firefox 4 beta? 303217 12 abarth 2010-11-01 22:21:31 -0700 wrong bug. :) 303399 13 72585 dglazkov 2010-11-02 09:11:15 -0700 Comment on attachment 72585 Patch 2 (always tolerance=0) ok 303971 14 72585 tkent 2010-11-03 04:20:28 -0700 Comment on attachment 72585 Patch 2 (always tolerance=0) Clearing flags on attachment: 72585 Committed r71228: <http://trac.webkit.org/changeset/71228> 303972 15 tkent 2010-11-03 04:20:37 -0700 All reviewed patches have been landed. Closing bug. 72493 2010-11-01 03:45:33 -0700 2010-11-01 16:05:22 -0700 Patch bug-48744-20101101194531.patch text/plain 4315 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlNGE1OTk4YTdlYzU0OTk3ODc2MTU0YjZjMmU0ZDJkZDI1MmM3ZWFhLi4yNzdhNTg3 Mjc5ZjEwOWFkYTRiOTYyOTA1YTU5MGFjOWE4MDRhMzAwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMTEtMDEgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT046IHJlYmFz ZWxpbmUtY2hyb21pdW0td2Via2l0LXRlc3RzIHVzZXMgbm9uLXplcm8gdG9sZXJhbmNlIGZvcgor ICAgICAgICBpbWFnZSBkdXAgZGV0ZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00ODc0NAorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHk6CisgICAgICAg ICAtIE1ha2UgYSBmdW5jdGlvbiBmb3Igb3B0aW9uIHBhcnNpbmcgZm9yIGVhc2Ugb2YgdGVzdAor ICAgICAgICAgLSBTZXQgMCB0byBvcHRpb25zLnRvbGVyYW5jZSBmb3IgQ2hyb21pdW0gdGFyZ2V0 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJv bWl1bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6CisgICAgICAgICAtIEFkZCBhIHRlc3QgZm9y IHRoaXMgY2hhbmdlCisKIDIwMTAtMTAtMzEgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9t aXVtX3dlYmtpdF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDQzNDA1OGVi NTRmMjQyNTE2ZmE1MGZkODAzMjlmMTBiOTYyNzgzOWMuLmIzMDZiYmM5NTNmMzBiMGYxMTQxM2Zk ODgxNjM4NDc3NWIzOTkzZTQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hy b21pdW1fd2Via2l0X3Rlc3RzLnB5CkBAIC04MTksOSArODE5LDggQEAgZGVmIGdldF9ob3N0X3Bv cnRfb2JqZWN0KG9wdGlvbnMpOgogICAgIHJldHVybiBwb3J0X29iagogCiAKLWRlZiBtYWluKGV4 ZWN1dGl2ZT1FeGVjdXRpdmUoKSk6Ci0gICAgIiIiTWFpbiBmdW5jdGlvbiB0byBwcm9kdWNlIG5l dyBiYXNlbGluZXMuIiIiCi0KK2RlZiBwYXJzZV9vcHRpb25zKGFyZ3MpOgorICAgICIiIlBhcnNl IG9wdGlvbnMgYW5kIHJldHVybiBhIHBhaXIgb2YgaG9zdCBvcHRpb25zIGFuZCB0YXJnZXQgb3B0 aW9ucy4iIiIKICAgICBvcHRpb25fcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkKICAg ICBvcHRpb25fcGFyc2VyLmFkZF9vcHRpb24oJy12JywgJy0tdmVyYm9zZScsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFjdGlvbj0nc3RvcmVfdHJ1ZScsCkBAIC04NzQsNyArODczLDIw IEBAIGRlZiBtYWluKGV4ZWN1dGl2ZT1FeGVjdXRpdmUoKSk6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGhlbHA9KCdUaGUgdGFyZ2V0IHBsYXRmb3JtIHRvIHJlYmFzZWxpbmUgJwogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKCJtYWMiLCAiY2hyb21pdW0iLCAicXQi LCBldGMuKS4gRGVmYXVsdHMgJwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn dG8gImNocm9taXVtIi4nKSkKLSAgICBvcHRpb25zID0gb3B0aW9uX3BhcnNlci5wYXJzZV9hcmdz KClbMF0KKyAgICBvcHRpb25zID0gb3B0aW9uX3BhcnNlci5wYXJzZV9hcmdzKGFyZ3MpWzBdCisK KyAgICB0YXJnZXRfb3B0aW9ucyA9IGNvcHkuY29weShvcHRpb25zKQorICAgIGlmIG9wdGlvbnMu dGFyZ2V0X3BsYXRmb3JtID09ICdjaHJvbWl1bSc6CisgICAgICAgIHRhcmdldF9vcHRpb25zLmNo cm9taXVtID0gVHJ1ZQorICAgICAgICBvcHRpb25zLnRvbGVyYW5jZSA9IDAKKworICAgIHJldHVy biAob3B0aW9ucywgdGFyZ2V0X29wdGlvbnMpCisKKworZGVmIG1haW4oZXhlY3V0aXZlPUV4ZWN1 dGl2ZSgpKToKKyAgICAiIiJNYWluIGZ1bmN0aW9uIHRvIHByb2R1Y2UgbmV3IGJhc2VsaW5lcy4i IiIKKworICAgIChvcHRpb25zLCB0YXJnZXRfb3B0aW9ucykgPSBwYXJzZV9vcHRpb25zKHN5cy5h cmd2WzE6XSkKIAogICAgICMgV2UgbmVlZCB0byBjcmVhdGUgdGhyZWUgZGlmZmVyZW50IFBvcnQg b2JqZWN0cyBvdmVyIHRoZSBsaWZlIG9mIHRoaXMKICAgICAjIHNjcmlwdC4gfHRhcmdldF9wb3J0 X29ianwgaXMgdXNlZCB0byBkZXRlcm1pbmUgY29uZmlndXJhdGlvbiBpbmZvcm1hdGlvbjoKQEAg LTg4Miw5ICs4OTQsNiBAQCBkZWYgbWFpbihleGVjdXRpdmU9RXhlY3V0aXZlKCkpOgogICAgICMg fHBvcnRfb2JqfCBpcyB1c2VkIGZvciBydW50aW1lIGZ1bmN0aW9uYWxpdHkgbGlrZSBhY3R1YWxs eSBkaWZmaW5nCiAgICAgIyBUaGVuIHdlIGNyZWF0ZSBhIHJlYmFzZWxpbmluZyBwb3J0IHRvIGFj dHVhbCBmaW5kIGFuZCBtYW5hZ2UgdGhlCiAgICAgIyBiYXNlbGluZXMuCi0gICAgdGFyZ2V0X29w dGlvbnMgPSBjb3B5LmNvcHkob3B0aW9ucykKLSAgICBpZiBvcHRpb25zLnRhcmdldF9wbGF0Zm9y bSA9PSAnY2hyb21pdW0nOgotICAgICAgICB0YXJnZXRfb3B0aW9ucy5jaHJvbWl1bSA9IFRydWUK ICAgICB0YXJnZXRfcG9ydF9vYmogPSBwb3J0LmdldChOb25lLCB0YXJnZXRfb3B0aW9ucykKIAog ICAgICMgU2V0IHVwIG91ciBsb2dnaW5nIGZvcm1hdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0 X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXgg OGRiMzFhNjNiNDE1YWM3M2E2MTRlYjY5ZDM0MGVhNzU1ODRhMjAwOS4uZmY5ZjdmNmJkOTY3MTNi MmI2MWUxMDE3ZDBiMjI1OGEyZDNjZjIwNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHNf dW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTk1LDYg Kzk1LDE1IEBAIGNsYXNzIFRlc3RSZWJhc2VsaW5lcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIHJldHVybiByZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5SZWJhc2VsaW5lcigK ICAgICAgICAgICAgIGhvc3RfcG9ydF9vYmosIHRhcmdldF9wb3J0X29iaiwgcGxhdGZvcm0sIG9w dGlvbnMpCiAKKyAgICBkZWYgdGVzdF9wYXJzZV9vcHRpb25zKHNlbGYpOgorICAgICAgICAob3B0 aW9ucywgdGFyZ2V0X29wdGlvbnMpID0gcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMu cGFyc2Vfb3B0aW9ucyhbXSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHRhcmdldF9vcHRpb25z LmNocm9taXVtKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG9wdGlvbnMudG9sZXJhbmNlLCAw KQorCisgICAgICAgIChvcHRpb25zLCB0YXJnZXRfb3B0aW9ucykgPSByZWJhc2VsaW5lX2Nocm9t aXVtX3dlYmtpdF90ZXN0cy5wYXJzZV9vcHRpb25zKFsnLS10YXJnZXQtcGxhdGZvcm0nLCAncXQn XSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShoYXNhdHRyKHRhcmdldF9vcHRpb25zLCAnY2hy b21pdW0nKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShoYXNhdHRyKG9wdGlvbnMsICd0b2xl cmFuY2UnKSkKKwogICAgIGRlZiB0ZXN0X25vb3Aoc2VsZik6CiAgICAgICAgICMgdGhpcyBtZXRo b2QgdGVzdHMgdGhhdCB3YXMgY2FuIGF0IGxlYXN0IGluc3RhbnRpYXRlIGFuIG9iamVjdCwgZXZl bgogICAgICAgICAjIGlmIHRoZXJlIGlzIG5vdGhpbmcgdG8gZG8uCg== 72585 2010-11-01 16:05:28 -0700 2010-11-03 04:20:28 -0700 Patch 2 (always tolerance=0) bug-48744-20101102080526.patch text/plain 4285 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmOTZmN2UxMmRjMzUxNzMyNzJjOWZmYmFlNDY2Yjg3ODQ2NzQ2MWYyLi40MDk4MDc2 NDI0OTdjNTNhNWY3NTk4NGQ1MDU2MDI0YTU5MjMzZTYxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMTEtMDEgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT046IHJlYmFz ZWxpbmUtY2hyb21pdW0td2Via2l0LXRlc3RzIHVzZXMgbm9uLXplcm8gdG9sZXJhbmNlIGZvcgor ICAgICAgICBpbWFnZSBkdXAgZGV0ZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00ODc0NAorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHk6CisgICAgICAg ICAtIE1ha2UgYSBmdW5jdGlvbiBmb3Igb3B0aW9uIHBhcnNpbmcgZm9yIGVhc2Ugb2YgdGVzdAor ICAgICAgICAgLSBTZXQgMCB0byBvcHRpb25zLnRvbGVyYW5jZQorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3Vu aXR0ZXN0LnB5OgorICAgICAgICAgLSBBZGQgYSB0ZXN0IGZvciB0aGlzIGNoYW5nZQorCiAyMDEw LTExLTAxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMu cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5l X2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQppbmRleCA0MzQwNThlYjU0ZjI0MjUxNmZhNTBmZDgw MzI5ZjEwYjk2Mjc4MzljLi4xYzIzZjc2YzU1YjhjZjQ0OGZmNDk3YWIwMGNiY2I0ZTcyZWEzY2Q3 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y ZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0 cy5weQpAQCAtODE5LDkgKzgxOSw4IEBAIGRlZiBnZXRfaG9zdF9wb3J0X29iamVjdChvcHRpb25z KToKICAgICByZXR1cm4gcG9ydF9vYmoKIAogCi1kZWYgbWFpbihleGVjdXRpdmU9RXhlY3V0aXZl KCkpOgotICAgICIiIk1haW4gZnVuY3Rpb24gdG8gcHJvZHVjZSBuZXcgYmFzZWxpbmVzLiIiIgot CitkZWYgcGFyc2Vfb3B0aW9ucyhhcmdzKToKKyAgICAiIiJQYXJzZSBvcHRpb25zIGFuZCByZXR1 cm4gYSBwYWlyIG9mIGhvc3Qgb3B0aW9ucyBhbmQgdGFyZ2V0IG9wdGlvbnMuIiIiCiAgICAgb3B0 aW9uX3BhcnNlciA9IG9wdHBhcnNlLk9wdGlvblBhcnNlcigpCiAgICAgb3B0aW9uX3BhcnNlci5h ZGRfb3B0aW9uKCctdicsICctLXZlcmJvc2UnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhY3Rpb249J3N0b3JlX3RydWUnLApAQCAtODc0LDcgKzg3MywyMCBAQCBkZWYgbWFpbihleGVj dXRpdmU9RXhlY3V0aXZlKCkpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSgn VGhlIHRhcmdldCBwbGF0Zm9ybSB0byByZWJhc2VsaW5lICcKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJygibWFjIiwgImNocm9taXVtIiwgInF0IiwgZXRjLikuIERlZmF1bHRz ICcKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3RvICJjaHJvbWl1bSIuJykp Ci0gICAgb3B0aW9ucyA9IG9wdGlvbl9wYXJzZXIucGFyc2VfYXJncygpWzBdCisgICAgb3B0aW9u cyA9IG9wdGlvbl9wYXJzZXIucGFyc2VfYXJncyhhcmdzKVswXQorCisgICAgdGFyZ2V0X29wdGlv bnMgPSBjb3B5LmNvcHkob3B0aW9ucykKKyAgICBpZiBvcHRpb25zLnRhcmdldF9wbGF0Zm9ybSA9 PSAnY2hyb21pdW0nOgorICAgICAgICB0YXJnZXRfb3B0aW9ucy5jaHJvbWl1bSA9IFRydWUKKyAg ICBvcHRpb25zLnRvbGVyYW5jZSA9IDAKKworICAgIHJldHVybiAob3B0aW9ucywgdGFyZ2V0X29w dGlvbnMpCisKKworZGVmIG1haW4oZXhlY3V0aXZlPUV4ZWN1dGl2ZSgpKToKKyAgICAiIiJNYWlu IGZ1bmN0aW9uIHRvIHByb2R1Y2UgbmV3IGJhc2VsaW5lcy4iIiIKKworICAgIChvcHRpb25zLCB0 YXJnZXRfb3B0aW9ucykgPSBwYXJzZV9vcHRpb25zKHN5cy5hcmd2WzE6XSkKIAogICAgICMgV2Ug bmVlZCB0byBjcmVhdGUgdGhyZWUgZGlmZmVyZW50IFBvcnQgb2JqZWN0cyBvdmVyIHRoZSBsaWZl IG9mIHRoaXMKICAgICAjIHNjcmlwdC4gfHRhcmdldF9wb3J0X29ianwgaXMgdXNlZCB0byBkZXRl cm1pbmUgY29uZmlndXJhdGlvbiBpbmZvcm1hdGlvbjoKQEAgLTg4Miw5ICs4OTQsNiBAQCBkZWYg bWFpbihleGVjdXRpdmU9RXhlY3V0aXZlKCkpOgogICAgICMgfHBvcnRfb2JqfCBpcyB1c2VkIGZv ciBydW50aW1lIGZ1bmN0aW9uYWxpdHkgbGlrZSBhY3R1YWxseSBkaWZmaW5nCiAgICAgIyBUaGVu IHdlIGNyZWF0ZSBhIHJlYmFzZWxpbmluZyBwb3J0IHRvIGFjdHVhbCBmaW5kIGFuZCBtYW5hZ2Ug dGhlCiAgICAgIyBiYXNlbGluZXMuCi0gICAgdGFyZ2V0X29wdGlvbnMgPSBjb3B5LmNvcHkob3B0 aW9ucykKLSAgICBpZiBvcHRpb25zLnRhcmdldF9wbGF0Zm9ybSA9PSAnY2hyb21pdW0nOgotICAg ICAgICB0YXJnZXRfb3B0aW9ucy5jaHJvbWl1bSA9IFRydWUKICAgICB0YXJnZXRfcG9ydF9vYmog PSBwb3J0LmdldChOb25lLCB0YXJnZXRfb3B0aW9ucykKIAogICAgICMgU2V0IHVwIG91ciBsb2dn aW5nIGZvcm1hdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJv bWl1bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXggOGRiMzFhNjNiNDE1YWM3M2E2MTRl YjY5ZDM0MGVhNzU1ODRhMjAwOS4uN2M1NWI5NGM5Y2M2OGUyMzIyZjZkNTdiMzZiZWVlNjBkMmEy NTcyNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGluZV9jaHJvbWl1 bV93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTk1LDYgKzk1LDE1IEBAIGNsYXNzIFRlc3RS ZWJhc2VsaW5lcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHJldHVybiByZWJhc2VsaW5l X2Nocm9taXVtX3dlYmtpdF90ZXN0cy5SZWJhc2VsaW5lcigKICAgICAgICAgICAgIGhvc3RfcG9y dF9vYmosIHRhcmdldF9wb3J0X29iaiwgcGxhdGZvcm0sIG9wdGlvbnMpCiAKKyAgICBkZWYgdGVz dF9wYXJzZV9vcHRpb25zKHNlbGYpOgorICAgICAgICAob3B0aW9ucywgdGFyZ2V0X29wdGlvbnMp ID0gcmViYXNlbGluZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucGFyc2Vfb3B0aW9ucyhbXSkKKyAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKHRhcmdldF9vcHRpb25zLmNocm9taXVtKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKG9wdGlvbnMudG9sZXJhbmNlLCAwKQorCisgICAgICAgIChvcHRpb25z LCB0YXJnZXRfb3B0aW9ucykgPSByZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5wYXJz ZV9vcHRpb25zKFsnLS10YXJnZXQtcGxhdGZvcm0nLCAncXQnXSkKKyAgICAgICAgc2VsZi5hc3Nl cnRGYWxzZShoYXNhdHRyKHRhcmdldF9vcHRpb25zLCAnY2hyb21pdW0nKSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChvcHRpb25zLnRvbGVyYW5jZSwgMCkKKwogICAgIGRlZiB0ZXN0X25vb3Ao c2VsZik6CiAgICAgICAgICMgdGhpcyBtZXRob2QgdGVzdHMgdGhhdCB3YXMgY2FuIGF0IGxlYXN0 IGluc3RhbnRpYXRlIGFuIG9iamVjdCwgZXZlbgogICAgICAgICAjIGlmIHRoZXJlIGlzIG5vdGhp bmcgdG8gZG8uCg==