41644 2010-07-05 20:22:37 -0700 rebaseline-chromium-webkit-tests: wrong dup detection 2010-07-06 21:42:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tkent webkit-unassigned hamaji morrita victorw oldest_to_newest 246829 0 tkent 2010-07-05 20:22:37 -0700 If an image expectation for Linux and an image expectation for Windows are *similar*, the Linux expectation imae is unexpectedly removed. How to repeat: Rebaseline Linux and Windows expectation on Mac Leopard 1. build ImageDiff (build-webkit and build-dumprendertree) 2. prepend "REBASELINE" to the following line in test_expectations.txt BUG48154 WIN LINUX: fast/forms/indeterminate.html = IMAGE 3. run "rebaseline-chromium-webkit-tests -w" Expected result: Because the Linux image and the Windows image are different, I expect LayoutTests/platform/chromium-win/fast/forms/indeterminate-expected.checksum LayoutTests/platform/chromium-win/fast/forms/indeterminate-expected.png LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.checksum LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.png are updated. Actual result: LayoutTests/platform/chromium-win/fast/forms/indeterminate-expected.checksum LayoutTests/platform/chromium-win/fast/forms/indeterminate-expected.png LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.checksum are updated, and LayoutTests/platform/chromium-linux/fast/forms/indeterminate-expected.png is removed. Log: 100706 12:14:27 rebaseline_chromium_webkit_tests.py:154 INFO ------------------ Extracting and adding new baselines: linux ------------------ 100706 12:14:27 rebaseline_chromium_webkit_tests.py:423 INFO Test 1: fast/forms/indeterminate.html 100706 12:14:27 rebaseline_chromium_webkit_tests.py:434 INFO .txt file not in archive. 100706 12:14:27 rebaseline_chromium_webkit_tests.py:438 INFO .png file found in archive. 100706 12:14:27 rebaseline_chromium_webkit_tests.py:527 INFO Found same baseline at /Users/tkent/WebKit/LayoutTests/platform/chromium-win/fast/forms/indeterminate-expected.png 100706 12:14:28 rebaseline_chromium_webkit_tests.py:438 INFO .checksum file found in archive. 100706 12:14:29 rebaseline_chromium_webkit_tests.py:487 INFO Rebaseline succeeded. Root cause: rebaseline-chromium-webkit-tests uses diff_image() in layout_tests_port/webkit.py, and it pass "--torelance 0.1" to ImageDiff. So diff_image() returns False if the difference between two images are small, 246842 1 60583 tkent 2010-07-05 21:41:29 -0700 Created attachment 60583 Patch 246859 2 60583 morrita 2010-07-05 22:36:58 -0700 Comment on attachment 60583 Patch http://wkrietveld.appspot.com/41644/diff/1/4 File WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py (right): http://wkrietveld.appspot.com/41644/diff/1/4#newcode119 WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py:119: diff_filename=None, tolerance=None): how about just to pass 0.1 ? http://wkrietveld.appspot.com/41644/diff/1/4#newcode124 WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py:124: # parameter, or make it go away and aways use exact matches. nit: aways -> always 246901 3 60594 tkent 2010-07-06 00:12:11 -0700 Created attachment 60594 Patch 2 246902 4 60583 tkent 2010-07-06 00:13:06 -0700 Comment on attachment 60583 Patch http://wkrietveld.appspot.com/41644/diff/1/4 File WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py (right): http://wkrietveld.appspot.com/41644/diff/1/4#newcode119 WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py:119: diff_filename=None, tolerance=None): On 2010/07/06 05:36:56, morrita wrote: > how about just to pass 0.1 ? Sounds good. Done. http://wkrietveld.appspot.com/41644/diff/1/4#newcode124 WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py:124: # parameter, or make it go away and aways use exact matches. On 2010/07/06 05:36:56, morrita wrote: > nit: aways -> always Done. 247040 5 60594 hamaji 2010-07-06 05:46:56 -0700 Comment on attachment 60594 Patch 2 Looks good. 247295 6 60594 tkent 2010-07-06 21:42:06 -0700 Comment on attachment 60594 Patch 2 Clearing flags on attachment: 60594 Committed r62620: <http://trac.webkit.org/changeset/62620> 247296 7 tkent 2010-07-06 21:42:14 -0700 All reviewed patches have been landed. Closing bug. 60583 2010-07-05 21:41:29 -0700 2010-07-06 00:13:06 -0700 Patch bug-41644-20100706134127.patch text/plain 5990 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1NTM5NjJhYjdiMzI0ODIzYjk1Y2Y0ZjcxM2RkMjhmNzE0YjY5NmE2Li4xYzViMzJj Y2IxYTNiMjI1MzhkN2I4MWRiMzFkNWJlYmFkMDhjNmU0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMTAtMDctMDUgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBhIHdyb25nIGR1cCBk ZXRlY3Rpb24gb2YgcmViYXNlbGluZS1jaHJvbWl1bS13ZWJraXQtdGVzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNjQ0CisKKyAgICAgICAgcmVi YXNlbGluZS1jaHJvbWl1bS13ZWJraXQtdGVzdHMgdXNlZCBJbWFnZURpZmYgd2l0aCAwLjElCisg ICAgICAgIHRvbGVyYW5jZS4gV2UgZG9uJ3QgbmVlZCB0b2xlcmFuY2UgZm9yIHJlYmFzZWxpbmUu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6 CisgICAgICAgICAgQWRkIG9wdGlvbmFsIHRvbGVyYW5jZSBwYXJhbWV0ZXIgdG8gZGlmZl9pbWFn ZSgpLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0 LnB5OgorICAgICAgICAgIEFkZCBvcHRpb25hbCB0b2xlcmFuY2UgcGFyYW1ldGVyIHRvIGRpZmZf aW1hZ2UoKSwgYW5kIHBhc3MgaXQgdG8gSW1hZ2VEaWZmLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3JlYmFzZWxpbmVfY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5Ogor ICAgICAgICAgIFBhc3MgMC4wIHRvIGltYWdlX2RpZmYuZGlmZl9maWxlcygpLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlmZi5weToK KyAgICAgICAgICBBZGQgb3B0aW9uYWwgdG9sZXJhbmNlIHBhcmFtZXRlciB0byBkaWZmX2ZpbGVz KCkuCisKIDIwMTAtMDctMDUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGU3 MzU3OWZlMGNjZmQ0ZGYwZWQ4NTkzOWRjYjcyMWRlNWY2M2Q4MGQuLmIzOGZlNTA4YzMyNjU0OTUx NDlkMDJhOWNhN2Q4NDRiZWYwOTdmZDYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTEyOCw3ICsxMjgsNyBA QCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBleHBlY3RlZF90ZXh0ICE9IGFj dHVhbF90ZXh0CiAKICAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBlY3RlZF9maWxlbmFtZSwg YWN0dWFsX2ZpbGVuYW1lLAotICAgICAgICAgICAgICAgICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSk6 CisgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFtZT1Ob25lLCB0b2xlcmFuY2U9Tm9uZSk6 CiAgICAgICAgICIiIkNvbXBhcmUgdHdvIGltYWdlIGZpbGVzIGFuZCBwcm9kdWNlIGEgZGVsdGEg aW1hZ2UgZmlsZS4KIAogICAgICAgICBSZXR1cm4gVHJ1ZSBpZiB0aGUgdHdvIGZpbGVzIGFyZSBk aWZmZXJlbnQsIEZhbHNlIGlmIHRoZXkgYXJlIHRoZSBzYW1lLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRl eCAyMDk3Y2U3OWUwMDkyNDZmNDA3OThlYmNmNzBiODM2YzNhMDI3M2JlLi44YmQ4YWY2ODIxZjBi NGI3ZGMyMzFjNmUwZGRjMzZjN2UxNTM3Y2NkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtMTE2LDEw ICsxMTYsMTMgQEAgY2xhc3MgV2ViS2l0UG9ydChiYXNlLlBvcnQpOgogICAgICAgICByZXR1cm4g VHJ1ZQogCiAgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVh bF9maWxlbmFtZSwKLSAgICAgICAgICAgICAgICAgICBkaWZmX2ZpbGVuYW1lPU5vbmUpOgorICAg ICAgICAgICAgICAgICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSwgdG9sZXJhbmNlPU5vbmUpOgogICAg ICAgICAiIiJSZXR1cm4gVHJ1ZSBpZiB0aGUgdHdvIGZpbGVzIGFyZSBkaWZmZXJlbnQuIEFsc28g d3JpdGUgYSBkZWx0YQogICAgICAgICBpbWFnZSBvZiB0aGUgdHdvIGltYWdlcyBpbnRvIHxkaWZm X2ZpbGVuYW1lfCBpZiBpdCBpcyBub3QgTm9uZS4iIiIKIAorICAgICAgICAjIEZJWE1FOiBlaXRo ZXIgZXhwb3NlIHRoZSB0b2xlcmFuY2UgYXJndW1lbnQgYXMgYSBjb21tYW5kLWxpbmUKKyAgICAg ICAgIyBwYXJhbWV0ZXIsIG9yIG1ha2UgaXQgZ28gYXdheSBhbmQgYXdheXMgdXNlIGV4YWN0IG1h dGNoZXMuCisKICAgICAgICAgIyBIYW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGhlIHRlc3QgZGlkbid0 IGFjdHVhbGx5IGdlbmVyYXRlIGFuIGltYWdlLgogICAgICAgICBhY3R1YWxfbGVuZ3RoID0gb3Mu c3RhdChhY3R1YWxfZmlsZW5hbWUpLnN0X3NpemUKICAgICAgICAgaWYgYWN0dWFsX2xlbmd0aCA9 PSAwOgpAQCAtMTI3LDEzICsxMzAsMTQgQEAgY2xhc3MgV2ViS2l0UG9ydChiYXNlLlBvcnQpOgog ICAgICAgICAgICAgICAgIHNodXRpbC5jb3B5ZmlsZShhY3R1YWxfZmlsZW5hbWUsIGV4cGVjdGVk X2ZpbGVuYW1lKQogICAgICAgICAgICAgcmV0dXJuIFRydWUKIAotICAgICAgICBzcCA9IHNlbGYu X2RpZmZfaW1hZ2VfcmVxdWVzdChleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lKQor ICAgICAgICBzcCA9IHNlbGYuX2RpZmZfaW1hZ2VfcmVxdWVzdChleHBlY3RlZF9maWxlbmFtZSwg YWN0dWFsX2ZpbGVuYW1lLCB0b2xlcmFuY2UpCiAgICAgICAgIHJldHVybiBzZWxmLl9kaWZmX2lt YWdlX3JlcGx5KHNwLCBleHBlY3RlZF9maWxlbmFtZSwgZGlmZl9maWxlbmFtZSkKIAotICAgIGRl ZiBfZGlmZl9pbWFnZV9yZXF1ZXN0KHNlbGYsIGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmls ZW5hbWUpOgotICAgICAgICAjIEZJWE1FOiBlaXRoZXIgZXhwb3NlIHRoZSB0b2xlcmFuY2UgYXJn dW1lbnQgYXMgYSBjb21tYW5kLWxpbmUKLSAgICAgICAgIyBwYXJhbWV0ZXIsIG9yIG1ha2UgaXQg Z28gYXdheSBhbmQgYXdheXMgdXNlIGV4YWN0IG1hdGNoZXMuCi0gICAgICAgIGNvbW1hbmQgPSBb c2VsZi5fcGF0aF90b19pbWFnZV9kaWZmKCksICctLXRvbGVyYW5jZScsICcwLjEnXQorICAgIGRl ZiBfZGlmZl9pbWFnZV9yZXF1ZXN0KHNlbGYsIGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmls ZW5hbWUsIHRvbGVyYW5jZSk6CisgICAgICAgICMgV2UgbmVlZCB0byBkaXN0aW5ndWlzaCAwIGFu ZCBOb25lLgorICAgICAgICBpZiB0b2xlcmFuY2UgaXMgTm9uZToKKyAgICAgICAgICAgIHRvbGVy YW5jZSA9IDAuMQorICAgICAgICBjb21tYW5kID0gW3NlbGYuX3BhdGhfdG9faW1hZ2VfZGlmZigp LCAnLS10b2xlcmFuY2UnLCBzdHIodG9sZXJhbmNlKV0KICAgICAgICAgc3AgPSBzZXJ2ZXJfcHJv Y2Vzcy5TZXJ2ZXJQcm9jZXNzKHNlbGYsICdJbWFnZURpZmYnLCBjb21tYW5kKQogCiAgICAgICAg IGFjdHVhbF9sZW5ndGggPSBvcy5zdGF0KGFjdHVhbF9maWxlbmFtZSkuc3Rfc2l6ZQpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcmViYXNlbGlu ZV9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQppbmRleCAz NWYzMmQ0N2VmN2UxZWM2OGY3ZWE3NWYzZjMxZWU4Y2JkYmJjYzk3Li5mNzkwYzcwN2IzZGI4OGM4 OWU0ZTJlZDhkMWFhMGY5OTZkYzk3YjJlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2VsaW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9yZWJhc2Vs aW5lX2Nocm9taXVtX3dlYmtpdF90ZXN0cy5weQpAQCAtNTUxLDcgKzU1MSw3IEBAIGNsYXNzIFJl YmFzZWxpbmVyKG9iamVjdCk6CiAKICAgICAgICAgaWYgZXh0MSA9PSAnLlBORyc6CiAgICAgICAg ICAgICByZXR1cm4gaW1hZ2VfZGlmZi5JbWFnZURpZmYoc2VsZi5fcG9ydCwKLSAgICAgICAgICAg ICAgICcnKS5kaWZmX2ZpbGVzKHNlbGYuX3BvcnQsIGZpbGUxLCBmaWxlMikKKyAgICAgICAgICAg ICAgICcnKS5kaWZmX2ZpbGVzKHNlbGYuX3BvcnQsIGZpbGUxLCBmaWxlMiwgMC4wKQogICAgICAg ICBlbHNlOgogICAgICAgICAgICAgcmV0dXJuIHRleHRfZGlmZi5UZXN0VGV4dERpZmYoc2VsZi5f cG9ydCwKICAgICAgICAgICAgICAgICAnJykuZGlmZl9maWxlcyhzZWxmLl9wb3J0LCBmaWxlMSwg ZmlsZTIpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkKaW5kZXggZmU3M2E3YjQ2 YjNjNjVkZGE2NjNkNDg2NjBmN2E2ZWU0YTVjM2Q1YS4uYjE3M2U0ODMwMGI0MGZjZjRlM2U0YzFm ODgwODZmZTM0YjdiODJmNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlmZi5weQpA QCAtMTkxLDE3ICsxOTEsMTkgQEAgY2xhc3MgSW1hZ2VEaWZmKHRlc3RfdHlwZV9iYXNlLlRlc3RU eXBlQmFzZSk6CiAKICAgICAgICAgcmV0dXJuIGZhaWx1cmVzCiAKLSAgICBkZWYgZGlmZl9maWxl cyhzZWxmLCBwb3J0LCBmaWxlMSwgZmlsZTIpOgorICAgIGRlZiBkaWZmX2ZpbGVzKHNlbGYsIHBv cnQsIGZpbGUxLCBmaWxlMiwgdG9sZXJhbmNlPU5vbmUpOgogICAgICAgICAiIiJEaWZmIHR3byBp bWFnZSBmaWxlcy4KIAogICAgICAgICBBcmdzOgogICAgICAgICAgIGZpbGUxLCBmaWxlMjogZnVs bCBwYXRocyBvZiB0aGUgZmlsZXMgdG8gY29tcGFyZS4KKyAgICAgICAgICB0b2xlcmFuY2U6IE5v bmUsIG9yIHRvbGVyYW5jZSBwZXJjZW50YWdlICgwLjAgLSAxMDAuMCkKKyAgICAgICAgICAgIElm IGl0IGlzIE5vbmUsIHRoZSBwb3J0IGRlZmF1bHQgdG9sZXJhbmNlIHZhbHVlIGlzIHVzZWQuCiAK ICAgICAgICAgUmV0dXJuczoKICAgICAgICAgICBUcnVlIGlmIHR3byBmaWxlcyBhcmUgZGlmZmVy ZW50LgogICAgICAgICAgIEZhbHNlIG90aGVyd2lzZS4KICAgICAgICAgIiIiCiAgICAgICAgIHRy eToKLSAgICAgICAgICAgIHJldHVybiBwb3J0LmRpZmZfaW1hZ2UoZmlsZTEsIGZpbGUyKQorICAg ICAgICAgICAgcmV0dXJuIHBvcnQuZGlmZl9pbWFnZShmaWxlMSwgZmlsZTIsIE5vbmUsIHRvbGVy YW5jZSkKICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IsIGU6CiAgICAgICAgICAgICByZXR1cm4g VHJ1ZQo= 60594 2010-07-06 00:12:11 -0700 2010-07-06 21:42:05 -0700 Patch 2 bug-41644-20100706161209.patch text/plain 6074 tkent ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1NTM5NjJhYjdiMzI0ODIzYjk1Y2Y0ZjcxM2RkMjhmNzE0YjY5NmE2Li5hZTJiOGI2 YWVjMWNmOGM2ZTUwYjQ0MDA5Yjg0MTY2Yzc1MzhhNjg4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTAtMDctMDYgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBhIHdyb25nIGR1cCBk ZXRlY3Rpb24gb2YgcmViYXNlbGluZS1jaHJvbWl1bS13ZWJraXQtdGVzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNjQ0CisKKyAgICAgICAgcmVi YXNlbGluZS1jaHJvbWl1bS13ZWJraXQtdGVzdHMgdXNlZCBJbWFnZURpZmYgd2l0aCAwLjElCisg ICAgICAgIHRvbGVyYW5jZS4gV2UgZG9uJ3QgbmVlZCB0b2xlcmFuY2UgZm9yIHJlYmFzZWxpbmUu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6 CisgICAgICAgICAgQWRkIG9wdGlvbmFsIHRvbGVyYW5jZSBwYXJhbWV0ZXIgdG8gZGlmZl9pbWFn ZSgpLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eToKKyAgICAgICAgICBBZGQgb3B0aW9uYWwgdG9sZXJhbmNlIHBhcmFtZXRlciB0byBkaWZmX2lt YWdlKCkuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJr aXQucHk6CisgICAgICAgICAgQWRkIG9wdGlvbmFsIHRvbGVyYW5jZSBwYXJhbWV0ZXIgdG8gZGlm Zl9pbWFnZSgpLCBhbmQgcGFzcyBpdCB0byBJbWFnZURpZmYgY29tbWFuZC4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHk6Cisg ICAgICAgICAgZGlmZl9maWxlcygpIGFsd2F5cyBjYWxscyBkaWZmX2ltYWdlKCkgd2l0aCB0b2xl cmFuY2U9MC4KKyAgICAgICAgICBkaWZmX2ZpbGVzKCkgaXMgdXNlZCBvbmx5IGJ5IHJlYmFzZWxp bmUtY2hyb21pdW0td2Via2l0LXRlc3RzLgorCiAyMDEwLTA3LTA1ICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVu dC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQppbmRleCBlNzM1NzlmZTBjY2ZkNGRmMGVkODU5MzlkY2I3MjFkZTVmNjNk ODBkLi5lMWIyM2FjYjhkNjgxZjk0YzhlYmM1NGQ5OGViMjcxNmEwYWI4MmY1IDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNl LnB5CkBAIC0xMjgsMTMgKzEyOCwxNiBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHJl dHVybiBleHBlY3RlZF90ZXh0ICE9IGFjdHVhbF90ZXh0CiAKICAgICBkZWYgZGlmZl9pbWFnZShz ZWxmLCBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lLAotICAgICAgICAgICAgICAg ICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSk6CisgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFt ZT1Ob25lLCB0b2xlcmFuY2U9MCk6CiAgICAgICAgICIiIkNvbXBhcmUgdHdvIGltYWdlIGZpbGVz IGFuZCBwcm9kdWNlIGEgZGVsdGEgaW1hZ2UgZmlsZS4KIAogICAgICAgICBSZXR1cm4gVHJ1ZSBp ZiB0aGUgdHdvIGZpbGVzIGFyZSBkaWZmZXJlbnQsIEZhbHNlIGlmIHRoZXkgYXJlIHRoZSBzYW1l LgogICAgICAgICBBbHNvIHByb2R1Y2UgYSBkZWx0YSBpbWFnZSBvZiB0aGUgdHdvIGltYWdlcyBh bmQgd3JpdGUgdGhhdCBpbnRvCiAgICAgICAgIHxkaWZmX2ZpbGVuYW1lfCBpZiBpdCBpcyBub3Qg Tm9uZS4KIAorICAgICAgICB8dG9sZXJhbmNlfCBzaG91bGQgYmUgYSBwZXJjZW50YWdlIHZhbHVl ICgwLjAgLSAxMDAuMCkuCisgICAgICAgIElmIGl0IGlzIG9taXR0ZWQsIHRoZSBwb3J0IGRlZmF1 bHQgdG9sZXJhbmNlIHZhbHVlIGlzIHVzZWQuCisKICAgICAgICAgV2hpbGUgdGhpcyBpcyBhIGdl bmVyaWMgcm91dGluZSwgd2UgaW5jbHVkZSBpdCBpbiB0aGUgUG9ydAogICAgICAgICBpbnRlcmZh Y2Ugc28gdGhhdCBpdCBjYW4gYmUgb3ZlcnJpZGVuIGZvciB0ZXN0aW5nIHB1cnBvc2VzLiIiIgog ICAgICAgICBleGVjdXRhYmxlID0gc2VsZi5fcGF0aF90b19pbWFnZV9kaWZmKCkKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eQppbmRleCBlNmQ0Yzk5YjQ0MzE3ZGVlNGEyOWY1MWY0OTJlODE3MTUxMTkwZTk0Li42ZWVmNTRl OTY3MDkxY2E2NGExODdmY2VmYTZiYjVjMzZjNDQ3MDYzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CkBAIC02MCw3 ICs2MCw3IEBAIGNsYXNzIFRlc3RQb3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIHJldHVybiBGYWxz ZQogCiAgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVhbF9m aWxlbmFtZSwKLSAgICAgICAgICAgICAgICAgICBkaWZmX2ZpbGVuYW1lPU5vbmUpOgorICAgICAg ICAgICAgICAgICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSwgdG9sZXJhbmNlPTApOgogICAgICAgICBy ZXR1cm4gRmFsc2UKIAogICAgIGRlZiBkaWZmX3RleHQoc2VsZiwgZXhwZWN0ZWRfdGV4dCwgYWN0 dWFsX3RleHQsCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IDIwOTdjZTc5ZTAwOTI0NmY0MDc5OGViY2Y3 MGI4MzZjM2EwMjczYmUuLjc2MTU4ZGZjYWVmMjM2M2I4NGRjOWJhNjUzOTIwMjFkZDhhNmI3NDAg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2Via2l0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2Via2l0LnB5CkBAIC0xMTYsMTAgKzExNiwxMyBAQCBjbGFzcyBXZWJLaXRQb3J0 KGJhc2UuUG9ydCk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgZGlmZl9pbWFnZShz ZWxmLCBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lLAotICAgICAgICAgICAgICAg ICAgIGRpZmZfZmlsZW5hbWU9Tm9uZSk6CisgICAgICAgICAgICAgICAgICAgZGlmZl9maWxlbmFt ZT1Ob25lLCB0b2xlcmFuY2U9MC4xKToKICAgICAgICAgIiIiUmV0dXJuIFRydWUgaWYgdGhlIHR3 byBmaWxlcyBhcmUgZGlmZmVyZW50LiBBbHNvIHdyaXRlIGEgZGVsdGEKICAgICAgICAgaW1hZ2Ug b2YgdGhlIHR3byBpbWFnZXMgaW50byB8ZGlmZl9maWxlbmFtZXwgaWYgaXQgaXMgbm90IE5vbmUu IiIiCiAKKyAgICAgICAgIyBGSVhNRTogZWl0aGVyIGV4cG9zZSB0aGUgdG9sZXJhbmNlIGFyZ3Vt ZW50IGFzIGEgY29tbWFuZC1saW5lCisgICAgICAgICMgcGFyYW1ldGVyLCBvciBtYWtlIGl0IGdv IGF3YXkgYW5kIGFsd2F5cyB1c2UgZXhhY3QgbWF0Y2hlcy4KKwogICAgICAgICAjIEhhbmRsZSB0 aGUgY2FzZSB3aGVyZSB0aGUgdGVzdCBkaWRuJ3QgYWN0dWFsbHkgZ2VuZXJhdGUgYW4gaW1hZ2Uu CiAgICAgICAgIGFjdHVhbF9sZW5ndGggPSBvcy5zdGF0KGFjdHVhbF9maWxlbmFtZSkuc3Rfc2l6 ZQogICAgICAgICBpZiBhY3R1YWxfbGVuZ3RoID09IDA6CkBAIC0xMjcsMTMgKzEzMCwxMSBAQCBj bGFzcyBXZWJLaXRQb3J0KGJhc2UuUG9ydCk6CiAgICAgICAgICAgICAgICAgc2h1dGlsLmNvcHlm aWxlKGFjdHVhbF9maWxlbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWUpCiAgICAgICAgICAgICByZXR1 cm4gVHJ1ZQogCi0gICAgICAgIHNwID0gc2VsZi5fZGlmZl9pbWFnZV9yZXF1ZXN0KGV4cGVjdGVk X2ZpbGVuYW1lLCBhY3R1YWxfZmlsZW5hbWUpCisgICAgICAgIHNwID0gc2VsZi5fZGlmZl9pbWFn ZV9yZXF1ZXN0KGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmlsZW5hbWUsIHRvbGVyYW5jZSkK ICAgICAgICAgcmV0dXJuIHNlbGYuX2RpZmZfaW1hZ2VfcmVwbHkoc3AsIGV4cGVjdGVkX2ZpbGVu YW1lLCBkaWZmX2ZpbGVuYW1lKQogCi0gICAgZGVmIF9kaWZmX2ltYWdlX3JlcXVlc3Qoc2VsZiwg ZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVhbF9maWxlbmFtZSk6Ci0gICAgICAgICMgRklYTUU6IGVp dGhlciBleHBvc2UgdGhlIHRvbGVyYW5jZSBhcmd1bWVudCBhcyBhIGNvbW1hbmQtbGluZQotICAg ICAgICAjIHBhcmFtZXRlciwgb3IgbWFrZSBpdCBnbyBhd2F5IGFuZCBhd2F5cyB1c2UgZXhhY3Qg bWF0Y2hlcy4KLSAgICAgICAgY29tbWFuZCA9IFtzZWxmLl9wYXRoX3RvX2ltYWdlX2RpZmYoKSwg Jy0tdG9sZXJhbmNlJywgJzAuMSddCisgICAgZGVmIF9kaWZmX2ltYWdlX3JlcXVlc3Qoc2VsZiwg ZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVhbF9maWxlbmFtZSwgdG9sZXJhbmNlKToKKyAgICAgICAg Y29tbWFuZCA9IFtzZWxmLl9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgJy0tdG9sZXJhbmNlJywgc3Ry KHRvbGVyYW5jZSldCiAgICAgICAgIHNwID0gc2VydmVyX3Byb2Nlc3MuU2VydmVyUHJvY2Vzcyhz ZWxmLCAnSW1hZ2VEaWZmJywgY29tbWFuZCkKIAogICAgICAgICBhY3R1YWxfbGVuZ3RoID0gb3Mu c3RhdChhY3R1YWxfZmlsZW5hbWUpLnN0X3NpemUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlmZi5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2Vf ZGlmZi5weQppbmRleCBmZTczYTdiNDZiM2M2NWRkYTY2M2Q0ODY2MGY3YTZlZTRhNWMzZDVhLi42 NWY4ZjNhNzExZGU5ODg0ZmNmMzVhNjFjZTMwZjMzZTM3ZTdmNzFkIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2Rp ZmYucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVz dF90eXBlcy9pbWFnZV9kaWZmLnB5CkBAIC0xOTIsNyArMTkyLDcgQEAgY2xhc3MgSW1hZ2VEaWZm KHRlc3RfdHlwZV9iYXNlLlRlc3RUeXBlQmFzZSk6CiAgICAgICAgIHJldHVybiBmYWlsdXJlcwog CiAgICAgZGVmIGRpZmZfZmlsZXMoc2VsZiwgcG9ydCwgZmlsZTEsIGZpbGUyKToKLSAgICAgICAg IiIiRGlmZiB0d28gaW1hZ2UgZmlsZXMuCisgICAgICAgICIiIkRpZmYgdHdvIGltYWdlIGZpbGVz IGV4YWN0bHkuCiAKICAgICAgICAgQXJnczoKICAgICAgICAgICBmaWxlMSwgZmlsZTI6IGZ1bGwg cGF0aHMgb2YgdGhlIGZpbGVzIHRvIGNvbXBhcmUuCkBAIC0yMDIsNiArMjAyLDYgQEAgY2xhc3Mg SW1hZ2VEaWZmKHRlc3RfdHlwZV9iYXNlLlRlc3RUeXBlQmFzZSk6CiAgICAgICAgICAgRmFsc2Ug b3RoZXJ3aXNlLgogICAgICAgICAiIiIKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgcmV0dXJu IHBvcnQuZGlmZl9pbWFnZShmaWxlMSwgZmlsZTIpCisgICAgICAgICAgICByZXR1cm4gcG9ydC5k aWZmX2ltYWdlKGZpbGUxLCBmaWxlMiwgTm9uZSwgMCkKICAgICAgICAgZXhjZXB0IFZhbHVlRXJy b3IsIGU6CiAgICAgICAgICAgICByZXR1cm4gVHJ1ZQo=