21124 2008-09-25 16:59:21 -0700 --pixel should be ignored for tests that use dumpAsText() 2008-09-30 17:43:44 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac (Intel) OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pol simon.fraser simon.fraser oldest_to_newest 92827 0 pol 2008-09-25 16:59:21 -0700 If I understand things right, tests that use the dumpAsText() instead of dumping the render tree are supposed to be platform agnostic, so their results are in the same directory as the tests instead of in "platform". Pixel test are by definition not platform agnostic (destination screen color profile, font rendering differences, etc...), so their result should always be in "platform". If you combine these two assumptions, then having a test that uses dumpAsText() also have its rendering be pixel-tested does not make sense. But today, if you run "WebKitTools/Scripts/run-webkit-tests --pixel LayoutTests/", it will generate images for such tests. For instance, 3 out of the 6 tests in LayoutTests/transforms/2d are dumpAsText() tests and do not print the render tree: - compound-2d-transforms.html - transform-2d.html - transform-accuracy.html But since there are no "base" images in LayoutTests/platform/mac/transforms/2d for these tests, DRT always creates news ones in LayoutTests/transforms/2d and this pollutes the directory. I think the DRT tool when running in --pixel-test mode should not compare pixel rendering of tests that use dumpAsText(). 92828 1 mrowe 2008-09-25 17:05:59 -0700 I thought that this was already the case. Perhaps we broke this behaviour somewhere along the way. 92829 2 pol 2008-09-25 17:12:19 -0700 We want to add a bunch of tests for transforms, transitions and animations, and some of them require pixel testing. Having this fixed sooner than later would help, thanks. 92960 3 pol 2008-09-26 13:06:09 -0700 For some reason, you can't just bypass dumpWebViewAsPixelsAndCompareWithExpected() completely in DRT or the tests hangs. Here's a diff that seems to fix the issue (it's a one-line change, but because of (re)tabbing a bunch of lines, it makes it look quite bigger): Index: WebKitTools/DumpRenderTree/cg/PixelDumpSupportCG.cpp =================================================================== --- WebKitTools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (revision 36958) +++ WebKitTools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (working copy) @@ -106,21 +106,25 @@ if (gLayoutTestController->dumpSelectionRect()) drawSelectionRect(context.get(), getSelectionRect()); #endif + + // Only process the rendered image if have a test that is not platform-agnositc i.e. doesn't use "dumpAsText()" + if(!gLayoutTestController->dumpAsText()) { - // Compute the actual hash to compare to the expected image's hash. - char actualHash[33]; - getMD5HashStringForBitmap(context.get(), actualHash); - printf("\nActualHash: %s\n", actualHash); + // Compute the actual hash to compare to the expected image's hash. + char actualHash[33]; + getMD5HashStringForBitmap(context.get(), actualHash); + printf("\nActualHash: %s\n", actualHash); - // FIXME: We should compare the actualHash to the expected hash here and - // only set dumpImage to true if they don't match, but DRT doesn't have - // enough information currently to find the expected checksum file. - bool dumpImage = true; + // FIXME: We should compare the actualHash to the expected hash here and + // only set dumpImage to true if they don't match, but DRT doesn't have + // enough information currently to find the expected checksum file. + bool dumpImage = true; - if (dumpImage) { - RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(context.get())); - printPNG(image.get()); + if (dumpImage) { + RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(context.get())); + printPNG(image.get()); + } } - + printf("#EOF\n"); } 93477 4 23965 simon.fraser 2008-09-30 17:40:25 -0700 Created attachment 23965 Patch, changelog 93478 5 23965 mitz 2008-09-30 17:42:16 -0700 Comment on attachment 23965 Patch, changelog r=me 93479 6 simon.fraser 2008-09-30 17:43:44 -0700 M WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm M WebKitTools/ChangeLog M WebKitTools/Scripts/run-webkit-tests r37129 = 783a6ba5d73a582590947cb76f7859d8d42b4f9c (trunk) 23965 2008-09-30 17:40:25 -0700 2008-09-30 17:42:16 -0700 Patch, changelog 21124_patch.txt text/plain 2142 simon.fraser ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv Zw1pbmRleCBmZWRiNjc4Li5hNGE3MmRiIDEwMDY0NA0tLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cNKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nDUBAIC0xLDMgKzEsMTQgQEANKzIwMDgtMDkt MzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+DSsNKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuDSsNKyAgICAgICAgRG9uJ3QgcnVuIHBpeGVsIGNvbXBh cmlzb24gZm9yIHRleHQtb25seSB0ZXN0cy4NKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMTI0DSsgICAgICAgIA0rICAgICAgICAqIER1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToNKyAgICAgICAgKGR1bXApOg0rICAgICAgICAqIFNj cmlwdHMvcnVuLXdlYmtpdC10ZXN0czoNKw0gMjAwOC0wOS0yOSAgVGhpYWdvIE1hY2llaXJhICA8 dGhpYWdvLm1hY2llaXJhQG5va2lhLmNvbT4NIA0gICAgICAgICBSZXZpZXdlZCBieSBTaW1vbi4N ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJl ZS5tbSBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQ1p bmRleCA5ZTlmMjM5Li43YTRiYWJiIDEwMDY0NA0tLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0NKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tDUBAIC04NjcsMTIgKzg2NywxMiBAQCB2b2lkIGR1bXAo KQ0gew0gICAgIGludmFsaWRhdGVBbnlQcmV2aW91c1dhaXRUb0R1bXBXYXRjaGRvZygpOw0gDSsg ICAgYm9vbCBkdW1wQXNUZXh0ID0gZ0xheW91dFRlc3RDb250cm9sbGVyLT5kdW1wQXNUZXh0KCk7 DSAgICAgaWYgKGR1bXBUcmVlKSB7DSAgICAgICAgIE5TU3RyaW5nICpyZXN1bHRTdHJpbmcgPSBu aWw7DSAgICAgICAgIE5TRGF0YSAqcmVzdWx0RGF0YSA9IG5pbDsNICAgICAgICAgTlNTdHJpbmcg KnJlc3VsdE1pbWVUeXBlID0gQCJ0ZXh0L3BsYWluIjsNIA0tICAgICAgICBib29sIGR1bXBBc1Rl eHQgPSBnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBBc1RleHQoKTsNICAgICAgICAgZHVtcEFz VGV4dCB8PSBbW1ttYWluRnJhbWUgZGF0YVNvdXJjZV0gX3Jlc3BvbnNlTUlNRVR5cGVdIGlzRXF1 YWxUb1N0cmluZzpAInRleHQvcGxhaW4iXTsNICAgICAgICAgZ0xheW91dFRlc3RDb250cm9sbGVy LT5zZXREdW1wQXNUZXh0KGR1bXBBc1RleHQpOw0gICAgICAgICBpZiAoZ0xheW91dFRlc3RDb250 cm9sbGVyLT5kdW1wQXNUZXh0KCkpIHsNQEAgLTkxNSw3ICs5MTUsNyBAQCB2b2lkIGR1bXAoKQ0g ICAgICAgICB9ICAgICAgICAgICAgDSAgICAgfQ0gICAgIA0tICAgIGlmIChkdW1wUGl4ZWxzKQ0r ICAgIGlmIChkdW1wQWxsUGl4ZWxzIHx8IChkdW1wUGl4ZWxzICYmICFkdW1wQXNUZXh0KSkNICAg ICAgICAgZHVtcFdlYlZpZXdBc1BpeGVsc0FuZENvbXBhcmVXaXRoRXhwZWN0ZWQoW2N1cnJlbnRU ZXN0IFVURjhTdHJpbmddLCBkdW1wQWxsUGl4ZWxzKTsNIA0gICAgIGZmbHVzaChzdGRvdXQpOw1k aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzDWluZGV4IDhhMDVlOGQuLjM0NWY4Y2EgMTAw NzU1DS0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cw0rKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMNQEAgLTYyNyw3ICs2MjcsNyBAQCBmb3Ig bXkgJHRlc3QgKEB0ZXN0cykgew0gICAgIG15ICRkaWZmUGVyY2VudGFnZSA9ICIiOw0gICAgIG15 ICRkaWZmUmVzdWx0ID0gInBhc3NlZCI7DSAgICAgDS0gICAgaWYgKCRwaXhlbFRlc3RzKSB7DSsg ICAgaWYgKCRwaXhlbFRlc3RzICYmICEkaXNUZXh0KSB7DSAgICAgICAgIG15ICRleHBlY3RlZFBp eGVsRGlyID0gZXhwZWN0ZWREaXJlY3RvcnlGb3JUZXN0KCRiYXNlLCAkaXNUZXh0LCAicG5nIik7 DSANICAgICAgICAgbXkgJGFjdHVhbEhhc2ggPSAiIjsN