21483 2008-10-08 13:33:32 -0700 Regression: run-webkit-tests --pixel svg fails with diffs which aren't diffs 2008-10-08 17:47:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED Regression P2 Normal --- 1 eric simon.fraser simon.fraser oldest_to_newest 94596 0 eric 2008-10-08 13:33:32 -0700 run-webkit-tests --pixel svg fails with diffs which aren't diffs the perl script seems to get confused as to what's what. It's spitting out png dumps as diffs and doing image diffs between the pixel results of the wrong two tests. Something in the output stream from DRT must have gotten run-webkit-tests confused. This is a regression as this used to work just fine. 94597 1 simon.fraser 2008-10-08 13:38:41 -0700 Fallout from bug 21124 and bug 21323 94630 2 24203 simon.fraser 2008-10-08 15:34:19 -0700 Created attachment 24203 Patch, changelog This patch changes DRT to print an ExpectPNG: line to the output when it knows it will spew out PNG data. The script can then look for this, rather than guessing. It also adds a little Content-Type checking. 94631 3 24203 eric 2008-10-08 15:43:09 -0700 Comment on attachment 24203 Patch, changelog Looks fine. 94652 4 24210 simon.fraser 2008-10-08 17:41:15 -0700 Created attachment 24210 Alternate solution This second patch makes DRT always dump two #EOF-terminated blocks; the second, for PNG data, may be empty. 94654 5 24210 mitz 2008-10-08 17:43:53 -0700 Comment on attachment 24210 Alternate solution r=me, assuming you tested in the various scenarios (--pixel, --pixel with no existing results, tests that dump as text and tests that don't etc.). 94655 6 simon.fraser 2008-10-08 17:47:18 -0700 r37433 = 8c2bac03b93d3aa1c8b2667ebc9ce1c20dcb3d04 (trunk) M WebKitTools/DumpRenderTree/cg/PixelDumpSupportCG.cpp M WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp M WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm M WebKitTools/ChangeLog M WebKitTools/Scripts/run-webkit-tests 24203 2008-10-08 15:34:19 -0700 2008-10-08 17:41:15 -0700 Patch, changelog 21483_patch.txt text/plain 6421 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxYmQwMWM1Li42OGU3NTcxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDgtMTAt MDggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHJ1bi13ZWJraXQtdGVzdCBo YW5ncyBjYXVzZWQgYnkgRFJUIGFuZCB0aGUgc2NyaXB0CisgICAgICAgIGRpc2FncmVlaW5nIGFi b3V0IHdoZW4gdG8gZXhwZWN0IHBpeGVsIHJlc3VsdHMuCisgICAgICAgIERSVCBub3cgcHJpbnRz IGFuIEV4cGVjdFBORzogbGluZSB0byB0ZWxsIHRoZSBzY3JpcHQKKyAgICAgICAgdG8gZXhwZWN0 IGEgUE5HIGR1bXAgKG9yIGp1c3QgI0VPRiksIHJhdGhlciB0aGFuIGJvdGgKKyAgICAgICAgc2lk ZXMgbWFraW5nIGd1ZXNzZXMgYmFzZWQgb24gd2hldGhlciB0aGUgdGVzdCBpcyB0ZXh0IG9yIG5v dC4KKyAgICAgICAgRFJUIGFsc28gcHJpbnRzIGEgQ29udGVudC1UeXBlOiBpbWFnZS9wbmcgbGlu ZSB0byBhbGxvdyB0aGUKKyAgICAgICAgc2NyaXB0IHRvIGRvdWJsZS1jaGVjayB0aGF0IHRoZSBQ TkcgcmVhZGluZyBjb2RlIGlzIGFjdHVhbGx5CisgICAgICAgIHJlY2VpdmluZyBQTkcgZGF0YS4K KyAgICAgICAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTQ4MworICAgICAgICAKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jZy9QaXhlbER1bXBT dXBwb3J0Q0cuY3BwOgorICAgICAgICAocHJpbnRQTkcpOgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAgKGR1bXApOgorICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChkdW1wKToKKyAg ICAgICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6CisKIDIwMDgtMTAtMDcgIEFkYW0gUm9i ZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ugc3VyZSBzaG9ydCBmdW5jdGlv bnMgZ2V0IGluY2x1ZGVkIGluIENoYW5nZUxvZyBvdXRwdXQgZm9yIGdpdApkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2cvUGl4ZWxEdW1wU3VwcG9ydENHLmNwcCBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2NnL1BpeGVsRHVtcFN1cHBvcnRDRy5jcHAKaW5kZXgg OTA2ZTI3NC4uOWRiN2EzZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv Y2cvUGl4ZWxEdW1wU3VwcG9ydENHLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9jZy9QaXhlbER1bXBTdXBwb3J0Q0cuY3BwCkBAIC01NSw2ICs1NSw3IEBAIHN0YXRpYyB2b2lk IHByaW50UE5HKENHSW1hZ2VSZWYgaW1hZ2UpCiAgICAgUmV0YWluUHRyPENHSW1hZ2VEZXN0aW5h dGlvblJlZj4gaW1hZ2VEZXN0KEFkb3B0Q0YsIENHSW1hZ2VEZXN0aW5hdGlvbkNyZWF0ZVdpdGhE YXRhKGltYWdlRGF0YS5nZXQoKSwga1VUVHlwZVBORywgMSwgMCkpOwogICAgIENHSW1hZ2VEZXN0 aW5hdGlvbkFkZEltYWdlKGltYWdlRGVzdC5nZXQoKSwgaW1hZ2UsIDApOwogICAgIENHSW1hZ2VE ZXN0aW5hdGlvbkZpbmFsaXplKGltYWdlRGVzdC5nZXQoKSk7CisgICAgcHJpbnRmKCJDb250ZW50 LVR5cGU6ICVzXG4iLCAiaW1hZ2UvcG5nIik7CiAgICAgcHJpbnRmKCJDb250ZW50LUxlbmd0aDog JWx1XG4iLCBDRkRhdGFHZXRMZW5ndGgoaW1hZ2VEYXRhLmdldCgpKSk7CiAgICAgZndyaXRlKENG RGF0YUdldEJ5dGVQdHIoaW1hZ2VEYXRhLmdldCgpKSwgMSwgQ0ZEYXRhR2V0TGVuZ3RoKGltYWdl RGF0YS5nZXQoKSksIHN0ZG91dCk7CiB9CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0gYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KaW5kZXggYjQ3MDRmOC4uMTBlMGU2ZSAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBi L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtODY4 LDYgKzg2OCw3IEBAIHZvaWQgZHVtcCgpCiAgICAgaW52YWxpZGF0ZUFueVByZXZpb3VzV2FpdFRv RHVtcFdhdGNoZG9nKCk7CiAKICAgICBib29sIGR1bXBBc1RleHQgPSBnTGF5b3V0VGVzdENvbnRy b2xsZXItPmR1bXBBc1RleHQoKTsKKyAgICBib29sIGR1bXBQTkcgPSBkdW1wQWxsUGl4ZWxzIHx8 IChkdW1wUGl4ZWxzICYmICFkdW1wQXNUZXh0KTsKICAgICBpZiAoZHVtcFRyZWUpIHsKICAgICAg ICAgTlNTdHJpbmcgKnJlc3VsdFN0cmluZyA9IG5pbDsKICAgICAgICAgTlNEYXRhICpyZXN1bHRE YXRhID0gbmlsOwpAQCAtOTA5LDEzICs5MTAsMTYgQEAgdm9pZCBkdW1wKCkKICAgICAgICAgfSBl bHNlCiAgICAgICAgICAgICBwcmludGYoIkVSUk9SOiBuaWwgcmVzdWx0IGZyb20gJXMiLCBtZXRo b2ROYW1lU3RyaW5nRm9yRmFpbGVkVGVzdCgpKTsKIAorICAgICAgICBkdW1wUE5HID0gZHVtcEFs bFBpeGVscyB8fCAoZHVtcFBpeGVscyAmJiAhZHVtcEFzVGV4dCk7ICAgICAvLyBkdW1wQXNUZXh0 IG1heSBoYXZlIGNoYW5nZWQgYWJvdmUKKyAgICAgICAgcHJpbnRmKCJFeHBlY3RQTkc6ICVkXG4i LCBkdW1wUE5HKTsKKwogICAgICAgICBpZiAocHJpbnRTZXBhcmF0b3JzKSB7CiAgICAgICAgICAg ICBwdXRzKCIjRU9GIik7CiAgICAgICAgICAgICBmcHV0cygiI0VPRlxuIiwgc3RkZXJyKTsKICAg ICAgICAgfSAgICAgICAgICAgIAogICAgIH0KICAgICAKLSAgICBpZiAoZHVtcEFsbFBpeGVscyB8 fCAoZHVtcFBpeGVscyAmJiAhZHVtcEFzVGV4dCkpCisgICAgaWYgKGR1bXBQTkcpCiAgICAgICAg IGR1bXBXZWJWaWV3QXNQaXhlbHNBbmRDb21wYXJlV2l0aEV4cGVjdGVkKFtjdXJyZW50VGVzdCBV VEY4U3RyaW5nXSwgZHVtcEFsbFBpeGVscyk7CiAKICAgICBmZmx1c2goc3Rkb3V0KTsKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAg Yi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4 IDkzZGIxZDkuLjFiYzQzNDQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv d2luL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNTk3LDYgKzU5Nyw5IEBAIHZvaWQgZHVtcCgpCiAg ICAgICAgICAgICBkdW1wQmFja0ZvcndhcmRMaXN0Rm9yQWxsV2luZG93cygpOwogICAgIH0KIAor ICAgIGJvb2wgZHVtcFBuZyA9IGR1bXBQaXhlbHMgJiYgIShnTGF5b3V0VGVzdENvbnRyb2xsZXIt PmR1bXBBc1RleHQoKSB8fCBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBET01Bc1dlYkFyY2hp dmUoKSB8fCBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBTb3VyY2VBc1dlYkFyY2hpdmUoKSk7 CisgICAgcHJpbnRmKCJFeHBlY3RQTkc6ICVkXG4iLCBkdW1wUE5HKTsKKwogICAgIGlmIChwcmlu dFNlcGFyYXRvcnMpIHsKICAgICAgICAgcHV0cygiI0VPRiIpOwogICAgICAgICBmcHV0cygiI0VP RlxuIiwgc3RkZXJyKTsKQEAgLTYwNCwxMSArNjA3LDggQEAgdm9pZCBkdW1wKCkKICAgICAgICAg ZmZsdXNoKHN0ZGVycik7CiAgICAgfQogCi0gICAgaWYgKGR1bXBQaXhlbHMpIHsKLSAgICAgICAg aWYgKGdMYXlvdXRUZXN0Q29udHJvbGxlci0+ZHVtcEFzVGV4dCgpIHx8IGdMYXlvdXRUZXN0Q29u dHJvbGxlci0+ZHVtcERPTUFzV2ViQXJjaGl2ZSgpIHx8IGdMYXlvdXRUZXN0Q29udHJvbGxlci0+ ZHVtcFNvdXJjZUFzV2ViQXJjaGl2ZSgpKQotICAgICAgICAgICAgcHJpbnRmKCIjRU9GXG4iKTsK LSAgICAgICAgZWxzZQotICAgICAgICAgICAgZHVtcFdlYlZpZXdBc1BpeGVsc0FuZENvbXBhcmVX aXRoRXhwZWN0ZWQoY3VycmVudFRlc3QsIGR1bXBBbGxQaXhlbHMpOworICAgIGlmIChkdW1wUG5n KSB7CisgICAgICAgIGR1bXBXZWJWaWV3QXNQaXhlbHNBbmRDb21wYXJlV2l0aEV4cGVjdGVkKGN1 cnJlbnRUZXN0LCBkdW1wQWxsUGl4ZWxzKTsKICAgICAgICAgZmZsdXNoKHN0ZG91dCk7CiAgICAg fQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKaW5kZXggZmI2ZTlkOS4uOTk4MGVj MyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwpAQCAtNjI4LDkgKzYyOCw3IEBA IGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgbXkgJGRpZmZQZXJjZW50YWdlID0gIiI7CiAg ICAgbXkgJGRpZmZSZXN1bHQgPSAicGFzc2VkIjsKIAotICAgICMgRFJUIGFuZCB0aGlzIHNjcmlw dCBuZWVkIHRvIGFncmVlIG9uIHdoZW4gcGl4ZWwgZGF0YSBpcyBkdW1wZWQsIHNvIHRoaXMKLSAg ICAjIHRlc3QgaGFzIHRvIG1hdGNoIGEgdGVzdCBpbiB0aGUgbmF0aXZlIGNvZGUKLSAgICBpZiAo JGR1bXBBbGxQaXhlbHMgfHwgKCRwaXhlbFRlc3RzICYmICEkaXNUZXh0KSkgeworICAgIGlmICgk YWN0dWFsUmVhZC0+e2V4cGVjdFBOR30pIHsKICAgICAgICAgbXkgJGV4cGVjdGVkUGl4ZWxEaXIg PSBleHBlY3RlZERpcmVjdG9yeUZvclRlc3QoJGJhc2UsICRpc1RleHQsICJwbmciKTsKIAogICAg ICAgICBteSAkYWN0dWFsSGFzaCA9ICIiOwpAQCAtNjQzLDYgKzY0MSw5IEBAIGZvciBteSAkdGVz dCAoQHRlc3RzKSB7CiAgICAgICAgICAgICAgICAgJGFjdHVhbEhhc2ggPSAkMTsKICAgICAgICAg ICAgIH0gZWxzaWYgKC9CYXNlbGluZUhhc2g6IChbYS1mMC05XXszMn0pLykgewogICAgICAgICAg ICAgICAgICRleHBlY3RlZEhhc2ggPSAkMTsKKyAgICAgICAgICAgIH0gZWxzaWYgKC9Db250ZW50 LVR5cGU6IChcUyspJC8pIHsKKyAgICAgICAgICAgICAgICBteSAkY29udGVudFR5cGUgPSAkMTsK KyAgICAgICAgICAgICAgICBkaWUgIkV4cGVjdGVkIGltYWdlL3BuZyBjb250ZW50IHR5cGUsIGdv dCAkY29udGVudFR5cGVcbiIgdW5sZXNzICRjb250ZW50VHlwZSBlcSAiaW1hZ2UvcG5nIjsKICAg ICAgICAgICAgIH0gZWxzaWYgKC9Db250ZW50LUxlbmd0aDogKFxkKylccyovKSB7CiAgICAgICAg ICAgICAgICAgJGFjdHVhbFBOR1NpemUgPSAkMTsKICAgICAgICAgICAgICAgICByZWFkKElOLCAk YWN0dWFsUE5HLCAkYWN0dWFsUE5HU2l6ZSk7CkBAIC0xNzU3LDYgKzE3NTgsNyBAQCBzdWIgcmVh ZEZyb21EdW1wVG9vbFdpdGhUaW1lcigqOyQpCiAgICAgIyBXZSBkb24ndCBoYXZlIGEgdmVyeSBn b29kIHdheSB0byBrbm93IHdoZW4gdGhlICJoZWFkZXJzIiBzdG9wCiAgICAgIyBhbmQgdGhlIGNv bnRlbnQgc3RhcnRzLCBzbyB3ZSB1c2UgdGhpcyBhcyBhIGhhY2s6CiAgICAgbXkgJGhhdmVTZWVu Q29udGVudFR5cGUgPSAwOworICAgIG15ICRleHBlY3RQTkcgPSAwOwogCiAgICAgd2hpbGUgKDEp IHsKICAgICAgICAgaWYgKHRpbWUgLSAkdGltZU9mTGFzdFN1Y2Nlc3NmdWxSZWFkID4gJG1heGlt dW1TZWNvbmRzV2l0aG91dE91dHB1dCkgewpAQCAtMTc4Nyw2ICsxNzg5LDEyIEBAIHN1YiByZWFk RnJvbUR1bXBUb29sV2l0aFRpbWVyKCo7JCkKICAgICAgICAgICAgICRoYXZlU2VlbkNvbnRlbnRU eXBlID0gMTsKICAgICAgICAgICAgIG5leHQ7CiAgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IGlmICgkbGluZSA9fiAvXkV4cGVjdFBORzogKFxkKylccyovKSB7CisgICAgICAgICAgJGV4cGVj dFBORyA9ICQxOworICAgICAgICAgIG5leHQ7CisgICAgICAgIH0KKyAgICAgICAgCiAgICAgICAg IGxhc3QgIGlmICgkbGluZSA9fiAvI0VPRi8pOwogICAgICAgICAKICAgICAgICAgcHVzaCBAb3V0 cHV0LCAkbGluZTsKQEAgLTE3OTcsNyArMTgwNSw4IEBAIHN1YiByZWFkRnJvbUR1bXBUb29sV2l0 aFRpbWVyKCo7JCkKICAgICAgICAgb3V0cHV0ID0+IGpvaW4oIiIsIEBvdXRwdXQpLAogICAgICAg ICBzdGF0dXMgPT4gJHN0YXR1cywKICAgICAgICAgbWltZVR5cGUgPT4gJG1pbWVUeXBlLAotICAg ICAgICBleHRlbnNpb24gPT4gZXh0ZW5zaW9uRm9yTWltZVR5cGUoJG1pbWVUeXBlKQorICAgICAg ICBleHRlbnNpb24gPT4gZXh0ZW5zaW9uRm9yTWltZVR5cGUoJG1pbWVUeXBlKSwKKyAgICAgICAg ZXhwZWN0UE5HID0+ICRleHBlY3RQTkcKICAgICB9OwogfQogCg== 24210 2008-10-08 17:41:15 -0700 2008-10-08 17:43:53 -0700 Alternate solution 21483_patch2.txt text/plain 6689 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxYmQwMWM1Li40NWE0MTRkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDgtMTAt MDggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgZGlzY29ubmVjdCBiZXR3 ZWVuIERSVCBhbmQgcnVuLXdlYmtpdC10ZXN0cworICAgICAgICBhYm91dCB3aGV0aGVyIHRvIGV4 cGVjdCBQTkcgZHVtcHMgYnkgaGF2aW5nIERSVCBhbHdheXMKKyAgICAgICAgcHJpbnQgdHdvIGJs b2NrcyB0ZXJtaW5hdGVkIGJ5ICNFT0YsIHRoZSBzZWNvbmQgb2Ygd2hpY2gKKyAgICAgICAgbWF5 IGJlIGVtcHR5LgorICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNDgzCisgICAgICAgIAorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nn L1BpeGVsRHVtcFN1cHBvcnRDRy5jcHA6CisgICAgICAgIChwcmludFBORyk6CisgICAgICAgIChk dW1wV2ViVmlld0FzUGl4ZWxzQW5kQ29tcGFyZVdpdGhFeHBlY3RlZCk6CisgICAgICAgICogRHVt cFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAoZHVtcCk6CisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGR1 bXApOgorICAgICAgICAqIFNjcmlwdHMvcnVuLXdlYmtpdC10ZXN0czoKKwogMjAwOC0xMC0wNyAg QWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBzdXJlIHNob3J0 IGZ1bmN0aW9ucyBnZXQgaW5jbHVkZWQgaW4gQ2hhbmdlTG9nIG91dHB1dCBmb3IgZ2l0CmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jZy9QaXhlbER1bXBTdXBwb3J0Q0cu Y3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2cvUGl4ZWxEdW1wU3VwcG9ydENHLmNw cAppbmRleCA5MDZlMjc0Li41ZTlkM2I2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9jZy9QaXhlbER1bXBTdXBwb3J0Q0cuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBS ZW5kZXJUcmVlL2NnL1BpeGVsRHVtcFN1cHBvcnRDRy5jcHAKQEAgLTU1LDcgKzU1LDEwIEBAIHN0 YXRpYyB2b2lkIHByaW50UE5HKENHSW1hZ2VSZWYgaW1hZ2UpCiAgICAgUmV0YWluUHRyPENHSW1h Z2VEZXN0aW5hdGlvblJlZj4gaW1hZ2VEZXN0KEFkb3B0Q0YsIENHSW1hZ2VEZXN0aW5hdGlvbkNy ZWF0ZVdpdGhEYXRhKGltYWdlRGF0YS5nZXQoKSwga1VUVHlwZVBORywgMSwgMCkpOwogICAgIENH SW1hZ2VEZXN0aW5hdGlvbkFkZEltYWdlKGltYWdlRGVzdC5nZXQoKSwgaW1hZ2UsIDApOwogICAg IENHSW1hZ2VEZXN0aW5hdGlvbkZpbmFsaXplKGltYWdlRGVzdC5nZXQoKSk7CisKKyAgICBwcmlu dGYoIkNvbnRlbnQtVHlwZTogJXNcbiIsICJpbWFnZS9wbmciKTsKICAgICBwcmludGYoIkNvbnRl bnQtTGVuZ3RoOiAlbHVcbiIsIENGRGF0YUdldExlbmd0aChpbWFnZURhdGEuZ2V0KCkpKTsKKwog ICAgIGZ3cml0ZShDRkRhdGFHZXRCeXRlUHRyKGltYWdlRGF0YS5nZXQoKSksIDEsIENGRGF0YUdl dExlbmd0aChpbWFnZURhdGEuZ2V0KCkpLCBzdGRvdXQpOwogfQogCkBAIC0xMjEsNiArMTI0LDQg QEAgdm9pZCBkdW1wV2ViVmlld0FzUGl4ZWxzQW5kQ29tcGFyZVdpdGhFeHBlY3RlZChjb25zdCBj aGFyKiAvKmN1cnJlbnRUZXN0Ki8sIGJvb2wKICAgICAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+ IGltYWdlKEFkb3B0Q0YsIENHQml0bWFwQ29udGV4dENyZWF0ZUltYWdlKGNvbnRleHQuZ2V0KCkp KTsKICAgICAgICAgcHJpbnRQTkcoaW1hZ2UuZ2V0KCkpOwogICAgIH0KLQotICAgIHByaW50Zigi I0VPRlxuIik7CiB9CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMv RHVtcFJlbmRlclRyZWUubW0gYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJl bmRlclRyZWUubW0KaW5kZXggYjQ3MDRmOC4uNDExZWJiMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBiL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtOTEwLDEzICs5MTAsMTUg QEAgdm9pZCBkdW1wKCkKICAgICAgICAgICAgIHByaW50ZigiRVJST1I6IG5pbCByZXN1bHQgZnJv bSAlcyIsIG1ldGhvZE5hbWVTdHJpbmdGb3JGYWlsZWRUZXN0KCkpOwogCiAgICAgICAgIGlmIChw cmludFNlcGFyYXRvcnMpIHsKLSAgICAgICAgICAgIHB1dHMoIiNFT0YiKTsKKyAgICAgICAgICAg IHB1dHMoIiNFT0YiKTsgICAgICAgLy8gdGVybWluYXRlIHRoZSBjb250ZW50IGJsb2NrCiAgICAg ICAgICAgICBmcHV0cygiI0VPRlxuIiwgc3RkZXJyKTsKICAgICAgICAgfSAgICAgICAgICAgIAog ICAgIH0KICAgICAKICAgICBpZiAoZHVtcEFsbFBpeGVscyB8fCAoZHVtcFBpeGVscyAmJiAhZHVt cEFzVGV4dCkpCiAgICAgICAgIGR1bXBXZWJWaWV3QXNQaXhlbHNBbmRDb21wYXJlV2l0aEV4cGVj dGVkKFtjdXJyZW50VGVzdCBVVEY4U3RyaW5nXSwgZHVtcEFsbFBpeGVscyk7CisgICAgCisgICAg cHV0cygiI0VPRiIpOyAgIC8vIHRlcm1pbmF0ZSB0aGUgKHBvc3NpYmx5IGVtcHR5KSBwaXhlbHMg YmxvY2sKIAogICAgIGZmbHVzaChzdGRvdXQpOwogICAgIGZmbHVzaChzdGRlcnIpOwpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcCBi L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAKaW5kZXgg OTNkYjFkOS4uYTE1MWViNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv d2luL0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93 aW4vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC01OTgsNyArNTk4LDcgQEAgdm9pZCBkdW1wKCkKICAg ICB9CiAKICAgICBpZiAocHJpbnRTZXBhcmF0b3JzKSB7Ci0gICAgICAgIHB1dHMoIiNFT0YiKTsK KyAgICAgICAgcHV0cygiI0VPRiIpOyAgIC8vIHRlcm1pbmF0ZSB0aGUgY29udGVudCBibG9jawog ICAgICAgICBmcHV0cygiI0VPRlxuIiwgc3RkZXJyKTsKICAgICAgICAgZmZsdXNoKHN0ZG91dCk7 CiAgICAgICAgIGZmbHVzaChzdGRlcnIpOwpAQCAtNjA2LDEyICs2MDYsMTMgQEAgdm9pZCBkdW1w KCkKIAogICAgIGlmIChkdW1wUGl4ZWxzKSB7CiAgICAgICAgIGlmIChnTGF5b3V0VGVzdENvbnRy b2xsZXItPmR1bXBBc1RleHQoKSB8fCBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBET01Bc1dl YkFyY2hpdmUoKSB8fCBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBTb3VyY2VBc1dlYkFyY2hp dmUoKSkKLSAgICAgICAgICAgIHByaW50ZigiI0VPRlxuIik7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIGR1bXBXZWJWaWV3QXNQaXhlbHNBbmRDb21wYXJlV2l0aEV4cGVjdGVkKGN1cnJlbnRU ZXN0LCBkdW1wQWxsUGl4ZWxzKTsKLSAgICAgICAgZmZsdXNoKHN0ZG91dCk7CiAgICAgfQogCisg ICAgcHJpbnRmKCIjRU9GXG4iKTsgICAvLyB0ZXJtaW5hdGUgdGhlIChwb3NzaWJseSBlbXB0eSkg cGl4ZWxzIGJsb2NrCisgICAgZmZsdXNoKHN0ZG91dCk7CisKIGZhaWw6CiAgICAgU3lzRnJlZVN0 cmluZyhyZXN1bHRTdHJpbmcpOwogICAgIC8vIFRoaXMgd2lsbCBleGl0IGZyb20gb3VyIG1lc3Nh Z2UgbG9vcApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3Rz IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IGZiNmU5ZDkuLmI0 ZjhjYmYgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKQEAgLTU3NSw2ICs1NzUs MTIgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgfQogICAgIH0KIAorICAgICMg RHVtcFJlbmRlclRyZWUgaXMgZXhwZWN0ZWQgdG8gZHVtcCB0d28gImJsb2NrcyIgdG8gc3Rkb3V0 IGZvciBlYWNoIHRlc3QuCisgICAgIyBFYWNoIGJsb2NrIGlzIHRlcm1pbmF0ZWQgYnkgYSAjRU9G IG9uIGEgbGluZSBieSBpdHNlbGYuCisgICAgIyBUaGUgZmlyc3QgYmxvY2sgaXMgdGhlIG91dHB1 dCBvZiB0aGUgdGVzdCAoaW4gdGV4dCwgUmVuZGVyVHJlZSBvciBvdGhlciBmb3JtYXRzKS4KKyAg ICAjIFRoZSBzZWNvbmQgYmxvY2sgaXMgZm9yIG9wdGlvbmFsIHBpeGVsIGRhdGEgaW4gUE5HIGZv cm1hdCwgYW5kIG1heSBiZSBlbXB0eSBpZgorICAgICMgcGl4ZWwgdGVzdHMgYXJlIG5vdCBiZWlu ZyBydW4sIG9yIHRoZSB0ZXN0IGRvZXMgbm90IGR1bXAgcGl4ZWxzIChlLmcuIHRleHQgdGVzdHMp LgorICAgIAogICAgIG15ICRhY3R1YWxSZWFkID0gcmVhZEZyb21EdW1wVG9vbFdpdGhUaW1lcihJ Tik7CiAgICAgbXkgJGVycm9yUmVhZCA9IHJlYWRGcm9tRHVtcFRvb2xXaXRoVGltZXIoRVJST1Is ICRhY3R1YWxSZWFkLT57c3RhdHVzfSBlcSAidGltZWRPdXQiKTsKIApAQCAtNjI4LDI2ICs2MzQs MjYgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICBteSAkZGlmZlBlcmNlbnRhZ2UgPSAi IjsKICAgICBteSAkZGlmZlJlc3VsdCA9ICJwYXNzZWQiOwogCi0gICAgIyBEUlQgYW5kIHRoaXMg c2NyaXB0IG5lZWQgdG8gYWdyZWUgb24gd2hlbiBwaXhlbCBkYXRhIGlzIGR1bXBlZCwgc28gdGhp cwotICAgICMgdGVzdCBoYXMgdG8gbWF0Y2ggYSB0ZXN0IGluIHRoZSBuYXRpdmUgY29kZQotICAg IGlmICgkZHVtcEFsbFBpeGVscyB8fCAoJHBpeGVsVGVzdHMgJiYgISRpc1RleHQpKSB7Ci0gICAg ICAgIG15ICRleHBlY3RlZFBpeGVsRGlyID0gZXhwZWN0ZWREaXJlY3RvcnlGb3JUZXN0KCRiYXNl LCAkaXNUZXh0LCAicG5nIik7Ci0KLSAgICAgICAgbXkgJGFjdHVhbEhhc2ggPSAiIjsKLSAgICAg ICAgbXkgJGV4cGVjdGVkSGFzaCA9ICIiOwotICAgICAgICBteSAkYWN0dWFsUE5HU2l6ZSA9IDA7 Ci0KLSAgICAgICAgd2hpbGUgKDxJTj4pIHsKLSAgICAgICAgICAgIGxhc3QgaWYgLyNFT0YvOwot ICAgICAgICAgICAgaWYgKC9BY3R1YWxIYXNoOiAoW2EtZjAtOV17MzJ9KS8pIHsKLSAgICAgICAg ICAgICAgICAkYWN0dWFsSGFzaCA9ICQxOwotICAgICAgICAgICAgfSBlbHNpZiAoL0Jhc2VsaW5l SGFzaDogKFthLWYwLTldezMyfSkvKSB7Ci0gICAgICAgICAgICAgICAgJGV4cGVjdGVkSGFzaCA9 ICQxOwotICAgICAgICAgICAgfSBlbHNpZiAoL0NvbnRlbnQtTGVuZ3RoOiAoXGQrKVxzKi8pIHsK LSAgICAgICAgICAgICAgICAkYWN0dWFsUE5HU2l6ZSA9ICQxOwotICAgICAgICAgICAgICAgIHJl YWQoSU4sICRhY3R1YWxQTkcsICRhY3R1YWxQTkdTaXplKTsKLSAgICAgICAgICAgIH0KKyAgICAj IExvb2sgZm9yIHRoZSBwaXhlbCBibG9jaywgYW5kIGRvIGFuIGltYWdlIGRpZmYgaWYgd2UgZmlu ZCBvbmUKKyAgICBteSAkYWN0dWFsSGFzaCA9ICIiOworICAgIG15ICRleHBlY3RlZEhhc2ggPSAi IjsKKyAgICBteSAkYWN0dWFsUE5HU2l6ZSA9IDA7CisKKyAgICB3aGlsZSAoPElOPikgeworICAg ICAgICBsYXN0IGlmIC8jRU9GLzsKKyAgICAgICAgaWYgKC9BY3R1YWxIYXNoOiAoW2EtZjAtOV17 MzJ9KS8pIHsKKyAgICAgICAgICAgICRhY3R1YWxIYXNoID0gJDE7CisgICAgICAgIH0gZWxzaWYg KC9CYXNlbGluZUhhc2g6IChbYS1mMC05XXszMn0pLykgeworICAgICAgICAgICAgJGV4cGVjdGVk SGFzaCA9ICQxOworICAgICAgICB9IGVsc2lmICgvQ29udGVudC1MZW5ndGg6IChcZCspXHMqLykg eworICAgICAgICAgICAgJGFjdHVhbFBOR1NpemUgPSAkMTsKKyAgICAgICAgICAgIHJlYWQoSU4s ICRhY3R1YWxQTkcsICRhY3R1YWxQTkdTaXplKTsKICAgICAgICAgfQorICAgIH0KKworICAgICMg SWYgd2UgZ290IHNvbWUgUE5HIGRhdGEsIGRpZmYgd2l0aCBleHBlY3RlZAorICAgIGlmICgkYWN0 dWFsUE5HU2l6ZSA+IDApIHsKKyAgICAgICAgbXkgJGV4cGVjdGVkUGl4ZWxEaXIgPSBleHBlY3Rl ZERpcmVjdG9yeUZvclRlc3QoJGJhc2UsICRpc1RleHQsICJwbmciKTsKIAogICAgICAgICBpZiAo JGV4cGVjdGVkSGFzaCBuZSAkYWN0dWFsSGFzaCAmJiAtZiAiJGV4cGVjdGVkUGl4ZWxEaXIvJGJh c2UtJGV4cGVjdGVkVGFnLnBuZyIpIHsKICAgICAgICAgICAgIG15ICRleHBlY3RlZFBOR1NpemUg PSAtcyAiJGV4cGVjdGVkUGl4ZWxEaXIvJGJhc2UtJGV4cGVjdGVkVGFnLnBuZyI7CkBAIC0xNzM5 LDYgKzE3NDUsNyBAQCBzdWIgZXh0ZW5zaW9uRm9yTWltZVR5cGUoJCkKICAgICByZXR1cm4gInR4 dCI7CiB9CiAKKyMgUmVhZCB1cCB0byB0aGUgZmlyc3QgI0VPRiAodGhlIGNvbnRlbnQgYmxvY2sg b2YgdGhlIHRlc3QpLCBvciB1bnRpbCBkZXRlY3RpbmcgY3Jhc2hlcyBvciB0aW1lb3V0cy4KIHN1 YiByZWFkRnJvbUR1bXBUb29sV2l0aFRpbWVyKCo7JCkKIHsKICAgICBteSAoJGZoLCAkZG9udFdh aXRGb3JUaW1lT3V0KSA9IEBfOwo=