Bug 216944 – Change dumpAsText to strip trailing spaces

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Darin Adler]

We should change the dumpAsText machinery to strip trailing spaces.

We’re not getting any value for comparing them, this helps Alan Bujtas with a project that affects trailing space collapsing, there are a lot of irritating trailing spaces in WPT tests, and this even makes the expected.txt files a tiny, tiny bit smaller.

We’ll update all the expected.txt files with a script.

[Darin Adler]

I think I’ll do this in 4 steps:

1) Make run-webkit-tests ignore trailing space differences in expected.txt files.

2) Change DumpRenderTree and WebKitTestRunner to not dump any trailing spaces.

3) Do a global replace across all the expected.txt files to remove existing trailing spaces (probably won’t post a patch for review for this step).

4) Remove the code from (1), no need to ignore trailing space differences any more.

Anyone have a better idea?

[Darin Adler]

Here’s the command line I will use for step 3:

    find . -name '*-expected.txt' | xargs perl -i -pe 's/ +$//g'

[Darin Adler]

Created attachment 409716 [details]
Patch

[zalan]

Comment on attachment 409716 [details]
Patch

Thanks for doing this!

[Darin Adler]

Comment on attachment 409716 [details]
Patch

I have a slightly better version of this patch that I will land, but only after seeing no failures on EWS.

[Darin Adler]

Created attachment 409723 [details]
Patch

[Darin Adler]

Created attachment 409734 [details]
Patch

[Darin Adler]

Running into trouble with other things that write into the file like these:

CONSOLE MESSSAGE:
PROMPT:

Won’t be hard to fix.

[Darin Adler]

Created attachment 409753 [details]
Patch

[Darin Adler]

Created attachment 409765 [details]
Patch

[Darin Adler]

Created attachment 409779 [details]
Patch

[Darin Adler]

Created attachment 409788 [details]
Patch

[Darin Adler]

Created attachment 409794 [details]
Patch

[Darin Adler]

Created attachment 409795 [details]
Patch

[Darin Adler]

(In reply to Darin Adler from comment #2)
> Here’s the command line I will use for step 3:
> 
>     find . -name '*-expected.txt' | xargs perl -i -pe 's/ +$//g'

Fancier version that skips web archive files:

find . -name '*-expected.txt' | xargs awk '/^CONSOLE MESSAGE:/ { next }; /^<\?xml/ { nextfile }; { print FILENAME; nextfile }' | xargs perl -i -pe 's/ +$//g'

[Darin Adler]

Created attachment 409796 [details]
Patch

[Darin Adler]

Committed r267640: <https://trac.webkit.org/changeset/267640>

[Radar WebKit Bug Importer]

<rdar://problem/69637010>