[LayoutTests] Rebaseline text tests with pixel refs

[JonWBedard]

67855f6

[LayoutTests] Rebaseline text tests with pixel refs
rdar://127396069
https://bugs.webkit.org/show_bug.cgi?id=273595

Reviewed by Sam Sneddon.

There are a number of text based tests which have pixel refs. Since these tests explicitly
dumpText, they cannot also be pixel tests.

* LayoutTests/TestExpectations:
* LayoutTests/imported/w3c/web-platform-tests/css/css-break/relpos-inline-hit-testing-expected.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-break/relpos-inline-hit-testing-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-004-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-size/col-wrap-005-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-001-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-001-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-002-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-002-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-003-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/colspan-003-expected.xht: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell-expected.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/css-tables/percent-height-overflow-auto-in-restricted-block-size-cell-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-004-expected.html: Removed.
* LayoutTests/imported/w3c/web-platform-tests/mathml/relations/css-styling/width-height-004-expected.txt: Added.
* LayoutTests/platform/ios/TestExpectations:
* LayoutTests/platform/mac/TestExpectations:

Canonical link: https://commits.webkit.org/278402@main

b07c0a1

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

[webkit-early-warning-system]

EWS run on previous version of this PR (hash 05e5de1)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	❌ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	❌ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-skia
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	❌ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🛠 watch
	✅ 🛠 watch-sim

[Ahmad-S792]

Just for my knowledge asking - LayoutTest use this but WPT in imported folder use LayoutTests/imported/w3c/web-platform-tests/resources/testharnessreport.js?

[JonWBedard]

No, the WPT tests use this too when run under run-webkit-tests, it's how WPT tests know how to interact with WebKitTestRunner.

[gsnedders]

So it turns out that upstream WPT doesn't lint for this: https://github.com/web-platform-tests/wpt/blob/c5ced76d2189c00405d2c153f406fdcd8f91781d/tools/lint/lint.py#L451-L469

This is another thing we should fix, and just fix the tests.

[JonWBedard]

Clearly, this doesn't work, testRunner.shouldDumpPixels() isn't a thing. I'll be working on a solution.

[gsnedders]

There's a number of moving parts here, and a number of places where we could fix this.

• The importer is (was?) copying the <link rel=match> files to -expected.html (I suspect https://commits.webkit.org/277673@main may well have fixed that, and they will no longer be copied, as like the upstream code it won't it as a reftest any more).
• Fixing the tests to avoid both being defined (and probably add a lint, lint for tests with link rel=match and testharness.js web-platform-tests/wpt#46058).
• Once we move over to actually paying attention to <link rel=match> instead of just looking for -expected.html, making sure we don't load that URL in this case.

[webkit-early-warning-system]

EWS run on current version of this PR (hash b07c0a1)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

[gsnedders]

This seems fine; we should have a longer-term solution to avoid these being added to WPT in the first place, and make sure we haven't missed anything from this PR.

[webkit-commit-queue]

Committed 278402@main (67855f6): https://commits.webkit.org/278402@main

Reviewed commits have been landed. Closing PR #28071 and removing active labels.