[webkit-dev] Trailing space changes in "expected.txt" files

Darin Adler darin at apple.com
Sat Sep 26 20:13:03 PDT 2020


Hi folks.

This afternoon, I changed dumpAsText so it strips trailing spaces.

    https://trac.webkit.org/changeset/267640

As part of that change, run-webkit-tests temporarily will ignore trailing spaces in expected.txt files, so they can be checked in with, or without, the spaces. Over the next few days, I’ll be checking in new versions of expected.txt files with the spaces at the ends of lines stripped. Once we have all the spaces stripped, then run-webkit-tests will go back to being strict about this again.

This affects you if you have a patch that changes an expected.txt file; the space changes might lead to patch conflicts. If you do encounter conflicts, you can resolve them by rebasing and either regenerating the expected.txt files hand editing. Any newly-regenerated files won’t have any trailing spaces, and it’s best if newly checked in files do not have trailing spaces.

If you run into any trouble with this, please get in touch.

— Darin


More information about the webkit-dev mailing list