84327 2012-04-19 04:11:51 -0700 [Qt] Make DRT not dump pixel results if test is calling layoutTestController.dumpAsText() 2012-04-23 00:10:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84246 1 milian.wolff webkit-unassigned abecsi ossy webkit.review.bot oldest_to_newest 605485 0 milian.wolff 2012-04-19 04:11:51 -0700 The DRT-Qt port creates pixel dumps even for test cases where this is not expected. I.e.: ./Tools/Scripts/run-webkit-tests -p LayoutTests/printing/page-break-orphans.html -> creates a PNG of the page and complains about missing baseline According to Dirk Pranke (https://lists.webkit.org/pipermail/webkit-dev/2012-April/020349.html) pixel dumps should not be created when layoutTestController.dumpAsText() was called. The attached patch does that and fixes the problem mentioned above. 605488 1 137875 milian.wolff 2012-04-19 04:19:56 -0700 Created attachment 137875 don't dump pixels if shouldDumpAsText is true patch that checks m_controller->shouldDumpAsText() and prevents the pixel-dump when that is true 605492 2 137875 ossy 2012-04-19 04:30:06 -0700 Comment on attachment 137875 don't dump pixels if shouldDumpAsText is true View in context: https://bugs.webkit.org/attachment.cgi?id=137875&action=review Only small nitpicks, otherwise LGTM. Please update the patch and upload it with r? > Tools/ChangeLog:5 > + Qt: don't dump pixels if test should be dumped as text > + > + [Qt] don't dump pixels if test should be dumped as text Could you add the title (the new one, please) only once to the changelog? > Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:951 > // FIXME: All other ports don't dump pixels, if generatePixelResults is false. Please remove this FIXME, we don't need anymore after your fix. 605519 3 137886 milian.wolff 2012-04-19 05:44:41 -0700 Created attachment 137886 don't dump pixels if shouldDumpAsText is true fix issues raised by Ossy 605522 4 137886 ossy 2012-04-19 05:51:24 -0700 Comment on attachment 137886 don't dump pixels if shouldDumpAsText is true View in context: https://bugs.webkit.org/attachment.cgi?id=137886&action=review Something is wrong with Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp, because it can't be applied. > Tools/ChangeLog:5 > + [Qt] Make DRT not dump pixel results if test is calling layoutTestController.dumpAsText() > + > + Reviewed by NOBODY (OOPS!). [Qt] Make DRT not dump pixel results if test is calling layoutTestController.dumpAsText() https://bugs.webkit.org/show_bug.cgi?id=84327 Reviewed by NOBODY (OOPS!). 605541 5 137893 milian.wolff 2012-04-19 06:41:42 -0700 Created attachment 137893 don't dump pixels if shouldDumpAsText is true - create patch that directly applies against master - add bug url to changelog entry 607494 6 137893 ossy 2012-04-22 23:30:57 -0700 Comment on attachment 137893 don't dump pixels if shouldDumpAsText is true LGTM, r=me. 607513 7 137893 webkit.review.bot 2012-04-23 00:10:44 -0700 Comment on attachment 137893 don't dump pixels if shouldDumpAsText is true Clearing flags on attachment: 137893 Committed r114875: <http://trac.webkit.org/changeset/114875> 607514 8 webkit.review.bot 2012-04-23 00:10:49 -0700 All reviewed patches have been landed. Closing bug. 137875 2012-04-19 04:19:56 -0700 2012-04-19 05:44:41 -0700 don't dump pixels if shouldDumpAsText is true 0002-Qt-don-t-dump-pixels-if-test-should-be-dumped-as-tex.patch text/plain 1707 milian.wolff RnJvbSA4NjhmNDkzY2EwMDY3YzNjYmMzMmU5OWZhZGEyZWM5NjdmYzc0YzM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWxpYW4gV29sZmYgPG1haWxAbWlsaWFudy5kZT4KRGF0ZTog VGh1LCAxOSBBcHIgMjAxMiAxMjo1MzoxMyArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBRdDog ZG9uJ3QgZHVtcCBwaXhlbHMgaWYgdGVzdCBzaG91bGQgYmUgZHVtcGVkIGFzIHRleHQKCi0tLQog VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDExICsrKysr KysrKysrCiBUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcCB8ICAg IDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDg0 OTc1My4uMmFjN2ZjYSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEyLTA0LTE5ICBNaWxpYW4gV29sZmYgIDxtYWls QG1pbGlhbncuZGU+CiAKKyAgICAgICAgUXQ6IGRvbid0IGR1bXAgcGl4ZWxzIGlmIHRlc3Qgc2hv dWxkIGJlIGR1bXBlZCBhcyB0ZXh0CisKKyAgICAgICAgW1F0XSBkb24ndCBkdW1wIHBpeGVscyBp ZiB0ZXN0IHNob3VsZCBiZSBkdW1wZWQgYXMgdGV4dAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRy ZWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6ZHVtcCk6CisKKzIw MTItMDQtMTkgIE1pbGlhbiBXb2xmZiAgPG1haWxAbWlsaWFudy5kZT4KKwogICAgICAgICBRdDog cHJvcGVybHkgaGFuZGxlIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRQcmludGluZyB0byBjcmVh dGUgcGl4ZWwgdGVzdHMKIAogICAgICAgICBbUXRdIEFkZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c2V0UHJpbnRpbmcgc3VwcG9ydCB0byBRdCB1bml0IHRlc3RzCmRpZmYgLS1naXQgYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCmluZGV4IDRlZjM4NjAuLjUzYjVjYTggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCisrKyBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCkBAIC05NDksNyAr OTQ5LDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZHVtcCgpCiAgICAgZnB1dHMoIiNFT0ZcbiIs IHN0ZGVycik7CiAKICAgICAvLyBGSVhNRTogQWxsIG90aGVyIHBvcnRzIGRvbid0IGR1bXAgcGl4 ZWxzLCBpZiBnZW5lcmF0ZVBpeGVsUmVzdWx0cyBpcyBmYWxzZS4KLSAgICBpZiAobV9kdW1wUGl4 ZWxzKSB7CisgICAgaWYgKG1fZHVtcFBpeGVscyAmJiAhbV9jb250cm9sbGVyLT5zaG91bGREdW1w QXNUZXh0KCkpIHsKICAgICAgICAgUUltYWdlIGltYWdlOwogICAgICAgICBpZiAoIW1fY29udHJv bGxlci0+aXNQcmludGluZygpKSB7CiAgICAgICAgICAgICBpbWFnZSA9IFFJbWFnZShtX3BhZ2Ut PnZpZXdwb3J0U2l6ZSgpLCBRSW1hZ2U6OkZvcm1hdF9BUkdCMzIpOwotLSAKMS43LjUuNAoK 137886 2012-04-19 05:44:41 -0700 2012-04-19 06:41:42 -0700 don't dump pixels if shouldDumpAsText is true 0002-Qt-don-t-dump-pixels-if-test-should-be-dumped-as-tex.patch text/plain 1656 milian.wolff RnJvbSAxZDNjZDJhN2FhY2VhMTZkYjQzMjgyNmM4MzZmMWMwZGUxNTk1YTE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWxpYW4gV29sZmYgPG1haWxAbWlsaWFudy5kZT4KRGF0ZTog VGh1LCAxOSBBcHIgMjAxMiAxMjo1MzoxMyArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBRdDog ZG9uJ3QgZHVtcCBwaXhlbHMgaWYgdGVzdCBzaG91bGQgYmUgZHVtcGVkIGFzIHRleHQKCi0tLQog VG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICsrKysr KysrKwogVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgfCAgICAz ICstLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyZGQ4 NjU0Li45N2QzZjhjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTItMDQtMTkgIE1pbGlhbiBXb2xmZiAgPG1haWxA bWlsaWFudy5kZT4KIAorICAgICAgICBbUXRdIE1ha2UgRFJUIG5vdCBkdW1wIHBpeGVsIHJlc3Vs dHMgaWYgdGVzdCBpcyBjYWxsaW5nIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEdW1w UmVuZGVyVHJlZTo6ZHVtcCk6CisKKzIwMTItMDQtMTkgIE1pbGlhbiBXb2xmZiAgPG1haWxAbWls aWFudy5kZT4KKwogICAgICAgICBbUXRdIGFkZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0UHJp bnRpbmcgc3VwcG9ydCB0byBRdCB1bml0IHRlc3RzCiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVu ZGVyVHJlZVF0LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQu Y3BwCmluZGV4IDRlZjM4NjAuLmNhMWM4N2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0R1bXBSZW5kZXJUcmVlUXQuY3BwCkBAIC05NDgsOCArOTQ4LDcgQEAgdm9pZCBEdW1wUmVuZGVy VHJlZTo6ZHVtcCgpCiAgICAgZnB1dHMoIiNFT0ZcbiIsIHN0ZG91dCk7CiAgICAgZnB1dHMoIiNF T0ZcbiIsIHN0ZGVycik7CiAKLSAgICAvLyBGSVhNRTogQWxsIG90aGVyIHBvcnRzIGRvbid0IGR1 bXAgcGl4ZWxzLCBpZiBnZW5lcmF0ZVBpeGVsUmVzdWx0cyBpcyBmYWxzZS4KLSAgICBpZiAobV9k dW1wUGl4ZWxzKSB7CisgICAgaWYgKG1fZHVtcFBpeGVscyAmJiAhbV9jb250cm9sbGVyLT5zaG91 bGREdW1wQXNUZXh0KCkpIHsKICAgICAgICAgUUltYWdlIGltYWdlOwogICAgICAgICBpZiAoIW1f Y29udHJvbGxlci0+aXNQcmludGluZygpKSB7CiAgICAgICAgICAgICBpbWFnZSA9IFFJbWFnZSht X3BhZ2UtPnZpZXdwb3J0U2l6ZSgpLCBRSW1hZ2U6OkZvcm1hdF9BUkdCMzIpOwotLSAKMS43LjUu NAoK 137893 2012-04-19 06:41:42 -0700 2012-04-23 00:10:44 -0700 don't dump pixels if shouldDumpAsText is true 0001-Qt-don-t-dump-pixels-if-test-should-be-dumped-as-tex.patch text/plain 1704 milian.wolff RnJvbSAwNDYyMWQwNzc0NzlhZmY0ZjFhZjE1YjlhNmMwYzEyNmQ3ZWM2OWY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWxpYW4gV29sZmYgPG1haWxAbWlsaWFudy5kZT4KRGF0ZTog VGh1LCAxOSBBcHIgMjAxMiAxMjo1MzoxMyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIFF0OiBkb24n dCBkdW1wIHBpeGVscyBpZiB0ZXN0IHNob3VsZCBiZSBkdW1wZWQgYXMgdGV4dAoKLS0tCiBUb29s cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTAgKysrKysrKysr KwogVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgfCAgICAzICst LQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxNWMyZGUw Li40NTJlZmU0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDQtMTkgIE1pbGlhbiBXb2xmZiAgPG1haWxAbWls aWFudy5kZT4KKworICAgICAgICBbUXRdIE1ha2UgRFJUIG5vdCBkdW1wIHBpeGVsIHJlc3VsdHMg aWYgdGVzdCBpcyBjYWxsaW5nIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQzMjcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRl clRyZWU6OmR1bXApOgorCiAyMDEyLTA0LTE4ICBIaXJvbm9yaSBCb25vICA8aGJvbm9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFNwbGl0IFNwZWxsQ2hlY2tlcjo6ZGlkQ2hlY2soKSB0byBTcGVs bENoZWNrZXI6OmRpZENoZWNrU3VjY2VlZGVkKCkgYW5kIFNwZWxsQ2hlY2tlcjo6ZGlkQ2hlY2tD YW5jZWxlZCgpCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVy VHJlZVF0LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3Bw CmluZGV4IDU1ZDY0ZWYuLjY3NjBkMDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1 bXBSZW5kZXJUcmVlUXQuY3BwCkBAIC05NDgsOCArOTQ4LDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJl ZTo6ZHVtcCgpCiAgICAgZnB1dHMoIiNFT0ZcbiIsIHN0ZG91dCk7CiAgICAgZnB1dHMoIiNFT0Zc biIsIHN0ZGVycik7CiAKLSAgICAvLyBGSVhNRTogQWxsIG90aGVyIHBvcnRzIGRvbid0IGR1bXAg cGl4ZWxzLCBpZiBnZW5lcmF0ZVBpeGVsUmVzdWx0cyBpcyBmYWxzZS4KLSAgICBpZiAobV9kdW1w UGl4ZWxzKSB7CisgICAgaWYgKG1fZHVtcFBpeGVscyAmJiAhbV9jb250cm9sbGVyLT5zaG91bGRE dW1wQXNUZXh0KCkpIHsKICAgICAgICAgUUltYWdlIGltYWdlKG1fcGFnZS0+dmlld3BvcnRTaXpl KCksIFFJbWFnZTo6Rm9ybWF0X0FSR0IzMik7CiAgICAgICAgIGltYWdlLmZpbGwoUXQ6OndoaXRl KTsKICAgICAgICAgUVBhaW50ZXIgcGFpbnRlcigmaW1hZ2UpOwotLSAKMS43LjUuNAoK